Migrate CONFIG_LMB in Kconfig.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

(no changes since v1)

arch/arc/include/asm/config.h | 2 -- arch/arm/include/asm/config.h | 1 - arch/m68k/include/asm/config.h | 1 - arch/microblaze/include/asm/config.h | 2 -- arch/mips/include/asm/config.h | 1 - arch/nds32/include/asm/config.h | 1 - arch/powerpc/include/asm/config.h | 1 - arch/riscv/include/asm/config.h | 1 - arch/sh/include/asm/config.h | 2 -- arch/x86/include/asm/config.h | 1 - arch/xtensa/include/asm/config.h | 2 -- include/configs/10m50_devboard.h | 5 ----- include/configs/3c120_devboard.h | 5 ----- include/configs/sandbox.h | 2 -- include/configs/x86-common.h | 2 -- include/image.h | 2 +- lib/Kconfig | 7 +++++++ scripts/config_whitelist.txt | 1 - 18 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h index d88c361488..46e94be141 100644 --- a/arch/arc/include/asm/config.h +++ b/arch/arc/include/asm/config.h @@ -8,6 +8,4 @@

#define CONFIG_SYS_BOOT_RAMDISK_HIGH

-#define CONFIG_LMB - #endif /*__ASM_ARC_CONFIG_H_ */ diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index bf692ce279..14860d89b6 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#if defined(CONFIG_ARCH_LS1021A) || \ diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#endif diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h index 3ae71b3e01..221eb93d58 100644 --- a/arch/microblaze/include/asm/config.h +++ b/arch/microblaze/include/asm/config.h @@ -6,8 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB - #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#endif diff --git a/arch/mips/include/asm/config.h b/arch/mips/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/mips/include/asm/config.h +++ b/arch/mips/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#endif diff --git a/arch/nds32/include/asm/config.h b/arch/nds32/include/asm/config.h index 8964a58f27..6c1cbce7ef 100644 --- a/arch/nds32/include/asm/config.h +++ b/arch/nds32/include/asm/config.h @@ -7,6 +7,5 @@

#ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#define CONFIG_LMB

#endif diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index c9c9964630..99b410dc9b 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -18,7 +18,6 @@ #define HWCONFIG_BUFFER_SIZE 256 #endif

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#ifndef CONFIG_MAX_MEM_MAPPED diff --git a/arch/riscv/include/asm/config.h b/arch/riscv/include/asm/config.h index 156cb94dc0..d911007537 100644 --- a/arch/riscv/include/asm/config.h +++ b/arch/riscv/include/asm/config.h @@ -7,7 +7,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#endif diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h index e1cd322152..406156dff5 100644 --- a/arch/sh/include/asm/config.h +++ b/arch/sh/include/asm/config.h @@ -8,8 +8,6 @@

#include <asm/processor.h>

-#define CONFIG_LMB - /* Timer */ #define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */ diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h index 7ea443673a..221eb93d58 100644 --- a/arch/x86/include/asm/config.h +++ b/arch/x86/include/asm/config.h @@ -6,7 +6,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_

-#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH

#endif diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index 5a95fc93f7..a1096ab196 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -9,8 +9,6 @@

#include <asm/arch/core.h>

-#define CONFIG_LMB - /* * Make boot parameters available in the MMUv2 virtual memory layout by * restricting used physical memory to the first 128MB. diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 768b4a6dfc..3ffc744928 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -34,11 +34,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE

-/* - * FDT options - */ -#define CONFIG_LMB - /* * MEMORY ORGANIZATION * -Monitor at top of sdram. diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 30bbd716b2..3f065ff315 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -34,11 +34,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE

-/* - * FDT options - */ -#define CONFIG_LMB - /* * MEMORY ORGANIZATION * -Monitor at top of sdram. diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index e0708fe573..6abb78611a 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_TIMER_RATE 1000000 #endif

-#define CONFIG_LMB - #define CONFIG_HOST_MAX_DEVICES 4

/* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 641ed2c5ec..f186dd6b82 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -16,8 +16,6 @@ */ #define CONFIG_PHYSMEM

