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

Commit 75adbd13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fix from Ingo Molnar:
 "Fix a UEFI mixed mode (64-bit kernel on 32-bit UEFI) reboot loop
  regression"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/x86: Fix mixed mode reboot loop by removing pointless call to PciIo->Attributes()
parents ae4ea397 e2967018

arch/x86/boot/compressed/eboot.c

+3 −9
Original line number Diff line number Diff line
@@ -114,18 +114,12 @@ __setup_efi_pci(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom) 
	struct pci_setup_rom *rom = NULL;

	efi_status_t status;

	unsigned long size;

	uint64_t attributes, romsize;

	uint64_t romsize;

	void *romimage;



	status = efi_call_proto(efi_pci_io_protocol, attributes, pci,

				EfiPciIoAttributeOperationGet, 0ULL,

				&attributes);

	if (status != EFI_SUCCESS)

		return status;



	/*

	 * Some firmware images contain EFI function pointers at the place where the

	 * romimage and romsize fields are supposed to be. Typically the EFI

	 * Some firmware images contain EFI function pointers at the place where

	 * the romimage and romsize fields are supposed to be. Typically the EFI

	 * code is mapped at high addresses, translating to an unrealistically

	 * large romsize. The UEFI spec limits the size of option ROMs to 16

	 * MiB so we reject any ROMs over 16 MiB in size to catch this.