| Message ID | 20221007211714.71129-2-Smita.KoralahalliChannabasappa@amd.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | efi/cper, cxl: Decode CXL Protocol Errors CPER | expand |
On Fri, 7 Oct 2022 21:17:13 +0000 Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> wrote: > Add support for decoding CXL Protocol Error Section as defined in UEFI 2.9 > Section N.2.13. > > Do the section decoding in a new cper_cxl.c file. This new file will be > used in the future for more CXL CPERs decode support. Add this to the > existing UEFI_CPER config. > > Decode only the fields that are useful to parse the error. > > Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> Hi Smita, A few comments inline, but this looks pretty good to me though lots to build on top of this (trace events, any in kernel handling necessary etc). Jonathan > --- > drivers/firmware/efi/Makefile | 2 +- > drivers/firmware/efi/cper.c | 9 ++++ > drivers/firmware/efi/cper_cxl.c | 87 +++++++++++++++++++++++++++++++++ > drivers/firmware/efi/cper_cxl.h | 58 ++++++++++++++++++++++ > 4 files changed, 155 insertions(+), 1 deletion(-) > create mode 100644 drivers/firmware/efi/cper_cxl.c > create mode 100644 drivers/firmware/efi/cper_cxl.h > > diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile > index 8d151e332584..4f332de54173 100644 > --- a/drivers/firmware/efi/Makefile > +++ b/drivers/firmware/efi/Makefile > @@ -19,7 +19,7 @@ endif > obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += fdtparams.o > obj-$(CONFIG_EFI_ESRT) += esrt.o > obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o > -obj-$(CONFIG_UEFI_CPER) += cper.o > +obj-$(CONFIG_UEFI_CPER) += cper.o cper_cxl.o > obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o > obj-$(CONFIG_EFI_RUNTIME_WRAPPERS) += runtime-wrappers.o > subdir-$(CONFIG_EFI_STUB) += libstub > diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c > index e4e5ea7ce910..181deb9af527 100644 > --- a/drivers/firmware/efi/cper.c > +++ b/drivers/firmware/efi/cper.c > @@ -24,6 +24,7 @@ > #include <linux/bcd.h> > #include <acpi/ghes.h> > #include <ras/ras_event.h> > +#include "cper_cxl.h" > > /* > * CPER record ID need to be unique even after reboot, because record > @@ -595,6 +596,14 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata > cper_print_fw_err(newpfx, gdata, fw_err); > else > goto err_section_too_small; > + } else if (guid_equal(sec_type, &CPER_SEC_CXL_PROT_ERR)) { > + struct cper_sec_prot_err *prot_err = acpi_hest_get_payload(gdata); > + > + printk("%ssection_type: CXL Protocol Error\n", newpfx); > + if (gdata->error_data_length >= sizeof(*prot_err)) > + cper_print_prot_err(newpfx, prot_err); > + else > + goto err_section_too_small; > } else { > const void *err = acpi_hest_get_payload(gdata); > > diff --git a/drivers/firmware/efi/cper_cxl.c b/drivers/firmware/efi/cper_cxl.c > new file mode 100644 > index 000000000000..e5f48f0de1a4 > --- /dev/null > +++ b/drivers/firmware/efi/cper_cxl.c > @@ -0,0 +1,87 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * UEFI Common Platform Error Record (CPER) support for CXL Section. > + * > + * Copyright (C) 2022 Advanced Micro Devices, Inc. > + * > + * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> > + */ > + > +#include <linux/cper.h> > +#include "cper_cxl.h" > + > +#define PROT_ERR_VALID_AGENT_TYPE BIT_ULL(0) > +#define PROT_ERR_VALID_AGENT_ADDRESS BIT_ULL(1) > +#define PROT_ERR_VALID_DEVICE_ID BIT_ULL(2) > +#define PROT_ERR_VALID_SERIAL_NUMBER BIT_ULL(3) > +#define PROT_ERR_VALID_CAPABILITY BIT_ULL(4) > +#define PROT_ERR_VALID_DVSEC BIT_ULL(5) Bit 6 has been defined by 2.10 so would be good to add that here as well. As below, could be a follow up patch. > + > +static const char * const prot_err_agent_type_strs[] = { > + "Restricted CXL Device", > + "Restricted CXL Host DP", Values up to 7 now defined, so good to list the ones we know... https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#compute-express-link-cxl-protocol-error-section even if they aren't going to be generated by your firmware. I've hacked qemu to poke out appropriate records in the past (for CCIX a while back) and it would be easy enough to add them for these cases if needed (obviously that's a dirty hack but it works for testing these flows ;) I guess I can send a follow up patch if you aren't happy jumping directly to the 2.10 version of these structures. > +}; > + > +enum { > + RCD, > + RCH_DP, > +}; > + > +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err) > +{ > + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_TYPE) > + pr_info("%s agent_type: %d, %s\n", pfx, prot_err->agent_type, > + prot_err->agent_type < ARRAY_SIZE(prot_err_agent_type_strs) > + ? prot_err_agent_type_strs[prot_err->agent_type] > + : "unknown"); > + > + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_ADDRESS) { > + switch (prot_err->agent_type) { > + case RCD: > + pr_info("%s agent_address: %04x:%02x:%02x.%x\n", > + pfx, prot_err->segment, prot_err->bus, > + prot_err->device, prot_err->function); > + break; > + case RCH_DP: > + pr_info("%s rcrb_base_address: 0x%016llx\n", pfx, > + prot_err->agent_addr); > + break; > + default: > + break; > + } > + } > + > + if (prot_err->valid_bits & PROT_ERR_VALID_DEVICE_ID) { > + const __u8 *class_code; > + > + switch (prot_err->agent_type) { > + case RCD: > + pr_info("%s slot: %d\n", pfx, > + prot_err->device_id.slot >> CPER_PCIE_SLOT_SHIFT); > + pr_info("%s vendor_id: 0x%04x, device_id: 0x%04x\n", > + pfx, prot_err->device_id.vendor_id, > + prot_err->device_id.device_id); > + pr_info("%s sub_vendor_id: 0x%04x, sub_device_id: 0x%04x\n", > + pfx, prot_err->device_id.sub_vendor_id, > + prot_err->device_id.sub_device_id); > + class_code = prot_err->device_id.class_code; > + pr_info("%s class_code: %02x%02x\n", pfx, > + class_code[1], class_code[0]); > + break; > + default: > + break; > + } > + } > + > + if (prot_err->valid_bits & PROT_ERR_VALID_SERIAL_NUMBER) { > + switch (prot_err->agent_type) { > + case RCD: > + pr_info("%s lower_dw: 0x%08x, upper_dw: 0x%08x\n", pfx, > + prot_err->dev_serial_num.lower_dw, > + prot_err->dev_serial_num.upper_dw); > + break; > + default: > + break; > + } > + } Nice to pretty print the cap structure and appropriate DVSEC and Error logs as well if valid, but that could be a follow up patch. > +} > diff --git a/drivers/firmware/efi/cper_cxl.h b/drivers/firmware/efi/cper_cxl.h > new file mode 100644 > index 000000000000..f924d96e4bb2 > --- /dev/null > +++ b/drivers/firmware/efi/cper_cxl.h > @@ -0,0 +1,58 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * UEFI Common Platform Error Record (CPER) support for CXL Section. > + * > + * Copyright (C) 2022 Advanced Micro Devices, Inc. > + * > + * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> > + */ > + > +#ifndef LINUX_CPER_CXL_H > +#define LINUX_CPER_CXL_H > + > +/* CXL Protocol Error Section */ > +#define CPER_SEC_CXL_PROT_ERR \ > + GUID_INIT(0x80B9EFB4, 0x52B5, 0x4DE3, 0xA7, 0x77, 0x68, 0x78, \ > + 0x4B, 0x77, 0x10, 0x48) > + > +#pragma pack(1) > + > +/* Compute Express Link Protocol Error Section, UEFI v2.9 sec N.2.13 */ Given 2.10 is out an expands on a few corners of this. Perhaps update an switch the reference over to that to cover that. I haven't checked, but assume the additional Agent Types were added in 2.10. > +struct cper_sec_prot_err { > + u64 valid_bits; > + u8 agent_type; > + u8 reserved[7]; > + union { > + u64 agent_addr; Perhaps useful to add a few comments to say when the different union elements are relevant. Perhaps also name the field as per the spec which would give the overall union the agent_address. I admit that is a little confusing with the union element having the same name for when it's treated as an address. Perhaps call the union element rcrb_base_addr? > + struct { > + u8 function; > + u8 device; > + u8 bus; > + u16 segment; > + u8 reserved_1[3]; > + }; > + }; > + struct { > + u16 vendor_id; > + u16 device_id; > + u16 sub_vendor_id; > + u16 sub_device_id; This is always fun. Far as I can tell not all PCI elements have subsystem IDs - so who knows what goes in these.. Also, there is wonderfully no such thing as a PCI subsystem device ID. It's just called subsystem ID in the PCI spec. > + u8 class_code[2]; Why treat class code as two u8s? If doing so, shall we name them? base_class_code, sub_class_code? > + u16 slot; > + u8 reserved_1[4]; > + } device_id; I would not align device-id structure name with the contents. I'm not personally a big fan of aligning structure elements because it often goes wrong, but if you want to do it, drop the alignment of device_id by a few levels. } device_id; > + struct { > + u32 lower_dw; > + u32 upper_dw; > + } dev_serial_num; > + u8 capability[60]; > + u16 dvsec_len; > + u16 err_len; > + u8 reserved_2[4]; You could add a [] array on the end to make it clear there are more elements. That's not a perfect solution though given there are two different variable length fields on the end. They aren't that variable (as defined by the structures in the CXL spec) however the complexity comes from the fact that they may not be valid / lengths will be 0 (I assume lengths will be 0 if not valid anyway, the spec doesn't seem to say either way...) Either way, adding a variable array element gives a good way to address the first one, and provides a good location for a comment on what else might be here. > +}; > + > +#pragma pack() I would push the structure definition down into the c file and provide a forwards definition only in the header. struct cper_sec_prot_err; > + > +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err); > + > +#endif //__CPER_CXL_
On 10/10/2022 7:24 AM, Jonathan Cameron wrote: > On Fri, 7 Oct 2022 21:17:13 +0000 > Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> wrote: > >> Add support for decoding CXL Protocol Error Section as defined in UEFI 2.9 >> Section N.2.13. >> >> Do the section decoding in a new cper_cxl.c file. This new file will be >> used in the future for more CXL CPERs decode support. Add this to the >> existing UEFI_CPER config. >> >> Decode only the fields that are useful to parse the error. >> >> Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> > Hi Smita, > > A few comments inline, but this looks pretty good to me though lots to > build on top of this (trace events, any in kernel handling necessary etc). > > Jonathan Hi Jonathan, Thanks for the review comments. Please find my responses/answers inline. > >> +#include <linux/cper.h> >> +#include "cper_cxl.h" >> + >> +#define PROT_ERR_VALID_AGENT_TYPE BIT_ULL(0) >> +#define PROT_ERR_VALID_AGENT_ADDRESS BIT_ULL(1) >> +#define PROT_ERR_VALID_DEVICE_ID BIT_ULL(2) >> +#define PROT_ERR_VALID_SERIAL_NUMBER BIT_ULL(3) >> +#define PROT_ERR_VALID_CAPABILITY BIT_ULL(4) >> +#define PROT_ERR_VALID_DVSEC BIT_ULL(5) > Bit 6 has been defined by 2.10 so would be good to add that here as well. > As below, could be a follow up patch. Yes, as you may have noticed, I have added this in the next patch of the series. > >> + >> +static const char * const prot_err_agent_type_strs[] = { >> + "Restricted CXL Device", >> + "Restricted CXL Host DP", > Values up to 7 now defined, so good to list the ones we know... > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fuefi.org%2Fspecs%2FUEFI%2F2.10%2FApx_N_Common_Platform_Error_Record.html%23compute-express-link-cxl-protocol-error-section&data=05%7C01%7CSmita.KoralahalliChannabasappa%40amd.com%7Cbbc0e9642a314f875d9b08daaacb283f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C638010086801792139%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=ZM0zOEVtdxsQtvAxHYrTEW%2FnIBttTK48v2x%2F5VdfQ0U%3D&reserved=0 > even if they aren't going to be generated by your firmware. Yes, I'm sorry that I missed it. I started my development with the old spec.. and did not pay heed to go back and check the latest spec again. Will add the remaining agent types in the next revision. Do you recommend adding all of them? > > I've hacked qemu to poke out appropriate records in the past > (for CCIX a while back) and it would be easy enough to add > them for these cases if needed (obviously that's a dirty hack > but it works for testing these flows ;) Yes that would be of a great help to verify all the fields I think. With our hardware support, I have just verified for CXL 1.1 Downstream Port. So, I haven't really gotten a chance to verify how Device ID and Device Serial Number would look like.. > > I guess I can send a follow up patch if you aren't happy jumping > directly to the 2.10 version of these structures. I think, I can add them in the next revision. But I don't think I can test them though :( > >> +}; >> + >> +enum { >> + RCD, >> + RCH_DP, >> +}; >> + >> +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err) >> +{ >> + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_TYPE) >> + pr_info("%s agent_type: %d, %s\n", pfx, prot_err->agent_type, >> + prot_err->agent_type < ARRAY_SIZE(prot_err_agent_type_strs) >> + ? prot_err_agent_type_strs[prot_err->agent_type] >> + : "unknown"); >> + >> + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_ADDRESS) { >> + switch (prot_err->agent_type) { >> + case RCD: >> + pr_info("%s agent_address: %04x:%02x:%02x.%x\n", >> + pfx, prot_err->segment, prot_err->bus, >> + prot_err->device, prot_err->function); >> + break; >> + case RCH_DP: >> + pr_info("%s rcrb_base_address: 0x%016llx\n", pfx, >> + prot_err->agent_addr); >> + break; >> + default: >> + break; >> + } >> + } >> + >> + if (prot_err->valid_bits & PROT_ERR_VALID_DEVICE_ID) { >> + const __u8 *class_code; >> + >> + switch (prot_err->agent_type) { >> + case RCD: >> + pr_info("%s slot: %d\n", pfx, >> + prot_err->device_id.slot >> CPER_PCIE_SLOT_SHIFT); >> + pr_info("%s vendor_id: 0x%04x, device_id: 0x%04x\n", >> + pfx, prot_err->device_id.vendor_id, >> + prot_err->device_id.device_id); >> + pr_info("%s sub_vendor_id: 0x%04x, sub_device_id: 0x%04x\n", >> + pfx, prot_err->device_id.sub_vendor_id, >> + prot_err->device_id.sub_device_id); >> + class_code = prot_err->device_id.class_code; >> + pr_info("%s class_code: %02x%02x\n", pfx, >> + class_code[1], class_code[0]); >> + break; >> + default: >> + break; >> + } >> + } >> + >> + if (prot_err->valid_bits & PROT_ERR_VALID_SERIAL_NUMBER) { >> + switch (prot_err->agent_type) { >> + case RCD: >> + pr_info("%s lower_dw: 0x%08x, upper_dw: 0x%08x\n", pfx, >> + prot_err->dev_serial_num.lower_dw, >> + prot_err->dev_serial_num.upper_dw); >> + break; >> + default: >> + break; >> + } >> + } > Nice to pretty print the cap structure and appropriate DVSEC and Error logs as well > if valid, but that could be a follow up patch. Hmm, I have added the Error log decoding support in the next patch. But, I did not include cap structure and DVSEC though as I initially thought it might not be that important to parse the error. Do you recommend adding them? > >> +} >> diff --git a/drivers/firmware/efi/cper_cxl.h b/drivers/firmware/efi/cper_cxl.h >> new file mode 100644 >> index 000000000000..f924d96e4bb2 >> --- /dev/null >> +++ b/drivers/firmware/efi/cper_cxl.h >> @@ -0,0 +1,58 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> +/* >> + * UEFI Common Platform Error Record (CPER) support for CXL Section. >> + * >> + * Copyright (C) 2022 Advanced Micro Devices, Inc. >> + * >> + * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> >> + */ >> + >> +#ifndef LINUX_CPER_CXL_H >> +#define LINUX_CPER_CXL_H >> + >> +/* CXL Protocol Error Section */ >> +#define CPER_SEC_CXL_PROT_ERR \ >> + GUID_INIT(0x80B9EFB4, 0x52B5, 0x4DE3, 0xA7, 0x77, 0x68, 0x78, \ >> + 0x4B, 0x77, 0x10, 0x48) >> + >> +#pragma pack(1) >> + >> +/* Compute Express Link Protocol Error Section, UEFI v2.9 sec N.2.13 */ > Given 2.10 is out an expands on a few corners of this. Perhaps update > an switch the reference over to that to cover that. > I haven't checked, but assume the additional Agent Types were added in 2.10. Right, will fix the comment to refer to 2.10. > >> +struct cper_sec_prot_err { >> + u64 valid_bits; >> + u8 agent_type; >> + u8 reserved[7]; >> + union { >> + u64 agent_addr; > Perhaps useful to add a few comments to say when the different union > elements are relevant. Perhaps also name the field as per the spec > which would give the overall union the agent_address. > I admit that is a little confusing with the union element having > the same name for when it's treated as an address. > Perhaps call the union element rcrb_base_addr? Okay, probably something like this? union { u64 rcrb_base_addr; struct { u8 function; u8 device; u8 bus; u16 segment; u8 reserved_1[3]; }; } agent_addr; And change printing from prot_err->segment to prot_err->agent_addr.segment and so on.. Please ignore my indentation/alignments here.. > >> + struct { >> + u8 function; >> + u8 device; >> + u8 bus; >> + u16 segment; >> + u8 reserved_1[3]; >> + }; >> + }; >> + struct { >> + u16 vendor_id; >> + u16 device_id; >> + u16 sub_vendor_id; >> + u16 sub_device_id; > This is always fun. Far as I can tell not all PCI elements > have subsystem IDs - so who knows what goes in these.. > Also, there is wonderfully no such thing as a PCI subsystem device ID. > It's just called subsystem ID in the PCI spec. Thanks for correcting this. Will fix. > >> + u8 class_code[2]; > Why treat class code as two u8s? If doing so, shall > we name them? base_class_code, sub_class_code? Just followed the PCI CPER decoding here.. Will name them if that makes more sense.. > >> + u16 slot; >> + u8 reserved_1[4]; >> + } device_id; > I would not align device-id structure name with the contents. > I'm not personally a big fan of aligning structure elements > because it often goes wrong, but if you want to do it, drop > the alignment of device_id by a few levels. Thats true actually. Will just drop the alignment for all elements in next revision. > > } device_id; > >> + struct { >> + u32 lower_dw; >> + u32 upper_dw; >> + } dev_serial_num; >> + u8 capability[60]; >> + u16 dvsec_len; >> + u16 err_len; >> + u8 reserved_2[4]; > You could add a [] array on the end to make it clear there are more elements. > That's not a perfect solution though given there are two different variable length > fields on the end. They aren't that variable (as defined by the structures > in the CXL spec) however the complexity comes from the fact that they may not > be valid / lengths will be 0 (I assume lengths will be 0 > if not valid anyway, the spec doesn't seem to say either way...) Hmm, I probably got the idea to do this way by referring to "efi/cper-x86.c" (N.2.4.2 IA32/X64 Processor Error Section in UEFI spec) and probably at few places under the APEI tables. Also to note, defining the new variable array member the parsing needs to be changed accordingly in the next patch. Add dvsec length to this new variable array member to get to the Error Log field. Am I right? > > Either way, adding a variable array element gives a good way to address the first > one, and provides a good location for a comment on what else might be here. > >> +}; >> + >> +#pragma pack() > I would push the structure definition down into the c file and provide a forwards > definition only in the header. > > struct cper_sec_prot_err; Okay will do that! Thanks, Smita > > >> + >> +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err); >> + >> +#endif //__CPER_CXL_
> >> + if (prot_err->valid_bits & PROT_ERR_VALID_SERIAL_NUMBER) { > >> + switch (prot_err->agent_type) { > >> + case RCD: > >> + pr_info("%s lower_dw: 0x%08x, upper_dw: 0x%08x\n", pfx, > >> + prot_err->dev_serial_num.lower_dw, > >> + prot_err->dev_serial_num.upper_dw); > >> + break; > >> + default: > >> + break; > >> + } > >> + } > > Nice to pretty print the cap structure and appropriate DVSEC and Error logs as well > > if valid, but that could be a follow up patch. > > Hmm, I have added the Error log decoding support in the next patch. > > But, I did not include cap structure and DVSEC though as I initially > thought it might not be > that important to parse the error. Do you recommend adding them? Given it would be straight forward to do, probably better to supply slightly too much info than miss one particular chunk out. > > > >> +struct cper_sec_prot_err { > >> + u64 valid_bits; > >> + u8 agent_type; > >> + u8 reserved[7]; > >> + union { > >> + u64 agent_addr; > > Perhaps useful to add a few comments to say when the different union > > elements are relevant. Perhaps also name the field as per the spec > > which would give the overall union the agent_address. > > I admit that is a little confusing with the union element having > > the same name for when it's treated as an address. > > Perhaps call the union element rcrb_base_addr? > > Okay, probably something like this? > > union { > u64 rcrb_base_addr; > struct { > u8 function; > u8 device; > u8 bus; > u16 segment; > u8 reserved_1[3]; > }; > } agent_addr; > > And change printing from prot_err->segment to prot_err->agent_addr.segment > and so on.. Please ignore my indentation/alignments here.. Looks good to me. > > > > >> + struct { > >> + u8 function; > >> + u8 device; > >> + u8 bus; > >> + u16 segment; > >> + u8 reserved_1[3]; > >> + }; > >> + }; > >> + struct { > >> + u16 vendor_id; > >> + u16 device_id; > >> + u16 sub_vendor_id; > >> + u16 sub_device_id; > > This is always fun. Far as I can tell not all PCI elements > > have subsystem IDs - so who knows what goes in these.. > > Also, there is wonderfully no such thing as a PCI subsystem device ID. > > It's just called subsystem ID in the PCI spec. > > Thanks for correcting this. Will fix. UEFI spec is inconsistent with PCIe :( > > > > >> + u8 class_code[2]; > > Why treat class code as two u8s? If doing so, shall > > we name them? base_class_code, sub_class_code? > > Just followed the PCI CPER decoding here.. Will name them if that makes > more sense.. > ok. Fine as is. > > > > > } device_id; > > > >> + struct { > >> + u32 lower_dw; > >> + u32 upper_dw; > >> + } dev_serial_num; > >> + u8 capability[60]; > >> + u16 dvsec_len; > >> + u16 err_len; > >> + u8 reserved_2[4]; > > You could add a [] array on the end to make it clear there are more elements. > > That's not a perfect solution though given there are two different variable length > > fields on the end. They aren't that variable (as defined by the structures > > in the CXL spec) however the complexity comes from the fact that they may not > > be valid / lengths will be 0 (I assume lengths will be 0 > > if not valid anyway, the spec doesn't seem to say either way...) > > Hmm, I probably got the idea to do this way by referring to "efi/cper-x86.c" > (N.2.4.2 IA32/X64 Processor Error Section in UEFI spec) and probably at few > places under the APEI tables. Ah. I didn't check for precedence. Down to maintainer preference then. > > Also to note, defining the new variable array member the parsing needs > to be changed > accordingly in the next patch. Add dvsec length to this new variable array > member to get to the Error Log field. Am I right? Yes. Jonathan
On 10/10/2022 7:24 AM, Jonathan Cameron wrote: > On Fri, 7 Oct 2022 21:17:13 +0000 > Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> wrote: > >> Add support for decoding CXL Protocol Error Section as defined in UEFI 2.9 >> Section N.2.13. >> >> Do the section decoding in a new cper_cxl.c file. This new file will be >> used in the future for more CXL CPERs decode support. Add this to the >> existing UEFI_CPER config. >> >> Decode only the fields that are useful to parse the error. >> >> Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> > Hi Smita, > > A few comments inline, but this looks pretty good to me though lots to > build on top of this (trace events, any in kernel handling necessary etc). > > Jonathan > > >> +}; >> + >> +#pragma pack() > I would push the structure definition down into the c file and provide a forwards > definition only in the header. > > struct cper_sec_prot_err; > I haven't done this in my v2. In efi/cper.c, I'm calculating the size of the struct. I think forward structure cannot be laid out there as size isn't known. Please correct me if I'm wrong. I can incorporate changes accordingly in my v3. Thanks, Smita >> + >> +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err); >> + >> +#endif //__CPER_CXL_
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index 8d151e332584..4f332de54173 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -19,7 +19,7 @@ endif obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += fdtparams.o obj-$(CONFIG_EFI_ESRT) += esrt.o obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o -obj-$(CONFIG_UEFI_CPER) += cper.o +obj-$(CONFIG_UEFI_CPER) += cper.o cper_cxl.o obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o obj-$(CONFIG_EFI_RUNTIME_WRAPPERS) += runtime-wrappers.o subdir-$(CONFIG_EFI_STUB) += libstub diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index e4e5ea7ce910..181deb9af527 100644 --- a/drivers/firmware/efi/cper.c +++ b/drivers/firmware/efi/cper.c @@ -24,6 +24,7 @@ #include <linux/bcd.h> #include <acpi/ghes.h> #include <ras/ras_event.h> +#include "cper_cxl.h" /* * CPER record ID need to be unique even after reboot, because record @@ -595,6 +596,14 @@ cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata cper_print_fw_err(newpfx, gdata, fw_err); else goto err_section_too_small; + } else if (guid_equal(sec_type, &CPER_SEC_CXL_PROT_ERR)) { + struct cper_sec_prot_err *prot_err = acpi_hest_get_payload(gdata); + + printk("%ssection_type: CXL Protocol Error\n", newpfx); + if (gdata->error_data_length >= sizeof(*prot_err)) + cper_print_prot_err(newpfx, prot_err); + else + goto err_section_too_small; } else { const void *err = acpi_hest_get_payload(gdata); diff --git a/drivers/firmware/efi/cper_cxl.c b/drivers/firmware/efi/cper_cxl.c new file mode 100644 index 000000000000..e5f48f0de1a4 --- /dev/null +++ b/drivers/firmware/efi/cper_cxl.c @@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * UEFI Common Platform Error Record (CPER) support for CXL Section. + * + * Copyright (C) 2022 Advanced Micro Devices, Inc. + * + * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> + */ + +#include <linux/cper.h> +#include "cper_cxl.h" + +#define PROT_ERR_VALID_AGENT_TYPE BIT_ULL(0) +#define PROT_ERR_VALID_AGENT_ADDRESS BIT_ULL(1) +#define PROT_ERR_VALID_DEVICE_ID BIT_ULL(2) +#define PROT_ERR_VALID_SERIAL_NUMBER BIT_ULL(3) +#define PROT_ERR_VALID_CAPABILITY BIT_ULL(4) +#define PROT_ERR_VALID_DVSEC BIT_ULL(5) + +static const char * const prot_err_agent_type_strs[] = { + "Restricted CXL Device", + "Restricted CXL Host DP", +}; + +enum { + RCD, + RCH_DP, +}; + +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err) +{ + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_TYPE) + pr_info("%s agent_type: %d, %s\n", pfx, prot_err->agent_type, + prot_err->agent_type < ARRAY_SIZE(prot_err_agent_type_strs) + ? prot_err_agent_type_strs[prot_err->agent_type] + : "unknown"); + + if (prot_err->valid_bits & PROT_ERR_VALID_AGENT_ADDRESS) { + switch (prot_err->agent_type) { + case RCD: + pr_info("%s agent_address: %04x:%02x:%02x.%x\n", + pfx, prot_err->segment, prot_err->bus, + prot_err->device, prot_err->function); + break; + case RCH_DP: + pr_info("%s rcrb_base_address: 0x%016llx\n", pfx, + prot_err->agent_addr); + break; + default: + break; + } + } + + if (prot_err->valid_bits & PROT_ERR_VALID_DEVICE_ID) { + const __u8 *class_code; + + switch (prot_err->agent_type) { + case RCD: + pr_info("%s slot: %d\n", pfx, + prot_err->device_id.slot >> CPER_PCIE_SLOT_SHIFT); + pr_info("%s vendor_id: 0x%04x, device_id: 0x%04x\n", + pfx, prot_err->device_id.vendor_id, + prot_err->device_id.device_id); + pr_info("%s sub_vendor_id: 0x%04x, sub_device_id: 0x%04x\n", + pfx, prot_err->device_id.sub_vendor_id, + prot_err->device_id.sub_device_id); + class_code = prot_err->device_id.class_code; + pr_info("%s class_code: %02x%02x\n", pfx, + class_code[1], class_code[0]); + break; + default: + break; + } + } + + if (prot_err->valid_bits & PROT_ERR_VALID_SERIAL_NUMBER) { + switch (prot_err->agent_type) { + case RCD: + pr_info("%s lower_dw: 0x%08x, upper_dw: 0x%08x\n", pfx, + prot_err->dev_serial_num.lower_dw, + prot_err->dev_serial_num.upper_dw); + break; + default: + break; + } + } +} diff --git a/drivers/firmware/efi/cper_cxl.h b/drivers/firmware/efi/cper_cxl.h new file mode 100644 index 000000000000..f924d96e4bb2 --- /dev/null +++ b/drivers/firmware/efi/cper_cxl.h @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * UEFI Common Platform Error Record (CPER) support for CXL Section. + * + * Copyright (C) 2022 Advanced Micro Devices, Inc. + * + * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> + */ + +#ifndef LINUX_CPER_CXL_H +#define LINUX_CPER_CXL_H + +/* CXL Protocol Error Section */ +#define CPER_SEC_CXL_PROT_ERR \ + GUID_INIT(0x80B9EFB4, 0x52B5, 0x4DE3, 0xA7, 0x77, 0x68, 0x78, \ + 0x4B, 0x77, 0x10, 0x48) + +#pragma pack(1) + +/* Compute Express Link Protocol Error Section, UEFI v2.9 sec N.2.13 */ +struct cper_sec_prot_err { + u64 valid_bits; + u8 agent_type; + u8 reserved[7]; + union { + u64 agent_addr; + struct { + u8 function; + u8 device; + u8 bus; + u16 segment; + u8 reserved_1[3]; + }; + }; + struct { + u16 vendor_id; + u16 device_id; + u16 sub_vendor_id; + u16 sub_device_id; + u8 class_code[2]; + u16 slot; + u8 reserved_1[4]; + } device_id; + struct { + u32 lower_dw; + u32 upper_dw; + } dev_serial_num; + u8 capability[60]; + u16 dvsec_len; + u16 err_len; + u8 reserved_2[4]; +}; + +#pragma pack() + +void cper_print_prot_err(const char *pfx, const struct cper_sec_prot_err *prot_err); + +#endif //__CPER_CXL_
Add support for decoding CXL Protocol Error Section as defined in UEFI 2.9 Section N.2.13. Do the section decoding in a new cper_cxl.c file. This new file will be used in the future for more CXL CPERs decode support. Add this to the existing UEFI_CPER config. Decode only the fields that are useful to parse the error. Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> --- drivers/firmware/efi/Makefile | 2 +- drivers/firmware/efi/cper.c | 9 ++++ drivers/firmware/efi/cper_cxl.c | 87 +++++++++++++++++++++++++++++++++ drivers/firmware/efi/cper_cxl.h | 58 ++++++++++++++++++++++ 4 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 drivers/firmware/efi/cper_cxl.c create mode 100644 drivers/firmware/efi/cper_cxl.h