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

lmb: Remove lmb_alloc_addr_flags()

Browse source 
lmb_alloc_addr() is just calling lmb_alloc_addr_flags() with LMB_NONE
There's not much we gain from this abstraction, so let's remove the
latter, add a flags argument to lmb_alloc_addr() 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:35 +02:00 • committed by Tom Rini
parent c207d6e3e3
commit 15e0c5e390
5 changed files with 25 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/fs.c
View file

@ -554,7 +554,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset,
lmb_dump_all(); lmb_dump_all();
if (lmb_alloc_addr(addr, read_len) == addr) if (lmb_alloc_addr(addr, read_len, LMB_NONE) == addr)
return 0; return 0;
log_err("** Reading file would overwrite reserved memory **\n"); log_err("** Reading file would overwrite reserved memory **\n");

10
include/lmb.h
View file

@ -94,7 +94,6 @@ 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_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr);
phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size);
phys_size_t lmb_get_free_size(phys_addr_t addr); phys_size_t lmb_get_free_size(phys_addr_t addr);
/** /**
@ -115,8 +114,8 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
phys_addr_t max_addr, uint flags); phys_addr_t max_addr, uint flags);
/** /**
* lmb_alloc_addr_flags() - Allocate specified memory address with specified * lmb_alloc_addr() - Allocate specified memory address with specified attributes
* attributes *
* @base: Base Address requested * @base: Base Address requested
* @size: Size of the region requested * @size: Size of the region requested
* @flags: Memory region attributes to be set * @flags: Memory region attributes to be set
@ -127,8 +126,7 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
* *
* Return: Base address on success, 0 on error. * Return: Base address on success, 0 on error.
*/ */
phys_addr_t lmb_alloc_addr_flags(phys_addr_t base, phys_size_t size, phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, uint flags);
uint flags);
/** /**
* lmb_is_reserved_flags() - Test if address is in reserved region with flag * lmb_is_reserved_flags() - Test if address is in reserved region with flag
@ -166,7 +164,7 @@ void lmb_pop(struct lmb *store);
static inline int lmb_read_check(phys_addr_t addr, phys_size_t len) static inline int lmb_read_check(phys_addr_t addr, phys_size_t len)
{ {
return lmb_alloc_addr(addr, len) == addr ? 0 : -1; return lmb_alloc_addr(addr, len, LMB_NONE) == addr ? 0 : -1;
} }
/** /**

2
lib/efi_loader/efi_memory.c
View file

@ -490,7 +490,7 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type,
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
addr = map_to_sysmem((void *)(uintptr_t)*memory); addr = map_to_sysmem((void *)(uintptr_t)*memory);
addr = (u64)lmb_alloc_addr_flags(addr, len, flags); addr = (u64)lmb_alloc_addr(addr, len, flags);
if (!addr) if (!addr)
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
break; break;

15
lib/lmb.c
View file

@ -761,8 +761,7 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
return alloc; return alloc;
} }
static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size, static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
u32 flags)
{ {
long rgn; long rgn;
struct lmb_region *lmb_memory = lmb.available_mem.data; struct lmb_region *lmb_memory = lmb.available_mem.data;
@ -786,17 +785,7 @@ static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size,
return 0; return 0;
} }
/* phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, uint flags)
* Try to allocate a specific address range: must be in defined memory but not
* reserved
*/
phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size)
{
return _lmb_alloc_addr(base, size, LMB_NONE);
}
phys_addr_t lmb_alloc_addr_flags(phys_addr_t base, phys_size_t size,
uint flags)
{ {
return _lmb_alloc_addr(base, size, flags); return _lmb_alloc_addr(base, size, flags);
} }

34
test/lib/lmb.c
View file

