lmb: Remove lmb_alloc_addr_flags()

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>

diff --git a/fs/fs.c b/fs/fs.c
index 21a23ef..99ddcc5 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -554,7 +554,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset,
 
        lmb_dump_all();
 
-       if (lmb_alloc_addr(addr, read_len) == addr)
+       if (lmb_alloc_addr(addr, read_len, LMB_NONE) == addr)
                return 0;
 
        log_err("** Reading file would overwrite reserved memory **\n");

diff --git a/include/lmb.h b/include/lmb.h
index 18030c6..e38af03 100644 (file)
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -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_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);
 
 /**
@@ -115,8 +114,8 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
                                 phys_addr_t max_addr, uint flags);
 
 /**
- * lmb_alloc_addr_flags() - Allocate specified memory address with specified
- *                         attributes
+ * lmb_alloc_addr() - Allocate specified memory address with specified attributes
+ *
  * @base: Base Address requested
  * @size: Size of the region requested
  * @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.
  */
-phys_addr_t lmb_alloc_addr_flags(phys_addr_t base, phys_size_t size,
-                                uint flags);
+phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, uint flags);
 
 /**
  * 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)
 {
-       return lmb_alloc_addr(addr, len) == addr ? 0 : -1;
+       return lmb_alloc_addr(addr, len, LMB_NONE) == addr ? 0 : -1;
 }
 
 /**

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index edd7da7..34e2b9e 100644 (file)
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -490,7 +490,7 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type,
                        return EFI_NOT_FOUND;
 
                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)
                        return EFI_NOT_FOUND;
                break;

diff --git a/lib/lmb.c b/lib/lmb.c
index 659581f..ffad7ec 100644 (file)
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -761,8 +761,7 @@ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align,
        return alloc;
 }
 
-static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size,
-                                  u32 flags)
+static phys_addr_t _lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
 {
        long rgn;
        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;
 }
 
-/*
- * 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)
+phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, uint flags)
 {
        return _lmb_alloc_addr(base, size, flags);
 }

diff --git a/test/lib/lmb.c b/test/lib/lmb.c
index 6e87027..971614f 100644 (file)
--- a/test/lib/lmb.c
+++ b/test/lib/lmb.c
@@ -530,21 +530,21 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
        ut_asserteq(ret, 0);
 
        /* 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);
-       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);
-       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);
-       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);
        ret = lmb_free(alloc_addr_a, 0x2000);
        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);
-       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);
-       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);
        ret = lmb_free(alloc_addr_a, 0x1000);
        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);
 
        /* 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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 3, ram, 0x8010000,
                   alloc_addr_b, 0x10000, alloc_addr_c, 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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x10010000,
                   alloc_addr_c, 0x10000, 0, 0);
        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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010000,
                   0, 0, 0, 0);
        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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, ram_size,
                   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 */
 
-       d = lmb_alloc_addr(ram_end - 4, 4);
+       d = lmb_alloc_addr(ram_end - 4, 4, LMB_NONE);
        ut_asserteq(d, ram_end - 4);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000,
                   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,
                   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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, ram, 0x18010000,
                   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,
                   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);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 1, ram, 0x18010004,
                   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,
                   0x10010000, 0, 0, 0, 0);
 
-       d = lmb_alloc_addr(ram, 4);
+       d = lmb_alloc_addr(ram, 4, LMB_NONE);
        ut_asserteq(d, ram);
        ASSERT_LMB(mem_lst, used_lst, ram, ram_size, 2, d, 4,
                   ram + 0x8000000, 0x10010000, 0, 0);
 
        /* check that allocating outside memory fails */
        if (ram_end != 0) {
-               ret = lmb_alloc_addr(ram_end, 1);
+               ret = lmb_alloc_addr(ram_end, 1, LMB_NONE);
                ut_asserteq(ret, 0);
        }
        if (ram != 0) {
-               ret = lmb_alloc_addr(ram - 1, 1);
+               ret = lmb_alloc_addr(ram - 1, 1, LMB_NONE);
                ut_asserteq(ret, 0);
        }