Commit 1abcb8c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-next-for-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI updates from Ard Biesheuvel:
 "Not a lot happening in EFI land this cycle.

   - Prevent kexec from crashing on a corrupted TPM log by using a
     memory type that is reserved by default

   - Log correctable errors reported via CPER

   - A couple of cosmetic fixes"

* tag 'efi-next-for-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Remove redundant null pointer checks in efi_debugfs_init()
  efistub/tpm: Use ACPI reclaim memory for event log to avoid corruption
  efi/cper: Print correctable AER information
  efi: Remove unused declaration efi_initialize_iomem_resources()
parents a78282e2 04736f7d

drivers/firmware/efi/cper.c

+8 −3
Original line number Diff line number Diff line
@@ -434,12 +434,17 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, 
	"%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n",

	pfx, pcie->bridge.secondary_status, pcie->bridge.control);



	/* Fatal errors call __ghes_panic() before AER handler prints this */

	if ((pcie->validation_bits & CPER_PCIE_VALID_AER_INFO) &&

	    (gdata->error_severity & CPER_SEV_FATAL)) {

	/*

	 * Print all valid AER info. Record may be from BERT (boot-time) or GHES (run-time).

	 *

	 * Fatal errors call __ghes_panic() before AER handler prints this.

	 */

	if (pcie->validation_bits & CPER_PCIE_VALID_AER_INFO) {

		struct aer_capability_regs *aer;



		aer = (struct aer_capability_regs *)pcie->aer_info;

		printk("%saer_cor_status: 0x%08x, aer_cor_mask: 0x%08x\n",

		       pfx, aer->cor_status, aer->cor_mask);

		printk("%saer_uncor_status: 0x%08x, aer_uncor_mask: 0x%08x\n",

		       pfx, aer->uncor_status, aer->uncor_mask);

		printk("%saer_uncor_severity: 0x%08x\n",

drivers/firmware/efi/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static void __init efi_debugfs_init(void) 
	int i = 0;



	efi_debugfs = debugfs_create_dir("efi", NULL);

	if (IS_ERR_OR_NULL(efi_debugfs))

	if (IS_ERR(efi_debugfs))

		return;



	for_each_efi_memory_desc(md) {

drivers/firmware/efi/libstub/tpm.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void efi_retrieve_tcg2_eventlog(int version, efi_physical_addr_t log_loca 
	}



	/* Allocate space for the logs and copy them. */

	status = efi_bs_call(allocate_pool, EFI_LOADER_DATA,

	status = efi_bs_call(allocate_pool, EFI_ACPI_RECLAIM_MEMORY,

			     sizeof(*log_tbl) + log_size, (void **)&log_tbl);



	if (status != EFI_SUCCESS) {

include/linux/efi.h

+0 −2
Original line number Diff line number Diff line
@@ -764,8 +764,6 @@ extern int efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md); 
extern int __efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);

extern void efi_mem_reserve(phys_addr_t addr, u64 size);

extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size);

extern void efi_initialize_iomem_resources(struct resource *code_resource,

		struct resource *data_resource, struct resource *bss_resource);

extern u64 efi_get_fdt_params(struct efi_memory_map_data *data);

extern struct kobject *efi_kobj;