common/board_f: Make reserve_mmu generic
Subsystems (3)
PATCH 1/1 common/board_f: Make reserve_mmu generic
Introduce arch_reserve_mmu to allow for architecture-specific reserve_mmu routines.
For ARM, move the reserve_mmu definition from common/board_f.c to arch/arm/lib/cache.c. Define arm_reserve_mmu and make it a weak define to allow machines to override it (in mach-versal/cpu.c and mach-zynqmp/cpu.c).
--- arch/arm/include/asm/cache.h | 2 ++ arch/arm/lib/cache.c | 33 +++++++++++++++++++++++++++++++++ arch/arm/mach-versal/cpu.c | 6 +++++- arch/arm/mach-zynqmp/cpu.c | 6 +++++- common/board_f.c | 32 ++++++-------------------------- include/init.h | 2 +- 6 files changed, 52 insertions(+), 29 deletions(-)
arch/arm/include/asm/cache.h +2 -0
@@ -49,4 +49,6 @@ void dram_bank_mmu_setup(int bank);*/ #define ARCH_DMA_MINALIGN CONFIG_SYS_CACHELINE_SIZE +int arm_reserve_mmu (void ); +#endif /* _ASM_CACHE_H */
arch/arm/lib/cache.c +33 -0
@@ -10,6 +10,8 @@#include <cpu_func.h> #include <malloc.h> +DECLARE_GLOBAL_DATA_PTR ; +/* * Flush range from all levels of d-cache/unified-cache. * Affects the range [start, start + size - 1].
@@ -118,3 +120,34 @@ void invalidate_l2_cache(void) isb(); }#endif + +int arch_reserve_mmu (void ) +{ +return arm_reserve_mmu (); +} + +__weak int arm_reserve_mmu (void ) +{ +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF )) +/* reserve TLB table */ + gd->arch.tlb_size =PGTABLE_SIZE ; + gd->relocaddr -= gd->arch.tlb_size; + +/* round down to next 64 kB limit */ + gd->relocaddr &= ~(0x10000 -1 ); + + gd->arch.tlb_addr = gd->relocaddr; +debug ("TLB table from %08lx to %08lx\n" , gd->arch.tlb_addr, + gd->arch.tlb_addr + gd->arch.tlb_size); + +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE +/* +* Record allocated tlb_addr in case gd->tlb_addr to be overwritten +* with location within secure ram. +*/ + gd->arch.tlb_allocated = gd->arch.tlb_addr; +#endif +#endif + +return 0 ; +}
arch/arm/mach-versal/cpu.c +5 -1
@@ -10,6 +10,10 @@#include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> +#if defined(CONFIG_SYS_MEM_RSVD_FOR_MMU ) +#include <asm/cache.h> +#endif +DECLARE_GLOBAL_DATA_PTR ;#define VERSAL_MEM_MAP_USED 5
@@ -98,7 +102,7 @@ u64 get_page_table_size(void) }#if defined(CONFIG_SYS_MEM_RSVD_FOR_MMU ) -int reserve_mmu (void ) +int arm_reserve_mmu (void ) {tcm_init (TCM_LOCK ); gd->arch.tlb_size =PGTABLE_SIZE ;
arch/arm/mach-zynqmp/cpu.c +5 -1
@@ -12,6 +12,10 @@#include <asm/io.h> #include <zynqmp_firmware.h> +#ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU +#include <asm/cache.h> +#endif +#define ZYNQ_SILICON_VER_MASK 0xF000#define ZYNQ_SILICON_VER_SHIFT 12
@@ -116,7 +120,7 @@ void tcm_init(u8 mode)#endif #ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU -int reserve_mmu (void ) +int arm_reserve_mmu (void ) {tcm_init (TCM_LOCK ); gd->arch.tlb_size =PGTABLE_SIZE ;
common/board_f.c +6 -26
@@ -385,33 +385,15 @@ static int reserve_round_4k(void)return 0 ; } -#ifdef CONFIG_ARM -__weak int reserve_mmu (void ) +__weak int arch_reserve_mmu (void ) { -#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF )) -/* reserve TLB table */ - gd->arch.tlb_size =PGTABLE_SIZE ; - gd->relocaddr -= gd->arch.tlb_size; - -/* round down to next 64 kB limit */ - gd->relocaddr &= ~(0x10000 -1 ); - - gd->arch.tlb_addr = gd->relocaddr; -debug ("TLB table from %08lx to %08lx\n" , gd->arch.tlb_addr, - gd->arch.tlb_addr + gd->arch.tlb_size); - -#ifdef CONFIG_SYS_MEM_RESERVE_SECURE -/* -* Record allocated tlb_addr in case gd->tlb_addr to be overwritten -* with location within secure ram. -*/ - gd->arch.tlb_allocated = gd->arch.tlb_addr; -#endif -#endif -return 0 ; } -#endif + +static int reserve_mmu (void ) +{ +return arch_reserve_mmu (); +}static int reserve_video (void ) {
@@ -970,9 +952,7 @@ static const init_fnc_t init_sequence_f[] = { reserve_pram, #endif reserve_round_4k, -#ifdef CONFIG_ARM reserve_mmu, -#endif reserve_video, reserve_trace, reserve_uboot,
include/init.h +1 -1
@@ -145,7 +145,7 @@ int init_cache_f_r(void);int print_cpuinfo (void );#endif int timer_init (void ); -int reserve_mmu (void ); +int arch_reserve_mmu (void );int misc_init_f (void );#if defined(CONFIG_DTB_RESELECT )
Signature · 1 line
2.17.1
PATCH 1/1 common/board_f: Make reserve_mmu generic
Hi,
Quoted 6 lines · Ovidiu Panait
Introduce
arch_reserve_mmuto allow for architecture-specificreserve_mmuroutines.For ARM, move the
reserve_mmudefinition fromcommon/board_f.ctoarch/arm/lib/cache.c.
Can you please do that bit in an initial patch before this one?
Quoted 4 lines
Define
arm_reserve_mmuand make it a weak define to allow machines to override it (inmach-versal/cpu.candmach-zynqmp/cpu.c).Signed-off-by Ovidiu Panait <[email protected]>
Quoted 8 lines
--- arch/arm/include/asm/cache.h | 2 ++ arch/arm/lib/cache.c | 33 +++++++++++++++++++++++++++++++++ arch/arm/mach-versal/cpu.c | 6 +++++- arch/arm/mach-zynqmp/cpu.c | 6 +++++- common/board_f.c | 32 ++++++-------------------------- include/init.h | 2 +- 6 files changed, 52 insertions(+), 29 deletions(-)
Can you please try to use if() instead of #if as much as possible?
arch/arm/include/asm/cache.h void dram_bank_mmu_setup(int bank); · line 52
Quoted 10 lines
arch/arm/include/asm/cache.h +1
-0@@ -49,4 +49,6 @@ void dram_bank_mmu_setup(int bank);*/ #define ARCH_DMA_MINALIGN CONFIG_SYS_CACHELINE_SIZE +int arm_reserve_mmu (void );
Function comment
Quoted 55 lines
arch/arm/include/asm/cache.h +1
-0+#endif /* _ASM_CACHE_H */ arch/arm/lib/cache.c +33
-0@@ -10,6 +10,8 @@#include <cpu_func.h> #include <malloc.h> +DECLARE_GLOBAL_DATA_PTR ; +/* * Flush range from all levels of d-cache/unified-cache. * Affects the range [start, start + size - 1]. @@ -118,3 +120,34 @@ void invalidate_l2_cache(void) isb(); }#endif + +int arch_reserve_mmu (void ) +{ +return arm_reserve_mmu (); +} + +__weak int arm_reserve_mmu (void ) +{ +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF )) +/* reserve TLB table */ + gd->arch.tlb_size =PGTABLE_SIZE ; + gd->relocaddr -= gd->arch.tlb_size; + +/* round down to next 64 kB limit */ + gd->relocaddr &= ~(0x10000 -1 ); + + gd->arch.tlb_addr = gd->relocaddr; +debug ("TLB table from %08lx to %08lx\n" , gd->arch.tlb_addr, + gd->arch.tlb_addr + gd->arch.tlb_size); + +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE +/* +* Record allocated tlb_addr in case gd->tlb_addr to be overwritten +* with location within secure ram. +*/ + gd->arch.tlb_allocated = gd->arch.tlb_addr; +#endif +#endif + +return 0 ; +}arch/arm/mach-versal/cpu.c +0
-0
arch/arm/mach-versal/cpu.c line 13
Quoted 4 lines
arch/arm/mach-versal/cpu.c +1
-0@@ -10,6 +10,10 @@#include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> +#if defined(CONFIG_SYS_MEM_RSVD_FOR_MMU )
Can you drop that #if?
Quoted 20 lines
arch/arm/mach-versal/cpu.c +4
-1+#include <asm/cache.h> +#endif +DECLARE_GLOBAL_DATA_PTR ;#define VERSAL_MEM_MAP_USED 5@@ -98,7 +102,7 @@ u64 get_page_table_size(void) }#if defined(CONFIG_SYS_MEM_RSVD_FOR_MMU ) -int reserve_mmu (void ) +int arm_reserve_mmu (void ) {tcm_init (TCM_LOCK ); gd->arch.tlb_size =PGTABLE_SIZE ;arch/arm/mach-zynqmp/cpu.c +0
-0
arch/arm/mach-zynqmp/cpu.c line 15
Quoted 4 lines
arch/arm/mach-zynqmp/cpu.c +1
-0@@ -12,6 +12,10 @@#include <asm/io.h> #include <zynqmp_firmware.h> +#ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU
Can you drop this #ifdef?
Quoted 46 lines
arch/arm/mach-zynqmp/cpu.c +4
-1+#include <asm/cache.h> +#endif +#define ZYNQ_SILICON_VER_MASK 0xF000#define ZYNQ_SILICON_VER_SHIFT 12@@ -116,7 +120,7 @@ void tcm_init(u8 mode)#endif #ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU -int reserve_mmu (void ) +int arm_reserve_mmu (void ) {tcm_init (TCM_LOCK ); gd->arch.tlb_size =PGTABLE_SIZE ;common/board_f.c +1
-21@@ -385,33 +385,15 @@ static int reserve_round_4k(void)return 0 ; } -#ifdef CONFIG_ARM -__weak int reserve_mmu (void ) +__weak int arch_reserve_mmu (void ) { -#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF )) -/* reserve TLB table */ - gd->arch.tlb_size =PGTABLE_SIZE ; - gd->relocaddr -= gd->arch.tlb_size; - -/* round down to next 64 kB limit */ - gd->relocaddr &= ~(0x10000 -1 ); - - gd->arch.tlb_addr = gd->relocaddr; -debug ("TLB table from %08lx to %08lx\n" , gd->arch.tlb_addr, - gd->arch.tlb_addr + gd->arch.tlb_size); - -#ifdef CONFIG_SYS_MEM_RESERVE_SECURE -/* -* Record allocated tlb_addr in case gd->tlb_addr to be overwritten -* with location within secure ram. -*/ - gd->arch.tlb_allocated = gd->arch.tlb_addr; -#endif
common/board_f.c static int reserve_round_4k(void) · line 396
Quoted 10 lines
common/board_f.c +5
-3-#endif -return 0 ; } -#endif + +static int reserve_mmu (void ) +{ +return arch_reserve_mmu (); +}
Then can we just put arch_reserve_mmu() in the thing below and drop this fnuction?
Quoted 18 lines
common/board_f.c +0
-2static int reserve_video (void ) {@@ -970,9 +952,7 @@ static const init_fnc_t init_sequence_f[] = { reserve_pram, #endif reserve_round_4k, -#ifdef CONFIG_ARM reserve_mmu, -#endif reserve_video, reserve_trace, reserve_uboot,include/init.h +0
-0
include/init.h int init_cache_f_r(void); · line 148
Quoted 5 lines
include/init.h +1
-1@@ -145,7 +145,7 @@ int init_cache_f_r(void);int print_cpuinfo (void );#endif int timer_init (void ); -int reserve_mmu (void ); +int arch_reserve_mmu (void );
function comment
Quoted 6 lines
include/init.h +0
-1int misc_init_f (void );#if defined(CONFIG_DTB_RESELECT ) --2.17.1
Regards,
Simon