Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+3
-9
+3
-9
arch/x86/boot/compressed/eboot.c
+3
-9
arch/x86/boot/compressed/eboot.c
···
114
114
struct pci_setup_rom *rom = NULL;
115
115
efi_status_t status;
116
116
unsigned long size;
117
-
uint64_t attributes, romsize;
117
+
uint64_t romsize;
118
118
void *romimage;
119
119
120
-
status = efi_call_proto(efi_pci_io_protocol, attributes, pci,
121
-
EfiPciIoAttributeOperationGet, 0ULL,
122
-
&attributes);
123
-
if (status != EFI_SUCCESS)
124
-
return status;
125
-
126
120
/*
127
-
* Some firmware images contain EFI function pointers at the place where the
128
-
* romimage and romsize fields are supposed to be. Typically the EFI
121
+
* Some firmware images contain EFI function pointers at the place where
122
+
* the romimage and romsize fields are supposed to be. Typically the EFI
129
123
* code is mapped at high addresses, translating to an unrealistically
130
124
* large romsize. The UEFI spec limits the size of option ROMs to 16
131
125
* MiB so we reject any ROMs over 16 MiB in size to catch this.