Skip to content

Commit 47935fc

Browse files
mchehabmstsirkin
authored andcommitted
acpi/ghes: Change ghes fill logic to work with only one source
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 <[email protected]> Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> Message-Id: <66bddd42a64c8515ad98b9975d953b4a70ffcc6d.1736945236.git.mchehab+huawei@kernel.org> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 1cd59b8 commit 47935fc

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

hw/acpi/ghes.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -387,15 +387,13 @@ static void get_hw_error_offsets(uint64_t ghes_addr,
387387
* As the current version supports only one source, the ack offset is
388388
* just sizeof(uint64_t).
389389
*/
390-
*read_ack_register_addr = ghes_addr +
391-
ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t);
390+
*read_ack_register_addr = ghes_addr + sizeof(uint64_t);
392391
}
393392

394393
void ghes_record_cper_errors(const void *cper, size_t len,
395394
uint16_t source_id, Error **errp)
396395
{
397396
uint64_t cper_addr = 0, read_ack_register_addr = 0, read_ack_register;
398-
uint64_t start_addr;
399397
AcpiGedState *acpi_ged_state;
400398
AcpiGhesState *ags;
401399

@@ -412,11 +410,9 @@ void ghes_record_cper_errors(const void *cper, size_t len,
412410
}
413411
ags = &acpi_ged_state->ghes_state;
414412

415-
start_addr = le64_to_cpu(ags->hw_error_le);
416-
417-
start_addr += source_id * sizeof(uint64_t);
418-
419-
get_hw_error_offsets(start_addr, &cper_addr, &read_ack_register_addr);
413+
assert(ACPI_GHES_ERROR_SOURCE_COUNT == 1);
414+
get_hw_error_offsets(le64_to_cpu(ags->hw_error_le),
415+
&cper_addr, &read_ack_register_addr);
420416

421417
if (!cper_addr) {
422418
error_setg(errp, "can not find Generic Error Status Block");

0 commit comments

Comments
 (0)