Commit 9479c7ce authored by Matt Fleming's avatar Matt Fleming
Browse files

efi: Refactor efi_memmap_init_early() into arch-neutral code 



Every EFI architecture apart from ia64 needs to setup the EFI memory
map at efi.memmap, and the code for doing that is essentially the same
across all implementations. Therefore, it makes sense to factor this
out into the common code under drivers/firmware/efi/.

The only slight variation is the data structure out of which we pull
the initial memory map information, such as physical address, memory
descriptor size and version, etc. We can address this by passing a
generic data structure (struct efi_memory_map_data) as the argument to
efi_memmap_init_early() which contains the minimum info required for
initialising the memory map.

In the process, this patch also fixes a few undesirable implementation
differences:

 - ARM and arm64 were failing to clear the EFI_MEMMAP bit when
   unmapping the early EFI memory map. EFI_MEMMAP indicates whether
   the EFI memory map is mapped (not the regions contained within) and
   can be traversed.  It's more correct to set the bit as soon as we
   memremap() the passed in EFI memmap.

 - Rename efi_unmmap_memmap() to efi_memmap_unmap() to adhere to the
   regular naming scheme.

This patch also uses a read-write mapping for the memory map instead
of the read-only mapping currently used on ARM and arm64. x86 needs
the ability to update the memory map in-place when assigning virtual
addresses to regions (efi_map_region()) and tagging regions when
reserving boot services (efi_reserve_boot_services()).

There's no way for the generic fake_mem code to know which mapping to
use without introducing some arch-specific constant/hook, so just use
read-write since read-only is of dubious value for the EFI memory map.

Tested-by: Dave Young <dyoung@redhat.com> [kexec/kdump]
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> [arm]
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Peter Jones <pjones@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
parent ab72a27d

arch/x86/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ extern int __init efi_memblock_x86_reserve_range(void); 
extern pgd_t * __init efi_call_phys_prolog(void);

extern void __init efi_call_phys_epilog(pgd_t *save_pgd);

extern void __init efi_print_memmap(void);

extern void __init efi_unmap_memmap(void);

extern void __init efi_memory_uc(u64 addr, unsigned long size);

extern void __init efi_map_region(efi_memory_desc_t *md);

extern void __init efi_map_region_fixed(efi_memory_desc_t *md);

arch/x86/platform/efi/efi.c

+17 −49
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ static void __init do_add_efi_memmap(void) 
int __init efi_memblock_x86_reserve_range(void)

{

	struct efi_info *e = &boot_params.efi_info;

	struct efi_memory_map_data data;

	phys_addr_t pmap;

	int rv;



	if (efi_enabled(EFI_PARAVIRT))

		return 0;
@@ -187,11 +189,17 @@ int __init efi_memblock_x86_reserve_range(void) 
#else

	pmap = (e->efi_memmap |	((__u64)e->efi_memmap_hi << 32));

#endif

	efi.memmap.phys_map	= pmap;

	efi.memmap.nr_map	= e->efi_memmap_size /

				  e->efi_memdesc_size;

	efi.memmap.desc_size	= e->efi_memdesc_size;

	efi.memmap.desc_version	= e->efi_memdesc_version;

	data.phys_map		= pmap;

	data.size 		= e->efi_memmap_size;

	data.desc_size		= e->efi_memdesc_size;

	data.desc_version	= e->efi_memdesc_version;



	rv = efi_memmap_init_early(&data);

	if (rv)

		return rv;



	if (add_efi_memmap)

		do_add_efi_memmap();



	WARN(efi.memmap.desc_version != 1,

	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
@@ -218,19 +226,6 @@ void __init efi_print_memmap(void) 
	}

}



void __init efi_unmap_memmap(void)

{

	unsigned long size;



	clear_bit(EFI_MEMMAP, &efi.flags);



	size = efi.memmap.nr_map * efi.memmap.desc_size;

	if (efi.memmap.map) {

		early_memunmap(efi.memmap.map, size);

		efi.memmap.map = NULL;

	}

}



static int __init efi_systab_init(void *phys)

