| Message ID | 20250501120239.199829-3-sughosh.ganu@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | lmb: use a single API for all allocations | expand |
On Thu May 1, 2025 at 3:02 PM EEST, Sughosh Ganu wrote: > There currently are two API's for requesting memory from the LMB > module, lmb_alloc() and lmb_alloc_base(). The function which does the > actual allocation is the same. Use the earlier introduced API > lmb_allocate_mem() for both types of allocation requests. > > Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> > --- > arch/arm/mach-apple/board.c | 27 ++++++++++++++----- > arch/arm/mach-snapdragon/board.c | 13 ++++++++- > boot/bootm.c | 6 +++-- > boot/image-board.c | 45 ++++++++++++++++++-------------- > boot/image-fdt.c | 32 +++++++++++++++++------ > include/lmb.h | 22 +++------------- > lib/efi_loader/efi_memory.c | 14 +++++----- > lib/lmb.c | 30 ++++++++++----------- > test/lib/lmb.c | 26 ++++++++++++++++++ > 9 files changed, 138 insertions(+), 77 deletions(-) > > diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c > index 2644a04a622..f0eab5df1ef 100644 > --- a/arch/arm/mach-apple/board.c > +++ b/arch/arm/mach-apple/board.c > @@ -772,6 +772,19 @@ u64 get_page_table_size(void) > > #define KERNEL_COMP_SIZE SZ_128M > > +static phys_addr_t lmb_alloc(phys_size_t size) > +{ > + int ret; > + phys_addr_t addr; > + > + /* All memory regions allocated with a 2MiB alignment */ > + ret = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, SZ_2M, &addr, size, LMB_NONE); > + if (ret) > + return 0; > + > + return addr; > +} > + > int board_late_init(void) > { > u32 status = 0; > @@ -779,15 +792,15 @@ int board_late_init(void) > /* somewhat based on the Linux Kernel boot requirements: > * align by 2M and maximal FDT size 2M > */ > - status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G, SZ_2M)); > - status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M, SZ_2M)); > - status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M, SZ_2M)); > - status |= env_set_hex("ramdisk_addr_r", lmb_alloc(SZ_1G, SZ_2M)); > + status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G)); env_set_hex() expects a ulong, which might end up causing problems for some archs, but I don't think that's a problem of this patchset. It's something that has to be fixed in a the wider codebase > + status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M)); > + status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M)); > rd_len, LMB_NONE); > } else { > if (initrd_high) > - *initrd_start = > - (ulong)lmb_alloc_base(rd_len, > - 0x1000, > - initrd_high, > - LMB_NONE); > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, > + 0x1000, &initrd_high, > + rd_len, LMB_NONE); > else > - *initrd_start = (ulong)lmb_alloc(rd_len, > - 0x1000); > + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, > + 0x1000, &initrd_high, > + rd_len, LMB_NONE); You are now calling the same function, put LMB_MEM_ALLOC_ANY/LMB_MEM_ALLOC_MAX in a variable instead and make the if smaller [...] > diff --git a/boot/image-fdt.c b/boot/image-fdt.c > index 6585813de00..b8e1b0f35bb 100644 > --- a/boot/image-fdt.c > +++ b/boot/image-fdt.c > @@ -198,15 +198,27 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) > of_start = (void *)(uintptr_t)addr; > disable_relocation = 1; > } else if (desired_addr) { > - addr = lmb_alloc_base(of_len, 0x1000, desired_addr, > - LMB_NONE); > + addr = desired_addr; > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0x1000, &addr, Is this LMB_MEM_ALLOC_MAX or LMB_MEM_ALLOC_ADDR? > + of_len, LMB_NONE); > + > + if (err) { > + puts("Failed using fdt_high value for Device Tree"); > + goto error; > + } > + > of_start = map_sysmem(addr, of_len); > } else { > @@ -228,11 +240,15 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) > > switch (type) { > + case LMB_MEM_ALLOC_ANY: > + *addr = LMB_ALLOC_ANYWHERE; > + ret = _lmb_alloc_base(size, align, addr, flags); > + break; > + case LMB_MEM_ALLOC_MAX: > + ret = _lmb_alloc_base(size, align, addr, flags); > + break; You can make this a fallthrough case LMB_MEM_ALLOC_ANY: *addr = LMB_ALLOC_ANYWHERE; case LMB_MEM_ALLOC_MAX: ret = _lmb_alloc_base(size, align, addr, flags); break; > case LMB_MEM_ALLOC_ADDR: > ret = _lmb_alloc_addr(*addr, size, flags); > break; > diff --git a/test/lib/lmb.c b/test/lib/lmb.c > index f80115570e7..8ce19efc854 100644 > --- a/test/lib/lmb.c > +++ b/test/lib/lmb.c > @@ -82,6 +82,32 @@ static int lmb_reserve(phys_addr_t addr, phys_size_t size, u32 flags) > return 0; > } > > +static phys_addr_t lmb_alloc(phys_size_t size, ulong align) > +{ > + int err; > + phys_addr_t addr; > + > + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, align, &addr, size, LMB_NONE); > + if (err) > + return 0; > + > + return addr; > +} > + > +static phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, > + phys_addr_t max_addr, u32 flags) > +{ > + int err; > + phys_addr_t addr; > + > + addr = max_addr; > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, align, &addr, size, flags); > + if (err) > + return 0; > + > + return addr; > +} > + > #define lmb_alloc_addr(addr, size, flags) lmb_reserve(addr, size, flags) > > static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram, Thanks /Ilias
On Fri, 2 May 2025 at 13:11, Ilias Apalodimas <ilias.apalodimas@linaro.org> wrote: > > On Thu May 1, 2025 at 3:02 PM EEST, Sughosh Ganu wrote: > > There currently are two API's for requesting memory from the LMB > > module, lmb_alloc() and lmb_alloc_base(). The function which does the > > actual allocation is the same. Use the earlier introduced API > > lmb_allocate_mem() for both types of allocation requests. > > > > Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> > > --- > > arch/arm/mach-apple/board.c | 27 ++++++++++++++----- > > arch/arm/mach-snapdragon/board.c | 13 ++++++++- > > boot/bootm.c | 6 +++-- > > boot/image-board.c | 45 ++++++++++++++++++-------------- > > boot/image-fdt.c | 32 +++++++++++++++++------ > > include/lmb.h | 22 +++------------- > > lib/efi_loader/efi_memory.c | 14 +++++----- > > lib/lmb.c | 30 ++++++++++----------- > > test/lib/lmb.c | 26 ++++++++++++++++++ > > 9 files changed, 138 insertions(+), 77 deletions(-) > > > > diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c > > index 2644a04a622..f0eab5df1ef 100644 > > --- a/arch/arm/mach-apple/board.c > > +++ b/arch/arm/mach-apple/board.c > > @@ -772,6 +772,19 @@ u64 get_page_table_size(void) > > > > #define KERNEL_COMP_SIZE SZ_128M > > > > +static phys_addr_t lmb_alloc(phys_size_t size) > > +{ > > + int ret; > > + phys_addr_t addr; > > + > > + /* All memory regions allocated with a 2MiB alignment */ > > + ret = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, SZ_2M, &addr, size, LMB_NONE); > > + if (ret) > > + return 0; > > + > > + return addr; > > +} > > + > > int board_late_init(void) > > { > > u32 status = 0; > > @@ -779,15 +792,15 @@ int board_late_init(void) > > /* somewhat based on the Linux Kernel boot requirements: > > * align by 2M and maximal FDT size 2M > > */ > > - status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G, SZ_2M)); > > - status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M, SZ_2M)); > > - status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M, SZ_2M)); > > - status |= env_set_hex("ramdisk_addr_r", lmb_alloc(SZ_1G, SZ_2M)); > > + status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G)); > > env_set_hex() expects a ulong, which might end up causing problems for some archs, but I don't think > that's a problem of this patchset. It's something that has to be fixed in a the wider codebase Yes, there seems to be a prevalence of using the ulong type instead of a fixed address size type, or something like phys_addr_t, which might be an issue with certain toolchains. But this issue has been around for a long time now. > > > + status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M)); > > + status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M)); > > rd_len, LMB_NONE); > > } else { > > if (initrd_high) > > - *initrd_start = > > - (ulong)lmb_alloc_base(rd_len, > > - 0x1000, > > - initrd_high, > > - LMB_NONE); > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, > > + 0x1000, &initrd_high, > > + rd_len, LMB_NONE); > > else > > - *initrd_start = (ulong)lmb_alloc(rd_len, > > - 0x1000); > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, > > + 0x1000, &initrd_high, > > + rd_len, LMB_NONE); > > You are now calling the same function, put LMB_MEM_ALLOC_ANY/LMB_MEM_ALLOC_MAX in a variable instead > and make the if smaller Will do. > > [...] > > > diff --git a/boot/image-fdt.c b/boot/image-fdt.c > > index 6585813de00..b8e1b0f35bb 100644 > > --- a/boot/image-fdt.c > > +++ b/boot/image-fdt.c > > @@ -198,15 +198,27 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) > > of_start = (void *)(uintptr_t)addr; > > disable_relocation = 1; > > } else if (desired_addr) { > > - addr = lmb_alloc_base(of_len, 0x1000, desired_addr, > > - LMB_NONE); > > + addr = desired_addr; > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0x1000, &addr, > > Is this LMB_MEM_ALLOC_MAX or LMB_MEM_ALLOC_ADDR? This is a case for LMB_MEM_ALLOC_MAX as the desired_addr variable that is read as fdt_high has a valid value. So the allocated address should be below desired_addr. > > > + of_len, LMB_NONE); > > + > > + if (err) { > > + puts("Failed using fdt_high value for Device Tree"); > > + goto error; > > + } > > + > > of_start = map_sysmem(addr, of_len); > > } else { > > @@ -228,11 +240,15 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) > > > > switch (type) { > > + case LMB_MEM_ALLOC_ANY: > > + *addr = LMB_ALLOC_ANYWHERE; > > + ret = _lmb_alloc_base(size, align, addr, flags); > > + break; > > + case LMB_MEM_ALLOC_MAX: > > + ret = _lmb_alloc_base(size, align, addr, flags); > > + break; > > You can make this a fallthrough > case LMB_MEM_ALLOC_ANY: > *addr = LMB_ALLOC_ANYWHERE; > case LMB_MEM_ALLOC_MAX: > ret = _lmb_alloc_base(size, align, addr, flags); > break; Will change. Thanks. -sughosh > > > case LMB_MEM_ALLOC_ADDR: > > ret = _lmb_alloc_addr(*addr, size, flags); > > break; > > diff --git a/test/lib/lmb.c b/test/lib/lmb.c > > index f80115570e7..8ce19efc854 100644 > > --- a/test/lib/lmb.c > > +++ b/test/lib/lmb.c > > @@ -82,6 +82,32 @@ static int lmb_reserve(phys_addr_t addr, phys_size_t size, u32 flags) > > return 0; > > } > > > > +static phys_addr_t lmb_alloc(phys_size_t size, ulong align) > > +{ > > + int err; > > + phys_addr_t addr; > > + > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, align, &addr, size, LMB_NONE); > > + if (err) > > + return 0; > > + > > + return addr; > > +} > > + > > +static phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, > > + phys_addr_t max_addr, u32 flags) > > +{ > > + int err; > > + phys_addr_t addr; > > + > > + addr = max_addr; > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, align, &addr, size, flags); > > + if (err) > > + return 0; > > + > > + return addr; > > +} > > + > > #define lmb_alloc_addr(addr, size, flags) lmb_reserve(addr, size, flags) > > > > static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram, > > Thanks > /Ilias
Hi Sughosh [...] > > > - (ulong)lmb_alloc_base(rd_len, > > > - 0x1000, > > > - initrd_high, > > > - LMB_NONE); > > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, > > > + 0x1000, &initrd_high, > > > + rd_len, LMB_NONE); > > > else > > > - *initrd_start = (ulong)lmb_alloc(rd_len, > > > - 0x1000); > > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, > > > + 0x1000, &initrd_high, > > > + rd_len, LMB_NONE); > > > > You are now calling the same function, put LMB_MEM_ALLOC_ANY/LMB_MEM_ALLOC_MAX in a variable instead > > and make the if smaller > > Will do. > > > > > [...] > > > > > diff --git a/boot/image-fdt.c b/boot/image-fdt.c > > > index 6585813de00..b8e1b0f35bb 100644 > > > --- a/boot/image-fdt.c > > > +++ b/boot/image-fdt.c > > > @@ -198,15 +198,27 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) > > > of_start = (void *)(uintptr_t)addr; > > > disable_relocation = 1; > > > } else if (desired_addr) { > > > - addr = lmb_alloc_base(of_len, 0x1000, desired_addr, > > > - LMB_NONE); > > > + addr = desired_addr; > > > + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0x1000, &addr, > > > > Is this LMB_MEM_ALLOC_MAX or LMB_MEM_ALLOC_ADDR? > > This is a case for LMB_MEM_ALLOC_MAX as the desired_addr variable that > is read as fdt_high has a valid value. So the allocated address should > be below desired_addr. Ah you are right, I misread lmb_alloc_base() for lmb_alloc_addr(). But in that case, can you rename 'desired_addr' as well to something that makes more sense -- e.g high_addr or something like that. [...] Thanks /Ilias
diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 2644a04a622..f0eab5df1ef 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -772,6 +772,19 @@ u64 get_page_table_size(void) #define KERNEL_COMP_SIZE SZ_128M +static phys_addr_t lmb_alloc(phys_size_t size) +{ + int ret; + phys_addr_t addr; + + /* All memory regions allocated with a 2MiB alignment */ + ret = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, SZ_2M, &addr, size, LMB_NONE); + if (ret) + return 0; + + return addr; +} + int board_late_init(void) { u32 status = 0; @@ -779,15 +792,15 @@ int board_late_init(void) /* somewhat based on the Linux Kernel boot requirements: * align by 2M and maximal FDT size 2M */ - status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G, SZ_2M)); - status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M, SZ_2M)); - status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M, SZ_2M)); - status |= env_set_hex("ramdisk_addr_r", lmb_alloc(SZ_1G, SZ_2M)); + status |= env_set_hex("loadaddr", lmb_alloc(SZ_1G)); + status |= env_set_hex("fdt_addr_r", lmb_alloc(SZ_2M)); + status |= env_set_hex("kernel_addr_r", lmb_alloc(SZ_128M)); + status |= env_set_hex("ramdisk_addr_r", lmb_alloc(SZ_1G)); status |= env_set_hex("kernel_comp_addr_r", - lmb_alloc(KERNEL_COMP_SIZE, SZ_2M)); + lmb_alloc(KERNEL_COMP_SIZE)); status |= env_set_hex("kernel_comp_size", KERNEL_COMP_SIZE); - status |= env_set_hex("scriptaddr", lmb_alloc(SZ_4M, SZ_2M)); - status |= env_set_hex("pxefile_addr_r", lmb_alloc(SZ_4M, SZ_2M)); + status |= env_set_hex("scriptaddr", lmb_alloc(SZ_4M)); + status |= env_set_hex("pxefile_addr_r", lmb_alloc(SZ_4M)); if (status) log_warning("late_init: Failed to set run time variables\n"); diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c index deae4d32378..0568426dfe9 100644 --- a/arch/arm/mach-snapdragon/board.c +++ b/arch/arm/mach-snapdragon/board.c @@ -484,7 +484,18 @@ void __weak qcom_late_init(void) #define FASTBOOT_BUF_SIZE 0 #endif -#define addr_alloc(size) lmb_alloc(size, SZ_2M) +static phys_addr_t addr_alloc(phys_size_t size) +{ + int ret; + phys_addr_t addr; + + /* All memory regions allocated with a 2MiB alignment */ + ret = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, SZ_2M, &addr, size, LMB_NONE); + if (ret) + return 0; + + return addr; +} /* Stolen from arch/arm/mach-apple/board.c */ int board_late_init(void) diff --git a/boot/bootm.c b/boot/bootm.c index b771fa6d965..a1c67d2003d 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -622,9 +622,11 @@ static int bootm_load_os(struct bootm_headers *images, int boot_progress) if (os.type == IH_TYPE_KERNEL_NOLOAD && os.comp != IH_COMP_NONE) { ulong req_size = ALIGN(image_len * 4, SZ_1M); - load = lmb_alloc(req_size, SZ_2M); - if (!load) + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, SZ_2M, (void *)&load, + req_size, LMB_NONE); + if (err) return 1; + os.load = load; images->ep = load; debug("Allocated %lx bytes at %lx for kernel (size %lx) decompression\n", diff --git a/boot/image-board.c b/boot/image-board.c index aa93371d9a7..bb7fbca0982 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -538,6 +538,7 @@ int boot_get_ramdisk(char const *select, struct bootm_headers *images, int boot_ramdisk_high(ulong rd_data, ulong rd_len, ulong *initrd_start, ulong *initrd_end) { + int err; char *s; phys_addr_t initrd_high; int initrd_copy_to_ram = 1; @@ -567,19 +568,20 @@ int boot_ramdisk_high(ulong rd_data, ulong rd_len, ulong *initrd_start, rd_len, LMB_NONE); } else { if (initrd_high) - *initrd_start = - (ulong)lmb_alloc_base(rd_len, - 0x1000, - initrd_high, - LMB_NONE); + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, + 0x1000, &initrd_high, + rd_len, LMB_NONE); else - *initrd_start = (ulong)lmb_alloc(rd_len, - 0x1000); + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, + 0x1000, &initrd_high, + rd_len, LMB_NONE); - if (*initrd_start == 0) { + if (err) { puts("ramdisk - allocation error\n"); goto error; } + + *initrd_start = (ulong)initrd_high; bootstage_mark(BOOTSTAGE_ID_COPY_RAMDISK); *initrd_end = *initrd_start + rd_len; @@ -830,9 +832,10 @@ int boot_get_loadable(struct bootm_headers *images) */ int boot_get_cmdline(ulong *cmd_start, ulong *cmd_end) { - int barg; + int barg, err; char *cmdline; char *s; + phys_addr_t addr; /* * Help the compiler detect that this function is only called when @@ -842,12 +845,14 @@ int boot_get_cmdline(ulong *cmd_start, ulong *cmd_end) return 0; barg = IF_ENABLED_INT(CONFIG_SYS_BOOT_GET_CMDLINE, CONFIG_SYS_BARGSIZE); - cmdline = (char *)(ulong)lmb_alloc_base(barg, 0xf, - env_get_bootm_mapsize() + env_get_bootm_low(), - LMB_NONE); - if (!cmdline) + addr = env_get_bootm_mapsize() + env_get_bootm_low(); + + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0xf, &addr, barg, LMB_NONE); + if (err) return -1; + cmdline = (char *)(uintptr_t)addr; + s = env_get("bootargs"); if (!s) s = ""; @@ -876,14 +881,16 @@ int boot_get_cmdline(ulong *cmd_start, ulong *cmd_end) */ int boot_get_kbd(struct bd_info **kbd) { - *kbd = (struct bd_info *)(ulong)lmb_alloc_base(sizeof(struct bd_info), - 0xf, - env_get_bootm_mapsize() + - env_get_bootm_low(), - LMB_NONE); - if (!*kbd) + int err; + phys_addr_t addr; + + addr = env_get_bootm_mapsize() + env_get_bootm_low(); + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0xf, &addr, + sizeof(struct bd_info), LMB_NONE); + if (err) return -1; + *kbd = (struct bd_info *)(uintptr_t)addr; **kbd = *gd->bd; debug("## kernel board info at 0x%08lx\n", (ulong)*kbd); diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 6585813de00..b8e1b0f35bb 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -198,15 +198,27 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) of_start = (void *)(uintptr_t)addr; disable_relocation = 1; } else if (desired_addr) { - addr = lmb_alloc_base(of_len, 0x1000, desired_addr, - LMB_NONE); + addr = desired_addr; + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0x1000, &addr, + of_len, LMB_NONE); + + if (err) { + puts("Failed using fdt_high value for Device Tree"); + goto error; + } + of_start = map_sysmem(addr, of_len); if (of_start == NULL) { puts("Failed using fdt_high value for Device Tree"); goto error; } } else { - addr = lmb_alloc(of_len, 0x1000); + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, 0x1000, &addr, + of_len, LMB_NONE); + if (err) { + puts("Unable to allocate memory for fdt\n"); + goto error; + } of_start = map_sysmem(addr, of_len); } } else { @@ -228,11 +240,15 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size) * for LMB allocation. */ usable = min(start + size, low + mapsize); - addr = lmb_alloc_base(of_len, 0x1000, usable, LMB_NONE); - of_start = map_sysmem(addr, of_len); - /* Allocation succeeded, use this block. */ - if (of_start != NULL) - break; + addr = usable; + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, 0x1000, + &addr, of_len, LMB_NONE); + if (!err) { + of_start = map_sysmem(addr, of_len); + /* Allocation succeeded, use this block. */ + if (of_start) + break; + } /* * Reduce the mapping size in the next bank diff --git a/include/lmb.h b/include/lmb.h index a9722e1910b..be723d9162a 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -34,9 +34,13 @@ /** * enum lmb_mem_type - type of memory allocation request * @LMB_MEM_ALLOC_ADDR: request for a particular region of memory + * @LMB_MEM_ALLOC_ANY: allocate any available memory region + * @LMB_MEM_ALLOC_MAX: allocate memory below a particular address */ enum lmb_mem_type { LMB_MEM_ALLOC_ADDR = 1, + LMB_MEM_ALLOC_ANY, + LMB_MEM_ALLOC_MAX, }; /** @@ -126,26 +130,8 @@ void lmb_add_memory(void); long lmb_add(phys_addr_t base, phys_size_t size); -phys_addr_t lmb_alloc(phys_size_t size, ulong align); phys_size_t lmb_get_free_size(phys_addr_t addr); -/** - * lmb_alloc_base() - Allocate specified memory region with specified - * attributes - * @size: Size of the region requested - * @align: Alignment of the memory region requested - * @max_addr: Maximum address of the requested region - * @flags: Memory region attributes to be set - * - * Allocate a region of memory with the attributes specified through the - * parameter. The max_addr parameter is used to specify the maximum address - * below which the requested region should be allocated. - * - * Return: Base address on success, 0 on error. - */ -phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr, - uint flags); - /** * lmb_is_reserved_flags() - Test if address is in reserved region with flag * bits set diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 12a7fd1f3bf..73e1eef5011 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -454,6 +454,7 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type, enum efi_memory_type memory_type, efi_uintn_t pages, uint64_t *memory) { + int err; u64 efi_addr, len; uint flags; efi_status_t ret; @@ -475,17 +476,18 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type, switch (type) { case EFI_ALLOCATE_ANY_PAGES: /* Any page */ - addr = (u64)lmb_alloc_base(len, EFI_PAGE_SIZE, - LMB_ALLOC_ANYWHERE, flags); - if (!addr) + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, EFI_PAGE_SIZE, + &addr, len, flags); + if (err) return EFI_OUT_OF_RESOURCES; break; case EFI_ALLOCATE_MAX_ADDRESS: /* Max address */ addr = map_to_sysmem((void *)(uintptr_t)*memory); - addr = (u64)lmb_alloc_base(len, EFI_PAGE_SIZE, addr, - flags); - if (!addr) + + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, EFI_PAGE_SIZE, + &addr, len, flags); + if (err) return EFI_OUT_OF_RESOURCES; break; case EFI_ALLOCATE_ADDRESS: diff --git a/lib/lmb.c b/lib/lmb.c index c536465a501..a21f9c72204 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -672,16 +672,18 @@ long lmb_free(phys_addr_t base, phys_size_t size) return lmb_free_flags(base, size, LMB_NONE); } -static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align, - phys_addr_t max_addr, u32 flags) +static int _lmb_alloc_base(phys_size_t size, ulong align, + phys_addr_t *addr, u32 flags) { int ret; long i, rgn; + phys_addr_t max_addr; phys_addr_t base = 0; phys_addr_t res_base; struct lmb_region *lmb_used = lmb.used_mem.data; struct lmb_region *lmb_memory = lmb.available_mem.data; + max_addr = *addr; for (i = lmb.available_mem.count - 1; i >= 0; i--) { phys_addr_t lmbbase = lmb_memory[i].base; phys_size_t lmbsize = lmb_memory[i].size; @@ -714,8 +716,8 @@ static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align, flags); if (ret) return ret; - - return base; + *addr = base; + return 0; } res_base = lmb_used[rgn].base; @@ -728,18 +730,7 @@ static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align, log_debug("%s: Failed to allocate 0x%lx bytes below 0x%lx\n", __func__, (ulong)size, (ulong)max_addr); - return 0; -} - -phys_addr_t lmb_alloc(phys_size_t size, ulong align) -{ - return _lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE, LMB_NONE); -} - -phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr, - uint flags) -{ - return _lmb_alloc_base(size, align, max_addr, flags); + return -1; } static int _lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags) @@ -778,6 +769,13 @@ int lmb_allocate_mem(enum lmb_mem_type type, u64 align, phys_addr_t *addr, return -EINVAL; switch (type) { + case LMB_MEM_ALLOC_ANY: + *addr = LMB_ALLOC_ANYWHERE; + ret = _lmb_alloc_base(size, align, addr, flags); + break; + case LMB_MEM_ALLOC_MAX: + ret = _lmb_alloc_base(size, align, addr, flags); + break; case LMB_MEM_ALLOC_ADDR: ret = _lmb_alloc_addr(*addr, size, flags); break; diff --git a/test/lib/lmb.c b/test/lib/lmb.c index f80115570e7..8ce19efc854 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -82,6 +82,32 @@ static int lmb_reserve(phys_addr_t addr, phys_size_t size, u32 flags) return 0; } +static phys_addr_t lmb_alloc(phys_size_t size, ulong align) +{ + int err; + phys_addr_t addr; + + err = lmb_allocate_mem(LMB_MEM_ALLOC_ANY, align, &addr, size, LMB_NONE); + if (err) + return 0; + + return addr; +} + +static phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, + phys_addr_t max_addr, u32 flags) +{ + int err; + phys_addr_t addr; + + addr = max_addr; + err = lmb_allocate_mem(LMB_MEM_ALLOC_MAX, align, &addr, size, flags); + if (err) + return 0; + + return addr; +} + #define lmb_alloc_addr(addr, size, flags) lmb_reserve(addr, size, flags) static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram,
There currently are two API's for requesting memory from the LMB module, lmb_alloc() and lmb_alloc_base(). The function which does the actual allocation is the same. Use the earlier introduced API lmb_allocate_mem() for both types of allocation requests. Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> --- arch/arm/mach-apple/board.c | 27 ++++++++++++++----- arch/arm/mach-snapdragon/board.c | 13 ++++++++- boot/bootm.c | 6 +++-- boot/image-board.c | 45 ++++++++++++++++++-------------- boot/image-fdt.c | 32 +++++++++++++++++------ include/lmb.h | 22 +++------------- lib/efi_loader/efi_memory.c | 14 +++++----- lib/lmb.c | 30 ++++++++++----------- test/lib/lmb.c | 26 ++++++++++++++++++ 9 files changed, 138 insertions(+), 77 deletions(-)