EFI fix
Linus,
Please pull the latest efi-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-urgent-for-linus
# HEAD: e296701800f30d260a66f8aa1971b5b1bc3d2f81 efi/x86: Fix mixed mode reboot loop by removing pointless call to PciIo->Attributes()
Fix a UEFI mixed mode (64-bit kernel on 32-bit UEFI) reboot loop regression.
Thanks,
Ingo
------------------>
Ard Biesheuvel (1):
efi/x86: Fix mixed mode reboot loop by removing pointless call to PciIo->Attributes()
arch/x86/boot/compressed/eboot.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
arch/x86/boot/compressed/eboot.c +3 -9
@@ -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.