On Tue, 17 Nov 2026 12:10:22 +0100
Pierre Gondois <[email protected]> wrote:

> Extract the CPER reporting code to a separate file in order
> to re-use it in the GHES code in a later patch.
> 
> CONFIG_ACPI_EXTLOG selects ACPI_APEI_GHES and acpi_extlog_report()
> will be used in ghes.c, built with CONFIG_ACPI_APEI_GHES. Thus also
> build extlog.c under CONFIG_ACPI_APEI_GHES.
> 
> Relax the definition of extlog_mem[|2]_event tracepoints to
> CONFIG_ACPI_APEI_GHES. The common reporter references them even
> when CONFIG_ACPI_EXTLOG is disabled. Guard its memory trace calls
> with CONFIG_RAS because GHES can be enabled without RAS.
> 
> Signed-off-by: Pierre Gondois <[email protected]>

There is too much going on in here that isn't code movement of
Kconfig stuff related to that.  Those other changes need their
own patches were you can describe fully why they are being done.

> diff --git a/drivers/acpi/apei/extlog.c b/drivers/acpi/apei/extlog.c
> new file mode 100644
> index 0000000000000..8eef33a4326a7
> --- /dev/null
> +++ b/drivers/acpi/apei/extlog.c

> +/**
> + * acpi_extlog_mem_error - trace a validated CPER memory section
> + * @gdata: section header followed by its payload
> + * @err_seq: sequence number shared by sections in the same error record
> + *
> + * The caller must validate the payload length, including any optional fields
> + * claimed by the memory validation bits, before calling this function.
> + */
> +static void acpi_extlog_mem_error(struct acpi_hest_generic_data *gdata, u32 
> err_seq)
> +{
> +#ifdef CONFIG_RAS
> +     struct cper_sec_mem_err *mem = acpi_hest_get_payload(gdata);
> +     const guid_t *fru_id;
> +     const char *fru_text;
> +
> +     if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
> +             fru_id = (guid_t *)gdata->fru_id;
> +     else
> +             fru_id = &guid_null;
> +     if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
> +             fru_text = gdata->fru_text;
> +     else
> +             fru_text = "";

See below. This work is done in the caller unless I'm going crazy
and it's a different fru entry...

> +
> +     trace_extlog_mem_event(mem, err_seq, fru_id, fru_text,
> +                            (u8)gdata->error_severity);
> +#endif
> +}
> +
> +/**
> + * acpi_extlog_mem2_error - trace a validated CPER memory section 2
> + * @gdata: section header followed by its payload
> + * @err_seq: sequence number shared by sections in the same error record
> + *
> + * The caller must validate the payload length before calling this function.
> + */
> +static void acpi_extlog_mem2_error(struct acpi_hest_generic_data *gdata, u32 
> err_seq)
> +{
> +#ifdef CONFIG_RAS
> +     struct cper_sec_mem_err2 *mem = acpi_hest_get_payload(gdata);
> +     const guid_t *fru_id;
> +     const char *fru_text;
> +
> +     if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
> +             fru_id = (guid_t *)gdata->fru_id;
> +     else
> +             fru_id = &guid_null;
> +     if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
> +             fru_text = gdata->fru_text;
> +     else
> +             fru_text = "";
> +
> +     trace_extlog_mem2_event(mem, err_seq, fru_id, fru_text,
> +                             (u8)gdata->error_severity);
> +#endif
> +}
> +
> +/**
> + * acpi_extlog_report - report sections of a validated generic error status 
> block
> + * @estatus: caller-owned status block, already checked by 
> cper_estatus_check()
> + *
> + * The caller handles console output and firmware acknowledgment. Section
> + * processing, including PCIe recovery, does not depend on RAS consumers.
> + */
> +void acpi_extlog_report(const struct acpi_hest_generic_status *estatus)

Given there are functional changes in here, it may make sense to do them
separately from the code move  / factor out. 

> +{
> +     static atomic_t seqno = ATOMIC_INIT(0);

Why did this become an atomic?  I don't mind that but I'd have made
the change in a separate patch so you can explain it.

> +     struct acpi_hest_generic_data *gdata;
> +     const guid_t *fru_id;
> +     const char *fru_text;
> +     guid_t *sec_type;
> +     u32 err_seq;
> +
> +     /* log event via trace */
> +     err_seq = atomic_inc_return(&seqno);
> +     apei_estatus_for_each_section(estatus, gdata) {
> +             if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
> +                     fru_id = (guid_t *)gdata->fru_id;
> +             else
> +                     fru_id = &guid_null;
> +             if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
> +                     fru_text = gdata->fru_text;
> +             else
> +                     fru_text = "";
> +             sec_type = (guid_t *)gdata->section_type;
> +             if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {
> +                     struct cper_sec_mem_err *mem = 
> acpi_hest_get_payload(gdata);
> +
> +                     if (gdata->error_data_length >= sizeof(*mem))
> +                             acpi_extlog_mem_error(gdata, err_seq);

I'd move them with old name then rename in a follow up patch.
Particularly as the new code duplicates the fru stuff above - that
needs explaining which can't be done in code move patch.

> +             } else if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM2)) {
> +                     struct cper_sec_mem_err2 *mem = 
> acpi_hest_get_payload(gdata);
> +
> +                     if (gdata->error_data_length >= sizeof(*mem))
> +                             acpi_extlog_mem2_error(gdata, err_seq);

Same for this.

> +             } else if (guid_equal(sec_type, &CPER_SEC_CXL_PROT_ERR)) {
> +                     struct cxl_cper_sec_prot_err *prot_err =
> +                             acpi_hest_get_payload(gdata);
> +
> +                     cxl_cper_post_prot_err(prot_err,
> +                                            gdata->error_severity,
> +                                            gdata->error_data_length);
> +             } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {
> +                     extlog_print_pcie(gdata);
> +             } else {
> +                     void *err = acpi_hest_get_payload(gdata);
> +
> +                     log_non_standard_event(sec_type, fru_id, fru_text,
> +                                            gdata->error_severity, err,
> +                                            gdata->error_data_length);
> +             }
> +     }
> +}
> +EXPORT_SYMBOL_FOR_MODULES(acpi_extlog_report, "acpi_extlog");



Reply via email to