summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2020-05-22 20:06:25 +0200
committerBorislav Petkov <bp@suse.de>2020-05-22 20:06:25 +0200
commit9bb4cbf4862dfa139f73e12912129e5b76baea1a (patch)
tree281445c282163ff286d7eb5b6b60f1a5eb608625 /include
parentb9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce (diff)
parentb4f1874c62168159fdb419ced4afc77c1b51c475 (diff)
Merge tag 'efi-fixes-for-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull EFI fixes from Ard Biesheuvel: "- fix EFI framebuffer earlycon for wide fonts - avoid filling screen_info with garbage if the EFI framebuffer is not available - fix a potential host tool build error due to a symbol clash on x86 - work around a EFI firmware bug regarding the binary format of the TPM final events table - fix a missing memory free by reworking the E820 table sizing routine to not do the allocation in the first place - add CPER parsing for firmware errors"
Diffstat (limited to 'include')
-rw-r--r--include/linux/cper.h9
-rw-r--r--include/linux/efi.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 4f005d95ce88..8537e9282a65 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -521,6 +521,15 @@ struct cper_sec_pcie {
u8 aer_info[96];
};
+/* Firmware Error Record Reference, UEFI v2.7 sec N.2.10 */
+struct cper_sec_fw_err_rec_ref {
+ u8 record_type;
+ u8 revision;
+ u8 reserved[6];
+ u64 record_identifier;
+ guid_t record_identifier_guid;
+};
+
/* Reset to default packing */
#pragma pack()
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 251f1f783cdf..9430d01c0c3d 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1245,4 +1245,6 @@ struct linux_efi_memreserve {
void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
+char *efi_systab_show_arch(char *str);
+
#endif /* _LINUX_EFI_H */