* [PATCH v3 1/8] efi: Fix IA32/X64 Processor Error Record definition
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section Yazen Ghannam
` (6 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
Based on UEFI 2.7 Table 252. Processor Error Record, the "Local APIC_ID"
field is 8 bytes but Linux defines this field as 1 byte.
Fix this in the struct cper_sec_proc_ia definition.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-2-Yazen.Ghannam@amd.com
v2->v3:
* Fix table number in commit message.
v1->v2:
* No changes.
include/linux/cper.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/cper.h b/include/linux/cper.h
index d14ef4e77c8a..4b5f8459b403 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -381,7 +381,7 @@ struct cper_sec_proc_generic {
/* IA32/X64 Processor Error Section */
struct cper_sec_proc_ia {
__u64 validation_bits;
- __u8 lapic_id;
+ __u64 lapic_id;
__u8 cpuid[48];
};
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 1/8] efi: Fix IA32/X64 Processor Error Record definition Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-29 9:46 ` Borislav Petkov
2018-03-24 18:49 ` [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure Yazen Ghannam
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
Recognize the IA32/X64 Processor Error Section.
Do the section decoding in a new "cper-x86.c" file and add this to the
Makefile depending on a new "UEFI_CPER_X86" config option.
Print the Local APIC ID and CPUID info from the Processor Error Record.
The "Processor Error Info" and "Processor Context" fields will be
decoded in following patches.
Based on UEFI 2.7 Table 252. Processor Error Record.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-3-Yazen.Ghannam@amd.com
v2->v3:
* Fix table number in commit message.
* Don't print raw validation bits.
v1->v2:
* Change config option depends to "X86" instead of "X86_32 || X64_64".
* Remove extra newline in Makefile changes.
* Drop author copyright line.
drivers/firmware/efi/Kconfig | 5 +++++
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/cper-x86.c | 23 +++++++++++++++++++++++
drivers/firmware/efi/cper.c | 10 ++++++++++
include/linux/cper.h | 2 ++
5 files changed, 41 insertions(+)
create mode 100644 drivers/firmware/efi/cper-x86.c
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 3098410abad8..781a4a337557 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -174,6 +174,11 @@ config UEFI_CPER_ARM
depends on UEFI_CPER && ( ARM || ARM64 )
default y
+config UEFI_CPER_X86
+ bool
+ depends on UEFI_CPER && X86
+ default y
+
config EFI_DEV_PATH_PARSER
bool
depends on ACPI
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index cb805374f4bc..5f9f5039de50 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_ARM) += $(arm-obj-y)
obj-$(CONFIG_ARM64) += $(arm-obj-y)
obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o
obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
+obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
new file mode 100644
index 000000000000..863f0cd2a0ff
--- /dev/null
+++ b/drivers/firmware/efi/cper-x86.c
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018, Advanced Micro Devices, Inc.
+
+#include <linux/cper.h>
+
+/*
+ * We don't need a "CPER_IA" prefix since these are all locally defined.
+ * This will save us a lot of line space.
+ */
+#define VALID_LAPIC_ID BIT_ULL(0)
+#define VALID_CPUID_INFO BIT_ULL(1)
+
+void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
+{
+ if (proc->validation_bits & VALID_LAPIC_ID)
+ printk("%sLocal APIC_ID: 0x%llx\n", pfx, proc->lapic_id);
+
+ if (proc->validation_bits & VALID_CPUID_INFO) {
+ printk("%sCPUID Info:\n", pfx);
+ print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, proc->cpuid,
+ sizeof(proc->cpuid), 0);
+ }
+}
diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
index c165933ebf38..5a59b582c9aa 100644
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
@@ -469,6 +469,16 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata
cper_print_proc_arm(newpfx, arm_err);
else
goto err_section_too_small;
+#endif
+#if defined(CONFIG_UEFI_CPER_X86)
+ } else if (guid_equal(sec_type, &CPER_SEC_PROC_IA)) {
+ struct cper_sec_proc_ia *ia_err = acpi_hest_get_payload(gdata);
+
+ printk("%ssection_type: IA32/X64 processor error\n", newpfx);
+ if (gdata->error_data_length >= sizeof(*ia_err))
+ cper_print_proc_ia(newpfx, ia_err);
+ else
+ goto err_section_too_small;
#endif
} else {
const void *err = acpi_hest_get_payload(gdata);
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 4b5f8459b403..9c703a0abe6e 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -551,5 +551,7 @@ const char *cper_mem_err_unpack(struct trace_seq *,
struct cper_mem_err_compact *);
void cper_print_proc_arm(const char *pfx,
const struct cper_sec_proc_arm *proc);
+void cper_print_proc_ia(const char *pfx,
+ const struct cper_sec_proc_ia *proc);
#endif
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section
2018-03-24 18:49 ` [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section Yazen Ghannam
@ 2018-03-29 9:46 ` Borislav Petkov
2018-03-29 13:47 ` Ghannam, Yazen
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2018-03-29 9:46 UTC (permalink / raw)
To: Yazen Ghannam; +Cc: linux-efi, linux-kernel, ard.biesheuvel, x86, tony.luck
On Sat, Mar 24, 2018 at 01:49:34PM -0500, Yazen Ghannam wrote:
> From: Yazen Ghannam <yazen.ghannam@amd.com>
>
> Recognize the IA32/X64 Processor Error Section.
>
> Do the section decoding in a new "cper-x86.c" file and add this to the
> Makefile depending on a new "UEFI_CPER_X86" config option.
>
> Print the Local APIC ID and CPUID info from the Processor Error Record.
>
> The "Processor Error Info" and "Processor Context" fields will be
> decoded in following patches.
>
> Based on UEFI 2.7 Table 252. Processor Error Record.
>
> Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> ---
> Link:
> https://lkml.kernel.org/r/20180226193904.20532-3-Yazen.Ghannam@amd.com
>
> v2->v3:
> * Fix table number in commit message.
> * Don't print raw validation bits.
>
> v1->v2:
> * Change config option depends to "X86" instead of "X86_32 || X64_64".
> * Remove extra newline in Makefile changes.
> * Drop author copyright line.
>
> drivers/firmware/efi/Kconfig | 5 +++++
> drivers/firmware/efi/Makefile | 1 +
> drivers/firmware/efi/cper-x86.c | 23 +++++++++++++++++++++++
I'd prefer if that were:
drivers/firmware/efi/cper/x86.c
drivers/firmware/efi/cper/arm.c
but that's Ard's call.
> drivers/firmware/efi/cper.c | 10 ++++++++++
> include/linux/cper.h | 2 ++
> 5 files changed, 41 insertions(+)
> create mode 100644 drivers/firmware/efi/cper-x86.c
>
> diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> index 3098410abad8..781a4a337557 100644
> --- a/drivers/firmware/efi/Kconfig
> +++ b/drivers/firmware/efi/Kconfig
> @@ -174,6 +174,11 @@ config UEFI_CPER_ARM
> depends on UEFI_CPER && ( ARM || ARM64 )
> default y
>
> +config UEFI_CPER_X86
> + bool
> + depends on UEFI_CPER && X86
> + default y
> +
> config EFI_DEV_PATH_PARSER
> bool
> depends on ACPI
> diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
> index cb805374f4bc..5f9f5039de50 100644
> --- a/drivers/firmware/efi/Makefile
> +++ b/drivers/firmware/efi/Makefile
> @@ -31,3 +31,4 @@ obj-$(CONFIG_ARM) += $(arm-obj-y)
> obj-$(CONFIG_ARM64) += $(arm-obj-y)
> obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o
> obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
> +obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
> diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
> new file mode 100644
> index 000000000000..863f0cd2a0ff
> --- /dev/null
> +++ b/drivers/firmware/efi/cper-x86.c
> @@ -0,0 +1,23 @@
> +// SPDX-License-Identifier: GPL-2.0
> +// Copyright (C) 2018, Advanced Micro Devices, Inc.
> +
> +#include <linux/cper.h>
> +
> +/*
> + * We don't need a "CPER_IA" prefix since these are all locally defined.
> + * This will save us a lot of line space.
> + */
> +#define VALID_LAPIC_ID BIT_ULL(0)
> +#define VALID_CPUID_INFO BIT_ULL(1)
> +
> +void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
> +{
> + if (proc->validation_bits & VALID_LAPIC_ID)
> + printk("%sLocal APIC_ID: 0x%llx\n", pfx, proc->lapic_id);
> +
> + if (proc->validation_bits & VALID_CPUID_INFO) {
> + printk("%sCPUID Info:\n", pfx);
> + print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, proc->cpuid,
> + sizeof(proc->cpuid), 0);
That's dumping 48 bytes of static information for every error!
Information which can be dumped only once when collecting system info.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section
2018-03-29 9:46 ` Borislav Petkov
@ 2018-03-29 13:47 ` Ghannam, Yazen
0 siblings, 0 replies; 16+ messages in thread
From: Ghannam, Yazen @ 2018-03-29 13:47 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-efi, linux-kernel, ard.biesheuvel, x86, tony.luck
> -----Original Message-----
> From: Borislav Petkov <bp@alien8.de>
> Sent: Thursday, March 29, 2018 5:46 AM
> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
> Cc: linux-efi@vger.kernel.org; linux-kernel@vger.kernel.org;
> ard.biesheuvel@linaro.org; x86@kernel.org; tony.luck@intel.com
> Subject: Re: [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section
>
> On Sat, Mar 24, 2018 at 01:49:34PM -0500, Yazen Ghannam wrote:
> > From: Yazen Ghannam <yazen.ghannam@amd.com>
> >
> > Recognize the IA32/X64 Processor Error Section.
> >
> > Do the section decoding in a new "cper-x86.c" file and add this to the
> > Makefile depending on a new "UEFI_CPER_X86" config option.
> >
> > Print the Local APIC ID and CPUID info from the Processor Error Record.
> >
> > The "Processor Error Info" and "Processor Context" fields will be
> > decoded in following patches.
> >
> > Based on UEFI 2.7 Table 252. Processor Error Record.
> >
> > Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> > ---
> > Link:
> > https://lkml.kernel.org/r/20180226193904.20532-3-
> Yazen.Ghannam@amd.com
> >
> > v2->v3:
> > * Fix table number in commit message.
> > * Don't print raw validation bits.
> >
> > v1->v2:
> > * Change config option depends to "X86" instead of "X86_32 || X64_64".
> > * Remove extra newline in Makefile changes.
> > * Drop author copyright line.
> >
> > drivers/firmware/efi/Kconfig | 5 +++++
> > drivers/firmware/efi/Makefile | 1 +
> > drivers/firmware/efi/cper-x86.c | 23 +++++++++++++++++++++++
>
> I'd prefer if that were:
>
> drivers/firmware/efi/cper/x86.c
> drivers/firmware/efi/cper/arm.c
>
> but that's Ard's call.
>
> > drivers/firmware/efi/cper.c | 10 ++++++++++
> > include/linux/cper.h | 2 ++
> > 5 files changed, 41 insertions(+)
> > create mode 100644 drivers/firmware/efi/cper-x86.c
> >
> > diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
> > index 3098410abad8..781a4a337557 100644
> > --- a/drivers/firmware/efi/Kconfig
> > +++ b/drivers/firmware/efi/Kconfig
> > @@ -174,6 +174,11 @@ config UEFI_CPER_ARM
> > depends on UEFI_CPER && ( ARM || ARM64 )
> > default y
> >
> > +config UEFI_CPER_X86
> > + bool
> > + depends on UEFI_CPER && X86
> > + default y
> > +
> > config EFI_DEV_PATH_PARSER
> > bool
> > depends on ACPI
> > diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
> > index cb805374f4bc..5f9f5039de50 100644
> > --- a/drivers/firmware/efi/Makefile
> > +++ b/drivers/firmware/efi/Makefile
> > @@ -31,3 +31,4 @@ obj-$(CONFIG_ARM) += $(arm-obj-
> y)
> > obj-$(CONFIG_ARM64) += $(arm-obj-y)
> > obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o
> > obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
> > +obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
> > diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-
> x86.c
> > new file mode 100644
> > index 000000000000..863f0cd2a0ff
> > --- /dev/null
> > +++ b/drivers/firmware/efi/cper-x86.c
> > @@ -0,0 +1,23 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +// Copyright (C) 2018, Advanced Micro Devices, Inc.
> > +
> > +#include <linux/cper.h>
> > +
> > +/*
> > + * We don't need a "CPER_IA" prefix since these are all locally defined.
> > + * This will save us a lot of line space.
> > + */
> > +#define VALID_LAPIC_ID BIT_ULL(0)
> > +#define VALID_CPUID_INFO BIT_ULL(1)
> > +
> > +void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia
> *proc)
> > +{
> > + if (proc->validation_bits & VALID_LAPIC_ID)
> > + printk("%sLocal APIC_ID: 0x%llx\n", pfx, proc->lapic_id);
> > +
> > + if (proc->validation_bits & VALID_CPUID_INFO) {
> > + printk("%sCPUID Info:\n", pfx);
> > + print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, proc-
> >cpuid,
> > + sizeof(proc->cpuid), 0);
>
> That's dumping 48 bytes of static information for every error!
> Information which can be dumped only once when collecting system info.
>
Right, but here we just print the record as-is. We can do it different when
this hooks into the MCA decoding. And the use-case at the moment is for
BERT which shouldn't have very many errors.
Thanks,
Yazen
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 1/8] efi: Fix IA32/X64 Processor Error Record definition Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 2/8] efi: Decode IA32/X64 Processor Error Section Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-29 10:54 ` Borislav Petkov
2018-03-24 18:49 ` [PATCH v3 4/8] efi: Decode UEFI-defined IA32/X64 Error Structure GUIDs Yazen Ghannam
` (4 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
Print the fields in the IA32/X64 Processor Error Info Structure.
Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
Structure.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-4-Yazen.Ghannam@amd.com
v2->v3:
* Fix table number in commit message.
* Don't print raw validation bits.
v1->v2:
* Add parantheses around "bits" expression in macro.
* Fix indentation on multi-line statements.
drivers/firmware/efi/cper-x86.c | 50 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index 863f0cd2a0ff..a9ab3bbf7986 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -3,15 +3,28 @@
#include <linux/cper.h>
+#define INDENT_SP " "
+
/*
* We don't need a "CPER_IA" prefix since these are all locally defined.
* This will save us a lot of line space.
*/
#define VALID_LAPIC_ID BIT_ULL(0)
#define VALID_CPUID_INFO BIT_ULL(1)
+#define VALID_PROC_ERR_INFO_NUM(bits) (((bits) & GENMASK_ULL(7, 2)) >> 2)
+
+#define INFO_VALID_CHECK_INFO BIT_ULL(0)
+#define INFO_VALID_TARGET_ID BIT_ULL(1)
+#define INFO_VALID_REQUESTOR_ID BIT_ULL(2)
+#define INFO_VALID_RESPONDER_ID BIT_ULL(3)
+#define INFO_VALID_IP BIT_ULL(4)
void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
{
+ int i;
+ struct cper_ia_err_info *err_info;
+ char newpfx[64];
+
if (proc->validation_bits & VALID_LAPIC_ID)
printk("%sLocal APIC_ID: 0x%llx\n", pfx, proc->lapic_id);
@@ -20,4 +33,41 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, proc->cpuid,
sizeof(proc->cpuid), 0);
}
+
+ snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
+
+ err_info = (struct cper_ia_err_info *)(proc + 1);
+ for (i = 0; i < VALID_PROC_ERR_INFO_NUM(proc->validation_bits); i++) {
+ printk("%sError Information Structure %d:\n", pfx, i);
+
+ printk("%sError Structure Type: %pUl\n", newpfx,
+ &err_info->err_type);
+
+ if (err_info->validation_bits & INFO_VALID_CHECK_INFO) {
+ printk("%sCheck Information: 0x%016llx\n", newpfx,
+ err_info->check_info);
+ }
+
+ if (err_info->validation_bits & INFO_VALID_TARGET_ID) {
+ printk("%sTarget Identifier: 0x%016llx\n",
+ newpfx, err_info->target_id);
+ }
+
+ if (err_info->validation_bits & INFO_VALID_REQUESTOR_ID) {
+ printk("%sRequestor Identifier: 0x%016llx\n",
+ newpfx, err_info->requestor_id);
+ }
+
+ if (err_info->validation_bits & INFO_VALID_RESPONDER_ID) {
+ printk("%sResponder Identifier: 0x%016llx\n",
+ newpfx, err_info->responder_id);
+ }
+
+ if (err_info->validation_bits & INFO_VALID_IP) {
+ printk("%sInstruction Pointer: 0x%016llx\n",
+ newpfx, err_info->ip);
+ }
+
+ err_info++;
+ }
}
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-03-24 18:49 ` [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure Yazen Ghannam
@ 2018-03-29 10:54 ` Borislav Petkov
2018-03-29 13:53 ` Ghannam, Yazen
0 siblings, 1 reply; 16+ messages in thread
From: Borislav Petkov @ 2018-03-29 10:54 UTC (permalink / raw)
To: Yazen Ghannam; +Cc: linux-efi, linux-kernel, ard.biesheuvel, x86, tony.luck
On Sat, Mar 24, 2018 at 01:49:35PM -0500, Yazen Ghannam wrote:
> From: Yazen Ghannam <yazen.ghannam@amd.com>
>
> Print the fields in the IA32/X64 Processor Error Info Structure.
>
> Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
> Structure.
>
> Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> ---
> Link:
> https://lkml.kernel.org/r/20180226193904.20532-4-Yazen.Ghannam@amd.com
>
> v2->v3:
> * Fix table number in commit message.
> * Don't print raw validation bits.
>
> v1->v2:
> * Add parantheses around "bits" expression in macro.
> * Fix indentation on multi-line statements.
>
> drivers/firmware/efi/cper-x86.c | 50 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 50 insertions(+)
>
> diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
> index 863f0cd2a0ff..a9ab3bbf7986 100644
> --- a/drivers/firmware/efi/cper-x86.c
> +++ b/drivers/firmware/efi/cper-x86.c
> @@ -3,15 +3,28 @@
>
> #include <linux/cper.h>
>
> +#define INDENT_SP " "
There's that thing again. So it was a total waste of time discussing
this last time. So let me save my time this time:
NAKed-by: Borislav Petkov <bp@suse.de>
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-03-29 10:54 ` Borislav Petkov
@ 2018-03-29 13:53 ` Ghannam, Yazen
2018-03-30 11:25 ` Ard Biesheuvel
0 siblings, 1 reply; 16+ messages in thread
From: Ghannam, Yazen @ 2018-03-29 13:53 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-efi, linux-kernel, ard.biesheuvel, x86, tony.luck
> -----Original Message-----
> From: Borislav Petkov <bp@alien8.de>
> Sent: Thursday, March 29, 2018 6:55 AM
> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
> Cc: linux-efi@vger.kernel.org; linux-kernel@vger.kernel.org;
> ard.biesheuvel@linaro.org; x86@kernel.org; tony.luck@intel.com
> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info
> Structure
>
> On Sat, Mar 24, 2018 at 01:49:35PM -0500, Yazen Ghannam wrote:
> > From: Yazen Ghannam <yazen.ghannam@amd.com>
> >
> > Print the fields in the IA32/X64 Processor Error Info Structure.
> >
> > Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
> > Structure.
> >
> > Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> > ---
> > Link:
> > https://lkml.kernel.org/r/20180226193904.20532-4-
> Yazen.Ghannam@amd.com
> >
> > v2->v3:
> > * Fix table number in commit message.
> > * Don't print raw validation bits.
> >
> > v1->v2:
> > * Add parantheses around "bits" expression in macro.
> > * Fix indentation on multi-line statements.
> >
> > drivers/firmware/efi/cper-x86.c | 50
> +++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 50 insertions(+)
> >
> > diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-
> x86.c
> > index 863f0cd2a0ff..a9ab3bbf7986 100644
> > --- a/drivers/firmware/efi/cper-x86.c
> > +++ b/drivers/firmware/efi/cper-x86.c
> > @@ -3,15 +3,28 @@
> >
> > #include <linux/cper.h>
> >
> > +#define INDENT_SP " "
>
> There's that thing again. So it was a total waste of time discussing
> this last time. So let me save my time this time:
>
> NAKed-by: Borislav Petkov <bp@suse.de>
>
IIRC, the arguments for keeping this are
1) convention for CPER
2) code readability
The argument against was
1) it's dumb
So I decided to keep it. I don't really mind either way so I'll change it
if there's a second opinion.
Thanks,
Yazen
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-03-29 13:53 ` Ghannam, Yazen
@ 2018-03-30 11:25 ` Ard Biesheuvel
2018-04-02 13:21 ` Ghannam, Yazen
0 siblings, 1 reply; 16+ messages in thread
From: Ard Biesheuvel @ 2018-03-30 11:25 UTC (permalink / raw)
To: Ghannam, Yazen; +Cc: Borislav Petkov, linux-efi, linux-kernel, x86, tony.luck
On 29 March 2018 at 14:53, Ghannam, Yazen <Yazen.Ghannam@amd.com> wrote:
>> -----Original Message-----
>> From: Borislav Petkov <bp@alien8.de>
>> Sent: Thursday, March 29, 2018 6:55 AM
>> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
>> Cc: linux-efi@vger.kernel.org; linux-kernel@vger.kernel.org;
>> ard.biesheuvel@linaro.org; x86@kernel.org; tony.luck@intel.com
>> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info
>> Structure
>>
>> On Sat, Mar 24, 2018 at 01:49:35PM -0500, Yazen Ghannam wrote:
>> > From: Yazen Ghannam <yazen.ghannam@amd.com>
>> >
>> > Print the fields in the IA32/X64 Processor Error Info Structure.
>> >
>> > Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
>> > Structure.
>> >
>> > Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
>> > ---
>> > Link:
>> > https://lkml.kernel.org/r/20180226193904.20532-4-
>> Yazen.Ghannam@amd.com
>> >
>> > v2->v3:
>> > * Fix table number in commit message.
>> > * Don't print raw validation bits.
>> >
>> > v1->v2:
>> > * Add parantheses around "bits" expression in macro.
>> > * Fix indentation on multi-line statements.
>> >
>> > drivers/firmware/efi/cper-x86.c | 50
>> +++++++++++++++++++++++++++++++++++++++++
>> > 1 file changed, 50 insertions(+)
>> >
>> > diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-
>> x86.c
>> > index 863f0cd2a0ff..a9ab3bbf7986 100644
>> > --- a/drivers/firmware/efi/cper-x86.c
>> > +++ b/drivers/firmware/efi/cper-x86.c
>> > @@ -3,15 +3,28 @@
>> >
>> > #include <linux/cper.h>
>> >
>> > +#define INDENT_SP " "
>>
>> There's that thing again. So it was a total waste of time discussing
>> this last time. So let me save my time this time:
>>
>> NAKed-by: Borislav Petkov <bp@suse.de>
>>
>
> IIRC, the arguments for keeping this are
> 1) convention for CPER
> 2) code readability
>
> The argument against was
> 1) it's dumb
>
> So I decided to keep it. I don't really mind either way so I'll change it
> if there's a second opinion.
>
Yes, please change it.
^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-03-30 11:25 ` Ard Biesheuvel
@ 2018-04-02 13:21 ` Ghannam, Yazen
2018-04-02 13:22 ` Ard Biesheuvel
0 siblings, 1 reply; 16+ messages in thread
From: Ghannam, Yazen @ 2018-04-02 13:21 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: Borislav Petkov, linux-efi, linux-kernel, x86, tony.luck
> -----Original Message-----
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Sent: Friday, March 30, 2018 7:25 AM
> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
> Cc: Borislav Petkov <bp@alien8.de>; linux-efi@vger.kernel.org; linux-
> kernel@vger.kernel.org; x86@kernel.org; tony.luck@intel.com
> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
>
> On 29 March 2018 at 14:53, Ghannam, Yazen <Yazen.Ghannam@amd.com>
> wrote:
> >> -----Original Message-----
> >> From: Borislav Petkov <bp@alien8.de>
> >> Sent: Thursday, March 29, 2018 6:55 AM
> >> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
> >> Cc: linux-efi@vger.kernel.org; linux-kernel@vger.kernel.org;
> >> ard.biesheuvel@linaro.org; x86@kernel.org; tony.luck@intel.com
> >> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info
> >> Structure
> >>
> >> On Sat, Mar 24, 2018 at 01:49:35PM -0500, Yazen Ghannam wrote:
> >> > From: Yazen Ghannam <yazen.ghannam@amd.com>
> >> >
> >> > Print the fields in the IA32/X64 Processor Error Info Structure.
> >> >
> >> > Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
> >> > Structure.
> >> >
> >> > Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> >> > ---
> >> > Link:
> >> > https://lkml.kernel.org/r/20180226193904.20532-4-
> >> Yazen.Ghannam@amd.com
> >> >
> >> > v2->v3:
> >> > * Fix table number in commit message.
> >> > * Don't print raw validation bits.
> >> >
> >> > v1->v2:
> >> > * Add parantheses around "bits" expression in macro.
> >> > * Fix indentation on multi-line statements.
> >> >
> >> > drivers/firmware/efi/cper-x86.c | 50
> >> +++++++++++++++++++++++++++++++++++++++++
> >> > 1 file changed, 50 insertions(+)
> >> >
> >> > diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-
> >> x86.c
> >> > index 863f0cd2a0ff..a9ab3bbf7986 100644
> >> > --- a/drivers/firmware/efi/cper-x86.c
> >> > +++ b/drivers/firmware/efi/cper-x86.c
> >> > @@ -3,15 +3,28 @@
> >> >
> >> > #include <linux/cper.h>
> >> >
> >> > +#define INDENT_SP " "
> >>
> >> There's that thing again. So it was a total waste of time discussing
> >> this last time. So let me save my time this time:
> >>
> >> NAKed-by: Borislav Petkov <bp@suse.de>
> >>
> >
> > IIRC, the arguments for keeping this are
> > 1) convention for CPER
> > 2) code readability
> >
> > The argument against was
> > 1) it's dumb
> >
> > So I decided to keep it. I don't really mind either way so I'll change it
> > if there's a second opinion.
> >
>
> Yes, please change it.
Okay, will do. Should I include a patch that changes it for the other CPER
code also?
Thanks,
Yazen
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
2018-04-02 13:21 ` Ghannam, Yazen
@ 2018-04-02 13:22 ` Ard Biesheuvel
0 siblings, 0 replies; 16+ messages in thread
From: Ard Biesheuvel @ 2018-04-02 13:22 UTC (permalink / raw)
To: Ghannam, Yazen; +Cc: Borislav Petkov, linux-efi, linux-kernel, x86, tony.luck
On 2 April 2018 at 15:21, Ghannam, Yazen <Yazen.Ghannam@amd.com> wrote:
>> -----Original Message-----
>> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Sent: Friday, March 30, 2018 7:25 AM
>> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
>> Cc: Borislav Petkov <bp@alien8.de>; linux-efi@vger.kernel.org; linux-
>> kernel@vger.kernel.org; x86@kernel.org; tony.luck@intel.com
>> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure
>>
>> On 29 March 2018 at 14:53, Ghannam, Yazen <Yazen.Ghannam@amd.com>
>> wrote:
>> >> -----Original Message-----
>> >> From: Borislav Petkov <bp@alien8.de>
>> >> Sent: Thursday, March 29, 2018 6:55 AM
>> >> To: Ghannam, Yazen <Yazen.Ghannam@amd.com>
>> >> Cc: linux-efi@vger.kernel.org; linux-kernel@vger.kernel.org;
>> >> ard.biesheuvel@linaro.org; x86@kernel.org; tony.luck@intel.com
>> >> Subject: Re: [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info
>> >> Structure
>> >>
>> >> On Sat, Mar 24, 2018 at 01:49:35PM -0500, Yazen Ghannam wrote:
>> >> > From: Yazen Ghannam <yazen.ghannam@amd.com>
>> >> >
>> >> > Print the fields in the IA32/X64 Processor Error Info Structure.
>> >> >
>> >> > Based on UEFI 2.7 Table 253. IA32/X64 Processor Error Information
>> >> > Structure.
>> >> >
>> >> > Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
>> >> > ---
>> >> > Link:
>> >> > https://lkml.kernel.org/r/20180226193904.20532-4-
>> >> Yazen.Ghannam@amd.com
>> >> >
>> >> > v2->v3:
>> >> > * Fix table number in commit message.
>> >> > * Don't print raw validation bits.
>> >> >
>> >> > v1->v2:
>> >> > * Add parantheses around "bits" expression in macro.
>> >> > * Fix indentation on multi-line statements.
>> >> >
>> >> > drivers/firmware/efi/cper-x86.c | 50
>> >> +++++++++++++++++++++++++++++++++++++++++
>> >> > 1 file changed, 50 insertions(+)
>> >> >
>> >> > diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-
>> >> x86.c
>> >> > index 863f0cd2a0ff..a9ab3bbf7986 100644
>> >> > --- a/drivers/firmware/efi/cper-x86.c
>> >> > +++ b/drivers/firmware/efi/cper-x86.c
>> >> > @@ -3,15 +3,28 @@
>> >> >
>> >> > #include <linux/cper.h>
>> >> >
>> >> > +#define INDENT_SP " "
>> >>
>> >> There's that thing again. So it was a total waste of time discussing
>> >> this last time. So let me save my time this time:
>> >>
>> >> NAKed-by: Borislav Petkov <bp@suse.de>
>> >>
>> >
>> > IIRC, the arguments for keeping this are
>> > 1) convention for CPER
>> > 2) code readability
>> >
>> > The argument against was
>> > 1) it's dumb
>> >
>> > So I decided to keep it. I don't really mind either way so I'll change it
>> > if there's a second opinion.
>> >
>>
>> Yes, please change it.
>
> Okay, will do. Should I include a patch that changes it for the other CPER
> code also?
>
No worries, Boris already sent that out.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v3 4/8] efi: Decode UEFI-defined IA32/X64 Error Structure GUIDs
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
` (2 preceding siblings ...)
2018-03-24 18:49 ` [PATCH v3 3/8] efi: Decode IA32/X64 Processor Error Info Structure Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 5/8] efi: Decode IA32/X64 Cache, TLB, and Bus Check structures Yazen Ghannam
` (3 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
For easier handling, match the known IA32/X64 error structure GUIDs to
enums.
Also, print out the name of the matching Error Structure Type.
Only print the GUID for unknown types.
GUIDs taken from UEFI 2.7 section N.2.4.2.1 IA32/X64 Processor Error
Information Structure.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-5-Yazen.Ghannam@amd.com
v2->v3:
* Only print raw GUID for unknown error types.
v1->v2:
* Change use of enum type to u8.
* Fix indentation on multi-line statements.
drivers/firmware/efi/cper-x86.c | 47 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index a9ab3bbf7986..57fbea5b3a8c 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -13,17 +13,53 @@
#define VALID_CPUID_INFO BIT_ULL(1)
#define VALID_PROC_ERR_INFO_NUM(bits) (((bits) & GENMASK_ULL(7, 2)) >> 2)
+#define INFO_ERR_STRUCT_TYPE_CACHE \
+ GUID_INIT(0xA55701F5, 0xE3EF, 0x43DE, 0xAC, 0x72, 0x24, 0x9B, \
+ 0x57, 0x3F, 0xAD, 0x2C)
+#define INFO_ERR_STRUCT_TYPE_TLB \
+ GUID_INIT(0xFC06B535, 0x5E1F, 0x4562, 0x9F, 0x25, 0x0A, 0x3B, \
+ 0x9A, 0xDB, 0x63, 0xC3)
+#define INFO_ERR_STRUCT_TYPE_BUS \
+ GUID_INIT(0x1CF3F8B3, 0xC5B1, 0x49a2, 0xAA, 0x59, 0x5E, 0xEF, \
+ 0x92, 0xFF, 0xA6, 0x3C)
+#define INFO_ERR_STRUCT_TYPE_MS \
+ GUID_INIT(0x48AB7F57, 0xDC34, 0x4f6c, 0xA7, 0xD3, 0xB0, 0xB5, \
+ 0xB0, 0xA7, 0x43, 0x14)
+
#define INFO_VALID_CHECK_INFO BIT_ULL(0)
#define INFO_VALID_TARGET_ID BIT_ULL(1)
#define INFO_VALID_REQUESTOR_ID BIT_ULL(2)
#define INFO_VALID_RESPONDER_ID BIT_ULL(3)
#define INFO_VALID_IP BIT_ULL(4)
+enum err_types {
+ ERR_TYPE_CACHE = 0,
+ ERR_TYPE_TLB,
+ ERR_TYPE_BUS,
+ ERR_TYPE_MS,
+ N_ERR_TYPES
+};
+
+static enum err_types cper_get_err_type(const guid_t *err_type)
+{
+ if (guid_equal(err_type, &INFO_ERR_STRUCT_TYPE_CACHE))
+ return ERR_TYPE_CACHE;
+ else if (guid_equal(err_type, &INFO_ERR_STRUCT_TYPE_TLB))
+ return ERR_TYPE_TLB;
+ else if (guid_equal(err_type, &INFO_ERR_STRUCT_TYPE_BUS))
+ return ERR_TYPE_BUS;
+ else if (guid_equal(err_type, &INFO_ERR_STRUCT_TYPE_MS))
+ return ERR_TYPE_MS;
+ else
+ return N_ERR_TYPES;
+}
+
void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
{
int i;
struct cper_ia_err_info *err_info;
char newpfx[64];
+ u8 err_type;
if (proc->validation_bits & VALID_LAPIC_ID)
printk("%sLocal APIC_ID: 0x%llx\n", pfx, proc->lapic_id);
@@ -40,8 +76,15 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
for (i = 0; i < VALID_PROC_ERR_INFO_NUM(proc->validation_bits); i++) {
printk("%sError Information Structure %d:\n", pfx, i);
- printk("%sError Structure Type: %pUl\n", newpfx,
- &err_info->err_type);
+ err_type = cper_get_err_type(&err_info->err_type);
+ printk("%sError Structure Type: %s\n", newpfx,
+ err_type < ARRAY_SIZE(cper_proc_error_type_strs) ?
+ cper_proc_error_type_strs[err_type] : "unknown");
+
+ if (err_type >= N_ERR_TYPES) {
+ printk("%sError Structure Type: %pUl\n", newpfx,
+ &err_info->err_type);
+ }
if (err_info->validation_bits & INFO_VALID_CHECK_INFO) {
printk("%sCheck Information: 0x%016llx\n", newpfx,
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 5/8] efi: Decode IA32/X64 Cache, TLB, and Bus Check structures
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
` (3 preceding siblings ...)
2018-03-24 18:49 ` [PATCH v3 4/8] efi: Decode UEFI-defined IA32/X64 Error Structure GUIDs Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 6/8] efi: Decode additional IA32/X64 Bus Check fields Yazen Ghannam
` (2 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
Print the common fields of the Cache, TLB, and Bus check structures.The
fields of these three check types are the same except for a few more
fields in the Bus check structure. The remaining Bus check structure
fields will be decoded in a following patch.
Based on UEFI 2.7,
Table 254. IA32/X64 Cache Check Structure
Table 255. IA32/X64 TLB Check Structure
Table 256. IA32/X64 Bus Check Structure
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-6-Yazen.Ghannam@amd.com
v2->v3:
* Fix table numbers in commit message.
* Don't print raw validation bits.
v1->v2:
* Add parantheses around "check" expression in macro.
* Change use of enum type to u8.
* Fix indentation on multi-line statements.
drivers/firmware/efi/cper-x86.c | 99 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 98 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index 57fbea5b3a8c..260e4bf7773c 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -32,6 +32,25 @@
#define INFO_VALID_RESPONDER_ID BIT_ULL(3)
#define INFO_VALID_IP BIT_ULL(4)
+#define CHECK_VALID_TRANS_TYPE BIT_ULL(0)
+#define CHECK_VALID_OPERATION BIT_ULL(1)
+#define CHECK_VALID_LEVEL BIT_ULL(2)
+#define CHECK_VALID_PCC BIT_ULL(3)
+#define CHECK_VALID_UNCORRECTED BIT_ULL(4)
+#define CHECK_VALID_PRECISE_IP BIT_ULL(5)
+#define CHECK_VALID_RESTARTABLE_IP BIT_ULL(6)
+#define CHECK_VALID_OVERFLOW BIT_ULL(7)
+
+#define CHECK_VALID_BITS(check) (((check) & GENMASK_ULL(15, 0)))
+#define CHECK_TRANS_TYPE(check) (((check) & GENMASK_ULL(17, 16)) >> 16)
+#define CHECK_OPERATION(check) (((check) & GENMASK_ULL(21, 18)) >> 18)
+#define CHECK_LEVEL(check) (((check) & GENMASK_ULL(24, 22)) >> 22)
+#define CHECK_PCC BIT_ULL(25)
+#define CHECK_UNCORRECTED BIT_ULL(26)
+#define CHECK_PRECISE_IP BIT_ULL(27)
+#define CHECK_RESTARTABLE_IP BIT_ULL(28)
+#define CHECK_OVERFLOW BIT_ULL(29)
+
enum err_types {
ERR_TYPE_CACHE = 0,
ERR_TYPE_TLB,
@@ -54,11 +73,81 @@ static enum err_types cper_get_err_type(const guid_t *err_type)
return N_ERR_TYPES;
}
+static const char * const ia_check_trans_type_strs[] = {
+ "Instruction",
+ "Data Access",
+ "Generic",
+};
+
+static const char * const ia_check_op_strs[] = {
+ "generic error",
+ "generic read",
+ "generic write",
+ "data read",
+ "data write",
+ "instruction fetch",
+ "prefetch",
+ "eviction",
+ "snoop",
+};
+
+static inline void print_bool(char *str, const char *pfx, u64 check, u64 bit)
+{
+ printk("%s%s: %s\n", pfx, str, (check & bit) ? "true" : "false");
+}
+
+static void print_err_info(const char *pfx, u8 err_type, u64 check)
+{
+ u16 validation_bits = CHECK_VALID_BITS(check);
+
+ if (err_type == ERR_TYPE_MS)
+ return;
+
+ if (validation_bits & CHECK_VALID_TRANS_TYPE) {
+ u8 trans_type = CHECK_TRANS_TYPE(check);
+
+ printk("%sTransaction Type: %u, %s\n", pfx, trans_type,
+ trans_type < ARRAY_SIZE(ia_check_trans_type_strs) ?
+ ia_check_trans_type_strs[trans_type] : "unknown");
+ }
+
+ if (validation_bits & CHECK_VALID_OPERATION) {
+ u8 op = CHECK_OPERATION(check);
+
+ /*
+ * CACHE has more operation types than TLB or BUS, though the
+ * name and the order are the same.
+ */
+ u8 max_ops = (err_type == ERR_TYPE_CACHE) ? 9 : 7;
+
+ printk("%sOperation: %u, %s\n", pfx, op,
+ op < max_ops ? ia_check_op_strs[op] : "unknown");
+ }
+
+ if (validation_bits & CHECK_VALID_LEVEL)
+ printk("%sLevel: %llu\n", pfx, CHECK_LEVEL(check));
+
+ if (validation_bits & CHECK_VALID_PCC)
+ print_bool("Processor Context Corrupt", pfx, check, CHECK_PCC);
+
+ if (validation_bits & CHECK_VALID_UNCORRECTED)
+ print_bool("Uncorrected", pfx, check, CHECK_UNCORRECTED);
+
+ if (validation_bits & CHECK_VALID_PRECISE_IP)
+ print_bool("Precise IP", pfx, check, CHECK_PRECISE_IP);
+
+ if (validation_bits & CHECK_VALID_RESTARTABLE_IP)
+ print_bool("Restartable IP", pfx, check, CHECK_RESTARTABLE_IP);
+
+ if (validation_bits & CHECK_VALID_OVERFLOW)
+ print_bool("Overflow", pfx, check, CHECK_OVERFLOW);
+}
+
void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
{
int i;
struct cper_ia_err_info *err_info;
- char newpfx[64];
+ char newpfx[64], infopfx[64];
u8 err_type;
if (proc->validation_bits & VALID_LAPIC_ID)
@@ -89,6 +178,14 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
if (err_info->validation_bits & INFO_VALID_CHECK_INFO) {
printk("%sCheck Information: 0x%016llx\n", newpfx,
err_info->check_info);
+
+ if (err_type < N_ERR_TYPES) {
+ snprintf(infopfx, sizeof(infopfx), "%s%s",
+ newpfx, INDENT_SP);
+
+ print_err_info(infopfx, err_type,
+ err_info->check_info);
+ }
}
if (err_info->validation_bits & INFO_VALID_TARGET_ID) {
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 6/8] efi: Decode additional IA32/X64 Bus Check fields
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
` (4 preceding siblings ...)
2018-03-24 18:49 ` [PATCH v3 5/8] efi: Decode IA32/X64 Cache, TLB, and Bus Check structures Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 7/8] efi: Decode IA32/X64 MS Check structure Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 8/8] efi: Decode IA32/X64 Context Info structure Yazen Ghannam
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
The "Participation Type", "Time Out", and "Address Space" fields are
unique to the IA32/X64 Bus Check structure. Print these fields.
Based on UEFI 2.7 Table 256. IA32/X64 Bus Check Structure
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-7-Yazen.Ghannam@amd.com
v2->v3:
* Fix table number in commit message.
v1->v2:
* Add parantheses around "check" expression in macro.
* Fix indentation on multi-line statements.
drivers/firmware/efi/cper-x86.c | 44 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index 260e4bf7773c..54bd32d241b7 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -41,6 +41,10 @@
#define CHECK_VALID_RESTARTABLE_IP BIT_ULL(6)
#define CHECK_VALID_OVERFLOW BIT_ULL(7)
+#define CHECK_VALID_BUS_PART_TYPE BIT_ULL(8)
+#define CHECK_VALID_BUS_TIME_OUT BIT_ULL(9)
+#define CHECK_VALID_BUS_ADDR_SPACE BIT_ULL(10)
+
#define CHECK_VALID_BITS(check) (((check) & GENMASK_ULL(15, 0)))
#define CHECK_TRANS_TYPE(check) (((check) & GENMASK_ULL(17, 16)) >> 16)
#define CHECK_OPERATION(check) (((check) & GENMASK_ULL(21, 18)) >> 18)
@@ -51,6 +55,10 @@
#define CHECK_RESTARTABLE_IP BIT_ULL(28)
#define CHECK_OVERFLOW BIT_ULL(29)
+#define CHECK_BUS_PART_TYPE(check) (((check) & GENMASK_ULL(31, 30)) >> 30)
+#define CHECK_BUS_TIME_OUT BIT_ULL(32)
+#define CHECK_BUS_ADDR_SPACE(check) (((check) & GENMASK_ULL(34, 33)) >> 33)
+
enum err_types {
ERR_TYPE_CACHE = 0,
ERR_TYPE_TLB,
@@ -91,6 +99,20 @@ static const char * const ia_check_op_strs[] = {
"snoop",
};
+static const char * const ia_check_bus_part_type_strs[] = {
+ "Local Processor originated request",
+ "Local Processor responded to request",
+ "Local Processor observed",
+ "Generic",
+};
+
+static const char * const ia_check_bus_addr_space_strs[] = {
+ "Memory Access",
+ "Reserved",
+ "I/O",
+ "Other Transaction",
+};
+
static inline void print_bool(char *str, const char *pfx, u64 check, u64 bit)
{
printk("%s%s: %s\n", pfx, str, (check & bit) ? "true" : "false");
@@ -141,6 +163,28 @@ static void print_err_info(const char *pfx, u8 err_type, u64 check)
if (validation_bits & CHECK_VALID_OVERFLOW)
print_bool("Overflow", pfx, check, CHECK_OVERFLOW);
+
+ if (err_type != ERR_TYPE_BUS)
+ return;
+
+ if (validation_bits & CHECK_VALID_BUS_PART_TYPE) {
+ u8 part_type = CHECK_BUS_PART_TYPE(check);
+
+ printk("%sParticipation Type: %u, %s\n", pfx, part_type,
+ part_type < ARRAY_SIZE(ia_check_bus_part_type_strs) ?
+ ia_check_bus_part_type_strs[part_type] : "unknown");
+ }
+
+ if (validation_bits & CHECK_VALID_BUS_TIME_OUT)
+ print_bool("Time Out", pfx, check, CHECK_BUS_TIME_OUT);
+
+ if (validation_bits & CHECK_VALID_BUS_ADDR_SPACE) {
+ u8 addr_space = CHECK_BUS_ADDR_SPACE(check);
+
+ printk("%sAddress Space: %u, %s\n", pfx, addr_space,
+ addr_space < ARRAY_SIZE(ia_check_bus_addr_space_strs) ?
+ ia_check_bus_addr_space_strs[addr_space] : "unknown");
+ }
}
void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 7/8] efi: Decode IA32/X64 MS Check structure
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
` (5 preceding siblings ...)
2018-03-24 18:49 ` [PATCH v3 6/8] efi: Decode additional IA32/X64 Bus Check fields Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
2018-03-24 18:49 ` [PATCH v3 8/8] efi: Decode IA32/X64 Context Info structure Yazen Ghannam
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
The IA32/X64 MS Check structure varies from the other Check structures
in the the bit positions of its fields, and it includes an additional
"Error Type" field.
Decode the MS Check structure in a separate function.
Based on UEFI 2.7 Table 257. IA32/X64 MS Check Field Description.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-8-Yazen.Ghannam@amd.com
v2->v3:
* Fix table number in commit message.
v1->v2:
* Add parantheses around "check" expression in macro.
* Fix indentation on multi-line statements.
drivers/firmware/efi/cper-x86.c | 55 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index 54bd32d241b7..ffc01483cac2 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -59,6 +59,20 @@
#define CHECK_BUS_TIME_OUT BIT_ULL(32)
#define CHECK_BUS_ADDR_SPACE(check) (((check) & GENMASK_ULL(34, 33)) >> 33)
+#define CHECK_VALID_MS_ERR_TYPE BIT_ULL(0)
+#define CHECK_VALID_MS_PCC BIT_ULL(1)
+#define CHECK_VALID_MS_UNCORRECTED BIT_ULL(2)
+#define CHECK_VALID_MS_PRECISE_IP BIT_ULL(3)
+#define CHECK_VALID_MS_RESTARTABLE_IP BIT_ULL(4)
+#define CHECK_VALID_MS_OVERFLOW BIT_ULL(5)
+
+#define CHECK_MS_ERR_TYPE(check) (((check) & GENMASK_ULL(18, 16)) >> 16)
+#define CHECK_MS_PCC BIT_ULL(19)
+#define CHECK_MS_UNCORRECTED BIT_ULL(20)
+#define CHECK_MS_PRECISE_IP BIT_ULL(21)
+#define CHECK_MS_RESTARTABLE_IP BIT_ULL(22)
+#define CHECK_MS_OVERFLOW BIT_ULL(23)
+
enum err_types {
ERR_TYPE_CACHE = 0,
ERR_TYPE_TLB,
@@ -113,17 +127,56 @@ static const char * const ia_check_bus_addr_space_strs[] = {
"Other Transaction",
};
+static const char * const ia_check_ms_error_type_strs[] = {
+ "No Error",
+ "Unclassified",
+ "Microcode ROM Parity Error",
+ "External Error",
+ "FRC Error",
+ "Internal Unclassified",
+};
+
static inline void print_bool(char *str, const char *pfx, u64 check, u64 bit)
{
printk("%s%s: %s\n", pfx, str, (check & bit) ? "true" : "false");
}
+static void print_err_info_ms(const char *pfx, u16 validation_bits, u64 check)
+{
+ if (validation_bits & CHECK_VALID_MS_ERR_TYPE) {
+ u8 err_type = CHECK_MS_ERR_TYPE(check);
+
+ printk("%sError Type: %u, %s\n", pfx, err_type,
+ err_type < ARRAY_SIZE(ia_check_ms_error_type_strs) ?
+ ia_check_ms_error_type_strs[err_type] : "unknown");
+ }
+
+ if (validation_bits & CHECK_VALID_MS_PCC)
+ print_bool("Processor Context Corrupt", pfx, check, CHECK_MS_PCC);
+
+ if (validation_bits & CHECK_VALID_MS_UNCORRECTED)
+ print_bool("Uncorrected", pfx, check, CHECK_MS_UNCORRECTED);
+
+ if (validation_bits & CHECK_VALID_MS_PRECISE_IP)
+ print_bool("Precise IP", pfx, check, CHECK_MS_PRECISE_IP);
+
+ if (validation_bits & CHECK_VALID_MS_RESTARTABLE_IP)
+ print_bool("Restartable IP", pfx, check, CHECK_MS_RESTARTABLE_IP);
+
+ if (validation_bits & CHECK_VALID_MS_OVERFLOW)
+ print_bool("Overflow", pfx, check, CHECK_MS_OVERFLOW);
+}
+
static void print_err_info(const char *pfx, u8 err_type, u64 check)
{
u16 validation_bits = CHECK_VALID_BITS(check);
+ /*
+ * The MS Check structure varies a lot from the others, so use a
+ * separate function for decoding.
+ */
if (err_type == ERR_TYPE_MS)
- return;
+ return print_err_info_ms(pfx, validation_bits, check);
if (validation_bits & CHECK_VALID_TRANS_TYPE) {
u8 trans_type = CHECK_TRANS_TYPE(check);
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 8/8] efi: Decode IA32/X64 Context Info structure
2018-03-24 18:49 [PATCH v3 0/8] Decode IA32/X64 CPER Yazen Ghannam
` (6 preceding siblings ...)
2018-03-24 18:49 ` [PATCH v3 7/8] efi: Decode IA32/X64 MS Check structure Yazen Ghannam
@ 2018-03-24 18:49 ` Yazen Ghannam
7 siblings, 0 replies; 16+ messages in thread
From: Yazen Ghannam @ 2018-03-24 18:49 UTC (permalink / raw)
To: linux-efi; +Cc: Yazen Ghannam, linux-kernel, ard.biesheuvel, x86, bp, tony.luck
From: Yazen Ghannam <yazen.ghannam@amd.com>
Print the fields of the IA32/X64 Context Information structure.
Print the "Register Array" as raw values. Some context types are defined
in the UEFI spec, so more detailed decoded may be added in the future.
Based on UEFI 2.7 section N.2.4.2.2 IA32/X64 Processor Context
Information Structure.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20180226193904.20532-9-Yazen.Ghannam@amd.com
v2->v3:
* No change.
v1->v2:
* Add parantheses around "bits" expression in macro.
* Change VALID_PROC_CNTXT_INFO_NUM to VALID_PROC_CTX_INFO_NUM.
* Fix indentation on multi-line statements.
* Remove conditional to skip unknown context types. The context info
should be printed even if the type is unknown. This is just like what
we do for the error information.
drivers/firmware/efi/cper-x86.c | 48 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index ffc01483cac2..fe479cc5a358 100644
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -12,6 +12,7 @@
#define VALID_LAPIC_ID BIT_ULL(0)
#define VALID_CPUID_INFO BIT_ULL(1)
#define VALID_PROC_ERR_INFO_NUM(bits) (((bits) & GENMASK_ULL(7, 2)) >> 2)
+#define VALID_PROC_CXT_INFO_NUM(bits) (((bits) & GENMASK_ULL(13, 8)) >> 8)
#define INFO_ERR_STRUCT_TYPE_CACHE \
GUID_INIT(0xA55701F5, 0xE3EF, 0x43DE, 0xAC, 0x72, 0x24, 0x9B, \
@@ -73,6 +74,9 @@
#define CHECK_MS_RESTARTABLE_IP BIT_ULL(22)
#define CHECK_MS_OVERFLOW BIT_ULL(23)
+#define CTX_TYPE_MSR 1
+#define CTX_TYPE_MMREG 7
+
enum err_types {
ERR_TYPE_CACHE = 0,
ERR_TYPE_TLB,
@@ -136,6 +140,17 @@ static const char * const ia_check_ms_error_type_strs[] = {
"Internal Unclassified",
};
+static const char * const ia_reg_ctx_strs[] = {
+ "Unclassified Data",
+ "MSR Registers (Machine Check and other MSRs)",
+ "32-bit Mode Execution Context",
+ "64-bit Mode Execution Context",
+ "FXSAVE Context",
+ "32-bit Mode Debug Registers (DR0-DR7)",
+ "64-bit Mode Debug Registers (DR0-DR7)",
+ "Memory Mapped Registers",
+};
+
static inline void print_bool(char *str, const char *pfx, u64 check, u64 bit)
{
printk("%s%s: %s\n", pfx, str, (check & bit) ? "true" : "false");
@@ -244,6 +259,7 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
{
int i;
struct cper_ia_err_info *err_info;
+ struct cper_ia_proc_ctx *ctx_info;
char newpfx[64], infopfx[64];
u8 err_type;
@@ -307,4 +323,36 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
err_info++;
}
+
+ ctx_info = (struct cper_ia_proc_ctx *)err_info;
+ for (i = 0; i < VALID_PROC_CXT_INFO_NUM(proc->validation_bits); i++) {
+ int size = sizeof(*ctx_info) + ctx_info->reg_arr_size;
+ int groupsize = 4;
+
+ printk("%sContext Information Structure %d:\n", pfx, i);
+
+ printk("%sRegister Context Type: %s\n", newpfx,
+ ctx_info->reg_ctx_type < ARRAY_SIZE(ia_reg_ctx_strs) ?
+ ia_reg_ctx_strs[ctx_info->reg_ctx_type] : "unknown");
+
+ printk("%sRegister Array Size: 0x%04x\n", newpfx,
+ ctx_info->reg_arr_size);
+
+ if (ctx_info->reg_ctx_type == CTX_TYPE_MSR) {
+ groupsize = 8; /* MSRs are 8 bytes wide. */
+ printk("%sMSR Address: 0x%08x\n", newpfx,
+ ctx_info->msr_addr);
+ }
+
+ if (ctx_info->reg_ctx_type == CTX_TYPE_MMREG) {
+ printk("%sMM Register Address: 0x%016llx\n", newpfx,
+ ctx_info->mm_reg_addr);
+ }
+
+ printk("%sRegister Array:\n", newpfx);
+ print_hex_dump(newpfx, "", DUMP_PREFIX_OFFSET, 16, groupsize,
+ (ctx_info + 1), ctx_info->reg_arr_size, 0);
+
+ ctx_info = (struct cper_ia_proc_ctx *)((long)ctx_info + size);
+ }
}
--
2.14.1
^ permalink raw reply related [flat|nested] 16+ messages in thread