diff options
| author | Pali Rohár <pali@kernel.org> | 2022-09-14 13:37:46 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-06 21:05:17 -0400 |
| commit | ae17910117f3ae5957eb1d7498710f881a091155 (patch) | |
| tree | d3cef53917c4b702a6631862ce71885122a7b061 /arch/arm/cpu/armv8 | |
| parent | 3c29c0fce0fea675a78d51b10a233d496065618a (diff) | |
| download | u-boot-ae17910117f3ae5957eb1d7498710f881a091155.zip u-boot-ae17910117f3ae5957eb1d7498710f881a091155.tar.gz u-boot-ae17910117f3ae5957eb1d7498710f881a091155.tar.bz2 | |
armv8: cache_v8: Fix pgtables setup when MMU is already enabled
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>
Diffstat (limited to 'arch/arm/cpu/armv8')
| -rw-r--r-- | arch/arm/cpu/armv8/cache_v8.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index e4736e5..2a226fd 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -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); } |