vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

loader/i386/linux: Use central copy of grub_efi_find_mmap_size()

Browse source 
Delete local copy of function to determine required buffer size for the
UEFI memory map, use helper in kern/efi/mm.c.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Leif Lindholm 2018-07-13 17:34:43 +01:00 committed by Vincent Batts
parent 26dc1a3ff6
commit 2a9d0f04ba
1 changed files with 1 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
grub-core/loader/i386/linux.c
View file

@ -104,55 +104,6 @@ page_align (grub_size_t size)
return (size + (1 << 12) - 1) & (~((1 << 12) - 1)); return (size + (1 << 12) - 1) & (~((1 << 12) - 1));
} }
#ifdef GRUB_MACHINE_EFI
/* Find the optimal number of pages for the memory map. Is it better to
move this code to efi/mm.c? */
static grub_efi_uintn_t
find_efi_mmap_size (void)
{
static grub_efi_uintn_t mmap_size = 0;
if (mmap_size != 0)
return mmap_size;
mmap_size = (1 << 12);
while (1)
{
int ret;
grub_efi_memory_descriptor_t *mmap;
grub_efi_uintn_t desc_size;
grub_efi_uintn_t cur_mmap_size = mmap_size;
mmap = grub_malloc (cur_mmap_size);
if (! mmap)
return 0;
ret = grub_efi_get_memory_map (&cur_mmap_size, mmap, 0, &desc_size, 0);
grub_free (mmap);
if (ret < 0)
{
grub_error (GRUB_ERR_IO, "cannot get memory map");
return 0;
}
else if (ret > 0)
break;
if (mmap_size < cur_mmap_size)
mmap_size = cur_mmap_size;
mmap_size += (1 << 12);
}
/* Increase the size a bit for safety, because GRUB allocates more on
later, and EFI itself may allocate more. */
mmap_size += (3 << 12);
mmap_size = page_align (mmap_size);
return mmap_size;
}
#endif
/* Helper for find_mmap_size. */ /* Helper for find_mmap_size. */
static int static int
count_hook (grub_uint64_t addr __attribute__ ((unused)), count_hook (grub_uint64_t addr __attribute__ ((unused)),
@ -569,7 +520,7 @@ grub_linux_boot (void)
ctx.real_size = ALIGN_UP (cl_offset + maximal_cmdline_size, 4096); ctx.real_size = ALIGN_UP (cl_offset + maximal_cmdline_size, 4096);
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
efi_mmap_size = find_efi_mmap_size (); efi_mmap_size = grub_efi_find_mmap_size ();
if (efi_mmap_size == 0) if (efi_mmap_size == 0)
return grub_errno; return grub_errno;
#endif #endif