[PATCH v2 13/14] lmb: remove call to efi_lmb_reserve()

[Ilias Apalodimas]

On Tue, 8 Oct 2024 at 21:15, Sughosh Ganu <sughosh.ganu at linaro.org> wrote:
>
> The EFI memory allocations are now being done through the LMB
> module. With this change, there is no need to get the EFI memory map
> and set aside EFI allocated memory.
>
> Signed-off-by: Sughosh Ganu <sughosh.ganu at linaro.org>
> ---
> Changes since V1:
> * Do not remove the inclusion of efi_loader.h as it is now needed for
>   the lmb_map_update_notify()
>
>  lib/lmb.c | 35 -----------------------------------
>  1 file changed, 35 deletions(-)
>
> diff --git a/lib/lmb.c b/lib/lmb.c
> index 82dfd36364b..82fa9cd14b9 100644
> --- a/lib/lmb.c
> +++ b/lib/lmb.c
> @@ -208,38 +208,6 @@ static void lmb_fix_over_lap_regions(struct alist *lmb_rgn_lst,
>         lmb_remove_region(lmb_rgn_lst, r2);
>  }
>
> -/**
> - * efi_lmb_reserve() - add reservations for EFI memory
> - *
> - * Add reservations for all EFI memory areas that are not
> - * EFI_CONVENTIONAL_MEMORY.
> - *
> - * Return:     0 on success, 1 on failure
> - */
> -static __maybe_unused int efi_lmb_reserve(void)
> -{
> -       struct efi_mem_desc *memmap = NULL, *map;
> -       efi_uintn_t i, map_size = 0;
> -       efi_status_t ret;
> -
> -       ret = efi_get_memory_map_alloc(&map_size, &memmap);
> -       if (ret != EFI_SUCCESS)
> -               return 1;
> -
> -       for (i = 0, map = memmap; i < map_size / sizeof(*map); ++map, ++i) {
> -               if (map->type != EFI_CONVENTIONAL_MEMORY) {
> -                       lmb_reserve_flags(map_to_sysmem((void *)(uintptr_t)
> -                                                       map->physical_start),
> -                                         map->num_pages * EFI_PAGE_SIZE,
> -                                         map->type == EFI_RESERVED_MEMORY_TYPE
> -                                             ? LMB_NOMAP : LMB_NONE);
> -               }
> -       }
> -       efi_free_pool(memmap);
> -
> -       return 0;
> -}
> -
>  static void lmb_reserve_uboot_region(void)
>  {
>         int bank;
> @@ -286,9 +254,6 @@ static void lmb_reserve_common(void *fdt_blob)
>
>         if (CONFIG_IS_ENABLED(OF_LIBFDT) && fdt_blob)
>                 boot_fdt_add_mem_rsv_regions(fdt_blob);
> -
> -       if (CONFIG_IS_ENABLED(EFI_LOADER))
> -               efi_lmb_reserve();
>  }
>
>  static __maybe_unused void lmb_reserve_common_spl(void)
> --
> 2.34.1
>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>