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

Merge "TF-A: Fix wrong register read for MPAM extension" into integration

This commit is contained in:
Olivier Deprez 2020-05-28 07:35:31 +00:00 committed by TrustedFirmware Code Review
parent 343580e59a dbcc44a10e
commit 85dd0c9c9b
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/arch/aarch64/arch.h
View File

@ -259,6 +259,9 @@
#define MTE_IMPLEMENTED_EL0 ULL(1) /* MTE is only implemented at EL0 */ #define MTE_IMPLEMENTED_EL0 ULL(1) /* MTE is only implemented at EL0 */
#define MTE_IMPLEMENTED_ELX ULL(2) /* MTE is implemented at all ELs */ #define MTE_IMPLEMENTED_ELX ULL(2) /* MTE is implemented at all ELs */
#define ID_AA64PFR1_MPAM_FRAC_SHIFT ULL(16)
#define ID_AA64PFR1_MPAM_FRAC_MASK ULL(0xf)
/* ID_PFR1_EL1 definitions */ /* ID_PFR1_EL1 definitions */
#define ID_PFR1_VIRTEXT_SHIFT U(12) #define ID_PFR1_VIRTEXT_SHIFT U(12)
#define ID_PFR1_VIRTEXT_MASK U(0xf) #define ID_PFR1_VIRTEXT_MASK U(0xf)

17
include/arch/aarch64/arch_features.h
View File

@ -64,4 +64,21 @@ static inline bool is_armv8_6_twed_present(void)
ID_AA64MMFR1_EL1_TWED_MASK) == ID_AA64MMFR1_EL1_TWED_SUPPORTED); ID_AA64MMFR1_EL1_TWED_MASK) == ID_AA64MMFR1_EL1_TWED_SUPPORTED);
} }
/*
* Return MPAM version:
*
* 0x00: None Armv8.0 or later
* 0x01: v0.1 Armv8.4 or later
* 0x10: v1.0 Armv8.2 or later
* 0x11: v1.1 Armv8.4 or later
*
*/
static inline unsigned int get_mpam_version(void)
{
return (unsigned int)((((read_id_aa64pfr0_el1() >>
ID_AA64PFR0_MPAM_SHIFT) & ID_AA64PFR0_MPAM_MASK) << 4) |
((read_id_aa64pfr1_el1() >>
ID_AA64PFR1_MPAM_FRAC_SHIFT) & ID_AA64PFR1_MPAM_FRAC_MASK));
}
#endif /* ARCH_FEATURES_H */ #endif /* ARCH_FEATURES_H */

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,20 +7,16 @@
#include <stdbool.h> #include <stdbool.h>
#include <arch.h> #include <arch.h>
#include <arch_features.h>
#include <arch_helpers.h> #include <arch_helpers.h>
#include <lib/extensions/mpam.h> #include <lib/extensions/mpam.h>
bool mpam_supported(void)
{
uint64_t features = read_id_aa64dfr0_el1() >> ID_AA64PFR0_MPAM_SHIFT;
return ((features & ID_AA64PFR0_MPAM_MASK) != 0U);
}
void mpam_enable(bool el2_unused) void mpam_enable(bool el2_unused)
{ {
if (!mpam_supported()) /* Check if MPAM is implemented */
if (get_mpam_version() == 0U) {
return; return;
}
/* /*
* Enable MPAM, and disable trapping to EL3 when lower ELs access their * Enable MPAM, and disable trapping to EL3 when lower ELs access their
@ -34,10 +30,11 @@ void mpam_enable(bool el2_unused)
* If EL2 is implemented and used, enable trapping to EL2. * If EL2 is implemented and used, enable trapping to EL2.
*/ */
if (el2_unused) { if (el2_unused) {
write_mpam2_el2(0); write_mpam2_el2(0ULL);
if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) {
write_mpamhcr_el2(0); write_mpamhcr_el2(0ULL);
}
} else { } else {
write_mpam2_el2(MPAM2_EL2_TRAPMPAM0EL1 | write_mpam2_el2(MPAM2_EL2_TRAPMPAM0EL1 |
MPAM2_EL2_TRAPMPAM1EL1); MPAM2_EL2_TRAPMPAM1EL1);