colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lmb: Simplify lmb_should_notify usage

Browse Source 
We never call lmb_map_update_notify() without checking the result of
lmb_should_notify(). Instead of running that function everytime fold it
in there and add the additional flags parameter

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Ilias Apalodimas
2024-10-23 18:22:01 +03:00
committed by Tom Rini
parent 0f57b009e6
commit f6fb6a8851
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/lmb.c
View File

@@ -40,7 +40,7 @@ static bool lmb_should_notify(enum lmb_flags flags)
static int __maybe_unused lmb_map_update_notify(phys_addr_t addr, static int __maybe_unused lmb_map_update_notify(phys_addr_t addr,
phys_size_t size, phys_size_t size,
u8 op) u8 op, enum lmb_flags flags)
{ {
u64 efi_addr; u64 efi_addr;
u64 pages; u64 pages;
@@ -51,6 +51,9 @@ static int __maybe_unused lmb_map_update_notify(phys_addr_t addr,
return -1; return -1;
} }
if (!lmb_should_notify(flags))
return 0;
efi_addr = (uintptr_t)map_sysmem(addr, 0); efi_addr = (uintptr_t)map_sysmem(addr, 0);
pages = efi_size_in_pages(size + (efi_addr & EFI_PAGE_MASK)); pages = efi_size_in_pages(size + (efi_addr & EFI_PAGE_MASK));
efi_addr &= ~EFI_PAGE_MASK; efi_addr &= ~EFI_PAGE_MASK;
@@ -64,9 +67,9 @@ static int __maybe_unused lmb_map_update_notify(phys_addr_t addr,
log_err("%s: LMB Map notify failure %lu\n", __func__, log_err("%s: LMB Map notify failure %lu\n", __func__,
status & ~EFI_ERROR_MASK); status & ~EFI_ERROR_MASK);
return -1; return -1;
} else {
return 0;
} }
return 0;
} }
static void lmb_print_region_flags(enum lmb_flags flags) static void lmb_print_region_flags(enum lmb_flags flags)
@@ -491,10 +494,7 @@ long lmb_add(phys_addr_t base, phys_size_t size)
if (ret) if (ret)
return ret; return ret;
if (lmb_should_notify(LMB_NONE)) return lmb_map_update_notify(base, size, MAP_OP_ADD, LMB_NONE);
return lmb_map_update_notify(base, size, MAP_OP_ADD);
return 0;
} }
static long _lmb_free(phys_addr_t base, phys_size_t size) static long _lmb_free(phys_addr_t base, phys_size_t size)
@@ -567,10 +567,7 @@ long lmb_free_flags(phys_addr_t base, phys_size_t size,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (lmb_should_notify(flags)) return lmb_map_update_notify(base, size, MAP_OP_FREE, flags);
return lmb_map_update_notify(base, size, MAP_OP_FREE);
return ret;
} }
long lmb_free(phys_addr_t base, phys_size_t size) long lmb_free(phys_addr_t base, phys_size_t size)
@@ -587,10 +584,7 @@ long lmb_reserve_flags(phys_addr_t base, phys_size_t size, enum lmb_flags flags)
if (ret) if (ret)
return ret; return ret;
if (lmb_should_notify(flags)) return lmb_map_update_notify(base, size, MAP_OP_RESERVE, flags);
return lmb_map_update_notify(base, size, MAP_OP_RESERVE);
return ret;
} }
long lmb_reserve(phys_addr_t base, phys_size_t size) long lmb_reserve(phys_addr_t base, phys_size_t size)
@@ -622,7 +616,6 @@ static phys_addr_t lmb_align_down(phys_addr_t addr, phys_size_t size)
static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align, static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align,
phys_addr_t max_addr, enum lmb_flags flags) phys_addr_t max_addr, enum lmb_flags flags)
{ {
u8 op;
int ret; int ret;
long i, rgn; long i, rgn;
phys_addr_t base = 0; phys_addr_t base = 0;
@@ -655,13 +648,11 @@ static phys_addr_t _lmb_alloc_base(phys_size_t size, ulong align,
size, flags)) size, flags))
return 0; return 0;
if (lmb_should_notify(flags)) { ret = lmb_map_update_notify(base, size,
op = MAP_OP_RESERVE; MAP_OP_RESERVE,
ret = lmb_map_update_notify(base, size, flags);
op); if (ret)
if (ret) return ret;
return ret;
}
return base; return base;
} }