-#define CONFIG_LMB - #define CONFIG_SYS_BOOTM_LEN (16 << 20)

/* SATA AHCI storage */ diff --git a/include/image.h b/include/image.h index 138c83dd28..a8ca76b21f 100644 --- a/include/image.h +++ b/include/image.h @@ -434,7 +434,7 @@ typedef struct bootm_headers { #define BOOTM_STATE_OS_GO (0x00000400) int state;

-#ifdef CONFIG_LMB +#if defined(CONFIG_LMB) && !defined(USE_HOSTCC) struct lmb lmb; /* for memory mgmt */ #endif } bootm_headers_t; diff --git a/lib/Kconfig b/lib/Kconfig index b35a71ac36..43bd7190b9 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -699,6 +699,13 @@ config LIB_ELF Support basic elf loading/validating functions. This supports for 32 bit and 64 bit versions.

+config LMB + bool "Enable the logical memory blocks library (lmb)" + default y if ARC || ARM || M68K || MICROBLAZE || MIPS || NDS32 || \ + NIOS2 || PPC || RISCV || SANDBOX || SH || X86 || XTENSA + help + Support the library logical memory blocks. + endmenu

config PHANDLE_CHECK_SEQ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7340e95bd4..d464f04b6b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -954,7 +954,6 @@ CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LINUX CONFIG_LINUX_RESET_VEC CONFIG_LITTLETON_LCD -CONFIG_LMB CONFIG_LMS283GF05 CONFIG_LOADADDR CONFIG_LOADCMD

Remove the unused field size of struct lmb_region as it is initialized to 0 and never used after in lmb library.

See Linux kernel commit 4734b594c6ca ("memblock: Remove memblock_type.size and add memblock.memory_size instead")

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

(no changes since v1)

include/lmb.h | 1 - lib/lmb.c | 6 ------ 2 files changed, 7 deletions(-)

diff --git a/include/lmb.h b/include/lmb.h index e9f19b16ea..a3247544c1 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -21,7 +21,6 @@ struct lmb_property {

struct lmb_region { unsigned long cnt; - phys_size_t size; struct lmb_property region[MAX_LMB_REGIONS+1]; };

diff --git a/lib/lmb.c b/lib/lmb.c index d126f8dc04..5cf419f439 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -20,8 +20,6 @@ void lmb_dump_all_force(struct lmb *lmb)

printf("lmb_dump_all:\n"); printf(" memory.cnt = 0x%lx\n", lmb->memory.cnt); - printf(" memory.size = 0x%llx\n", - (unsigned long long)lmb->memory.size); for (i = 0; i < lmb->memory.cnt; i++) { printf(" memory.reg[0x%lx].base = 0x%llx\n", i, (unsigned long long)lmb->memory.region[i].base); @@ -30,8 +28,6 @@ void lmb_dump_all_force(struct lmb *lmb) }

printf("\n reserved.cnt = 0x%lx\n", lmb->reserved.cnt); - printf(" reserved.size = 0x%llx\n", - (unsigned long long)lmb->reserved.size); for (i = 0; i < lmb->reserved.cnt; i++) { printf(" reserved.reg[0x%lx].base = 0x%llx\n", i, (unsigned long long)lmb->reserved.region[i].base); @@ -100,9 +96,7 @@ static void lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, void lmb_init(struct lmb *lmb) { lmb->memory.cnt = 0; - lmb->memory.size = 0; lmb->reserved.cnt = 0; - lmb->reserved.size = 0; }

static void lmb_reserve_common(struct lmb *lmb, void *fdt_blob)

Add a max parameter in lmb_region struct to handle test in lmb_add_region without using the MAX_LMB_REGIONS define.

This patch allows to modify these size independently for memory of reserved regions in the next patches.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - add a max parameter extracted from v1 [3/5]

include/lmb.h | 1 + lib/lmb.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/lmb.h b/include/lmb.h index a3247544c1..f3397c7f73 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -21,6 +21,7 @@ struct lmb_property {

struct lmb_region { unsigned long cnt; + unsigned long max; struct lmb_property region[MAX_LMB_REGIONS+1]; };

diff --git a/lib/lmb.c b/lib/lmb.c index 5cf419f439..a926198d48 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -95,6 +95,9 @@ static void lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1,

void lmb_init(struct lmb *lmb) { + lmb->memory.max = MAX_LMB_REGIONS; + lmb->reserved.max = MAX_LMB_REGIONS; + lmb->memory.cnt = 0; lmb->reserved.cnt = 0; } @@ -179,7 +182,7 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t

if (coalesced) return coalesced; - if (rgn->cnt >= MAX_LMB_REGIONS) + if (rgn->cnt >= rgn->max) return -1;

/* Couldn't coalesce the LMB, so add it to the sorted table. */

Move MAX_LMB_REGIONS value in Kconfig, the max number of the regions in lmb library.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - new in v2: introduced MAX_LMB_REGIONS

include/lmb.h | 4 +--- lib/Kconfig | 10 +++++++++- lib/lmb.c | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/lmb.h b/include/lmb.h index f3397c7f73..d3adf8ef69 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -12,8 +12,6 @@ * Copyright (C) 2001 Peter Bergner, IBM Corp. */

-#define MAX_LMB_REGIONS 8 - struct lmb_property { phys_addr_t base; phys_size_t size; @@ -22,7 +20,7 @@ struct lmb_property { struct lmb_region { unsigned long cnt; unsigned long max; - struct lmb_property region[MAX_LMB_REGIONS+1]; + struct lmb_property region[CONFIG_LMB_MAX_REGIONS + 1]; };

struct lmb { diff --git a/lib/Kconfig b/lib/Kconfig index 43bd7190b9..43798d7a91 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -438,7 +438,7 @@ config LZ4 is included. The LZ4 algorithm can run in-place as long as the compressed image is loaded to the end of the output buffer, and trades lower compression ratios for much faster decompression. - + NOTE: This implements the release version of the LZ4 frame format as generated by default by the 'lz4' command line tool. This is not the same as the outdated, less efficient legacy @@ -706,6 +706,14 @@ config LMB help Support the library logical memory blocks.

+ +config LMB_MAX_REGIONS + int "Number of memory and reserved regions in lmb lib" + depends on LMB + default 8 + help + Define the number of supported regions, memory and reserved, in the + library logical memory blocks. endmenu

config PHANDLE_CHECK_SEQ diff --git a/lib/lmb.c b/lib/lmb.c index a926198d48..9fbc56619b 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -95,8 +95,8 @@ static void lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1,

void lmb_init(struct lmb *lmb) { - lmb->memory.max = MAX_LMB_REGIONS; - lmb->reserved.max = MAX_LMB_REGIONS; + lmb->memory.max = CONFIG_LMB_MAX_REGIONS; + lmb->reserved.max = CONFIG_LMB_MAX_REGIONS;

lmb->memory.cnt = 0; lmb->reserved.cnt = 0;

As in lmb_region, cnt < max and in the lmb library use region[i] only with i in 0...cnt, this region array size can be reduced by 1 element without overflow.

This patch allows to reduce the struct lmb size.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - new in V2: reduce size impact by correct regions array size

include/lmb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/lmb.h b/include/lmb.h index d3adf8ef69..898ce15d07 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -20,7 +20,7 @@ struct lmb_property { struct lmb_region { unsigned long cnt; unsigned long max; - struct lmb_property region[CONFIG_LMB_MAX_REGIONS + 1]; + struct lmb_property region[CONFIG_LMB_MAX_REGIONS]; };

struct lmb {

Add test for max number of memory regions and in reserved regions.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - new in V2: add test for overflow protection in lmb libary

test/lib/lmb.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)

diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 644ee78758..0d8963fcbf 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -659,3 +659,67 @@ static int lib_test_lmb_get_free_size(struct unit_test_state *uts)

DM_TEST(lib_test_lmb_get_free_size, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + +static int lib_test_lmb_max_regions(struct unit_test_state *uts) +{ + const phys_addr_t ram = 0x00000000; + const phys_size_t ram_size = 0x8000000; + const phys_size_t blk_size = 0x10000; + phys_addr_t offset; + struct lmb lmb; + int ret, i; + + lmb_init(&lmb); + + ut_asserteq(lmb.memory.cnt, 0); + ut_asserteq(lmb.memory.max, 8); + ut_asserteq(lmb.reserved.cnt, 0); + ut_asserteq(lmb.reserved.max, 8); + + /* Add 8 memory regions */ + for (i = 0; i < 8; i++) { + offset = ram + 2 * i * ram_size; + ret = lmb_add(&lmb, offset, ram_size); + ut_asserteq(ret, 0); + } + ut_asserteq(lmb.memory.cnt, 8); + ut_asserteq(lmb.reserved.cnt, 0); + + /* error for the 9th memory regions */ + offset = ram + 2 * 8 * ram_size; + ret = lmb_add(&lmb, offset, ram_size); + ut_asserteq(ret, -1); + + ut_asserteq(lmb.memory.cnt, 8); + ut_asserteq(lmb.reserved.cnt, 0); + + /* reserve 8 regions */ + for (i = 0; i < 8; i++) { + offset = ram + 2 * i * blk_size; + ret = lmb_reserve(&lmb, offset, blk_size); + ut_asserteq(ret, 0); + } + + ut_asserteq(lmb.memory.cnt, 8); + ut_asserteq(lmb.reserved.cnt, 8); + + /* error for the 9th reserved blocks */ + offset = ram + 2 * 8 * blk_size; + ret = lmb_reserve(&lmb, offset, blk_size); + ut_asserteq(ret, -1); + + ut_asserteq(lmb.memory.cnt, 8); + ut_asserteq(lmb.reserved.cnt, 8); + + /* check each regions */ + for (i = 0; i < 8; i++) + ut_asserteq(lmb.memory.region[i].base, ram + 2 * i * ram_size); + + for (i = 0; i < 8; i++) + ut_asserteq(lmb.reserved.region[i].base, ram + 2 * i * blk_size); + + return 0; +} + +DM_TEST(lib_test_lmb_max_regions, + UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);

Add 2 configs CONFIG_LMB_MEMORY_REGIONS and CONFIG_LMB_RESERVED_REGIONS to change independently the max number of the regions in lmb library.

When CONFIG_LMB_USE_MAX_REGIONS=y, move the lmb property arrays to struct lmb and manage the array size with the element 'max' of struct lmb_region; their are still allocated in stack.

When CONFIG_LMB_USE_MAX_REGIONS=n, keep the current location in struct lmb_region to allow compiler optimization.

Increase CONFIG_LMB_RESERVED_REGIONS is useful to avoid lmb errors in bootm when the number of reserved regions (not adjacent) is reached: + 1 region for relocated U-Boot + 1 region for initrd + 1 region for relocated linux device tree + reserved memory regions present in Linux device tree.

The current limit of 8 regions is reached with only 5 reserved regions in DT.

see Linux kernel commit bf23c51f1f49 ("memblock: Move memblock arrays to static storage in memblock.c and make their size a variable")

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - rework v1 [4/5] to keep current optimization by default when CONFIG_LMB_USE_MAX_REGIONS=n

include/lmb.h | 34 ++++++++++++++++++++++++++++++++++ lib/Kconfig | 29 ++++++++++++++++++++++++++++- lib/lmb.c | 8 +++++++- 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/include/lmb.h b/include/lmb.h index 898ce15d07..541e17093c 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -12,20 +12,54 @@ * Copyright (C) 2001 Peter Bergner, IBM Corp. */

+/** + * struct lmb_property - Description of one region. + * + * @base: Base address of the region. + * @size: Size of the region + */ struct lmb_property { phys_addr_t base; phys_size_t size; };

+/** + * struct lmb_region - Description of a set of region. + * + * @cnt: Number of regions. + * @max: Size of the region array, max value of cnt. + * @region: Array of the region properties + */ struct lmb_region { unsigned long cnt; unsigned long max; +#if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) struct lmb_property region[CONFIG_LMB_MAX_REGIONS]; +#else + struct lmb_property *region; +#endif };

+/** + * struct lmb - Logical memory block handle. + * + * Clients provide storage for Logical memory block (lmb) handles. + * The content of the structure is managed by the lmb library. + * A lmb struct is initialized by lmb_init() functions. + * The lmb struct is passed to all other lmb APIs. + * + * @memory: Description of memory regions. + * @reserved: Description of reserved regions. + * @memory_regions: Array of the memory regions (statically allocated) + * @reserved_regions: Array of the reserved regions (statically allocated) + */ struct lmb { struct lmb_region memory; struct lmb_region reserved; +#if !IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) + struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS]; + struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS]; +#endif };

extern void lmb_init(struct lmb *lmb); diff --git a/lib/Kconfig b/lib/Kconfig index 43798d7a91..946b29ae5a 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -706,14 +706,41 @@ config LMB help Support the library logical memory blocks.

+config LMB_USE_MAX_REGIONS + bool "Use a commun number of memory and reserved regions in lmb lib" + depends on LMB + default y + help + Define the number of supported memory regions in the library logical + memory blocks. + This feature allow to reduce the lmb library size by using compiler + optimization when LMB_MEMORY_REGIONS == LMB_RESERVED_REGIONS.

config LMB_MAX_REGIONS int "Number of memory and reserved regions in lmb lib" - depends on LMB + depends on LMB && LMB_USE_MAX_REGIONS default 8 help Define the number of supported regions, memory and reserved, in the library logical memory blocks. + +config LMB_MEMORY_REGIONS + int "Number of memory regions in lmb lib" + depends on LMB && !LMB_USE_MAX_REGIONS + default 8 + help + Define the number of supported memory regions in the library logical + memory blocks. + The minimal value is CONFIG_NR_DRAM_BANKS. + +config LMB_RESERVED_REGIONS + int "Number of reserved regions in lmb lib" + depends on LMB && !LMB_USE_MAX_REGIONS + default 8 + help + Define the number of supported reserved regions in the library logical + memory blocks. + endmenu

config PHANDLE_CHECK_SEQ diff --git a/lib/lmb.c b/lib/lmb.c index 9fbc56619b..c08c4d942b 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -95,9 +95,15 @@ static void lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1,

void lmb_init(struct lmb *lmb) { +#if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->reserved.max = CONFIG_LMB_MAX_REGIONS; - +#else + lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS; + lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; + lmb->memory.region = lmb->memory_regions; + lmb->reserved.region = lmb->reserved_regions; +#endif lmb->memory.cnt = 0; lmb->reserved.cnt = 0; }

For the latest kernel device tree the max number of reserved regions in lmb library is reached: 8 with 5 reserved regions in device tree.

When a new region is added, the lmb allocation for the device tree relocation failed and boot with ramdisk failed.

This patch avoids this issue by increasing the max number of supported reserved memory in lmb library to 16.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---

Changes in v2: - Add CONFIG_LMB_USE_MAX_REGIONS=n and reduce LMB_MEMORY_REGIONS to reduce the used size in stack

configs/stm32mp15_basic_defconfig | 3 +++ configs/stm32mp15_trusted_defconfig | 3 +++ 2 files changed, 6 insertions(+)

diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 1c680984b8..a290224a46 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -168,3 +168,6 @@ CONFIG_WDT_STM32MP=y CONFIG_ERRNO_STR=y # CONFIG_HEXDUMP is not set CONFIG_FDT_FIXUP_PARTITIONS=y +# CONFIG_LMB_USE_MAX_REGIONS is not set +CONFIG_LMB_MEMORY_REGIONS=2 +CONFIG_LMB_RESERVED_REGIONS=16 diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 107041119f..ebd4c05891 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -148,3 +148,6 @@ CONFIG_WDT_STM32MP=y CONFIG_ERRNO_STR=y # CONFIG_HEXDUMP is not set CONFIG_FDT_FIXUP_PARTITIONS=y +# CONFIG_LMB_USE_MAX_REGIONS is not set +CONFIG_LMB_MEMORY_REGIONS=2 +CONFIG_LMB_RESERVED_REGIONS=16