[PATCH master] ARM: mmu32: mark whole early pagetable region as reserved

[PATCH master] ARM: mmu32: mark whole early pagetable region as reserved

[Ahmad Fatoum]

The TTB area allocated for early MMU is now 64K instead of 16K, yet only
the old 16K were requested to ensure e.g. memtest doesn't touch them.

Fix this by requesting the full region.

Fixes: 407ff71a3b5d ("ARM: mmu: alloc 64k for early page tables")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/cpu/mmu_32.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c
index ebe92969997e..3ed76e30840a 100644
--- a/arch/arm/cpu/mmu_32.c
+++ b/arch/arm/cpu/mmu_32.c
@@ -561,7 +561,8 @@ void __mmu_init(bool mmu_on)
 	struct memory_bank *bank;
 	uint32_t *ttb = get_ttb();
 
-	if (!request_sdram_region("ttb", (unsigned long)ttb, SZ_16K))
+	if (!request_sdram_region("ttb", (unsigned long)ttb,
+				  ARM_EARLY_PAGETABLE_SIZE))
 		/*
 		 * This can mean that:
 		 * - the early MMU code has put the ttb into a place
-- 
2.39.2

Re: [PATCH master] ARM: mmu32: mark whole early pagetable region as reserved

[Sascha Hauer]

On Thu, Aug 31, 2023 at 11:09:43AM +0200, Ahmad Fatoum wrote:
> The TTB area allocated for early MMU is now 64K instead of 16K, yet only
> the old 16K were requested to ensure e.g. memtest doesn't touch them.
> 
> Fix this by requesting the full region.
> 
> Fixes: 407ff71a3b5d ("ARM: mmu: alloc 64k for early page tables")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/cpu/mmu_32.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c
> index ebe92969997e..3ed76e30840a 100644
> --- a/arch/arm/cpu/mmu_32.c
> +++ b/arch/arm/cpu/mmu_32.c
> @@ -561,7 +561,8 @@ void __mmu_init(bool mmu_on)
>  	struct memory_bank *bank;
>  	uint32_t *ttb = get_ttb();
>  
> -	if (!request_sdram_region("ttb", (unsigned long)ttb, SZ_16K))
> +	if (!request_sdram_region("ttb", (unsigned long)ttb,
> +				  ARM_EARLY_PAGETABLE_SIZE))
>  		/*
>  		 * This can mean that:
>  		 * - the early MMU code has put the ttb into a place
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |