summaryrefslogtreecommitdiff
path: root/include/arch
diff options
context:
space:
mode:
authorLouis Mayencourt <louis.mayencourt@arm.com>2019-02-11 11:25:50 +0000
committerLouis Mayencourt <louis.mayencourt@arm.com>2019-02-28 10:28:25 +0000
commit537fa859176ff86a9fc5c261384a2d8d0d8c2846 (patch)
treea600ce205c728442923d5a55219a9bcc2cefcfca /include/arch
parent1baa28bb2dc79f23c550d67604324afd222221c3 (diff)
MPAM: enable MPAM EL2 traps
Complete the MPAM enablement in TF-A for lower ELs by enabling the EL2 traps in MPAMHCR_EL2 and MPAM2_EL2.This prevents an MPAM-unaware-hypervisor to be restricted by an MPAM-aware-guest. Change-Id: I47bf3f833fa22baa590f83d49cc0e3f2974e698d Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>
Diffstat (limited to 'include/arch')
-rw-r--r--include/arch/aarch64/arch.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h
index b9d1f9fa..88a28554 100644
--- a/include/arch/aarch64/arch.h
+++ b/include/arch/aarch64/arch.h
@@ -782,6 +782,10 @@
/* MPAM register definitions */
#define MPAM3_EL3_MPAMEN_BIT (ULL(1) << 63)
+#define MPAMHCR_EL2_TRAP_MPAMIDR_EL1 (ULL(1) << 31)
+
+#define MPAM2_EL2_TRAPMPAM0EL1 (ULL(1) << 49)
+#define MPAM2_EL2_TRAPMPAM1EL1 (ULL(1) << 48)
#define MPAMIDR_HAS_HCR_BIT (ULL(1) << 17)