]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
armv8: cache_v8: Fix pgtables setup when MMU is already enabled
authorPali Rohár <pali@kernel.org>
Wed, 14 Sep 2022 11:37:46 +0000 (13:37 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 7 Oct 2022 01:05:17 +0000 (21:05 -0400)
When MMU is already enabled then dcache_enable() does not call mmu_setup()
and so setup_all_pgtables() is also never called.

In this situation when some driver calls mmu_set_region_dcache_behaviour()
function then U-Boot crashes with error message:

    Emergency page table not setup.

Fix this issue by explicitly calling setup_all_pgtables() in dcache_enable()
function near condition for mmu_setup().

This change fixes chainloading U-Boot from U-Boot on Turris Mox board which
uses mvneta ethernet driver which calls mmu_set_region_dcache_behaviour().

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
arch/arm/cpu/armv8/cache_v8.c

index e4736e564366838ebc10f24a8b97c17822734b60..2a226fd0633d40f28443749b34046a20242dd052 100644 (file)
@@ -503,6 +503,10 @@ void dcache_enable(void)
                mmu_setup();
        }
 
+       /* Set up page tables only once (it is done also by mmu_setup()) */
+       if (!gd->arch.tlb_fillptr)
+               setup_all_pgtables();
+
        set_sctlr(get_sctlr() | CR_C);
 }