On 10/17/25 6:30 AM, Fabio M. De Francesco wrote:
> Make a helper out of cxl_cper_post_prot_err() that checks the CXL agent
> type and copy the CPER CXL protocol errors information to a work data
> structure.
>
> Signed-off-by: Fabio M. De Francesco <[email protected]>
> ---
> drivers/acpi/apei/ghes.c | 42 ++++++++++++++++++++++++++--------------
> include/cxl/event.h | 10 ++++++++++
> 2 files changed, 37 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index e69ae864f43d3..e0f8b8ed2b7c4 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -734,20 +734,12 @@ int cxl_cper_sec_prot_err_valid(struct
> cxl_cper_sec_prot_err *prot_err)
> }
> EXPORT_SYMBOL_GPL(cxl_cper_sec_prot_err_valid);
>
> -static void cxl_cper_post_prot_err(struct cxl_cper_sec_prot_err *prot_err,
> - int severity)
> +int cxl_cper_sec_prot_err_copy_to_wd(struct cxl_cper_prot_err_work_data *wd,
Function name a bit awkward. Maybe cxl_cper_setup_error_work_data()?
> + struct cxl_cper_sec_prot_err *prot_err,
> + int severity)
> {
> - struct cxl_cper_prot_err_work_data wd;
> u8 *dvsec_start, *cap_start;
>
> - if (cxl_cper_sec_prot_err_valid(prot_err))
> - return;
> -
> - guard(spinlock_irqsave)(&cxl_cper_prot_err_work_lock);
> -
> - if (!cxl_cper_prot_err_work)
> - return;
> -
> switch (prot_err->agent_type) {
> case RCD:
> case DEVICE:
> @@ -756,20 +748,40 @@ static void cxl_cper_post_prot_err(struct
> cxl_cper_sec_prot_err *prot_err,
> case RP:
> case DSP:
> case USP:
> - memcpy(&wd.prot_err, prot_err, sizeof(wd.prot_err));
> + memcpy(wd->prot_err, prot_err, sizeof(wd->prot_err));
>
> dvsec_start = (u8 *)(prot_err + 1);
> cap_start = dvsec_start + prot_err->dvsec_len;
>
> - memcpy(&wd.ras_cap, cap_start, sizeof(wd.ras_cap));
> - wd.severity = cper_severity_to_aer(severity);
> + memcpy(wd->ras_cap, cap_start, sizeof(wd->ras_cap));
> + wd->severity = cper_severity_to_aer(severity);
> break;
> default:
> pr_err_ratelimited("CXL CPER invalid agent type: %d\n",
> prot_err->agent_type);
> - return;
> + return -EINVAL;
> }
>
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(cxl_cper_sec_prot_err_copy_to_wd);
> +
> +static void cxl_cper_post_prot_err(struct cxl_cper_sec_prot_err *prot_err,
> + int severity)
> +{
> + struct cxl_cper_prot_err_work_data wd;
> +
> + if (cxl_cper_sec_prot_err_valid(prot_err))
> + return;
> +
> + guard(spinlock_irqsave)(&cxl_cper_prot_err_work_lock);
> +
> + if (!cxl_cper_prot_err_work)
> + return;
> +
> + if (cxl_cper_sec_prot_err_copy_to_wd(&wd, prot_err, severity))
> + return;
> +
> if (!kfifo_put(&cxl_cper_prot_err_fifo, wd)) {
> pr_err_ratelimited("CXL CPER kfifo overflow\n");
> return;
> diff --git a/include/cxl/event.h b/include/cxl/event.h
> index e1deb66c2197e..5f06cea5d6005 100644
> --- a/include/cxl/event.h
> +++ b/include/cxl/event.h
> @@ -322,12 +322,22 @@ static inline int cxl_cper_prot_err_kfifo_get(struct
> cxl_cper_prot_err_work_data
>
> #ifdef CONFIG_ACPI_APEI_PCIEAER
> int cxl_cper_sec_prot_err_valid(struct cxl_cper_sec_prot_err *prot_err);
> +int cxl_cper_sec_prot_err_copy_to_wd(struct cxl_cper_prot_err_work_data *wd,
> + struct cxl_cper_sec_prot_err *prot_err,
> + int severity);
> #else
> static inline int
> cxl_cper_sec_prot_err_valid(struct cxl_cper_sec_prot_err *prot_err)
> {
> return -EINVAL;
> }
> +static inline int
> +cxl_cper_sec_prot_err_copy_to_wd(struct cxl_cper_prot_err_work_data *wd,
> + struct cxl_cper_sec_prot_err *prot_err,
> + int severity)
> +{
> + return -EINVAL;
-EOPNOTSUPP
> +}
> #endif
>
> #endif /* _LINUX_CXL_EVENT_H */
