|
@@ -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
|
|
* As the current version supports only one source, the ack offset is
|
|
* just sizeof(uint64_t).
|
|
* 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,
|
|
void ghes_record_cper_errors(const void *cper, size_t len,
|
|
uint16_t source_id, Error **errp)
|
|
uint16_t source_id, Error **errp)
|
|
{
|
|
{
|
|
uint64_t cper_addr = 0, read_ack_register_addr = 0, read_ack_register;
|
|
uint64_t cper_addr = 0, read_ack_register_addr = 0, read_ack_register;
|
|
- uint64_t start_addr;
|
|
|
|
AcpiGedState *acpi_ged_state;
|
|
AcpiGedState *acpi_ged_state;
|
|
AcpiGhesState *ags;
|
|
AcpiGhesState *ags;
|
|
|
|
|
|
@@ -412,11 +410,9 @@ void ghes_record_cper_errors(const void *cper, size_t len,
|
|
}
|
|
}
|
|
ags = &acpi_ged_state->ghes_state;
|
|
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);
|
|
|
|
|
|
if (!cper_addr) {
|
|
if (!cper_addr) {
|
|
error_setg(errp, "can not find Generic Error Status Block");
|
|
error_setg(errp, "can not find Generic Error Status Block");
|