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

Commit 1adb9123 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'efi-urgent' of... 

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi

 into x86/urgent

Pull EFI fixes from Matt Fleming:

 * Fix an EFI boot issue preventing a Parallels virtual machine from
   booting because the upper 32-bits of the EFI memmap pointer were
   being discarded in setup_e820(). (Dmitry Skorodumov)

 * Validate that the "efi" kernel parameter gets used with an argument,
   otherwise we will oops. (Ricardo Neri)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 646c4b75 9115c758

arch/x86/boot/compressed/eboot.c

+4 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,10 @@ static efi_status_t setup_e820(struct boot_params *params, 
		unsigned int e820_type = 0;

		unsigned long m = efi->efi_memmap;



#ifdef CONFIG_X86_64

		m |= (u64)efi->efi_memmap_hi << 32;

#endif



		d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));

		switch (d->type) {

		case EFI_RESERVED_TYPE:

arch/x86/platform/efi/efi.c

+5 −0
Original line number Diff line number Diff line
@@ -972,6 +972,11 @@ u64 efi_mem_attributes(unsigned long phys_addr) 


static int __init arch_parse_efi_cmdline(char *str)

{

	if (!str) {

		pr_warn("need at least one option\n");

		return -EINVAL;

	}



	if (parse_option_str(str, "old_map"))

		set_bit(EFI_OLD_MEMMAP, &efi.flags);

	if (parse_option_str(str, "debug"))

drivers/firmware/efi/efi.c

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ bool efi_runtime_disabled(void) 


static int __init parse_efi_cmdline(char *str)

{

	if (!str) {

		pr_warn("need at least one option\n");

		return -EINVAL;

	}



	if (parse_option_str(str, "noruntime"))

		disable_runtime = true;