Skip to content

Commit 315c2f0

Browse files
skoralahdavejiang
authored andcommitted
acpi/ghes, cper: Recognize and cache CXL Protocol errors
Add support in GHES to detect and process CXL CPER Protocol errors, as defined in UEFI v2.10, section N.2.13. Define struct cxl_cper_prot_err_work_data to cache CXL protocol error information, including RAS capabilities and severity, for further handling. These cached CXL CPER records will later be processed by workqueues within the CXL subsystem. Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Tony Luck <tony.luck@intel.com> Reviewed-by: Gregory Price <gourry@gourry.net> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Link: https://patch.msgid.link/20250123084421.127697-5-Smita.KoralahalliChannabasappa@amd.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
1 parent 61eac5f commit 315c2f0

File tree

2 files changed

+60
-0
lines changed

2 files changed

+60
-0
lines changed

drivers/acpi/apei/ghes.c

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,56 @@ static void ghes_defer_non_standard_event(struct acpi_hest_generic_data *gdata,
674674
schedule_work(&entry->work);
675675
}
676676

677+
static void cxl_cper_post_prot_err(struct cxl_cper_sec_prot_err *prot_err,
678+
int severity)
679+
{
680+
#ifdef CONFIG_ACPI_APEI_PCIEAER
681+
struct cxl_cper_prot_err_work_data wd;
682+
u8 *dvsec_start, *cap_start;
683+
684+
if (!(prot_err->valid_bits & PROT_ERR_VALID_AGENT_ADDRESS)) {
685+
pr_err_ratelimited("CXL CPER invalid agent type\n");
686+
return;
687+
}
688+
689+
if (!(prot_err->valid_bits & PROT_ERR_VALID_ERROR_LOG)) {
690+
pr_err_ratelimited("CXL CPER invalid protocol error log\n");
691+
return;
692+
}
693+
694+
if (prot_err->err_len != sizeof(struct cxl_ras_capability_regs)) {
695+
pr_err_ratelimited("CXL CPER invalid RAS Cap size (%u)\n",
696+
prot_err->err_len);
697+
return;
698+
}
699+
700+
if (!(prot_err->valid_bits & PROT_ERR_VALID_SERIAL_NUMBER))
701+
pr_warn(FW_WARN "CXL CPER no device serial number\n");
702+
703+
switch (prot_err->agent_type) {
704+
case RCD:
705+
case DEVICE:
706+
case LD:
707+
case FMLD:
708+
case RP:
709+
case DSP:
710+
case USP:
711+
memcpy(&wd.prot_err, prot_err, sizeof(wd.prot_err));
712+
713+
dvsec_start = (u8 *)(prot_err + 1);
714+
cap_start = dvsec_start + prot_err->dvsec_len;
715+
716+
memcpy(&wd.ras_cap, cap_start, sizeof(wd.ras_cap));
717+
wd.severity = cper_severity_to_aer(severity);
718+
break;
719+
default:
720+
pr_err_ratelimited("CXL CPER invalid agent type: %d\n",
721+
prot_err->agent_type);
722+
return;
723+
}
724+
#endif
725+
}
726+
677727
/* Room for 8 entries for each of the 4 event log queues */
678728
#define CXL_CPER_FIFO_DEPTH 32
679729
DEFINE_KFIFO(cxl_cper_fifo, struct cxl_cper_work_data, CXL_CPER_FIFO_DEPTH);
@@ -777,6 +827,10 @@ static bool ghes_do_proc(struct ghes *ghes,
777827
}
778828
else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {
779829
queued = ghes_handle_arm_hw_error(gdata, sev, sync);
830+
} else if (guid_equal(sec_type, &CPER_SEC_CXL_PROT_ERR)) {
831+
struct cxl_cper_sec_prot_err *prot_err = acpi_hest_get_payload(gdata);
832+
833+
cxl_cper_post_prot_err(prot_err, gdata->error_severity);
780834
} else if (guid_equal(sec_type, &CPER_SEC_CXL_GEN_MEDIA_GUID)) {
781835
struct cxl_cper_event_rec *rec = acpi_hest_get_payload(gdata);
782836

include/cxl/event.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,12 @@ struct cxl_ras_capability_regs {
244244
u32 header_log[16];
245245
};
246246

247+
struct cxl_cper_prot_err_work_data {
248+
struct cxl_cper_sec_prot_err prot_err;
249+
struct cxl_ras_capability_regs ras_cap;
250+
int severity;
251+
};
252+
247253
#ifdef CONFIG_ACPI_APEI_GHES
248254
int cxl_cper_register_work(struct work_struct *work);
249255
int cxl_cper_unregister_work(struct work_struct *work);

0 commit comments

Comments
 (0)