Re: [PATCH v4 14/15] acpi/ghes: Change ghes fill logic to work with only one source
From: Igor Mammedov
Date: Tue Dec 03 2024 - 07:59:26 EST
On Fri, 22 Nov 2024 10:11:31 +0100
Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> wrote:
> Extending to multiple sources require a BIOS pointer to the
> beginning of the HEST table, which in turn requires a backward-compatible
> code.
>
> So, the current code supports only one source. Ensure that and simplify
> the code.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Reviewed-by: Igor Mammedov <imammedo@xxxxxxxxxx>
> ---
> hw/acpi/ghes.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
> index d99697b20164..b0b1865dc8d3 100644
> --- a/hw/acpi/ghes.c
> +++ b/hw/acpi/ghes.c
> @@ -387,15 +387,13 @@ static void get_hw_error_offsets(uint64_t ghes_addr,
> * As the current version supports only one source, the ack offset is
> * just sizeof(uint64_t).
> */
> - *read_ack_register_addr = ghes_addr +
> - ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t);
> + *read_ack_register_addr = ghes_addr + sizeof(uint64_t);
> }
>
> void ghes_record_cper_errors(const void *cper, size_t len,
> uint16_t source_id, Error **errp)
> {
> uint64_t cper_addr = 0, read_ack_register_addr = 0, read_ack_register;
> - uint64_t start_addr;
> AcpiGedState *acpi_ged_state;
> AcpiGhesState *ags;
>
> @@ -412,11 +410,9 @@ void ghes_record_cper_errors(const void *cper, size_t len,
> }
> ags = &acpi_ged_state->ghes_state;
>
> - start_addr = le64_to_cpu(ags->hw_error_le);
> -
> - start_addr += source_id * sizeof(uint64_t);
> -
> - get_hw_error_offsets(start_addr, &cper_addr, &read_ack_register_addr);
> + assert(ACPI_GHES_ERROR_SOURCE_COUNT == 1);
> + get_hw_error_offsets(le64_to_cpu(ags->hw_error_le),
> + &cper_addr, &read_ack_register_addr);
>
> cper_addr = le64_to_cpu(cper_addr);
> if (!cper_addr) {