andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "refactor(mpam): remove initialization of EL2 registers when EL2 is used" into integration

This commit is contained in:
Joanna Farley 2022-04-12 17:44:41 +02:00 committed by TrustedFirmware Code Review
parent d2b68f498f fd5da7a847
commit 9c2e925964
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/extensions/mpam/mpam.c
View File

@ -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 * 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 * If EL2 is implemented but unused, disable trapping to EL2 when lower
* ELs access their own MPAM registers. * ELs access their own MPAM registers.
* If EL2 is implemented and used, enable trapping to EL2.
*/ */
if (el2_unused) { if (el2_unused) {
write_mpam2_el2(0ULL); write_mpam2_el2(0ULL);
@ -35,12 +34,5 @@ void mpam_enable(bool el2_unused)
if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) { if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) {
write_mpamhcr_el2(0ULL); 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);
}
} }
} }