common: Add get_effective_memsize() to memsize.c
Subsystems (2)
PATCH v2 1/1 common: Add get_effective_memsize() to memsize.c
This function has been around for powerpc. It is used for systems with memory more than CONFIG_MAX_MEM_MAPPED. In case of non-contiguous memory, this feature can limit U-boot to one block without going over the limit.
---
Change log:
v1: The function is added to arch/arm/lib/board.c without changing others
v2: The function is moved to common/memsize.c, using __weak. The prototype
is added to include/common.h. Also consolidate existing functions for powerpc.
arch/arm/lib/board.c | 2 +- arch/powerpc/cpu/mpc512x/traps.c | 1 - arch/powerpc/cpu/mpc85xx/traps.c | 1 - arch/powerpc/cpu/mpc86xx/traps.c | 1 - arch/powerpc/lib/board.c | 18 ------------------ arch/powerpc/lib/bootm.c | 1 - board/freescale/c29xpcie/spl.c | 2 +- board/freescale/p1022ds/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- common/board_f.c | 11 ----------- common/cmd_log.c | 2 +- common/memsize.c | 16 +++++++++++++++- include/common.h | 1 + 13 files changed, 21 insertions(+), 39 deletions(-)
arch/arm/lib/board.c +1 -1
@@ -322,7 +322,7 @@ void board_init_f(ulong bootflag) gd->ram_size -=CONFIG_SYS_MEM_TOP_HIDE ;#endif - addr =CONFIG_SYS_SDRAM_BASE + gd->ram_size; + addr =CONFIG_SYS_SDRAM_BASE +get_effective_memsize ();#ifdef CONFIG_LOGBUFFER #ifndef CONFIG_ALT_LB_ADDR
arch/powerpc/cpu/mpc512x/traps.c +0 -1
@@ -27,7 +27,6 @@ extern unsigned long search_exception_table(unsigned long);* amount of memory on the system if we're unable to keep all * the memory mapped in. */ -extern ulong get_effective_memsize (void );#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())/*
arch/powerpc/cpu/mpc85xx/traps.c +0 -1
@@ -35,7 +35,6 @@ extern unsigned long search_exception_table(unsigned long);* amount of memory on the system if we're unable to keep all * the memory mapped in. */ -extern ulong get_effective_memsize (void );#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())static __inline__void set_tsr (unsigned long val)
arch/powerpc/cpu/mpc86xx/traps.c +0 -1
@@ -29,7 +29,6 @@ extern unsigned long search_exception_table(unsigned long);* amount of memory on the system if we're unable to keep all * the memory mapped in. */ -extern ulong get_effective_memsize (void );#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())/*
arch/powerpc/lib/board.c +0 -18
@@ -312,17 +312,6 @@ static init_fnc_t *init_sequence[] = { NULL, /* Terminate this list */ }; -ulong get_effective_memsize (void ) -{ -#ifndef CONFIG_VERY_BIG_RAM -return gd->ram_size; -#else -/* limit stack to what we can reasonable map */ -return ((gd->ram_size >CONFIG_MAX_MEM_MAPPED ) ? -CONFIG_MAX_MEM_MAPPED : gd->ram_size); -#endif -} -static int __fixup_cpu (void ) {return 0 ;
@@ -343,13 +332,6 @@ int fixup_cpu(void) __attribute__((weak, alias("__fixup_cpu")));* initialized, and stack space is limited to a few kB. */ -#ifdef CONFIG_LOGBUFFER -unsigned long logbuffer_base (void ) -{ -return CONFIG_SYS_SDRAM_BASE +get_effective_memsize () -LOGBUFF_LEN ; -} -#endif -void board_init_f (ulong bootflag) {bd_t *bd;
arch/powerpc/lib/bootm.c +0 -1
@@ -30,7 +30,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern ulong get_effective_memsize (void );static ulong get_sp (void );extern void ft_fixup_num_cores (void *blob);static void set_clocks_in_mhz (bd_t *kbd);
board/freescale/c29xpcie/spl.c +1 -1
@@ -12,7 +12,7 @@DECLARE_GLOBAL_DATA_PTR ; -ulong get_effective_memsize (void ) +phys_size_t get_effective_memsize (void ) {return CONFIG_SYS_L2_SIZE ; }
board/freescale/p1022ds/spl.c +1 -1
@@ -21,7 +21,7 @@ static const u32 sysclk_tbl[] = { 99999000, 11111000, 12499800, 13333200 }; -ulong get_effective_memsize (void ) +phys_size_t get_effective_memsize (void ) {return CONFIG_SYS_L2_SIZE ; }
board/freescale/p1_p2_rdb_pc/spl.c +1 -1
@@ -20,7 +20,7 @@ static const u32 sysclk_tbl[] = { 99999000, 11111000, 12499800, 13333200 }; -ulong get_effective_memsize (void ) +phys_size_t get_effective_memsize (void ) {return CONFIG_SYS_L2_SIZE ; }
common/board_f.c +0 -11
@@ -223,17 +223,6 @@ static int show_dram_config(void)return 0 ; } -ulong get_effective_memsize (void ) -{ -#ifndef CONFIG_VERY_BIG_RAM -return gd->ram_size; -#else -/* limit stack to what we can reasonable map */ -return ((gd->ram_size >CONFIG_MAX_MEM_MAPPED ) ? -CONFIG_MAX_MEM_MAPPED : gd->ram_size); -#endif -} -void __dram_init_banksize (void ) {#if defined(CONFIG_NR_DRAM_BANKS ) && defined(CONFIG_SYS_SDRAM_BASE )
common/cmd_log.c +1 -1
@@ -52,7 +52,7 @@ static char *lbuf;unsigned long __logbuffer_base (void ) { -return CONFIG_SYS_SDRAM_BASE + gd->ram_size -LOGBUFF_LEN ; +return CONFIG_SYS_SDRAM_BASE +get_effective_memsize () -LOGBUFF_LEN ; }unsigned long logbuffer_base (void ) __attribute__((weak,alias ("__logbuffer_base" )));
common/memsize.c +15 -1
@@ -5,7 +5,10 @@* SPDX-License-Identifier: GPL-2.0+ */ -#include <config.h> +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; +#ifdef __PPC__/* * At least on G2 PowerPC cores, sequential accesses to non-existent
@@ -76,3 +79,14 @@ long get_ram_size(long *base, long maxsize)return (maxsize); } + +phys_size_t __weak get_effective_memsize (void ) +{ +#ifndef CONFIG_VERY_BIG_RAM +return gd->ram_size; +#else +/* limit stack to what we can reasonable map */ +return ((gd->ram_size >CONFIG_MAX_MEM_MAPPED ) ? +CONFIG_MAX_MEM_MAPPED : gd->ram_size); +#endif +}
include/common.h +1 -0
@@ -454,6 +454,7 @@ void api_init (void);/* common/memsize.c */ long get_ram_size (long *,long ); +phys_size_t get_effective_memsize (void );/* $(BOARD)/$(BOARD).c */ void reset_phy (void );
Signature · 1 line
1.7.9.5
PATCH v2 1/1 common: Add get_effective_memsize() to memsize.c
Hi York,
Quoted 12 lines · York Sun
This function has been around for powerpc. It is used for systems with memory more than
CONFIG_MAX_MEM_MAPPED. In case of non-contiguous memory, this feature can limit U-boot to one block without going over the limit.Signed-off-by York Sun <[email protected]>---
Change log:
v1: The function is added toarch/arm/lib/board.cwithout changing others
v2: The function is moved tocommon/memsize.c, using__weak. The prototype
is added toinclude/common.h. Also consolidate existing functions for powerpc.
Quoted 14 lines
arch/arm/lib/board.c | 2 +- arch/powerpc/cpu/mpc512x/traps.c | 1 - arch/powerpc/cpu/mpc85xx/traps.c | 1 - arch/powerpc/cpu/mpc86xx/traps.c | 1 - arch/powerpc/lib/board.c | 18 ------------------ arch/powerpc/lib/bootm.c | 1 - board/freescale/c29xpcie/spl.c | 2 +- board/freescale/p1022ds/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- common/board_f.c | 11 ----------- common/cmd_log.c | 2 +- common/memsize.c | 16 +++++++++++++++- include/common.h | 1 + 13 files changed, 21 insertions(+), 39 deletions(-)
For the trivial ARM change:
Since the rest is essentially PPC, though, it makes sense not to go through the ARM repo for this patch.
Amicalement,
Signature · 1 line
Albert.
PATCH v2 1/1 common: Add get_effective_memsize() to memsize.c
Quoted 32 lines · Albert ARIBAUD
Hi York,
Quoted 12 lines · York Sun
This function has been around for powerpc. It is used for systems with memory more than
CONFIG_MAX_MEM_MAPPED. In case of non-contiguous memory, this feature can limit U-boot to one block without going over the limit.Signed-off-by York Sun <[email protected]>---
Change log:
v1: The function is added toarch/arm/lib/board.cwithout changing others
v2: The function is moved tocommon/memsize.c, using__weak. The prototype
is added toinclude/common.h. Also consolidate existing functions for powerpc.Quoted 14 lines
arch/arm/lib/board.c | 2 +- arch/powerpc/cpu/mpc512x/traps.c | 1 - arch/powerpc/cpu/mpc85xx/traps.c | 1 - arch/powerpc/cpu/mpc86xx/traps.c | 1 - arch/powerpc/lib/board.c | 18 ------------------ arch/powerpc/lib/bootm.c | 1 - board/freescale/c29xpcie/spl.c | 2 +- board/freescale/p1022ds/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- common/board_f.c | 11 ----------- common/cmd_log.c | 2 +- common/memsize.c | 16 +++++++++++++++- include/common.h | 1 + 13 files changed, 21 insertions(+), 39 deletions(-)
Quoted 7 lines
For the trivial ARM change:
Acked-by Albert ARIBAUD <[email protected]>Since the rest is essentially PPC, though, it makes sense not to go through the ARM repo for this patch.
Agree. Originally I put the change mainly to arch/arm/lib/board.c. That's why it went to you.
I will merge it.
York
PATCH v2 1/1 common: Add get_effective_memsize() to memsize.c
In reply to York SunQuoted 6 lines · York Sun
This function has been around for powerpc. It is used for systems with memory more than
CONFIG_MAX_MEM_MAPPED. In case of non-contiguous memory, this feature can limit U-boot to one block without going over the limit.Signed-off-by York Sun <[email protected]>Acked-by Albert ARIBAUD <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140221/113f2f0b/attachment.pgp>