TF-A: Fix wrong register read for MPAM extension

This patch fixes wrong ID_AA64DFR0_EL1 register read instead of
ID_AA64PFR0_EL1 to detect support for MPAM extension.
It also implements get_mpam_version() function which returns
MPAM version as:
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;

Change-Id: I31d776b1a1b60cb16e5e62296d70adb129d7b760
Reported-by: Matteo Zini <matteozini96@gmail.com>
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>

diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h
index 92e673771f4104dc4a55e8706ff53aaec4e25667..9d4ad3ba819ef366a05274527fab408ed64acf41 100644 (file)
--- a/include/arch/aarch64/arch.h
+++ b/include/arch/aarch64/arch.h
@@ -259,6 +259,9 @@
 #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 ID_AA64PFR1_MPAM_FRAC_SHIFT    ULL(16)
+#define ID_AA64PFR1_MPAM_FRAC_MASK     ULL(0xf)
+
 /* ID_PFR1_EL1 definitions */
 #define ID_PFR1_VIRTEXT_SHIFT  U(12)
 #define ID_PFR1_VIRTEXT_MASK   U(0xf)

diff --git a/include/arch/aarch64/arch_features.h b/include/arch/aarch64/arch_features.h
index 49d827dbab93ce7eb729c9a262c7622b85789246..321485aedbeb6939a93e5e790f3a0b6fb5787a1f 100644 (file)
--- a/include/arch/aarch64/arch_features.h
+++ b/include/arch/aarch64/arch_features.h
@@ -64,4 +64,21 @@ static inline bool is_armv8_6_twed_present(void)
                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 */

diff --git a/lib/extensions/mpam/mpam.c b/lib/extensions/mpam/mpam.c
index e794f013b65394830a8969d0901313186bfb4c47..65601ddec74c834750aa8526840caebaf4666490 100644 (file)
--- a/lib/extensions/mpam/mpam.c
+++ b/lib/extensions/mpam/mpam.c
@@ -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
  */
@@ -7,20 +7,16 @@
 #include <stdbool.h>
 
 #include <arch.h>
+#include <arch_features.h>
 #include <arch_helpers.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)
 {
-       if (!mpam_supported())
+       /* Check if MPAM is implemented */
+       if (get_mpam_version() == 0U) {
                return;
+       }
 
        /*
         * 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_unused) {
-               write_mpam2_el2(0);
+               write_mpam2_el2(0ULL);
 
-               if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U)
-                       write_mpamhcr_el2(0);
+               if ((read_mpamidr_el1() & MPAMIDR_HAS_HCR_BIT) != 0U) {
+                       write_mpamhcr_el2(0ULL);
+               }
        } else {
                write_mpam2_el2(MPAM2_EL2_TRAPMPAM0EL1 |
                                MPAM2_EL2_TRAPMPAM1EL1);