Skip to content

Commit 64dd765

Browse files
committed
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Thomas Gleixner: "Two fixlets for the EFI maze: - Properly zero variables to prevent an early boot hang on EFI mixed mode systems - Fix the fallout of merging the 32bit and 64bit variants of EFI PCI related code which ended up chosing the 32bit variant of the actual EFi call invocation which leads to failures on 64bit" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/x86: Fix incorrect invocation of PciIo->Attributes() efi/libstub/tpm: Initialize efi_physical_addr_t vars to zero for mixed mode
2 parents d3a6749 + 2e6eb40 commit 64dd765

File tree

2 files changed

+2
-2
lines changed
  • arch/x86/boot/compressed
  • drivers/firmware/efi/libstub

2 files changed

+2
-2
lines changed

arch/x86/boot/compressed/eboot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ __setup_efi_pci(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom)
118118
void *romimage;
119119

120120
status = efi_call_proto(efi_pci_io_protocol, attributes, pci,
121-
EfiPciIoAttributeOperationGet, 0, 0,
121+
EfiPciIoAttributeOperationGet, 0ULL,
122122
&attributes);
123123
if (status != EFI_SUCCESS)
124124
return status;

drivers/firmware/efi/libstub/tpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg)
6464
efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID;
6565
efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID;
6666
efi_status_t status;
67-
efi_physical_addr_t log_location, log_last_entry;
67+
efi_physical_addr_t log_location = 0, log_last_entry = 0;
6868
struct linux_efi_tpm_eventlog *log_tbl = NULL;
6969
unsigned long first_entry_addr, last_entry_addr;
7070
size_t log_size, last_entry_size;

0 commit comments

Comments
 (0)