[PATCH] arm: stm32mp: Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled

[PATCH] arm: stm32mp: Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled

[Patrice Chotard]

From: Patrice Chotard <patrice.chotard@st.com>

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>
---

 arch/arm/mach-stm32mp/cpu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 3faa4ec18a..cd503b7294 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -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();
 
-- 
2.17.1

[PATCH] arm: stm32mp: Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled

[Patrick DELAUNAY]

Hi Patrice,

On 2/24/21 1:53 PM, Patrice Chotard wrote:
> From: Patrice Chotard <patrice.chotard@st.com>
>
> 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>
> ---
>
>   arch/arm/mach-stm32mp/cpu.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

[PATCH] arm: stm32mp: Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled

[Patrice CHOTARD]

Hi

On 3/12/21 10:52 AM, Patrick DELAUNAY wrote:
> Hi Patrice,
> 
> On 2/24/21 1:53 PM, Patrice Chotard wrote:
>> From: Patrice Chotard <patrice.chotard@st.com>
>>
>> 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>
>> ---
>>
>> ? arch/arm/mach-stm32mp/cpu.c | 6 ++++--
>> ? 1 file changed, 4 insertions(+), 2 deletions(-)
>>
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick

Applied to u-boot-stm/next

Thanks

Patrice