diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2013-01-07 23:09:49 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-28 05:19:37 +0100 |
| commit | b607e2126705ca28ecf21aa051172882bbdaae8a (patch) | |
| tree | 705578a0bf1084b392096c12db94ca34e53a60b4 | |
| parent | x86, efi: Fix 32-bit EFI handover protocol entry point (diff) | |
| download | linux-b607e2126705ca28ecf21aa051172882bbdaae8a.tar.xz linux-b607e2126705ca28ecf21aa051172882bbdaae8a.zip | |
x86, efi: Fix PCI ROM handing in EFI boot stub, in 32-bit mode
The 'Attributes' argument to pci->Attributes() function is 64-bit. So
when invoking in 32-bit mode it takes two registers, not just one.
This fixes memory corruption when booting via the 32-bit EFI boot stub.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/1358513837.2397.247.camel@shinybook.infradead.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 448a86e154a9..b7f220877294 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -295,10 +295,15 @@ static efi_status_t setup_efi_pci(struct boot_params *params) if (!pci) continue; +#ifdef CONFIG_X86_64 status = efi_call_phys4(pci->attributes, pci, EfiPciIoAttributeOperationGet, 0, &attributes); - +#else + status = efi_call_phys5(pci->attributes, pci, + EfiPciIoAttributeOperationGet, 0, 0, + &attributes); +#endif if (status != EFI_SUCCESS) continue; |