{

	if (efi_enabled(EFI_64BIT)) {
@@ -414,33 +409,6 @@ static int __init efi_runtime_init(void) 
	return 0;

}



static int __init efi_memmap_init(void)

{

	unsigned long addr, size;



	if (efi_enabled(EFI_PARAVIRT))

		return 0;



	/* Map the EFI memory map */

	size = efi.memmap.nr_map * efi.memmap.desc_size;

	addr = (unsigned long)efi.memmap.phys_map;



	efi.memmap.map = early_memremap(addr, size);

	if (efi.memmap.map == NULL) {

		pr_err("Could not map the memory map!\n");

		return -ENOMEM;

	}



	efi.memmap.map_end = efi.memmap.map + size;



	if (add_efi_memmap)

		do_add_efi_memmap();



	set_bit(EFI_MEMMAP, &efi.flags);



	return 0;

}



void __init efi_init(void)

{

	efi_char16_t *c16;
@@ -498,11 +466,11 @@ void __init efi_init(void) 
	if (!efi_runtime_supported())

		pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");

	else {

		if (efi_runtime_disabled() || efi_runtime_init())

		if (efi_runtime_disabled() || efi_runtime_init()) {

			efi_memmap_unmap();

			return;

		}

	if (efi_memmap_init())

		return;

	}



	if (efi_enabled(EFI_DBG))

		efi_print_memmap();
@@ -839,7 +807,7 @@ static void __init kexec_enter_virtual_mode(void) 
	 * non-native EFI

	 */

	if (!efi_is_native()) {

		efi_unmap_memmap();

		efi_memmap_unmap();

		clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);

		return;

	}

arch/x86/platform/efi/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ void __init efi_free_boot_services(void) 
		free_bootmem_late(start, size);

	}



	efi_unmap_memmap();

	efi_memmap_unmap();

}



/*
@@ -365,7 +365,7 @@ void __init efi_apply_memmap_quirks(void) 
	 */

	if (!efi_runtime_supported()) {

		pr_info("Setup done, disabling due to 32/64-bit mismatch\n");

		efi_unmap_memmap();

		efi_memmap_unmap();

	}



	/* UV2+ BIOS has a fix for this issue.  UV1 still needs the quirk. */

drivers/firmware/efi/arm-init.c

+8 −9
Original line number Diff line number Diff line
@@ -211,12 +211,11 @@ static __init void reserve_regions(void) 
			memblock_mark_nomap(paddr, size);



	}



	set_bit(EFI_MEMMAP, &efi.flags);

}



void __init efi_init(void)

{

	struct efi_memory_map_data data;

	struct efi_fdt_params params;



	/* Grab UEFI information placed in FDT by stub */
@@ -225,9 +224,12 @@ void __init efi_init(void) 


	efi_system_table = params.system_table;



	efi.memmap.phys_map = params.mmap;

	efi.memmap.map = early_memremap_ro(params.mmap, params.mmap_size);

	if (efi.memmap.map == NULL) {

	data.desc_version = params.desc_ver;

	data.desc_size = params.desc_size;

	data.size = params.mmap_size;

	data.phys_map = params.mmap;



	if (efi_memmap_init_early(&data) < 0) {

		/*

		* If we are booting via UEFI, the UEFI memory map is the only

		* description of memory we have, so there is little point in
@@ -235,9 +237,6 @@ void __init efi_init(void) 
		*/

		panic("Unable to map EFI memory map.\n");

	}

	efi.memmap.map_end = efi.memmap.map + params.mmap_size;

	efi.memmap.desc_size = params.desc_size;

	efi.memmap.desc_version = params.desc_ver;



	WARN(efi.memmap.desc_version != 1,

	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
@@ -248,7 +247,7 @@ void __init efi_init(void) 


	reserve_regions();

	efi_memattr_init();

	early_memunmap(efi.memmap.map, params.mmap_size);

	efi_memmap_unmap();



	memblock_reserve(params.mmap & PAGE_MASK,

			 PAGE_ALIGN(params.mmap_size +

drivers/firmware/efi/arm-runtime.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int __init arm_enable_runtime_services(void) 


	pr_info("Remapping and enabling EFI services.\n");



	mapsize = efi.memmap.map_end - efi.memmap.map;

	mapsize = efi.memmap.desc_size * efi.memmap.nr_map;



	efi.memmap.map = memremap(efi.memmap.phys_map, mapsize, MEMREMAP_WB);

	if (!efi.memmap.map) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE