armv8: enable HAFDBS for other ELx when FEAT_HAFDBS is present

u-boot could be run at EL1/EL2/EL3. so we set it as same as EL1 does.
otherwise it will hang when enable mmu, that is what we encounter
in our SOC.

Signed-off-by: meitao <meitaogao@asrmicro.com>
[ Paul: pick from the Android tree. Rebase to the upstream ]
Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
Cc: Tom Rini <trini@konsulko.com>
Link: https://android.googlesource.com/platform/external/u-boot/+/3bf38943aeab4700c2319bff2a1477d99c6afd2f

diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 4c6a1b1d6c5ee74f03fc39da7ca2f8dd53617cd0..cb1131a0480e788c4d85fe2c24df09713c8f05b0 100644 (file)
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -94,11 +94,15 @@ u64 get_tcr(u64 *pips, u64 *pva_bits)
        if (el == 1) {
                tcr = TCR_EL1_RSVD | (ips << 32) | TCR_EPD1_DISABLE;
                if (gd->arch.has_hafdbs)
-                       tcr |= TCR_HA | TCR_HD;
+                       tcr |= TCR_EL1_HA | TCR_EL1_HD;
        } else if (el == 2) {
                tcr = TCR_EL2_RSVD | (ips << 16);
+               if (gd->arch.has_hafdbs)
+                       tcr |= TCR_EL2_HA | TCR_EL2_HD;
        } else {
                tcr = TCR_EL3_RSVD | (ips << 16);
+               if (gd->arch.has_hafdbs)
+                       tcr |= TCR_EL3_HA | TCR_EL3_HD;
        }
 
        /* PTWs cacheable, inner/outer WBWA and inner shareable */

diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h
index 98a27db3166bd6d11bb861c6248e9442ebbc4893..19a9e112a43448f7142e984964d3fb2245b9a105 100644 (file)
--- a/arch/arm/include/asm/armv8/mmu.h
+++ b/arch/arm/include/asm/armv8/mmu.h
@@ -102,8 +102,14 @@
 #define TCR_TG0_16K            (2 << 14)
 #define TCR_EPD1_DISABLE       (1 << 23)
 
-#define TCR_HA                 BIT(39)
-#define TCR_HD                 BIT(40)
+#define TCR_EL1_HA             BIT(39)
+#define TCR_EL1_HD             BIT(40)
+
+#define TCR_EL2_HA             BIT(21)
+#define TCR_EL2_HD             BIT(22)
+
+#define TCR_EL3_HA             BIT(21)
+#define TCR_EL3_HD             BIT(22)
 
 #define TCR_EL1_RSVD           (1U << 31)
 #define TCR_EL2_RSVD           (1U << 31 | 1 << 23)