From edebefbcbc01f4ab67a7838e0191736fd9ee0192 Mon Sep 17 00:00:00 2001 From: Arvind Ram Prakash Date: Wed, 11 Oct 2023 12:10:56 -0500 Subject: fix(mpam): refine MPAM initialization and enablement process Restricts MPAM to only NS world and enables trap to EL3 for access of MPAM registers from lower ELs of Secure and Realm world. This patch removes MPAM enablement from global context and adds it to EL3 State context which enables/disables MPAM during world switches. Renamed ENABLE_MPAM_FOR_LOWER_ELS to ENABLE_FEAT_MPAM and removed mpam_init_el3() as RESET behaviour is trapping. Signed-off-by: Arvind Ram Prakash Change-Id: I131f9dba5df236a71959b2d425ee11af7f3c38c4 --- plat/arm/board/arm_fpga/platform.mk | 2 +- plat/arm/board/fvp/platform.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plat') diff --git a/plat/arm/board/arm_fpga/platform.mk b/plat/arm/board/arm_fpga/platform.mk index bd56f30db..c71c99a21 100644 --- a/plat/arm/board/arm_fpga/platform.mk +++ b/plat/arm/board/arm_fpga/platform.mk @@ -41,7 +41,7 @@ ENABLE_FEAT_CSV2_2 := 2 ENABLE_FEAT_ECV := 2 ENABLE_FEAT_FGT := 2 ENABLE_FEAT_HCX := 2 -ENABLE_MPAM_FOR_LOWER_ELS := 2 +ENABLE_FEAT_MPAM := 2 ENABLE_SYS_REG_TRACE_FOR_NS := 2 ENABLE_TRF_FOR_NS := 2 diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 72f94b0a1..7a2b5ced2 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -53,7 +53,7 @@ ifneq (${SPD}, tspd) ENABLE_FEAT_AMU := 2 ENABLE_FEAT_AMUv1p1 := 2 ENABLE_FEAT_HCX := 2 - ENABLE_MPAM_FOR_LOWER_ELS := 2 + ENABLE_FEAT_MPAM := 2 ENABLE_FEAT_RNG := 2 ENABLE_FEAT_TWED := 2 ENABLE_FEAT_GCS := 2 -- cgit v1.2.3