Commit 171539f5 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: libstub: install boot-time memory map as config table 



Expose the EFI boot time memory map to the kernel via a configuration
table. This is arch agnostic and enables future changes that remove the
dependency on DT on architectures that don't otherwise rely on it.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 4fc8e738

drivers/firmware/efi/libstub/arm64-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static bool check_image_region(u64 base, u64 size) 
	bool ret = false;

	int map_offset;



	status = efi_get_memory_map(&map);

	status = efi_get_memory_map(&map, false);

	if (status != EFI_SUCCESS)

		return false;

drivers/firmware/efi/libstub/efi-stub-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ efi_status_t efi_exit_boot_services(void *handle, void *priv, 
	struct efi_boot_memmap *map;

	efi_status_t status;



	status = efi_get_memory_map(&map);

	status = efi_get_memory_map(&map, true);

	if (status != EFI_SUCCESS)

		return status;

drivers/firmware/efi/libstub/efistub.h

+2 −1
Original line number Diff line number Diff line
@@ -876,7 +876,8 @@ void efi_apply_loadoptions_quirk(const void **load_options, int *load_options_si 


char *efi_convert_cmdline(efi_loaded_image_t *image, int *cmd_line_len);



efi_status_t efi_get_memory_map(struct efi_boot_memmap **map);

efi_status_t efi_get_memory_map(struct efi_boot_memmap **map,

				bool install_cfg_tbl);



efi_status_t efi_allocate_pages(unsigned long size, unsigned long *addr,

				unsigned long max);

drivers/firmware/efi/libstub/mem.c

+24 −3
Original line number Diff line number Diff line
@@ -9,14 +9,20 @@ 
 * efi_get_memory_map() - get memory map

 * @map:		pointer to memory map pointer to which to assign the

 *			newly allocated memory map

 * @install_cfg_tbl:	whether or not to install the boot memory map as a

 *			configuration table

 *

 * Retrieve the UEFI memory map. The allocated memory leaves room for

 * up to EFI_MMAP_NR_SLACK_SLOTS additional memory map entries.

 *

 * Return:	status code

 */

efi_status_t efi_get_memory_map(struct efi_boot_memmap **map)

efi_status_t efi_get_memory_map(struct efi_boot_memmap **map,

				bool install_cfg_tbl)

{

	int memtype = install_cfg_tbl ? EFI_ACPI_RECLAIM_MEMORY

				      : EFI_LOADER_DATA;

	efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID;

	struct efi_boot_memmap *m, tmp;

	efi_status_t status;

	unsigned long size;
@@ -28,20 +34,35 @@ efi_status_t efi_get_memory_map(struct efi_boot_memmap **map) 
		return EFI_LOAD_ERROR;



	size = tmp.map_size + tmp.desc_size * EFI_MMAP_NR_SLACK_SLOTS;

	status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, sizeof(*m) + size,

	status = efi_bs_call(allocate_pool, memtype, sizeof(*m) + size,

			     (void **)&m);

	if (status != EFI_SUCCESS)

		return status;



	if (install_cfg_tbl) {

		/*

		 * Installing a configuration table might allocate memory, and

		 * this may modify the memory map. This means we should install

		 * the configuration table first, and re-install or delete it

		 * as needed.

		 */

		status = efi_bs_call(install_configuration_table, &tbl_guid, m);

		if (status != EFI_SUCCESS)

			goto free_map;

	}



	m->buff_size = m->map_size = size;

	status = efi_bs_call(get_memory_map, &m->map_size, m->map, &m->map_key,

			     &m->desc_size, &m->desc_ver);

	if (status != EFI_SUCCESS)

		goto free_map;

		goto uninstall_table;



	*map = m;

	return EFI_SUCCESS;



uninstall_table:

	if (install_cfg_tbl)

		efi_bs_call(install_configuration_table, &tbl_guid, NULL);

free_map:

	efi_bs_call(free_pool, m);

	return status;

drivers/firmware/efi/libstub/randomalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ efi_status_t efi_random_alloc(unsigned long size, 
	efi_status_t status;

	int map_offset;



	status = efi_get_memory_map(&map);

	status = efi_get_memory_map(&map, false);

	if (status != EFI_SUCCESS)

		return status;