aboutsummaryrefslogtreecommitdiff
path: root/drivers/firmware/efi
diff options
context:
space:
mode:
authorGravatar Mikel Rychliski <mikel@mikelr.com> 2023-08-23 17:51:58 -0400
committerGravatar Ard Biesheuvel <ardb@kernel.org> 2023-08-24 11:22:12 +0200
commit8b94da92559f7e403dc7ab81937cc50f949ee2fd (patch)
treea4d62ca77e18d653ed9ab49413e66f4fdc039f8d /drivers/firmware/efi
parentLinux 6.5-rc1 (diff)
downloadlinux-8b94da92559f7e403dc7ab81937cc50f949ee2fd.tar.gz
linux-8b94da92559f7e403dc7ab81937cc50f949ee2fd.tar.bz2
linux-8b94da92559f7e403dc7ab81937cc50f949ee2fd.zip
x86/efistub: Fix PCI ROM preservation in mixed mode
preserve_pci_rom_image() was accessing the romsize field in efi_pci_io_protocol_t directly instead of using the efi_table_attr() helper. This prevents the ROM image from being saved correctly during a mixed mode boot. Fixes: 2c3625cb9fa2 ("efi/x86: Fold __setup_efi_pci32() and __setup_efi_pci64() into one function") Signed-off-by: Mikel Rychliski <mikel@mikelr.com> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers/firmware/efi')
-rw-r--r--drivers/firmware/efi/libstub/x86-stub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 220be75a5cdc..146477da2b98 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -72,7 +72,7 @@ preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom)
rom->data.type = SETUP_PCI;
rom->data.len = size - sizeof(struct setup_data);
rom->data.next = 0;
- rom->pcilen = pci->romsize;
+ rom->pcilen = romsize;
*__rom = rom;
status = efi_call_proto(pci, pci.read, EfiPciIoWidthUint16,