tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 64dd7655 d3a6749c

+2 -2
+1 -1
arch/x86/boot/compressed/eboot.c
··· 118 118 void *romimage; 119 119 120 120 status = efi_call_proto(efi_pci_io_protocol, attributes, pci, 121 - EfiPciIoAttributeOperationGet, 0, 0, 121 + EfiPciIoAttributeOperationGet, 0ULL, 122 122 &attributes); 123 123 if (status != EFI_SUCCESS) 124 124 return status;
+1 -1
drivers/firmware/efi/libstub/tpm.c
··· 64 64 efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID; 65 65 efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID; 66 66 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; 68 68 struct linux_efi_tpm_eventlog *log_tbl = NULL; 69 69 unsigned long first_entry_addr, last_entry_addr; 70 70 size_t log_size, last_entry_size;