linux/sizes.h: add SZ_8G for 1GB RAM size
Subsystems (3)
PATCH 1/2 linux/sizes.h: add SZ_8G for 1GB RAM size
Add additional macro to handle a 1GB RAM size in 8Gb.
Drop the redundant entry from the Mediatek arch.
--- arch/arm/mach-mediatek/mt7988/init.c | 2 -- include/linux/sizes.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-mediatek/mt7988/init.c +0 -2
@@ -12,8 +12,6 @@DECLARE_GLOBAL_DATA_PTR ; -#define SZ_8G _AC(0x200000000, ULL) -int dram_init (void ) {int ret;
include/linux/sizes.h +1 -0
@@ -47,5 +47,6 @@#define SZ_2G 0x80000000#define SZ_4G _AC(0x100000000, ULL) +#define SZ_8G _AC(0x200000000, ULL)#endif /* __LINUX_SIZES_H__ */
Signature · 1 line
2.48.1
PATCH 2/2 airoha: rework RAM size handling to support multiple RAM size
There are multiple version of the same reference board with different RAM size and it's not enough to base the RAM size entirely from DT. To better support it use the get_ram_size way to scan for the actual RAM size of Airoha SoC and increase the size of the memory map.
--- arch/arm/mach-airoha/an7581/init.c | 22 ++++++++++++++++++---- arch/arm/mach-airoha/an7583/init.c | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-)
arch/arm/mach-airoha/an7581/init.c +18 -4
@@ -3,8 +3,11 @@#include <fdtdec.h> #include <init.h> #include <asm/armv8/mmu.h> +#include <asm/global_data.h> #include <asm/system.h> +DECLARE_GLOBAL_DATA_PTR ; +int print_cpuinfo (void ) {printf ("CPU: Airoha AN7581\n" );
@@ -13,12 +16,23 @@ int print_cpuinfo(void)int dram_init (void ) { -return fdtdec_setup_mem_size_base (); +int ret; + + ret =fdtdec_setup_mem_size_base (); +if (ret) +return ret; + + gd->ram_size =get_ram_size ((void *)gd->ram_base,SZ_8G ); + +return 0 ; }int dram_init_banksize (void ) { -return fdtdec_setup_memory_banksize (); + gd->bd->bi_dram[0 ].start = gd->ram_base; + gd->bd->bi_dram[0 ].size = gd->ram_size; + +return 0 ; }void reset_cpu (ulong addr)
@@ -31,12 +45,12 @@ static struct mm_region an7581_mem_map[] = {/* DDR */ .virt = 0x80000000UL, .phys = 0x80000000UL, - .size = 0x80000000UL, + .size = 0x200000000ULL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, }, { .virt = 0x00000000UL, .phys = 0x00000000UL, - .size =0x20000000UL , + .size =0x40000000UL , .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |PTE_BLOCK_NON_SHARE |PTE_BLOCK_PXN |PTE_BLOCK_UXN
arch/arm/mach-airoha/an7583/init.c +18 -4
@@ -4,6 +4,9 @@#include <init.h> #include <asm/armv8/mmu.h> #include <asm/system.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR ;int print_cpuinfo (void ) {
@@ -13,12 +16,23 @@ int print_cpuinfo(void)int dram_init (void ) { -return fdtdec_setup_mem_size_base (); +int ret; + + ret =fdtdec_setup_mem_size_base (); +if (ret) +return ret; + + gd->ram_size =get_ram_size ((void *)gd->ram_base,SZ_8G ); + +return 0 ; }int dram_init_banksize (void ) { -return fdtdec_setup_memory_banksize (); + gd->bd->bi_dram[0 ].start = gd->ram_base; + gd->bd->bi_dram[0 ].size = gd->ram_size; + +return 0 ; }void reset_cpu (ulong addr)
@@ -31,12 +45,12 @@ static struct mm_region an7583_mem_map[] = {/* DDR */ .virt = 0x80000000UL, .phys = 0x80000000UL, - .size = 0x80000000UL, + .size = 0x200000000ULL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, }, { .virt = 0x00000000UL, .phys = 0x00000000UL, - .size =0x20000000UL , + .size =0x40000000UL , .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |PTE_BLOCK_NON_SHARE |PTE_BLOCK_PXN |PTE_BLOCK_UXN
Signature · 1 line
2.48.1
Re: [PATCH 2/2] airoha: rework RAM size handling to support multiple RAM size
Quoted 6 lines · Christian Marangi
There are multiple version of the same reference board with different RAM size and it's not enough to base the RAM size entirely from DT. To better support it use the
get_ram_sizeway to scan for the actual RAM size of Airoha SoC and increase the size of the memory map.Signed-off-by Christian Marangi <[email protected]>
Sorry ignore this as it was sent by mistake, I resent a new version of the same patch that actually apply and build.
Quoted 120 lines
--- arch/arm/mach-airoha/an7581/init.c | 22 ++++++++++++++++++---- arch/arm/mach-airoha/an7583/init.c | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-)arch/arm/mach-airoha/an7581/init.c +18
-4@@ -3,8 +3,11 @@#include <fdtdec.h> #include <init.h> #include <asm/armv8/mmu.h> +#include <asm/global_data.h> #include <asm/system.h> +DECLARE_GLOBAL_DATA_PTR ; +int print_cpuinfo (void ) {printf ("CPU: Airoha AN7581\n" );@@ -13,12 +16,23 @@ int print_cpuinfo(void)int dram_init (void ) { -return fdtdec_setup_mem_size_base (); +int ret; + + ret =fdtdec_setup_mem_size_base (); +if (ret) +return ret; + + gd->ram_size =get_ram_size ((void *)gd->ram_base,SZ_8G ); + +return 0 ; }int dram_init_banksize (void ) { -return fdtdec_setup_memory_banksize (); + gd->bd->bi_dram[0 ].start = gd->ram_base; + gd->bd->bi_dram[0 ].size = gd->ram_size; + +return 0 ; }void reset_cpu (ulong addr)@@ -31,12 +45,12 @@ static struct mm_region an7581_mem_map[] = {/* DDR */ .virt = 0x80000000UL, .phys = 0x80000000UL, - .size = 0x80000000UL, + .size = 0x200000000ULL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, }, { .virt = 0x00000000UL, .phys = 0x00000000UL, - .size =0x20000000UL , + .size =0x40000000UL , .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |PTE_BLOCK_NON_SHARE |PTE_BLOCK_PXN |PTE_BLOCK_UXN arch/arm/mach-airoha/an7583/init.c +18
-4@@ -4,6 +4,9 @@#include <init.h> #include <asm/armv8/mmu.h> #include <asm/system.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR ;int print_cpuinfo (void ) {@@ -13,12 +16,23 @@ int print_cpuinfo(void)int dram_init (void ) { -return fdtdec_setup_mem_size_base (); +int ret; + + ret =fdtdec_setup_mem_size_base (); +if (ret) +return ret; + + gd->ram_size =get_ram_size ((void *)gd->ram_base,SZ_8G ); + +return 0 ; }int dram_init_banksize (void ) { -return fdtdec_setup_memory_banksize (); + gd->bd->bi_dram[0 ].start = gd->ram_base; + gd->bd->bi_dram[0 ].size = gd->ram_size; + +return 0 ; }void reset_cpu (ulong addr)@@ -31,12 +45,12 @@ static struct mm_region an7583_mem_map[] = {/* DDR */ .virt = 0x80000000UL, .phys = 0x80000000UL, - .size = 0x80000000UL, + .size = 0x200000000ULL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, }, { .virt = 0x00000000UL, .phys = 0x00000000UL, - .size =0x20000000UL , + .size =0x40000000UL , .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |PTE_BLOCK_NON_SHARE |PTE_BLOCK_PXN |PTE_BLOCK_UXN Signature · 1 line
2.48.1
Signature · 1 line
Ansuel
On July 16, 2025 thus sayeth Christian Marangi:
Quoted 28 lines
Add additional macro to handle a 1GB RAM size in 8Gb.
Drop the redundant entry from the Mediatek arch.
Signed-off-by Christian Marangi <[email protected]>--- arch/arm/mach-mediatek/mt7988/init.c | 2 -- include/linux/sizes.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)arch/arm/mach-mediatek/mt7988/init.c +0
-2@@ -12,8 +12,6 @@DECLARE_GLOBAL_DATA_PTR ; -#define SZ_8G _AC(0x200000000, ULL) -int dram_init (void ) {int ret;include/linux/sizes.h +0
-0
include/linux/sizes.h line 50
Quoted 4 lines
include/linux/sizes.h +1
-0@@ -47,5 +47,6 @@#define SZ_2G 0x80000000#define SZ_4G _AC(0x100000000, ULL) +#define SZ_8G _AC(0x200000000, ULL)
Should we just copy over linux/sizes.h from the kernel? It seems like we're missing more than just SZ_8G from them
~Bryan