@ -530,21 +530,21 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
ut_asserteq(ret, 0); ut_asserteq(ret, 0);
/* Try to allocate a page twice */ /* Try to allocate a page twice */
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NONE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NONE);
ut_asserteq(b, alloc_addr_a); ut_asserteq(b, alloc_addr_a);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NOOVERWRITE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NOOVERWRITE);
ut_asserteq(b, 0); ut_asserteq(b, 0);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NONE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NONE);
ut_asserteq(b, alloc_addr_a); ut_asserteq(b, alloc_addr_a);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x2000, LMB_NONE); b = lmb_alloc_addr(alloc_addr_a, 0x2000, LMB_NONE);
ut_asserteq(b, alloc_addr_a); ut_asserteq(b, alloc_addr_a);
ret = lmb_free(alloc_addr_a, 0x2000); ret = lmb_free(alloc_addr_a, 0x2000);
ut_asserteq(ret, 0); ut_asserteq(ret, 0);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NOOVERWRITE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NOOVERWRITE);
ut_asserteq(b, alloc_addr_a); ut_asserteq(b, alloc_addr_a);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NONE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NONE);
ut_asserteq(b, 0); ut_asserteq(b, 0);
b = lmb_alloc_addr_flags(alloc_addr_a, 0x1000, LMB_NOOVERWRITE); b = lmb_alloc_addr(alloc_addr_a, 0x1000, LMB_NOOVERWRITE);
ut_asserteq(b, 0); ut_asserteq(b, 0);
ret = lmb_free(alloc_addr_a, 0x1000); ret = lmb_free(alloc_addr_a, 0x1000);
ut_asserteq(ret, 0); ut_asserteq(ret, 0);
@ -560,22 +560,22 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
alloc_addr_b, 0x10000, alloc_addr_c, 0x10000); alloc_addr_b, 0x10000, alloc_addr_c, 0x10000);
/* allocate blocks */ /* allocate blocks */
a = lmb_alloc_addr(ram, alloc_addr_a - ram); a = lmb_alloc_addr(ram, alloc_addr_a - ram, LMB_NONE);
ut_asserteq(a, ram); ut_asserteq(a, ram);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 3, ram, 0x8010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 3, ram, 0x8010000,
alloc_addr_b, 0x10000, alloc_addr_c, 0x10000); alloc_addr_b, 0x10000, alloc_addr_c, 0x10000);
b = lmb_alloc_addr(alloc_addr_a + 0x10000, b = lmb_alloc_addr(alloc_addr_a + 0x10000,
alloc_addr_b - alloc_addr_a - 0x10000); alloc_addr_b - alloc_addr_a - 0x10000, LMB_NONE);
ut_asserteq(b, alloc_addr_a + 0x10000); ut_asserteq(b, alloc_addr_a + 0x10000);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x10010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x10010000,
alloc_addr_c, 0x10000, 0, 0); alloc_addr_c, 0x10000, 0, 0);
c = lmb_alloc_addr(alloc_addr_b + 0x10000, c = lmb_alloc_addr(alloc_addr_b + 0x10000,
alloc_addr_c - alloc_addr_b - 0x10000); alloc_addr_c - alloc_addr_b - 0x10000, LMB_NONE);
ut_asserteq(c, alloc_addr_b + 0x10000); ut_asserteq(c, alloc_addr_b + 0x10000);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000,
0, 0, 0, 0); 0, 0, 0, 0);
d = lmb_alloc_addr(alloc_addr_c + 0x10000, d = lmb_alloc_addr(alloc_addr_c + 0x10000,
ram_end - alloc_addr_c - 0x10000); ram_end - alloc_addr_c - 0x10000, LMB_NONE);
ut_asserteq(d, alloc_addr_c + 0x10000); ut_asserteq(d, alloc_addr_c + 0x10000);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, ram_size, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, ram_size,
0, 0, 0, 0); 0, 0, 0, 0);
@ -591,7 +591,7 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
/* allocate at 3 points in free range */ /* allocate at 3 points in free range */
d = lmb_alloc_addr(ram_end - 4, 4); d = lmb_alloc_addr(ram_end - 4, 4, LMB_NONE);
ut_asserteq(d, ram_end - 4); ut_asserteq(d, ram_end - 4);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000,
d, 4, 0, 0); d, 4, 0, 0);
@ -600,7 +600,7 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000,
0, 0, 0, 0); 0, 0, 0, 0);
d = lmb_alloc_addr(ram_end - 128, 4); d = lmb_alloc_addr(ram_end - 128, 4, LMB_NONE);
ut_asserteq(d, ram_end - 128); ut_asserteq(d, ram_end - 128);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000,
d, 4, 0, 0); d, 4, 0, 0);
@ -609,7 +609,7 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000,
0, 0, 0, 0); 0, 0, 0, 0);
d = lmb_alloc_addr(alloc_addr_c + 0x10000, 4); d = lmb_alloc_addr(alloc_addr_c + 0x10000, 4, LMB_NONE);
ut_asserteq(d, alloc_addr_c + 0x10000); ut_asserteq(d, alloc_addr_c + 0x10000);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010004, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010004,
0, 0, 0, 0); 0, 0, 0, 0);
@ -624,18 +624,18 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram + 0x8000000, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram + 0x8000000,
0x10010000, 0, 0, 0, 0); 0x10010000, 0, 0, 0, 0);
d = lmb_alloc_addr(ram, 4); d = lmb_alloc_addr(ram, 4, LMB_NONE);
ut_asserteq(d, ram); ut_asserteq(d, ram);
ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, d, 4, ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, d, 4,
ram + 0x8000000, 0x10010000, 0, 0); ram + 0x8000000, 0x10010000, 0, 0);
/* check that allocating outside memory fails */ /* check that allocating outside memory fails */
if (ram_end != 0) { if (ram_end != 0) {
ret = lmb_alloc_addr(ram_end, 1); ret = lmb_alloc_addr(ram_end, 1, LMB_NONE);
ut_asserteq(ret, 0); ut_asserteq(ret, 0);
} }
if (ram != 0) { if (ram != 0) {
ret = lmb_alloc_addr(ram - 1, 1); ret = lmb_alloc_addr(ram - 1, 1, LMB_NONE);
ut_asserteq(ret, 0); ut_asserteq(ret, 0);
} }