arm: stm32mp: Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are...
authorPatrice Chotard <patrice.chotard@st.com>
Wed, 24 Feb 2021 12:53:27 +0000 (13:53 +0100)
committerPatrice Chotard <patrice.chotard@foss.st.com>
Fri, 12 Mar 2021 09:58:55 +0000 (10:58 +0100)
Fix following compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS
are enabled :

arch/arm/mach-stm32mp/cpu.c: In function ‘early_enable_caches’:
arch/arm/mach-stm32mp/cpu.c:223:10: error: ‘volatile struct arch_global_data’ has no member named ‘tlb_size’
  223 |  gd->arch.tlb_size = PGTABLE_SIZE;
      |          ^
arch/arm/mach-stm32mp/cpu.c:224:10: error: ‘volatile struct arch_global_data’ has no member named ‘tlb_addr’
  224 |  gd->arch.tlb_addr = (unsigned long)&early_tlb;
      |          ^

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
arch/arm/mach-stm32mp/cpu.c

index 9a76b56..bc2db53 100644 (file)
@@ -223,8 +223,10 @@ static void early_enable_caches(void)
        if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
                return;
 
-       gd->arch.tlb_size = PGTABLE_SIZE;
-       gd->arch.tlb_addr = (unsigned long)&early_tlb;
+       if (!(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))) {
+               gd->arch.tlb_size = PGTABLE_SIZE;
+               gd->arch.tlb_addr = (unsigned long)&early_tlb;
+       }
 
        dcache_enable();