From fd5da7a84731e9687f56c263ff3aa8ebed75075a Mon Sep 17 00:00:00 2001 From: Zelalem Aweke Date: Wed, 2 Feb 2022 15:29:13 -0600 Subject: [PATCH] refactor(mpam): remove initialization of EL2 registers when EL2 is used The patch removes initialization of MPAM EL2 registers when an EL2 software exists. The patch assumes the EL2 software will perform the necessary initializations of the registers. Signed-off-by: Zelalem Aweke Change-Id: I5bed81bc22f417bc3e3cbbcd860a8553cd4307cd --- lib/extensions/mpam/mpam.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/extensions/mpam/mpam.c b/lib/extensions/mpam/mpam.c index 65601ddec..884d480d5 100644 --- a/lib/extensions/mpam/mpam.c +++ b/lib/extensions/mpam/mpam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -27,7 +27,6 @@ void mpam_enable(bool el2_unused) /* * If EL2 is implemented but unused, disable trapping to EL2 when lower * ELs access their own MPAM registers. - * If EL2 is implemented and used, enable trapping to EL2. */ if (el2_unused) { write_mpam2_el2(0ULL); @@ -35,12 +34,5 @@ void mpam_enable(bool el2_unused) if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) { write_mpamhcr_el2(0ULL); } - } else { - write_mpam2_el2(MPAM2_EL2_TRAPMPAM0EL1 | - MPAM2_EL2_TRAPMPAM1EL1); - - if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) { - write_mpamhcr_el2(MPAMHCR_EL2_TRAP_MPAMIDR_EL1); - } } }