Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecacf09f authored by Huang, Ying's avatar Huang, Ying Committed by Thomas Gleixner
Browse files

x86: reserve EFI memory map with reserve_early 



This patch reserves the EFI memory map with reserve_early(). Because EFI
memory map is allocated by bootloader, if it is not reserved by
reserved_early(), it may be overwritten through address returned by
find_e820_area().

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Cc: andi@firstfloor.org
Cc: mingo@redhat.com
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d0ec2c6f

arch/x86/kernel/efi.c

+20 −13
Original line number Diff line number Diff line
@@ -238,6 +238,23 @@ static void __init add_efi_memmap(void) 
	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

}



void __init efi_reserve_early(void)

{

	unsigned long pmap;



	pmap = boot_params.efi_info.efi_memmap;

#ifdef CONFIG_X86_64

	pmap += (__u64)boot_params.efi_info.efi_memmap_hi << 32;

#endif

	memmap.phys_map = (void *)pmap;

	memmap.nr_map = boot_params.efi_info.efi_memmap_size /

		boot_params.efi_info.efi_memdesc_size;

	memmap.desc_version = boot_params.efi_info.efi_memdesc_version;

	memmap.desc_size = boot_params.efi_info.efi_memdesc_size;

	reserve_early(pmap, pmap + memmap.nr_map * memmap.desc_size,

		      "EFI memmap");

}



#if EFI_DEBUG

static void __init print_efi_memmap(void)

{
@@ -267,21 +284,11 @@ void __init efi_init(void) 
	int i = 0;

	void *tmp;



#ifdef CONFIG_X86_32

	efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab;

	memmap.phys_map = (void *)boot_params.efi_info.efi_memmap;

#else

	efi_phys.systab = (efi_system_table_t *)

		(boot_params.efi_info.efi_systab |

		 ((__u64)boot_params.efi_info.efi_systab_hi<<32));

	memmap.phys_map = (void *)

		(boot_params.efi_info.efi_memmap |

		 ((__u64)boot_params.efi_info.efi_memmap_hi<<32));

#ifdef CONFIG_X86_64

	efi_phys.systab = (void *)efi_phys.systab +

		((__u64)boot_params.efi_info.efi_systab_hi<<32);

#endif

	memmap.nr_map = boot_params.efi_info.efi_memmap_size /

		boot_params.efi_info.efi_memdesc_size;

	memmap.desc_version = boot_params.efi_info.efi_memdesc_version;

	memmap.desc_size = boot_params.efi_info.efi_memdesc_size;



	efi.systab = early_ioremap((unsigned long)efi_phys.systab,

				   sizeof(efi_system_table_t));

arch/x86/kernel/efi_64.c

+0 −6
Original line number Diff line number Diff line
@@ -97,12 +97,6 @@ void __init efi_call_phys_epilog(void) 
	early_runtime_code_mapping_set_exec(0);

}



void __init efi_reserve_bootmem(void)

{

	reserve_bootmem_generic((unsigned long)memmap.phys_map,

				memmap.nr_map * memmap.desc_size);

}



void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size)

{

	static unsigned pages_mapped __initdata;

arch/x86/kernel/setup_32.c

+4 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <asm/bios_ebda.h>

#include <asm/cacheflush.h>

#include <asm/processor.h>

#include <asm/efi.h>



/* This value is set up by the early boot code to point to the value

   immediately after the boot time page tables.  It contains a *physical*
@@ -683,8 +684,10 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_EFI

	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,

		     "EL32", 4))

		     "EL32", 4)) {

		efi_enabled = 1;

		efi_reserve_early();

	}

#endif



	ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);

arch/x86/kernel/setup_64.c

+3 −4
Original line number Diff line number Diff line
@@ -330,8 +330,10 @@ void __init setup_arch(char **cmdline_p) 
#endif

#ifdef CONFIG_EFI

	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,

		     "EL64", 4))

		     "EL64", 4)) {

		efi_enabled = 1;

		efi_reserve_early();

	}

#endif



	ARCH_SETUP
@@ -457,9 +459,6 @@ void __init setup_arch(char **cmdline_p) 
       acpi_reserve_bootmem();

#endif



	if (efi_enabled)

		efi_reserve_bootmem();



#ifdef CONFIG_X86_MPPARSE

       /*

	* Find and reserve possible boot-time SMP configuration:

include/asm-x86/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ extern void *efi_ioremap(unsigned long addr, unsigned long size); 


#endif /* CONFIG_X86_32 */



extern void efi_reserve_bootmem(void);

extern void efi_reserve_early(void);

extern void efi_call_phys_prelog(void);

extern void efi_call_phys_epilog(void);