diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-07-21 09:52:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 09:52:51 +0200 |
| commit | cd369c2239dd08c273c0fafbbea44e3e0c509ebd (patch) | |
| tree | ed0959e0532ceb79ae6aaae35fe900dfe41e454c /include/linux | |
| parent | x86/mm/pat, drivers/media/ivtv: Move the PAT warning and replace WARN() with pr_warn() (diff) | |
| parent | efi: Handle memory error structures produced based on old versions of standard (diff) | |
| download | linux-dev-cd369c2239dd08c273c0fafbbea44e3e0c509ebd.tar.xz linux-dev-cd369c2239dd08c273c0fafbbea44e3e0c509ebd.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull an EFI fix from Matt Fleming:
- Fix a bug in the Common Platform Error Record (CPER) driver that
caused old UEFI spec (< 2.3) versions of the memory error record
structure to be declared invalid. (Tony Luck)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cper.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 76abba4b238e..dcacb1a72e26 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -340,7 +340,27 @@ struct cper_ia_proc_ctx { __u64 mm_reg_addr; }; -/* Memory Error Section */ +/* Old Memory Error Section UEFI 2.1, 2.2 */ +struct cper_sec_mem_err_old { + __u64 validation_bits; + __u64 error_status; + __u64 physical_addr; + __u64 physical_addr_mask; + __u16 node; + __u16 card; + __u16 module; + __u16 bank; + __u16 device; + __u16 row; + __u16 column; + __u16 bit_pos; + __u64 requestor_id; + __u64 responder_id; + __u64 target_id; + __u8 error_type; +}; + +/* Memory Error Section UEFI >= 2.3 */ struct cper_sec_mem_err { __u64 validation_bits; __u64 error_status; |