Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-18 10:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lmb: Remove lmb_alloc_base_flags()

Browse source 
lmb_alloc_base() is just calling lmb_alloc_base_flags() with LMB_NONE.
There's not much we gain from this abstraction, so let's remove the
former add the flags argument to lmb_alloc_base() and make the code
a bit easier to follow.

Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
Tested-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Ilias Apalodimas 2024-12-18 09:02:36 +02:00 • committed by Tom Rini
parent 15e0c5e390
commit 3075708017
6 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
boot/image-board.c
View file

@ -565,9 +565,11 @@ int boot_ramdisk_high(ulong rd_data, ulong rd_len, ulong *initrd_start,
lmb_reserve(rd_data, rd_len, LMB_NONE); lmb_reserve(rd_data, rd_len, LMB_NONE);
} else { } else {
if (initrd_high) if (initrd_high)
*initrd_start = (ulong)lmb_alloc_base(rd_len, *initrd_start =
0x1000, (ulong)lmb_alloc_base(rd_len,
initrd_high); 0x1000,
initrd_high,
LMB_NONE);
else else
*initrd_start = (ulong)lmb_alloc(rd_len, *initrd_start = (ulong)lmb_alloc(rd_len,
0x1000); 0x1000);
@ -839,7 +841,8 @@ int boot_get_cmdline(ulong *cmd_start, ulong *cmd_end)
barg = IF_ENABLED_INT(CONFIG_SYS_BOOT_GET_CMDLINE, CONFIG_SYS_BARGSIZE); barg = IF_ENABLED_INT(CONFIG_SYS_BOOT_GET_CMDLINE, CONFIG_SYS_BARGSIZE);
cmdline = (char *)(ulong)lmb_alloc_base(barg, 0xf, cmdline = (char *)(ulong)lmb_alloc_base(barg, 0xf,
env_get_bootm_mapsize() + env_get_bootm_low()); env_get_bootm_mapsize() + env_get_bootm_low(),
LMB_NONE);
if (!cmdline) if (!cmdline)
return -1; return -1;
@ -872,9 +875,10 @@ int boot_get_cmdline(ulong *cmd_start, ulong *cmd_end)
int boot_get_kbd(struct bd_info **kbd) int boot_get_kbd(struct bd_info **kbd)
{ {
*kbd = (struct bd_info *)(ulong)lmb_alloc_base(sizeof(struct bd_info), *kbd = (struct bd_info *)(ulong)lmb_alloc_base(sizeof(struct bd_info),
0xf, 0xf,
env_get_bootm_mapsize() + env_get_bootm_mapsize() +
env_get_bootm_low()); env_get_bootm_low(),
LMB_NONE);
if (!*kbd) if (!*kbd)
return -1; return -1;

5
boot/image-fdt.c
View file

@ -187,7 +187,8 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size)
lmb_reserve(map_to_sysmem(of_start), of_len, LMB_NONE); lmb_reserve(map_to_sysmem(of_start), of_len, LMB_NONE);
disable_relocation = 1; disable_relocation = 1;
} else if (desired_addr) { } else if (desired_addr) {
addr = lmb_alloc_base(of_len, 0x1000, desired_addr); addr = lmb_alloc_base(of_len, 0x1000, desired_addr,
LMB_NONE);
of_start = map_sysmem(addr, of_len); of_start = map_sysmem(addr, of_len);
if (of_start == NULL) { if (of_start == NULL) {
puts("Failed using fdt_high value for Device Tree"); puts("Failed using fdt_high value for Device Tree");
@ -216,7 +217,7 @@ int boot_relocate_fdt(char **of_flat_tree, ulong *of_size)
* for LMB allocation. * for LMB allocation.
*/ */
usable = min(start + size, low + mapsize); usable = min(start + size, low + mapsize);
addr = lmb_alloc_base(of_len, 0x1000, usable); addr = lmb_alloc_base(of_len, 0x1000, usable, LMB_NONE);
of_start = map_sysmem(addr, of_len); of_start = map_sysmem(addr, of_len);
/* Allocation succeeded, use this block. */ /* Allocation succeeded, use this block. */
if (of_start != NULL) if (of_start != NULL)

7
include/lmb.h
View file

@ -93,11 +93,10 @@ long lmb_add(phys_addr_t base, phys_size_t size);
long lmb_reserve(phys_addr_t base, phys_size_t size, u32 flags); long lmb_reserve(phys_addr_t base, phys_size_t size, u32 flags);
phys_addr_t lmb_alloc(phys_size_t size, ulong align); phys_addr_t lmb_alloc(phys_size_t size, ulong align);
phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr);
phys_size_t lmb_get_free_size(phys_addr_t addr); phys_size_t lmb_get_free_size(phys_addr_t addr);
/** /**
* lmb_alloc_base_flags() - Allocate specified memory region with specified * lmb_alloc_base() - Allocate specified memory region with specified
* attributes * attributes
* @size: Size of the region requested * @size: Size of the region requested
* @align: Alignment of the memory region requested * @align: Alignment of the memory region requested
@ -110,8 +109,8 @@ phys_size_t lmb_get_free_size(phys_addr_t addr);
* *
* Return: Base address on success, 0 on error. * Return: Base address on success, 0 on error.
*/ */
phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align, phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr,
phys_addr_t max_addr, uint flags); uint flags);
/** /**
* lmb_alloc_addr() - Allocate specified memory address with specified attributes * lmb_alloc_addr() - Allocate specified memory address with specified attributes

4
lib/efi_loader/efi_memory.c
View file

@ -472,7 +472,7 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type,
switch (type) { switch (type) {
case EFI_ALLOCATE_ANY_PAGES: case EFI_ALLOCATE_ANY_PAGES:
/* Any page */ /* Any page */
addr = (u64)lmb_alloc_base_flags(len, EFI_PAGE_SIZE, addr = (u64)lmb_alloc_base(len, EFI_PAGE_SIZE,
LMB_ALLOC_ANYWHERE, flags); LMB_ALLOC_ANYWHERE, flags);
if (!addr) if (!addr)
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
@ -480,7 +480,7 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type,
case EFI_ALLOCATE_MAX_ADDRESS: case EFI_ALLOCATE_MAX_ADDRESS:
/* Max address */ /* Max address */
addr = map_to_sysmem((void *)(uintptr_t)*memory); addr = map_to_sysmem((void *)(uintptr_t)*memory);
addr = (u64)lmb_alloc_base_flags(len, EFI_PAGE_SIZE, addr, addr = (u64)lmb_alloc_base(len, EFI_PAGE_SIZE, addr,
flags); flags);
if (!addr) if (!addr)
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;

19
lib/lmb.c
View file

@ -731,24 +731,11 @@ static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align,
phys_addr_t lmb_alloc(phys_size_t size, ulong align) phys_addr_t lmb_alloc(phys_size_t size, ulong align)
{ {
return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE); 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) phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr,
{ uint flags)
phys_addr_t alloc;
alloc = _lmb_alloc_base(size, align, max_addr, LMB_NONE);
if (alloc == 0)
printf("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
(ulong)size, (ulong)max_addr);
return alloc;
}
phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
phys_addr_t max_addr, uint flags)
{ {
phys_addr_t alloc; phys_addr_t alloc;

8
test/lib/lmb.c
View file

@ -128,7 +128,7 @@ static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram,
ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, alloc_64k_addr, 0x10000, ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, alloc_64k_addr, 0x10000,
ram_end - 4, 4, 0, 0); ram_end - 4, 4, 0, 0);
/* alloc below end of reserved region -> below reserved region */ /* alloc below end of reserved region -> below reserved region */
b = lmb_alloc_base(4, 1, alloc_64k_end); b = lmb_alloc_base(4, 1, alloc_64k_end, LMB_NONE);
ut_asserteq(b, alloc_64k_addr - 4); ut_asserteq(b, alloc_64k_addr - 4);
ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, ASSERT_LMB(mem_lst, used_lst, 0, 0, 2,
alloc_64k_addr - 4, 0x10000 + 4, ram_end - 4, 4, 0, 0); alloc_64k_addr - 4, 0x10000 + 4, ram_end - 4, 4, 0, 0);
@ -138,7 +138,7 @@ static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram,
ut_asserteq(c, ram_end - 8); ut_asserteq(c, ram_end - 8);
ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, ASSERT_LMB(mem_lst, used_lst, 0, 0, 2,
alloc_64k_addr - 4, 0x10000 + 4, ram_end - 8, 8, 0, 0); alloc_64k_addr - 4, 0x10000 + 4, ram_end - 8, 8, 0, 0);
d = lmb_alloc_base(4, 1, alloc_64k_end); d = lmb_alloc_base(4, 1, alloc_64k_end, LMB_NONE);
ut_asserteq(d, alloc_64k_addr - 8); ut_asserteq(d, alloc_64k_addr - 8);
ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, ASSERT_LMB(mem_lst, used_lst, 0, 0, 2,
alloc_64k_addr - 8, 0x10000 + 8, ram_end - 8, 8, 0, 0); alloc_64k_addr - 8, 0x10000 + 8, ram_end - 8, 8, 0, 0);
@ -163,7 +163,7 @@ static int test_multi_alloc(struct unit_test_state *uts, const phys_addr_t ram,
alloc_64k_addr - 8, 4, alloc_64k_addr, 0x10000, alloc_64k_addr - 8, 4, alloc_64k_addr, 0x10000,
ram_end - 8, 4); ram_end - 8, 4);
/* allocate again to ensure we get the same address */ /* allocate again to ensure we get the same address */
b2 = lmb_alloc_base(4, 1, alloc_64k_end); b2 = lmb_alloc_base(4, 1, alloc_64k_end, LMB_NONE);
ut_asserteq(b, b2); ut_asserteq(b, b2);
ASSERT_LMB(mem_lst, used_lst, 0, 0, 2, ASSERT_LMB(mem_lst, used_lst, 0, 0, 2,
alloc_64k_addr - 8, 0x10000 + 8, ram_end - 8, 4, 0, 0); alloc_64k_addr - 8, 0x10000 + 8, ram_end - 8, 4, 0, 0);
@ -363,7 +363,7 @@ static int test_noreserved(struct unit_test_state *uts, const phys_addr_t ram,
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 0, 0, 0, 0, 0, 0, 0); ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 0, 0, 0, 0, 0, 0, 0);
/* allocate a block with base*/ /* allocate a block with base*/
b = lmb_alloc_base(alloc_size, align, ram_end); b = lmb_alloc_base(alloc_size, align, ram_end, LMB_NONE);
ut_assert(a == b); ut_assert(a == b);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1,
ram + ram_size - alloc_size_aligned, ram + ram_size - alloc_size_aligned,