Prepare GHES driver to support error injection
Subsystems (2)
cover Prepare GHES driver to support error injection
Hi Michael,
Could you please merge this series for ACPI stuff? All patches were already reviewed by Igor. The changes against v4 are just on some patch descriptions, plus the addition of Reviewed-by. No Code changes.
Thanks,
Mauro
-
During the development of a patch series meant to allow GHESv2 error injections, it was requested a change on how CPER offsets are calculated, by adding a new BIOS pointer and reworking the GHES logic. See:
https://lore.kernel.org/qemu-devel/[email protected]/
Such change ended being a big patch, so several intermediate steps are needed, together with several cleanups and renames.
As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches.
The next series will contain the shift to use offsets from the location of the HEST table, together with a migration logic to make it compatible with 9.1.
---
v5:
- some changes at patches description and added some R-B;
- no changes at the code.
v4:
- merged a patch renaming the function which calculate offsets to:
get_hw_error_offsets(), to avoid the need of such change at the next patch series;
- removed a functional change at the logic which makes
the GHES record generation more generic;
- a couple of trivial changes on patch descriptions and line break cleanups.
v3:
- improved some patch descriptions;
- some patches got reordered to better reflect the changes;
- patch v2 08/15: acpi/ghes: Prepare to support multiple sources on ghes was split on two patches. The first one is in this cleanup series:
acpi/ghes: Change ghes fill logic to work with only one source
contains just the simplification logic. The actual preparation will be moved to this series:
https://lore.kernel.org/qemu-devel/[email protected]/
v2:
- some indentation fixes;
- some description improvements;
- fixed a badly-solved merge conflict that ended renaming a parameter.
Mauro Carvalho Chehab (31):
acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED acpi/ghes: simplify acpi_ghes_record_errors() code acpi/ghes: simplify the per-arch caller to build HEST table acpi/ghes: better handle source_id and notification acpi/ghes: Fix acpi_ghes_record_errors() argument acpi/ghes: Remove a duplicated out of bounds check acpi/ghes: Change the type for source_id
acpi/ghes: don't check if physical_address is not zero acpi/ghes: make the GHES record generation more generic acpi/ghes: better name GHES memory error function acpi/ghes: don't crash QEMU if ghes GED is not found acpi/ghes: rename etc/hardware_error file macros acpi/ghes: better name the offset of the hardware error firmware acpi/ghes: Prepare to support multiple sources on ghes acpi/ghes: add a firmware file with HEST address acpi/ghes: Use HEST table offsets when preparing GHES records acpi/generic_event_device: Update GHES migration to cover hest addr acpi/generic_event_device: add logic to detect if HEST addr is
available
acpi/ghes: add a notifier to notify when error data is ready acpi/generic_event_device: add an APEI error device arm/virt: Wire up a GED error device for ACPI / GHES qapi/acpi-hest: add an interface to do generic CPER error injection scripts/ghes_inject: add a script to generate GHES error inject target/arm: add an experimental mpidr arm cpu property object scripts/arm_processor_error.py: retrieve mpidr if not filled acpi/ghes: move offset calculus to a separate function DEBUG
acpi/ghes: Change ghes fill logic to work with only one source
HACK: use GPIO as source ID for virt-9.1 machines
docs: acpi_hest_ghes: fix documentation for CPER size
FIXME: acpi/ghes: properly set data record size
MAINTAINERS | 10 + docs/specs/acpi_hest_ghes.rst | 6 +- hw/acpi/Kconfig | 5 + hw/acpi/aml-build.c | 10 + hw/acpi/generic_event_device.c | 42 +- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 391 ++++++++++---- hw/acpi/ghes_cper.c | 32 ++ hw/acpi/ghes_cper_stub.c | 19 + hw/acpi/meson.build | 2 + hw/arm/virt-acpi-build.c | 36 +- hw/arm/virt.c | 19 +- hw/core/machine.c | 2 + include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/aml-build.h | 2 + include/hw/acpi/generic_event_device.h | 1 + include/hw/acpi/ghes.h | 39 +- include/hw/arm/virt.h | 2 + qapi/acpi-hest.json | 35 ++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + scripts/arm_processor_error.py | 390 ++++++++++++++ scripts/ghes_inject.py | 51 ++ scripts/qmp_helper.py | 702 +++++++++++++++++++++++++ target/arm/cpu.c | 1 + target/arm/cpu.h | 1 + target/arm/helper.c | 10 +- target/arm/kvm.c | 2 +- 28 files changed, 1678 insertions(+), 137 deletions(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 hw/acpi/ghes_cper_stub.c create mode 100644 qapi/acpi-hest.json create mode 100644 scripts/arm_processor_error.py create mode 100755 scripts/ghes_inject.py create mode 100644 scripts/qmp_helper.py
Signature · 1 line
2.47.1
PATCH 1/31 acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED
This is just duplicating ACPI_GHES_ERROR_SOURCE_COUNT, which has a better name. So, drop the duplication.
--- hw/acpi/ghes.c | 7 ++----- include/hw/acpi/ghes.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-)
hw/acpi/ghes.c +2 -5
@@ -34,9 +34,6 @@/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB) -/* Now only support ARMv8 SEA notification type error source */ -#define ACPI_GHES_ERROR_SOURCE_COUNT 1 -/* Generic Hardware Error Source version 2 */ #define ACPI_GHES_SOURCE_GENERIC_ERROR_V2 10
@@ -396,7 +393,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_HEST_SRC_ID_RESERVED ); +assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));
@@ -407,7 +404,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)if (physical_address) { -if (source_id <ACPI_HEST_SRC_ID_RESERVED ) { +if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { start_addr += source_id *sizeof (uint64_t ); }
include/hw/acpi/ghes.h +2 -1
@@ -59,7 +59,8 @@ enum AcpiGhesNotifyType {enum {ACPI_HEST_SRC_ID_SEA =0 ,/* future ids go here */ -ACPI_HEST_SRC_ID_RESERVED , + +ACPI_GHES_ERROR_SOURCE_COUNT }; typedef struct AcpiGhesState {
Signature · 1 line
2.47.1
PATCH 2/31 acpi/ghes: simplify acpi_ghes_record_errors() code
In reply to Mauro Carvalho ChehabReduce the ident of the function and prepares it for the next changes.
No functional changes.
--- hw/acpi/ghes.c | 56 ++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-)
hw/acpi/ghes.c +29 -27
@@ -402,40 +402,42 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (physical_address) { +if (!physical_address) { +return -1 ; + } -if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { - start_addr += source_id *sizeof (uint64_t ); - } +if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { + start_addr += source_id *sizeof (uint64_t ); + } -cpu_physical_memory_read (start_addr, &error_block_addr, -sizeof (error_block_addr)); +cpu_physical_memory_read (start_addr, &error_block_addr, +sizeof (error_block_addr)); - error_block_addr =le64_to_cpu (error_block_addr); + error_block_addr =le64_to_cpu (error_block_addr); - read_ack_register_addr = start_addr + -ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); + read_ack_register_addr = start_addr + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); -cpu_physical_memory_read (read_ack_register_addr, - &read_ack_register,sizeof (read_ack_register)); +cpu_physical_memory_read (read_ack_register_addr, + &read_ack_register,sizeof (read_ack_register)); -/* zero means OSPM does not acknowledge the error */ -if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); +/* zero means OSPM does not acknowledge the error */ +if (!read_ack_register) { +error_report ("OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); + }else if (error_block_addr) { + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write it to 1 when +* it acknowledges this error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t )); - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else -error_report ("can not find Generic Error Status Block" ); + ret =acpi_ghes_record_mem_error (error_block_addr, + physical_address); + }else { +error_report ("can not find Generic Error Status Block" ); }return ret;
Signature · 1 line
2.47.1
PATCH 3/31 acpi/ghes: simplify the per-arch caller to build HEST table
In reply to Mauro Carvalho ChehabThe GHES driver requires not only a HEST table, but also a separate firmware file to store Error Structure records. It can't do one without the other.
Simplify the caller logic for it to require one function.
No functional changes.
---
Changes from v10:
- Removed the logic which associates notification and source ID. This will be placed on a separate patch.
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- hw/acpi/ghes.c | 7 +++++-- hw/arm/virt-acpi-build.c | 5 ++--- include/hw/acpi/ghes.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-)
hw/acpi/ghes.c +5 -2
@@ -233,7 +233,7 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address,* Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg blobs. * See docs/specs/acpi_hest_ghes.rst for blobs format. */ -void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) +static void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) {int i, error_status_block_offset;
@@ -356,12 +356,15 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) }/* Build Hardware Error Source Table */ -void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +BIOSLinker *linker,const char *oem_id,const char *oem_table_id) {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; +build_ghes_error_table (hardware_errors, linker); +acpi_table_begin (&table, table_data);/* Error Source Count */
hw/arm/virt-acpi-build.c +2 -3
@@ -942,10 +942,9 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_dbg2 (tables_blob, tables->linker, vms);if (vms->ras) { -build_ghes_error_table (tables->hardware_errors, tables->linker);acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->linker, vms->oem_id, - vms->oem_table_id); +acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, + vms->oem_id, vms->oem_table_id); }if (ms->numa_state->num_nodes >0 ) {
include/hw/acpi/ghes.h +2 -2
@@ -68,8 +68,8 @@ typedef struct AcpiGhesState {bool present;/* True if GHES is present at all on this board */ } AcpiGhesState; -void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker); -void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +BIOSLinker *linker,const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);
Signature · 1 line
2.47.1
PATCH 4/31 acpi/ghes: better handle source_id and notification
In reply to Mauro Carvalho ChehabGHES has two fields that are stored on HEST error source blocks associated with notifications:
- notification type, which is a number defined at the ACPI spec containing several arch-specific synchronous and assynchronous types;
- source id, which is a HW/FW defined number, used to distinguish between different implemented sources.
There could be several sources with the same notification type, which is dependent of the way each architecture maps notifications.
Right now, build_ghes_v2() hardcodes a 1:1 mapping between such fields. Move it to two independent parameters, allowing the caller function to fill both.
---
Chenges from v10:
- Some changes got moved to the previous patch.
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- hw/acpi/ghes.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
hw/acpi/ghes.c +9 -14
@@ -284,9 +284,13 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) }/* Build Generic Hardware Error Source version 2 (GHESv2) */ -static void build_ghes_v2 (GArray *table_data,int source_id,BIOSLinker *linker) +static void build_ghes_v2 (GArray *table_data, +BIOSLinker *linker, +enum AcpiGhesNotifyType notify, +uint16_t source_id) {uint64_t address_offset; +/* * Type: * Generic Hardware Error Source version 2(GHESv2 - Type 10)
@@ -316,18 +320,8 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ), ACPI_GHES_ERRORS_FW_CFG_FILE, source_id * sizeof(uint64_t)); -switch (source_id) { -case ACPI_HEST_SRC_ID_SEA : -/* -* Notification Structure -* Now only enable ARMv8 SEA notification type -*/ -build_ghes_hw_error_notification (table_data,ACPI_GHES_NOTIFY_SEA ); -break ; -default : -error_report ("Not support this error source" ); -abort (); - } +/* Notification Structure */ +build_ghes_hw_error_notification (table_data, notify);/* Error Status Block Length */ build_append_int_noprefix (table_data,ACPI_GHES_MAX_RAW_DATA_LENGTH ,4 );
@@ -369,7 +363,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,/* Error Source Count */ build_append_int_noprefix (table_data,ACPI_GHES_ERROR_SOURCE_COUNT ,4 ); -build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker); +build_ghes_v2 (table_data, linker, +ACPI_GHES_NOTIFY_SEA ,ACPI_HEST_SRC_ID_SEA );acpi_table_end (linker, &table); }
Signature · 1 line
2.47.1
PATCH 5/31 acpi/ghes: Fix acpi_ghes_record_errors() argument
In reply to Mauro Carvalho ChehabAlign the header file with the actual implementation of this function, as the first argument is source ID and not notification type.
---
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- include/hw/acpi/ghes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/acpi/ghes.h +1 -1
@@ -73,7 +73,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); -int acpi_ghes_record_errors (uint8_t notify,uint64_t error_physical_addr); +int acpi_ghes_record_errors (uint8_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present
Signature · 1 line
2.47.1
PATCH 6/31 acpi/ghes: Remove a duplicated out of bounds check
In reply to Mauro Carvalho Chehabacpi_ghes_record_errors() has an assert() at the beginning to ensure that source_id will be lower than ACPI_GHES_ERROR_SOURCE_COUNT. Remove a duplicated check.
--- hw/acpi/ghes.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/acpi/ghes.c +1 -3
@@ -404,9 +404,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)return -1 ; } -if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { - start_addr += source_id *sizeof (uint64_t ); - } + start_addr += source_id *sizeof (uint64_t );cpu_physical_memory_read (start_addr, &error_block_addr,sizeof (error_block_addr));
Signature · 1 line
2.47.1
PATCH 7/31 acpi/ghes: Change the type for source_id
In reply to Mauro Carvalho ChehabAs described at: ACPI 6.5 spec at:
18.3.2. ACPI Error Source
In particular at GHES/GHESv2 table:
Table 18.10 Generic Hardware Error Source Structure
HEST source ID is actually a 16-bit value.
--- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 2 +- include/hw/acpi/ghes.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
hw/acpi/ghes-stub.c +1 -1
@@ -11,7 +11,7 @@#include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_record_errors (uint8_t source_id,uint64_t physical_address) +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) {return -1 ; }
hw/acpi/ghes.c +1 -1
@@ -383,7 +383,7 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint8_t source_id,uint64_t physical_address) +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr;
include/hw/acpi/ghes.h +1 -1
@@ -73,7 +73,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); -int acpi_ghes_record_errors (uint8_t source_id,uint64_t error_physical_addr); +int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present
Signature · 1 line
2.47.1
PATCH 8/31 acpi/ghes: don't check if physical_address is not zero
In reply to Mauro Carvalho ChehabThe 'physical_address' value is a faulty page. As such, 0 is as valid as any other value.
--- hw/acpi/ghes.c | 4 ---- 1 file changed, 4 deletions(-)
hw/acpi/ghes.c +0 -4
@@ -400,10 +400,6 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (!physical_address) { -return -1 ; - } - start_addr += source_id *sizeof (uint64_t ); cpu_physical_memory_read(start_addr, &error_block_addr,
Signature · 1 line
2.47.1
PATCH 9/31 acpi/ghes: make the GHES record generation more generic
In reply to Mauro Carvalho ChehabSplit the code into separate functions to allow using the common CPER filling code by different error sources.
The generic code was moved to ghes_record_cper_errors(), and ghes_gen_err_data_uncorrectable_recoverable() now contains only a logic to fill the Generic Error Data part of the record, as described at:
ACPI 6.2: 18.3.2.7.1 Generic Error Data
The remaining code to generate a memory error now belongs to acpi_ghes_record_errors() function.
A further patch will give it a better name.
--- hw/acpi/ghes.c | 121 ++++++++++++++++++++++++----------------- include/hw/acpi/ghes.h | 3 + 2 files changed, 73 insertions(+), 51 deletions(-)
hw/acpi/ghes.c +70 -51
@@ -181,51 +181,24 @@ static void acpi_ghes_build_append_mem_cper(GArray *table,build_append_int_noprefix (table,0 ,7 ); } -static int acpi_ghes_record_mem_error (uint64_t error_block_address, -uint64_t error_physical_addr) +static void +ghes_gen_err_data_uncorrectable_recoverable (GArray *block, +const uint8_t *section_type, +int data_length) { -GArray *block; - -/* Memory Error Section Type */ -const uint8_t uefi_cper_mem_sec[] = -UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ -0xED ,0x7C ,0x83 ,0xB1 ); -/* invalid fru id: ACPI 4.0: 17.3.2.6.1 Generic Error Data, * Table 17-13 Generic Error Data Entry */ QemuUUID fru_id = {}; -uint32_t data_length; - - block =g_array_new (false, true/* clear */ ,1 ); - -/* This is the length if adding a new generic error data entry*/ - data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; -/* -* It should not run out of the preallocated memory if adding a new generic -* error data entry -*/ -assert ((data_length +ACPI_GHES_GESB_SIZE ) <= -ACPI_GHES_MAX_RAW_DATA_LENGTH );/* Build the new generic error status block header */ acpi_ghes_generic_error_status (block,ACPI_GEBS_UNCORRECTABLE ,0 ,0 , data_length,ACPI_CPER_SEV_RECOVERABLE );/* Build this new generic error data entry header */ -acpi_ghes_generic_error_data (block, uefi_cper_mem_sec, +acpi_ghes_generic_error_data (block, section_type,ACPI_CPER_SEV_RECOVERABLE ,0 ,0 ,ACPI_GHES_MEM_CPER_LENGTH , fru_id,0 ); - -/* Build the memory section CPER for above new generic error data entry */ -acpi_ghes_build_append_mem_cper (block, error_physical_addr); - -/* Write the generic error data entry into guest memory */ -cpu_physical_memory_write (error_block_address, block->data, block->len); - -g_array_free (block, true); - -return 0 ; }/*
@@ -383,15 +356,18 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr; -bool ret =-1 ;AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); +if (len >ACPI_GHES_MAX_RAW_DATA_LENGTH ) { +error_setg (errp,"GHES CPER record is too big: %ld" , len); +return ; + } acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));
@@ -406,6 +382,10 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) sizeof(error_block_addr)); error_block_addr =le64_to_cpu (error_block_addr); +if (!error_block_addr) { +error_setg (errp,"can not find Generic Error Status Block" ); +return ; + } read_ack_register_addr = start_addr +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t );
@@ -415,24 +395,63 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)/* zero means OSPM does not acknowledge the error */ if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); - - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else { -error_report ("can not find Generic Error Status Block" ); +error_setg (errp, +"OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); +return ; } -return ret; + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write 1 to this register when +* it acknowledges the error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t )); + +/* Write the generic error data entry into guest memory */ +cpu_physical_memory_write (error_block_addr, cper, len); + +return ; +} + +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +{ +/* Memory Error Section Type */ +const uint8_t guid[] = +UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ +0xED ,0x7C ,0x83 ,0xB1 ); +Error *errp =NULL ; +int data_length; +GArray *block; + + block =g_array_new (false, true/* clear */ ,1 ); + + data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; +/* +* It should not run out of the preallocated memory if adding a new generic +* error data entry +*/ +assert ((data_length +ACPI_GHES_GESB_SIZE ) <= +ACPI_GHES_MAX_RAW_DATA_LENGTH ); + +ghes_gen_err_data_uncorrectable_recoverable (block, guid, + data_length); + +/* Build the memory section CPER for above new generic error data entry */ +acpi_ghes_build_append_mem_cper (block, physical_address); + +/* Report the error */ +ghes_record_cper_errors (block->data, block->len, source_id, &errp); + +g_array_free (block, true); + +if (errp) { +error_report_err (errp); +return -1 ; + } + +return 0 ; }bool acpi_ghes_present (void )
include/hw/acpi/ghes.h +3 -0
@@ -23,6 +23,7 @@#define ACPI_GHES_H #include "hw/acpi/bios-linker-loader.h" +#include "qapi/error.h" /* * Values for Hardware Error Notification Type field
@@ -73,6 +74,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp);int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/**
Signature · 1 line
2.47.1
PATCH 10/31 acpi/ghes: better name GHES memory error function
In reply to Mauro Carvalho ChehabThe current function used to generate GHES data is specific for memory errors. Give a better name for it, as we now have a generic function as well.
--- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 2 +- include/hw/acpi/ghes.h | 4 ++-- target/arm/kvm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
hw/acpi/ghes-stub.c +1 -1
@@ -11,7 +11,7 @@#include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) {return -1 ; }
hw/acpi/ghes.c +1 -1
@@ -415,7 +415,7 @@ void ghes_record_cper_errors(const void *cper, size_t len,return ; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) {/* Memory Error Section Type */ const uint8_t guid[] =
include/hw/acpi/ghes.h +2 -2
@@ -74,15 +74,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t error_physical_addr);void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp); -int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present * * Returns: true if the system has an ACPI GHES table and it is -* safe to call acpi_ghes_record_errors() to record a memory error. +* safe to call acpi_ghes_memory_errors() to record a memory error. */ bool acpi_ghes_present (void );#endif
target/arm/kvm.c +1 -1
@@ -2387,7 +2387,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)*/ if (code ==BUS_MCEERR_AR ) {kvm_cpu_synchronize_state (c); -if (!acpi_ghes_record_errors (ACPI_HEST_SRC_ID_SEA , paddr)) { +if (!acpi_ghes_memory_errors (ACPI_HEST_SRC_ID_SEA , paddr)) {kvm_inject_arm_sea (c); }else {error_report ("failed to record the error" );
Signature · 1 line
2.47.1
PATCH 11/31 acpi/ghes: don't crash QEMU if ghes GED is not found
In reply to Mauro Carvalho ChehabMake error handling within ghes_record_cper_errors() consistent, i.e. instead abort just print a error in case ghes GED is not found.
--- hw/acpi/ghes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +4 -1
@@ -371,7 +371,10 @@ void ghes_record_cper_errors(const void *cper, size_t len, acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL )); -g_assert (acpi_ged_state); +if (!acpi_ged_state) { +error_setg (errp,"Can't find ACPI_GED object" ); +return ; + } ags = &acpi_ged_state->ghes_state; start_addr =le64_to_cpu (ags->ghes_addr_le);
Signature · 1 line
2.47.1
PATCH 12/31 acpi/ghes: rename etc/hardware_error file macros
In reply to Mauro Carvalho ChehabNow that we have also have a file to store HEST data location, which is part of GHES, better name the file where CPER records are stored.
No functional changes.
--- hw/acpi/ghes.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
hw/acpi/ghes.c +23 -15
@@ -28,8 +28,8 @@#include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" -#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" -#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" +#define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors" +#define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr"/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB)
@@ -234,7 +234,7 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT);/* Tell guest firmware to place hardware_errors blob into RAM */ -bios_linker_loader_alloc (linker,ACPI_GHES_ERRORS_FW_CFG_FILE , +bios_linker_loader_alloc (linker,ACPI_HW_ERROR_FW_CFG_FILE , hardware_errors,sizeof (uint64_t ), false);for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) {
@@ -243,17 +243,21 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)* corresponding "Generic Error Status Block" */ bios_linker_loader_add_pointer (linker, -ACPI_GHES_ERRORS_FW_CFG_FILE ,sizeof (uint64_t ) * i, -sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE , - error_status_block_offset + i *ACPI_GHES_MAX_RAW_DATA_LENGTH ); +ACPI_HW_ERROR_FW_CFG_FILE , +sizeof (uint64_t ) * i, +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + error_status_block_offset + + i *ACPI_GHES_MAX_RAW_DATA_LENGTH ); }/* * tell firmware to write hardware_errors GPA into * hardware_errors_addr fw_cfg, once the former has been initialized. */ -bios_linker_loader_write_pointer (linker,ACPI_GHES_DATA_ADDR_FW_CFG_FILE , -0 ,sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE ,0 ); +bios_linker_loader_write_pointer (linker,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,0 , +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE ,0 ); }/* Build Generic Hardware Error Source version 2 (GHESv2) */
@@ -290,8 +294,10 @@ static void build_ghes_v2(GArray *table_data,build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0x40 ,0 ,4 /* QWord access */ ,0 );bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , - address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ), -ACPI_GHES_ERRORS_FW_CFG_FILE , source_id *sizeof (uint64_t )); + address_offset +GAS_ADDR_OFFSET , +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + source_id *sizeof (uint64_t ));/* Notification Structure */ build_ghes_hw_error_notification (table_data, notify);
@@ -308,9 +314,11 @@ static void build_ghes_v2(GArray *table_data,build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0x40 ,0 ,4 /* QWord access */ ,0 );bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , - address_offset +GAS_ADDR_OFFSET , -sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE , - (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) *sizeof (uint64_t )); + address_offset +GAS_ADDR_OFFSET , +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) + *sizeof (uint64_t ));/* * Read Ack Preserve field
@@ -346,11 +354,11 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, GArray *hardware_error) {/* Create a read-only fw_cfg file for GHES */ -fw_cfg_add_file (s,ACPI_GHES_ERRORS_FW_CFG_FILE , hardware_error->data, +fw_cfg_add_file (s,ACPI_HW_ERROR_FW_CFG_FILE , hardware_error->data, hardware_error->len);/* Create a read-write fw_cfg file for Address */ -fw_cfg_add_file_callback (s,ACPI_GHES_DATA_ADDR_FW_CFG_FILE ,NULL ,NULL , +fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->ghes_addr_le),sizeof (ags->ghes_addr_le), false); ags->present = true;
Signature · 1 line
2.47.1
PATCH 13/31 acpi/ghes: better name the offset of the hardware error firmware
In reply to Mauro Carvalho ChehabThe etc/hardware_errors fw_cfg file is where the HEST error source structures store registers pointed by Generic Address Structures, as defined at:
https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html#generic-error-data-entry
and
As the name of the firmware file is hardware_errors, better name the variable where the offset pointing to it will be stored from ghes_error_le to hw_error_le.
No functional changes.
--- hw/acpi/generic_event_device.c | 4 ++-- hw/acpi/ghes.c | 4 ++-- include/hw/acpi/ghes.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
hw/acpi/generic_event_device.c +2 -2
@@ -364,7 +364,7 @@ static const VMStateDescription vmstate_ghes = { .version_id = 1, .minimum_version_id = 1, .fields = (const VMStateField []) { -VMSTATE_UINT64 (ghes_addr_le, AcpiGhesState), +VMSTATE_UINT64 (hw_error_le, AcpiGhesState),VMSTATE_END_OF_LIST () }, };
@@ -372,7 +372,7 @@ static const VMStateDescription vmstate_ghes = {static bool ghes_needed (void *opaque) {AcpiGedState *s = opaque; -return s->ghes_state.ghes_addr_le; +return s->ghes_state.hw_error_le; }static const VMStateDescription vmstate_ghes_state = {
hw/acpi/ghes.c +2 -2
@@ -359,7 +359,7 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,/* Create a read-write fw_cfg file for Address */ fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL , -NULL , &(ags->ghes_addr_le),sizeof (ags->ghes_addr_le), false); +NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); ags->present = true; }
@@ -385,7 +385,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; - start_addr =le64_to_cpu (ags->ghes_addr_le); + start_addr =le64_to_cpu (ags->hw_error_le); start_addr += source_id *sizeof (uint64_t );
include/hw/acpi/ghes.h +1 -1
@@ -65,7 +65,7 @@ enum { };typedef struct AcpiGhesState { -uint64_t ghes_addr_le; +uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ;
Signature · 1 line
2.47.1
PATCH 14/31 acpi/ghes: Prepare to support multiple sources on ghes
In reply to Mauro Carvalho ChehabThe current code is actually dependent on having just one error structure with a single source.
As the number of sources should be arch-dependent, as it will depend on what kind of synchronous/assynchronous notifications will exist, change the logic to dynamically build the table.
Yet, for a proper support, we need to get the number of sources by reading the number from the HEST table. However, bios currently doesn't store a pointer to it.
For now just change the logic at table build time, while enforcing that it will behave like before with a single source ID.
A future patch will add a HEST table bios pointer and change the logic at acpi_ghes_record_errors() to dynamically use the new size.
--- hw/acpi/ghes.c | 43 ++++++++++++++++++++++++++-------------- hw/arm/virt-acpi-build.c | 5 +++++ include/hw/acpi/ghes.h | 21 +++++++++++++------- 3 files changed, 47 insertions(+), 22 deletions(-)
hw/acpi/ghes.c +28 -15
@@ -206,17 +206,26 @@ ghes_gen_err_data_uncorrectable_recoverable(GArray *block,* Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg blobs. * See docs/specs/acpi_hest_ghes.rst for blobs format. */ -static void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) +static void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker, +int num_sources) {int i, error_status_block_offset; +/* +* TODO: Current version supports only one source. +* A further patch will drop this check, after adding a proper migration +* code, as, for the code to work, we need to store a bios pointer to the +* HEST table. +*/ +assert (num_sources ==1 ); +/* Build error_block_address */ -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t )); }/* Build read_ack_register */ -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {/* * Initialize the value of read_ack_register to 1, so GHES can be * writable after (re)boot.
@@ -231,13 +240,13 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)/* Reserve space for Error Status Data Block */ acpi_data_push (hardware_errors, -ACPI_GHES_MAX_RAW_DATA_LENGTH *ACPI_GHES_ERROR_SOURCE_COUNT ); +ACPI_GHES_MAX_RAW_DATA_LENGTH * num_sources);/* Tell guest firmware to place hardware_errors blob into RAM */ bios_linker_loader_alloc (linker,ACPI_HW_ERROR_FW_CFG_FILE , hardware_errors,sizeof (uint64_t ), false); -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {/* * Tell firmware to patch error_block_address entries to point to * corresponding "Generic Error Status Block"
@@ -263,10 +272,12 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)/* Build Generic Hardware Error Source version 2 (GHESv2) */ static void build_ghes_v2 (GArray *table_data,BIOSLinker *linker, -enum AcpiGhesNotifyType notify, -uint16_t source_id) +const AcpiNotificationSourceId *notif_src, +uint16_t index,int num_sources) {uint64_t address_offset; +const uint16_t notify = notif_src->notify; +const uint16_t source_id = notif_src->source_id;/* * Type:
@@ -297,7 +308,7 @@ static void build_ghes_v2(GArray *table_data, address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ),ACPI_HW_ERROR_FW_CFG_FILE , - source_id * sizeof(uint64_t)); + index * sizeof(uint64_t));/* Notification Structure */ build_ghes_hw_error_notification (table_data, notify);
@@ -317,8 +328,7 @@ static void build_ghes_v2(GArray *table_data, address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ),ACPI_HW_ERROR_FW_CFG_FILE , - (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) - * sizeof(uint64_t)); + (num_sources + index) * sizeof(uint64_t));/* * Read Ack Preserve field
@@ -333,19 +343,23 @@ static void build_ghes_v2(GArray *table_data,/* Build Hardware Error Source Table */ void acpi_build_hest (GArray *table_data,GArray *hardware_errors,BIOSLinker *linker, +const AcpiNotificationSourceId *const notif_source, +int num_sources,const char *oem_id,const char *oem_table_id) {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; +int i; -build_ghes_error_table (hardware_errors, linker); +build_ghes_error_table (hardware_errors, linker, num_sources);acpi_table_begin (&table, table_data);/* Error Source Count */ -build_append_int_noprefix (table_data,ACPI_GHES_ERROR_SOURCE_COUNT ,4 ); -build_ghes_v2 (table_data, linker, -ACPI_GHES_NOTIFY_SEA ,ACPI_HEST_SRC_ID_SEA ); +build_append_int_noprefix (table_data, num_sources,4 ); +for (i =0 ; i < num_sources; i++) { +build_ghes_v2 (table_data, linker, ¬if_source[i], i, num_sources); + }acpi_table_end (linker, &table); }
@@ -410,7 +424,6 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -assert (ACPI_GHES_ERROR_SOURCE_COUNT ==1 );get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr);
hw/arm/virt-acpi-build.c +5 -0
@@ -889,6 +889,10 @@ static void acpi_align_size(GArray *blob, unsigned align)g_array_set_size (blob,ROUND_UP (acpi_data_len (blob), align)); } +static const AcpiNotificationSourceId hest_ghes_notify[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -944,6 +948,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {acpi_add_table (table_offsets, tables_blob);acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, + hest_ghes_notify,ARRAY_SIZE (hest_ghes_notify), vms->oem_id, vms->oem_table_id); }
include/hw/acpi/ghes.h +14 -7
@@ -57,20 +57,27 @@ enum AcpiGhesNotifyType { ACPI_GHES_NOTIFY_RESERVED = 12 }; -enum { -ACPI_HEST_SRC_ID_SEA =0 , -/* future ids go here */ - -ACPI_GHES_ERROR_SOURCE_COUNT -}; -typedef struct AcpiGhesState {uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ; +/* +* ID numbers used to fill HEST source ID field +*/ +enum AcpiGhesSourceID { +ACPI_HEST_SRC_ID_SYNC , +}; + +typedef struct AcpiNotificationSourceId { +enum AcpiGhesSourceID source_id; +enum AcpiGhesNotifyType notify; +}AcpiNotificationSourceId ; +void acpi_build_hest (GArray *table_data,GArray *hardware_errors,BIOSLinker *linker, +const AcpiNotificationSourceId *const notif_source, +int num_sources,const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);
Signature · 1 line
2.47.1
PATCH 15/31 acpi/ghes: add a firmware file with HEST address
In reply to Mauro Carvalho ChehabStore HEST table address at GPA, placing its content at hest_addr_le variable.
---
Change from v8:
- hest_addr_lr is now pointing to the error source size and data.
--- hw/acpi/ghes.c | 17 ++++++++++++++++- include/hw/acpi/ghes.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +16 -1
@@ -30,6 +30,7 @@#define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors"#define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" +#define ACPI_HEST_ADDR_FW_CFG_FILE "etc/acpi_table_hest_addr"/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB)
@@ -261,7 +262,7 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, }/* -* tell firmware to write hardware_errors GPA into +* Tell firmware to write hardware_errors GPA into * hardware_errors_addr fw_cfg, once the former has been initialized. */ bios_linker_loader_write_pointer(linker, ACPI_HW_ERROR_ADDR_FW_CFG_FILE, 0,
@@ -355,6 +356,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,acpi_table_begin (&table, table_data); +int hest_offset = table_data->len; +/* Error Source Count */ build_append_int_noprefix (table_data, num_sources,4 );for (i =0 ; i < num_sources; i++) {
@@ -362,6 +365,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, }acpi_table_end (linker, &table); + +/* +* tell firmware to write into GPA the address of HEST via fw_cfg, +* once initialized. +*/ +bios_linker_loader_write_pointer (linker, +ACPI_HEST_ADDR_FW_CFG_FILE ,0 , +sizeof (uint64_t ), +ACPI_BUILD_TABLE_FILE , hest_offset); } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
@@ -375,6 +387,9 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); +fw_cfg_add_file_callback (s,ACPI_HEST_ADDR_FW_CFG_FILE ,NULL ,NULL , +NULL , &(ags->hest_addr_le),sizeof (ags->hest_addr_le), false); + ags->present = true; }
include/hw/acpi/ghes.h +1 -0
@@ -58,6 +58,7 @@ enum AcpiGhesNotifyType { };typedef struct AcpiGhesState { +uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ;
Signature · 1 line
2.47.1
PATCH 16/31 acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabThere are two pointers that are needed during error injection:
1. The start address of the CPER block to be stored;
2. The address of the ack, which needs a reset before next error.
It is preferable to calculate them from the HEST table. This allows checking the source ID, the size of the table and the type of the HEST error block structures.
Yet, keep the old code, as this is needed for migration purposes.
--- hw/acpi/ghes.c | 106 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 10 deletions(-)
hw/acpi/ghes.c +96 -10
@@ -61,6 +61,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, according with the memory layout map at +* docs/specs/acpi_hest_ghes.rst. +*/ + +/* +* ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 +* Table 18-382 Generic Hardware Error Source version 2 (GHESv2) Structure +*/ +#define HEST_GHES_V2_TABLE_SIZE 92 +#define GHES_ACK_OFFSET (64 + GAS_ADDR_OFFSET) + +/* +* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source +* Table 18-380: 'Error Status Address' field +*/ +#define GHES_ERR_ST_ADDR_OFFSET (20 + GAS_ADDR_OFFSET) +/* * Values for error_severity field */
@@ -212,14 +231,6 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, {int i, error_status_block_offset; -/* -* TODO: Current version supports only one source. -* A further patch will drop this check, after adding a proper migration -* code, as, for the code to work, we need to store a bios pointer to the -* HEST table. -*/ -assert (num_sources ==1 ); -/* Build error_block_address */ for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t ));
@@ -419,6 +430,76 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); } +static void get_ghes_source_offsets (uint16_t source_id,uint64_t hest_addr, +uint64_t *cper_addr, +uint64_t *read_ack_start_addr, +Error **errp) +{ +uint64_t hest_err_block_addr, hest_read_ack_addr; +uint64_t err_source_struct, error_block_addr; +uint32_t num_sources, i; + +if (!hest_addr) { +return ; + } + +cpu_physical_memory_read (hest_addr, &num_sources,sizeof (num_sources)); + num_sources =le32_to_cpu (num_sources); + + err_source_struct = hest_addr +sizeof (num_sources); + +/* +* Currently, HEST Error source navigates only for GHESv2 tables +*/ + +for (i =0 ; i < num_sources; i++) { +uint64_t addr = err_source_struct; +uint16_t type, src_id; + +cpu_physical_memory_read (addr, &type,sizeof (type)); + type =le16_to_cpu (type); + +/* For now, we only know the size of GHESv2 table */ +if (type !=ACPI_GHES_SOURCE_GENERIC_ERROR_V2 ) { +error_setg (errp,"HEST: type %d not supported." , type); +return ; + } + +/* Compare CPER source address at the GHESv2 structure */ + addr +=sizeof (type); +cpu_physical_memory_read (addr, &src_id,sizeof (src_id)); + +if (src_id == source_id) { +break ; + } + + err_source_struct +=HEST_GHES_V2_TABLE_SIZE ; + } +if (i == num_sources) { +error_setg (errp,"HEST: Source %d not found." , source_id); +return ; + } + +/* Navigate though table address pointers */ + hest_err_block_addr = err_source_struct +GHES_ERR_ST_ADDR_OFFSET ; + hest_read_ack_addr = err_source_struct +GHES_ACK_OFFSET ; + +cpu_physical_memory_read (hest_err_block_addr, &error_block_addr, +sizeof (error_block_addr)); + + error_block_addr =le64_to_cpu (error_block_addr); + +cpu_physical_memory_read (error_block_addr, cper_addr, +sizeof (*cper_addr)); + + *cper_addr =le64_to_cpu (*cper_addr); + +cpu_physical_memory_read (hest_read_ack_addr, read_ack_start_addr, +sizeof (*read_ack_start_addr)); + + *read_ack_start_addr =le64_to_cpu (*read_ack_start_addr); +} +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -439,8 +520,13 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), - &cper_addr, &read_ack_register_addr); +if (!ags->hest_addr_le) { +get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), + &cper_addr, &read_ack_register_addr); + }else { +get_ghes_source_offsets (source_id,le64_to_cpu (ags->hest_addr_le), + &cper_addr, &read_ack_register_addr, errp); + }if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );
Signature · 1 line
2.47.1
PATCH 17/31 acpi/generic_event_device: Update GHES migration to cover hest addr
In reply to Mauro Carvalho ChehabThe GHES migration logic at GED should now support HEST table location too.
--- hw/acpi/generic_event_device.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
hw/acpi/generic_event_device.c +29 -0
@@ -387,6 +387,34 @@ static const VMStateDescription vmstate_ghes_state = { } }; +static const VMStateDescription vmstate_hest = { + .name ="acpi-hest" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (const VMStateField []) { +VMSTATE_UINT64 (hest_addr_le, AcpiGhesState), +VMSTATE_END_OF_LIST () + }, +}; + +static bool hest_needed (void *opaque) +{ +AcpiGedState *s = opaque; +return s->ghes_state.hest_addr_le; +} + +static const VMStateDescription vmstate_hest_state = { + .name ="acpi-ged/hest" , + .version_id =1 , + .minimum_version_id =1 , + .needed = hest_needed, + .fields = (const VMStateField []) { +VMSTATE_STRUCT (ghes_state, AcpiGedState,1 , + vmstate_hest, AcpiGhesState), +VMSTATE_END_OF_LIST () + } +}; +static const VMStateDescription vmstate_acpi_ged = { .name ="acpi-ged" , .version_id =1 ,
@@ -399,6 +427,7 @@ static const VMStateDescription vmstate_acpi_ged = { &vmstate_memhp_state, &vmstate_cpuhp_state, &vmstate_ghes_state, + &vmstate_hest_state, NULL } };
Signature · 1 line
2.47.1
PATCH 18/31 acpi/generic_event_device: add logic to detect if HEST addr is available
In reply to Mauro Carvalho ChehabCreate a new property (x-has-hest-addr) and use it to detect if the GHES table offsets can be calculated from the HEST address (qemu 9.2 and upper) or via the legacy way via an offset obtained from the hardware_errors firmware file.
--- hw/acpi/generic_event_device.c | 1 + hw/acpi/ghes.c | 24 +++++++++++++++++------- hw/arm/virt-acpi-build.c | 30 ++++++++++++++++++++++++++---- hw/core/machine.c | 2 ++ include/hw/acpi/ghes.h | 1 + 5 files changed, 47 insertions(+), 11 deletions(-)
hw/acpi/generic_event_device.c +1 -0
@@ -318,6 +318,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.hest_lookup, true),DEFINE_PROP_END_OF_LIST (), };
hw/acpi/ghes.c +17 -7
@@ -361,6 +361,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags;int i;build_ghes_error_table (hardware_errors, linker, num_sources);
@@ -381,10 +383,16 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,* tell firmware to write into GPA the address of HEST via fw_cfg, * once initialized. */ -bios_linker_loader_write_pointer (linker, -ACPI_HEST_ADDR_FW_CFG_FILE ,0 , -sizeof (uint64_t ), -ACPI_BUILD_TABLE_FILE , hest_offset); + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); + ags = &acpi_ged_state->ghes_state; +if (ags->hest_lookup) { +bios_linker_loader_write_pointer (linker, +ACPI_HEST_ADDR_FW_CFG_FILE ,0 , +sizeof (uint64_t ), +ACPI_BUILD_TABLE_FILE , hest_offset); + } } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
@@ -398,8 +406,10 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); -fw_cfg_add_file_callback (s,ACPI_HEST_ADDR_FW_CFG_FILE ,NULL ,NULL , -NULL , &(ags->hest_addr_le),sizeof (ags->hest_addr_le), false); +if (ags->hest_lookup) { +fw_cfg_add_file_callback (s,ACPI_HEST_ADDR_FW_CFG_FILE ,NULL ,NULL , +NULL , &(ags->hest_addr_le),sizeof (ags->hest_addr_le), false); + } ags->present = true; }
@@ -520,7 +530,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -if (!ags->hest_addr_le) { +if (!ags->hest_lookup) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else {
hw/arm/virt-acpi-build.c +26 -4
@@ -893,6 +893,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_9_1[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -946,10 +950,28 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_dbg2 (tables_blob, tables->linker, vms);if (vms->ras) { -acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, - hest_ghes_notify,ARRAY_SIZE (hest_ghes_notify), - vms->oem_id, vms->oem_table_id); +AcpiGhesState *ags; +AcpiGedState *acpi_ged_state; + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + +acpi_add_table (table_offsets, tables_blob); + +if (!ags->hest_lookup) { +acpi_build_hest (tables_blob, tables->hardware_errors, + tables->linker, hest_ghes_notify_9_1, +ARRAY_SIZE (hest_ghes_notify_9_1), + vms->oem_id, vms->oem_table_id); + }else { +acpi_build_hest (tables_blob, tables->hardware_errors, + tables->linker, hest_ghes_notify, +ARRAY_SIZE (hest_ghes_notify), + vms->oem_id, vms->oem_table_id); + } + } }if (ms->numa_state->num_nodes >0 ) {
hw/core/machine.c +2 -0
@@ -34,10 +34,12 @@#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-iommu.h" +#include "hw/acpi/generic_event_device.h" #include "audio/audio.h" GlobalProperty hw_compat_9_1[] = { {TYPE_PCI_DEVICE ,"x-pcie-ext-tag" ,"false" }, + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, };const size_t hw_compat_9_1_len =G_N_ELEMENTS (hw_compat_9_1);
include/hw/acpi/ghes.h +1 -0
@@ -61,6 +61,7 @@ typedef struct AcpiGhesState {uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ +bool hest_lookup;/* True if HEST address is present */ } AcpiGhesState;/*
Signature · 1 line
2.47.1
PATCH 19/31 acpi/ghes: add a notifier to notify when error data is ready
In reply to Mauro Carvalho ChehabSome error injection notify methods are async, like GPIO notify. Add a notifier to be used when the error record is ready to be sent to the guest OS.
--- hw/acpi/ghes.c | 5 ++++- include/hw/acpi/ghes.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +4 -1
@@ -510,6 +510,9 @@ static void get_ghes_source_offsets(uint16_t source_id, uint64_t hest_addr, *read_ack_start_addr =le64_to_cpu (*read_ack_start_addr); } +NotifierList acpi_generic_error_notifiers = +NOTIFIER_LIST_INITIALIZER (error_device_notifiers); +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -565,7 +568,7 @@ void ghes_record_cper_errors(const void *cper, size_t len,/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (cper_addr, cper, len); -return ; +notifier_list_notify (&acpi_generic_error_notifiers,NULL ); }int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address)
include/hw/acpi/ghes.h +3 -0
@@ -24,6 +24,9 @@#include "hw/acpi/bios-linker-loader.h" #include "qapi/error.h" +#include "qemu/notify.h" + +extern NotifierList acpi_generic_error_notifiers;/* * Values for Hardware Error Notification Type field
Signature · 1 line
2.47.1
PATCH 20/31 acpi/generic_event_device: add an APEI error device
In reply to Mauro Carvalho ChehabAdds a generic error device to handle generic hardware error events as specified at ACPI 6.5 specification at 18.3.2.7.2:
https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html#event-notification-for-generic-error-sources
using HID PNP0C33.
The PNP0C33 device is used to report hardware errors to the guest via ACPI APEI Generic Hardware Error Source (GHES).
--- hw/acpi/aml-build.c | 10 ++++++++++ hw/acpi/generic_event_device.c | 8 ++++++++ include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/aml-build.h | 2 ++ include/hw/acpi/generic_event_device.h | 1 + 5 files changed, 22 insertions(+)
hw/acpi/aml-build.c +10 -0
@@ -2602,3 +2602,13 @@ Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source)return var; } + +/* ACPI 5.0b: 18.3.2.6.2 Event Notification For Generic Error Sources */ +Aml *aml_error_device (void ) +{ +Aml *dev =aml_device (ACPI_APEI_ERROR_DEVICE ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0C33" ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); + +return dev; +}
hw/acpi/generic_event_device.c +8 -0
@@ -26,6 +26,7 @@ static const uint32_t ged_supported_events[] = {ACPI_GED_PWR_DOWN_EVT ,ACPI_GED_NVDIMM_HOTPLUG_EVT ,ACPI_GED_CPU_HOTPLUG_EVT , + ACPI_GED_ERROR_EVT, };/*
@@ -116,6 +117,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,aml_notify (aml_name (ACPI_POWER_BUTTON_DEVICE ), aml_int(0x80)));break ; +case ACPI_GED_ERROR_EVT : +aml_append (if_ctx, +aml_notify (aml_name (ACPI_APEI_ERROR_DEVICE ), +aml_int (0x80 ))); +break ;case ACPI_GED_NVDIMM_HOTPLUG_EVT : aml_append(if_ctx, aml_notify(aml_name("\\_SB.NVDR"),
@@ -295,6 +301,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) sel =ACPI_GED_MEM_HOTPLUG_EVT ; }else if (ev &ACPI_POWER_DOWN_STATUS ) { sel =ACPI_GED_PWR_DOWN_EVT ; + }else if (ev &ACPI_GENERIC_ERROR ) { + sel =ACPI_GED_ERROR_EVT ; }else if (ev &ACPI_NVDIMM_HOTPLUG_STATUS ) { sel =ACPI_GED_NVDIMM_HOTPLUG_EVT ; }else if (ev &ACPI_CPU_HOTPLUG_STATUS ) {
include/hw/acpi/acpi_dev_interface.h +1 -0
@@ -13,6 +13,7 @@ typedef enum {ACPI_NVDIMM_HOTPLUG_STATUS =16 ,ACPI_VMGENID_CHANGE_STATUS =32 ,ACPI_POWER_DOWN_STATUS =64 , +ACPI_GENERIC_ERROR =128 , } AcpiEventStatusBits;#define TYPE_ACPI_DEVICE_IF "acpi-device-interface"
include/hw/acpi/aml-build.h +2 -0
@@ -252,6 +252,7 @@ struct CrsRangeSet {/* Consumer/Producer */ #define AML_SERIAL_BUS_FLAG_CONSUME_ONLY (1 << 1) +#define ACPI_APEI_ERROR_DEVICE "GEDD"/** * init_aml_allocator: *
@@ -382,6 +383,7 @@ Aml *aml_dma(AmlDmaType typ, AmlDmaBusMaster bm, AmlTransferSize sz, uint8_t channel);Aml *aml_sleep (uint64_t msec);Aml *aml_i2c_serial_bus_device (uint16_t address,const char *resource_source); +Aml *aml_error_device (void );/* Block AML object primitives */ Aml *aml_scope (const char *name_format, ...)G_GNUC_PRINTF (1 ,2 );
include/hw/acpi/generic_event_device.h +1 -0
@@ -101,6 +101,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_ERROR_EVT 0x10 typedef struct GEDState { MemoryRegion evt;
Signature · 1 line
2.47.1
PATCH 21/31 arm/virt: Wire up a GED error device for ACPI / GHES
In reply to Mauro Carvalho ChehabAdds support to ARM virtualization to allow handling generic error ACPI Event via GED & error source device.
It is aligned with Linux Kernel patch:
https://lore.kernel.org/lkml/[email protected]/
---
Changes from v8:
- Added a call to the function that produces GHES generic records, as this is now added earlier in this series.
--- hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 12 +++++++++++- include/hw/arm/virt.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +1 -0
@@ -857,6 +857,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +aml_append (scope,aml_error_device ());#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif
hw/arm/virt.c +11 -1
@@ -678,7 +678,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);int irq = vms->irqmap[VIRT_ACPI_GED ]; -uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +uint32_t event =ACPI_GED_PWR_DOWN_EVT |ACPI_GED_ERROR_EVT ;if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;
@@ -1010,6 +1010,13 @@ static void virt_powerdown_req(Notifier *n, void *opaque) } } +static void virt_generic_error_req (Notifier *n,void *opaque) +{ +VirtMachineState *s =container_of (n, VirtMachineState, generic_error_notifier); + +acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR ); +} +static void create_gpio_keys (char *fdt,DeviceState *pl061_dev,uint32_t phandle) {
@@ -2403,6 +2410,9 @@ static void machvirt_init(MachineState *machine)if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms); + vms->generic_error_notifier.notify = virt_generic_error_req; +notifier_list_add (&acpi_generic_error_notifiers, + &vms->generic_error_notifier); }else {create_gpio_devices (vms,VIRT_GPIO , sysmem); }
include/hw/arm/virt.h +1 -0
@@ -176,6 +176,7 @@ struct VirtMachineState {DeviceState *gic;DeviceState *acpi_dev;Notifier powerdown_notifier; +Notifier generic_error_notifier;PCIBus *bus;char *oem_id;char *oem_table_id;
Signature · 1 line
2.47.1
PATCH 22/31 qapi/acpi-hest: add an interface to do generic CPER error injection
In reply to Mauro Carvalho ChehabCreates a QMP command to be used for generic ACPI APEI hardware error injection (HEST) via GHESv2, and add support for it for ARM guests.
Error injection uses ACPI_HEST_SRC_ID_QMP source ID to be platform independent. This is mapped at arch virt bindings, depending on the types supported by QEMU and by the BIOS. So, on ARM, this is supported via ACPI_GHES_NOTIFY_GPIO notification type.
This patch is co-authored:
- original ghes logic to inject a simple ARM record by Shiju Jose;
- generic logic to handle block addresses by Jonathan Cameron;
- generic GHESv2 error inject by Mauro Carvalho Chehab;
---
Changes since v9:
- ARM source IDs renamed to reflect SYNC/ASYNC;
- command name changed to better reflect what it does;
- some improvements at JSON documentation;
- add a check for QMP source at the notification logic.
--- MAINTAINERS | 7 +++++++ hw/acpi/Kconfig | 5 +++++ hw/acpi/ghes.c | 2 +- hw/acpi/ghes_cper.c | 32 ++++++++++++++++++++++++++++++++ hw/acpi/ghes_cper_stub.c | 19 +++++++++++++++++++ hw/acpi/meson.build | 2 ++ hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 7 +++++++ include/hw/acpi/ghes.h | 1 + include/hw/arm/virt.h | 1 + qapi/acpi-hest.json | 35 +++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 13 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 hw/acpi/ghes_cper_stub.c create mode 100644 qapi/acpi-hest.json
MAINTAINERS +7 -0
@@ -2055,6 +2055,13 @@ F: hw/acpi/ghes.c F: include/hw/acpi/ghes.h F: docs/specs/acpi_hest_ghes.rst +ACPI/HEST/GHES/ARM processor CPER +R: Mauro Carvalho Chehab <[email protected]> +S: Maintained +F: hw/arm/ghes_cper.c +F: hw/acpi/ghes_cper_stub.c +F: qapi/acpi-hest.json + ppc4xx L: [email protected] S: Orphan
hw/acpi/Kconfig +5 -0
@@ -51,6 +51,11 @@ config ACPI_APEI bool depends on ACPI +config GHES_CPER + bool + depends on ACPI_APEI + default y + config ACPI_PCI bool depends on ACPI && PCI
hw/acpi/ghes.c +1 -1
@@ -568,7 +568,7 @@ void ghes_record_cper_errors(const void *cper, size_t len,/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (cper_addr, cper, len); -notifier_list_notify (&acpi_generic_error_notifiers,NULL ); +notifier_list_notify (&acpi_generic_error_notifiers, &source_id); }int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address)
hw/acpi/ghes_cper.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* CPER payload parser for error injection +* +* Copyright(C) 2024 Huawei LTD. +* +* This code is licensed under the GPL version 2 or later. See the +* COPYING file in the top-level directory. +* +*/ + +#include "qemu/osdep.h" + +#include "qemu/base64.h" +#include "qemu/error-report.h" +#include "qemu/uuid.h" +#include "qapi/qapi-commands-acpi-hest.h" +#include "hw/acpi/ghes.h" + +void qmp_inject_ghes_error (const char *qmp_cper,Error **errp) +{ + +uint8_t *cper; +size_t len; + + cper =qbase64_decode (qmp_cper,-1 , &len, errp); +if (!cper) { +error_setg (errp,"missing GHES CPER payload" ); +return ; + } + +ghes_record_cper_errors (cper, len,ACPI_HEST_SRC_ID_QMP , errp); +}
hw/acpi/ghes_cper_stub.c new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Stub interface for CPER payload parser for error injection +* +* Copyright(C) 2024 Huawei LTD. +* +* This code is licensed under the GPL version 2 or later. See the +* COPYING file in the top-level directory. +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-acpi-hest.h" +#include "hw/acpi/ghes.h" + +void qmp_inject_ghes_error (const char *cper,Error **errp) +{ +error_setg (errp,"GHES QMP error inject is not compiled in" ); +}
hw/acpi/meson.build +2 -0
@@ -33,4 +33,6 @@ endif system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c')) system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c')) system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) +system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c')) +system_ss.add(when: 'CONFIG_GHES_CPER', if_false: files('ghes_cper_stub.c')) system_ss.add(files('acpi-qmp-cmds.c'))
hw/arm/virt-acpi-build.c +1 -0
@@ -892,6 +892,7 @@ static void acpi_align_size(GArray *blob, unsigned align)static const AcpiNotificationSourceId hest_ghes_notify[] = { {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, + {ACPI_HEST_SRC_ID_QMP ,ACPI_GHES_NOTIFY_GPIO }, };static const AcpiNotificationSourceId hest_ghes_notify_9_1[] = {
hw/arm/virt.c +7 -0
@@ -1012,6 +1012,13 @@ static void virt_powerdown_req(Notifier *n, void *opaque)static void virt_generic_error_req (Notifier *n,void *opaque) { +uint16_t *source_id = opaque; + +/* Currently, only QMP source ID is async */ +if (*source_id !=ACPI_HEST_SRC_ID_QMP ) { +return ; + } +VirtMachineState *s =container_of (n, VirtMachineState, generic_error_notifier);acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR );
include/hw/acpi/ghes.h +1 -0
@@ -72,6 +72,7 @@ typedef struct AcpiGhesState {*/ enum AcpiGhesSourceID {ACPI_HEST_SRC_ID_SYNC , +ACPI_HEST_SRC_ID_QMP ,/* Use it only for QMP injected errors */ }; typedef struct AcpiNotificationSourceId {
include/hw/arm/virt.h +1 -0
@@ -33,6 +33,7 @@#include "exec/hwaddr.h" #include "qemu/notify.h" #include "hw/boards.h" +#include "hw/acpi/ghes.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h"
qapi/acpi-hest.json new file +35 -0
@@ -0,0 +1,35 @@ +# -*- Mode: Python -*- +# vim: filetype=python + +## +# == GHESv2 CPER Error Injection +# +# Defined since ACPI Specification 6.1, +# section 18.3.2.8 Generic Hardware Error Source version 2. See: +# +# https://uefi.org/sites/default/files/resources/ACPI_6_1.pdf +## + + +## +# @inject-ghes-error: +# +# Inject an error with additional ACPI 6.1 GHESv2 error information +# +# @cper: contains a base64 encoded string with raw data for a single +# CPER record with Generic Error Status Block, Generic Error Data +# Entry and generic error data payload, as described at +# https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#format +# +# Features: +# +# @unstable: This command is experimental. +# +# Since: 9.2 +## +{ 'command': 'inject-ghes-error', + 'data': { + 'cper': 'str' + }, + 'features': [ 'unstable' ] +}
qapi/meson.build +1 -0
@@ -59,6 +59,7 @@ qapi_all_modules = [ if have_system qapi_all_modules += [ 'acpi', + 'acpi-hest', 'audio', 'cryptodev', 'qdev',
qapi/qapi-schema.json +1 -0
@@ -75,6 +75,7 @@ { 'include': 'misc-target.json' } { 'include': 'audio.json' } { 'include': 'acpi.json' } +{ 'include': 'acpi-hest.json' } { 'include': 'pci.json' } { 'include': 'stats.json' } { 'include': 'virtio.json' }
Signature · 1 line
2.47.1
PATCH 23/31 scripts/ghes_inject: add a script to generate GHES error inject
In reply to Mauro Carvalho ChehabUsing the QMP GHESv2 API requires preparing a raw data array containing a CPER record.
Add a helper script with subcommands to prepare such data.
Currently, only ARM Processor error CPER record is supported.
--- MAINTAINERS | 3 + scripts/arm_processor_error.py | 377 ++++++++++++++++++ scripts/ghes_inject.py | 51 +++ scripts/qmp_helper.py | 702 +++++++++++++++++++++++++++++++++ 4 files changed, 1133 insertions(+) create mode 100644 scripts/arm_processor_error.py create mode 100755 scripts/ghes_inject.py create mode 100644 scripts/qmp_helper.py
MAINTAINERS +3 -0
@@ -2061,6 +2061,9 @@ S: Maintained F: hw/arm/ghes_cper.c F: hw/acpi/ghes_cper_stub.c F: qapi/acpi-hest.json +F: scripts/ghes_inject.py +F: scripts/arm_processor_error.py +F: scripts/qmp_helper.py ppc4xx L: [email protected]
scripts/arm_processor_error.py new file +377 -0
377 lines not on this page · raw message
scripts/ghes_inject.py new file +51 -0
51 lines not on this page · raw message
scripts/qmp_helper.py new file +702 -0
702 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH 24/31 target/arm: add an experimental mpidr arm cpu property object
In reply to Mauro Carvalho ChehabAccurately injecting an ARM Processor error ACPI/APEI GHES error record requires the value of the ARM Multiprocessor Affinity Register (mpidr).
While ARM implements it, this is currently not visible.
Add a field at CPU storing it, and place it at arm_cpu_properties as experimental, thus allowing it to be queried via QMP using qom-get function.
--- target/arm/cpu.c | 1 + target/arm/cpu.h | 1 + target/arm/helper.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 2 deletions(-)
target/arm/cpu.c +1 -0
@@ -2636,6 +2636,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)static Property arm_cpu_properties[] = {DEFINE_PROP_UINT64 ("midr" ,ARMCPU , midr,0 ), +DEFINE_PROP_UINT64 ("x-mpidr" ,ARMCPU , mpidr,0 ),DEFINE_PROP_UINT64 ("mp-affinity" ,ARMCPU , mp_affinity,ARM64_AFFINITY_INVALID ),DEFINE_PROP_INT32 ("node-id" ,ARMCPU , node_id,CPU_UNSET_NUMA_NODE_ID ),
target/arm/cpu.h +1 -0
@@ -1035,6 +1035,7 @@ struct ArchCPU {uint64_t reset_pmcr_el0; } isar;uint64_t midr; +uint64_t mpidr;uint32_t revidr;uint32_t reset_fpsid;uint64_t ctr;
target/arm/helper.c +8 -2
@@ -4700,7 +4700,7 @@ static uint64_t mpidr_read_val(CPUARMState *env)return mpidr; } -static uint64_t mpidr_read (CPUARMState *env,const ARMCPRegInfo *ri) +static uint64_t mpidr_read (CPUARMState *env) {unsigned int cur_el =arm_current_el (env);
@@ -4710,6 +4710,11 @@ static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)return mpidr_read_val (env); } +static uint64_t mpidr_read_ri (CPUARMState *env,const ARMCPRegInfo *ri) +{ +return mpidr_read (env); +} +static const ARMCPRegInfo lpae_cp_reginfo[] = {/* NOP AMAIR0/1 */ { .name ="AMAIR0" , .state =ARM_CP_STATE_BOTH ,
@@ -9741,7 +9746,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) { .name = "MPIDR_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 5, .fgt = FGT_MPIDR_EL1, - .access = PL1_R, .readfn = mpidr_read, .type = ARM_CP_NO_RAW }, + .access = PL1_R, .readfn = mpidr_read_ri, .type = ARM_CP_NO_RAW }, };#ifdef CONFIG_USER_ONLY static const ARMCPRegUserSpaceInfo mpidr_user_cp_reginfo[] = {
@@ -9751,6 +9756,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)modify_arm_cp_regs (mpidr_cp_reginfo, mpidr_user_cp_reginfo);#endif define_arm_cp_regs (cpu, mpidr_cp_reginfo); + cpu->mpidr =mpidr_read (env); }if (arm_feature (env,ARM_FEATURE_AUXCR )) {
Signature · 1 line
2.47.1
PATCH 25/31 scripts/arm_processor_error.py: retrieve mpidr if not filled
In reply to Mauro Carvalho ChehabAdd support to retrieve mpidr value via qom-get.
--- scripts/arm_processor_error.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
scripts/arm_processor_error.py +21 -8
@@ -5,12 +5,10 @@ # # Copyright (C) 2024 Mauro Carvalho Chehab <[email protected]> -# TODO: current implementation has dummy defaults. -# -# For a better implementation, a QMP addition/call is needed to -# retrieve some data for ARM Processor Error injection: -# -# - ARM registers: power_state, mpidr. +# Note: currently it lacks a method to fill the ARM Processor Error CPER +# psci field from emulation. On a real hardware, this is filled only +# when a CPU is not running. Implementing support for it to simulate a +# real hardware is not trivial. import argparse import re
@@ -174,11 +172,26 @@ def send_cper(self, args): else: cper["running-state"] = 0 + if args.mpidr: + cper["mpidr-el1"] = arg["mpidr"] + elif cpus: + cmd_arg = { + 'path': cpus[0], + 'property': "x-mpidr" + } + ret = qmp_cmd.send_cmd("qom-get", cmd_arg, may_open=True) + if isinstance(ret, int): + cper["mpidr-el1"] = ret + else: + cper["mpidr-el1"] = 0 + else: + cper["mpidr-el1"] = 0 + if arm_valid_init: if args.affinity: cper["valid"] |= self.arm_valid_bits["affinity"] - if args.mpidr: + if "mpidr-el1" in cper: cper["valid"] |= self.arm_valid_bits["mpidr"] if "running-state" in cper:
@@ -362,7 +375,7 @@ def send_cper(self, args): if isinstance(ret, int): arg["midr-el1"] = ret - util.data_add(data, arg.get("mpidr-el1", 0), 8) + util.data_add(data, cper["mpidr-el1"], 8) util.data_add(data, arg.get("midr-el1", 0), 8) util.data_add(data, cper["running-state"], 4) util.data_add(data, arg.get("psci-state", 0), 4)
Signature · 1 line
2.47.1
PATCH 26/31 acpi/ghes: move offset calculus to a separate function
In reply to Mauro Carvalho ChehabCurrently, CPER address location is calculated as an offset of the hardware_errors table. It is also badly named, as the offset actually used is the address where the CPER data starts, and not the beginning of the error source.
Move the logic which calculates such offset to a separate function, in preparation for a patch that will be changing the logic to calculate it from the HEST table.
While here, properly name the variable which stores the cper address.
--- hw/acpi/ghes.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
hw/acpi/ghes.c +31 -9
@@ -364,10 +364,37 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } +static void get_hw_error_offsets (uint64_t ghes_addr, +uint64_t *cper_addr, +uint64_t *read_ack_register_addr) +{ +if (!ghes_addr) { +return ; + } + +/* +* non-HEST version supports only one source, so no need to change +* the start offset based on the source ID. Also, we can't validate +* the source ID, as it is stored inside the HEST table. +*/ + +cpu_physical_memory_read (ghes_addr, cper_addr, +sizeof (*cper_addr)); + + *cper_addr =le64_to_cpu (*cper_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 ); +} +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) { -uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ; +uint64_t cper_addr =0 , read_ack_register_addr =0 , read_ack_register;uint64_t start_addr;AcpiGedState *acpi_ged_state;AcpiGhesState *ags;
@@ -389,18 +416,13 @@ void ghes_record_cper_errors(const void *cper, size_t len, start_addr += source_id *sizeof (uint64_t ); -cpu_physical_memory_read (start_addr, &error_block_addr, -sizeof (error_block_addr)); +get_hw_error_offsets (start_addr, &cper_addr, &read_ack_register_addr); - error_block_addr =le64_to_cpu (error_block_addr); -if (!error_block_addr) { +if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );return ; } - read_ack_register_addr = start_addr + -ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); -cpu_physical_memory_read (read_ack_register_addr, &read_ack_register,sizeof (read_ack_register));
@@ -421,7 +443,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, &read_ack_register, sizeof(uint64_t));/* Write the generic error data entry into guest memory */ -cpu_physical_memory_write (error_block_addr, cper, len); +cpu_physical_memory_write (cper_addr, cper, len);return ; }
Signature · 1 line
2.47.1
PATCH 27/31 DEBUG
In reply to Mauro Carvalho Chehab--- hw/acpi/ghes.c | 2 ++ 1 file changed, 2 insertions(+)
hw/acpi/ghes.c +2 -0
@@ -534,9 +534,11 @@ void ghes_record_cper_errors(const void *cper, size_t len, ags = &acpi_ged_state->ghes_state;if (!ags->hest_lookup) { +fprintf (stderr,"Using old GHES lookup\n" );get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else { +fprintf (stderr,"Using new HEST lookup\n" );get_ghes_source_offsets (source_id,le64_to_cpu (ags->hest_addr_le), &cper_addr, &read_ack_register_addr, errp); }
Signature · 1 line
2.47.1
Re: [PATCH 27/31] DEBUG
Quoted 11 lines · Mauro Carvalho Chehab
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 2 ++ 1 file changed, 2 insertions(+)hw/acpi/ghes.c +0
-0
hw/acpi/ghes.c void ghes_record_cper_errors(const void *cper, size_t len, · line 537
Quoted 4 lines
hw/acpi/ghes.c +1
-0@@ -534,9 +534,11 @@ void ghes_record_cper_errors(const void *cper, size_t len, ags = &acpi_ged_state->ghes_state;if (!ags->hest_lookup) { +fprintf (stderr,"Using old GHES lookup\n" );
I don't like this. If you must please have them under #ifdef DEBUG or somesuch. See ich9.c
Quoted 10 lines
hw/acpi/ghes.c +1
-1get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else { +fprintf (stderr,"Using new HEST lookup\n" );get_ghes_source_offsets (source_id,le64_to_cpu (ags->hest_addr_le), &cper_addr, &read_ack_register_addr, errp); } --2.47.1
Re: [PATCH 27/31] DEBUG
Quoted 15 lines · Ani Sinha
Quoted 13 lines · Mauro Carvalho Chehab
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 2 ++ 1 file changed, 2 insertions(+)hw/acpi/ghes.c +0
-0@@ -534,9 +534,11 @@ void ghes_record_cper_errors(const void *cper, size_t len, ags = &acpi_ged_state->ghes_state;
Quoted 5 lines
hw/acpi/ghes.c void ghes_record_cper_errors(const void *cper, size_t len, · line 537
Quoted 2 lines
hw/acpi/ghes.c +1
-0if (!ags->hest_lookup) { +fprintf (stderr,"Using old GHES lookup\n" );I don't like this. If you must please have them under #ifdef DEBUG or somesuch. See
ich9.c
Judging from the subject line, it's not meant to be posted, let alone merged :)
Quoted 10 lines
Quoted 10 lines
hw/acpi/ghes.c +1
-1get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else { +fprintf (stderr,"Using new HEST lookup\n" );get_ghes_source_offsets (source_id,le64_to_cpu (ags->hest_addr_le), &cper_addr, &read_ack_register_addr, errp); } --2.47.1
Re: [PATCH 27/31] DEBUG
Em Sat, 07 Dec 2024 07:16:31 +0100
Markus Armbruster <[email protected]> escreveu:
Quoted 17 lines
Quoted 15 lines · Ani Sinha
Quoted 13 lines · Mauro Carvalho Chehab
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 2 ++ 1 file changed, 2 insertions(+)hw/acpi/ghes.c +0
-0@@ -534,9 +534,11 @@ void ghes_record_cper_errors(const void *cper, size_t len, ags = &acpi_ged_state->ghes_state;
Quoted 8 lines
Quoted 5 lines
hw/acpi/ghes.c void ghes_record_cper_errors(const void *cper, size_t len, · line 537
Quoted 2 lines
hw/acpi/ghes.c +1
-0if (!ags->hest_lookup) { +fprintf (stderr,"Using old GHES lookup\n" );I don't like this. If you must please have them under #ifdef DEBUG or somesuch. See
ich9.cJudging from the subject line, it's not meant to be posted, let alone merged :)
Sorry! Yea, this was not meant to be posted.
I ended submitting the entire pile of patches I have pending, including some patches I placed at the end to test that what method is used to calculate offsets (the one supported up to current QEMU version, which is limted, and the new one that uses backport logic).
I'll submit the right patches again. Please ignore this.
Regards,
Mauro
PATCH 28/31 acpi/ghes: Change ghes fill logic to work with only one source
In reply to Mauro Carvalho ChehabExtending 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.
--- hw/acpi/ghes.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
hw/acpi/ghes.c +4 -8
@@ -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);if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );
Signature · 1 line
2.47.1
PATCH 29/31 HACK: use GPIO as source ID for virt-9.1 machines
In reply to Mauro Carvalho ChehabThis reverts commit 692373fc8838a6450ff5b5a8708646a673b693dd.
--- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +1 -1
@@ -896,7 +896,7 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { };static const AcpiNotificationSourceId hest_ghes_notify_9_1[] = { - {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, + {ACPI_HEST_SRC_ID_QMP ,ACPI_GHES_NOTIFY_GPIO }, }; static
Signature · 1 line
2.47.1
PATCH 30/31 docs: acpi_hest_ghes: fix documentation for CPER size
In reply to Mauro Carvalho ChehabWhile the spec defines a CPER size of 4KiB for each record, currently it is set to 1KiB. Fix the documentation and add a pointer to the macro name there, as this may help to keep it updated.
--- docs/specs/acpi_hest_ghes.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
docs/specs/acpi_hest_ghes.rst +4 -2
@@ -67,8 +67,10 @@ Design Details (3) The address registers table contains N Error Block Address entries and N Read Ack Register entries. The size for each entry is 8-byte. The Error Status Data Block table contains N Error Status Data Block - entries. The size for each entry is 4096(0x1000) bytes. The total size - for the "etc/hardware_errors" fw_cfg blob is (N * 8 * 2 + N * 4096) bytes. + entries. The size for each entry is defined at the source code as + ACPI_GHES_MAX_RAW_DATA_LENGTH (currently 1024 bytes). The total size + for the "etc/hardware_errors" fw_cfg blob is + (N * 8 * 2 + N * ACPI_GHES_MAX_RAW_DATA_LENGTH) bytes. N is the number of the kinds of hardware error sources. (4) QEMU generates the ACPI linker/loader script for the firmware. The
Signature · 1 line
2.47.1
PATCH 31/31 FIXME: acpi/ghes: properly set data record size
In reply to Mauro Carvalho Chehab--- hw/acpi/ghes.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
hw/acpi/ghes.c +7 -10
@@ -211,6 +211,12 @@ ghes_gen_err_data_uncorrectable_recoverable(GArray *block,*/ QemuUUID fru_id = {}; +/* +* Calculate the size with this block. No need to check for +* too big CPER, as CPER size is checked at ghes_record_cper_errors() +*/ + data_length +=ACPI_GHES_GESB_SIZE ; +/* Build the new generic error status block header */ acpi_ghes_generic_error_status (block,ACPI_GEBS_UNCORRECTABLE ,0 ,0 , data_length,ACPI_CPER_SEV_RECOVERABLE );
@@ -580,21 +586,12 @@ int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \0xED ,0x7C ,0x83 ,0xB1 );Error *errp =NULL ; -int data_length;GArray *block; block =g_array_new (false, true/* clear */ ,1 ); - data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; -/* -* It should not run out of the preallocated memory if adding a new generic -* error data entry -*/ -assert ((data_length +ACPI_GHES_GESB_SIZE ) <= -ACPI_GHES_MAX_RAW_DATA_LENGTH ); -ghes_gen_err_data_uncorrectable_recoverable (block, guid, - data_length); +ACPI_GHES_MAX_RAW_DATA_LENGTH );/* Build the memory section CPER for above new generic error data entry */ acpi_ghes_build_append_mem_cper (block, physical_address);
Signature · 1 line
2.47.1
Re: [PATCH 31/31] FIXME: acpi/ghes: properly set data record size
Another subject line that suggests this isn't fully baked. Respin to reduce confusion?
Re: [PATCH 31/31] FIXME: acpi/ghes: properly set data record size
Em Sat, 07 Dec 2024 07:17:42 +0100
Markus Armbruster <[email protected]> escreveu:
Quoted 2 lines
Another subject line that suggests this isn't fully baked. Respin to reduce confusion?
The last 3 patches on this series were purely to debug some things, and aren't meant to be submitted. This particular one is just a potential future cleanup. The FIXME there is just to remind me that I would need to double check it, and provide a better description when submitting it again.
Thanks,
Mauro
This is v10, right?
Quoted 1 line · Markus Armbruster
This is v10, right?
Scratch that, the cover letter explains: "As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches."
However, it doesn't apply for me. What's your base?
Em Sat, 07 Dec 2024 07:15:19 +0100
Markus Armbruster <[email protected]> escreveu:
Quoted 8 lines
Quoted 1 line · Markus Armbruster
This is v10, right?
Scratch that, the cover letter explains: "As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches."
Please scratch this series. It seems I picked the wrong git range, sending a lot more patches than intended.
Quoted 1 line
However, it doesn't apply for me. What's your base?
That's weird. Despite my mistake, the series is based on v9.2.0-rc3 (which was identical to master last time I rebased).
Should it be based against some other branch?
Thanks,
Mauro
Mauro Carvalho Chehab <[email protected]> writes:
[...]
Quoted 4 lines
Quoted 1 line
However, it doesn't apply for me. What's your base?
That's weird. Despite my mistake, the series is based on v9.2.0-rc3 (which was identical to master last time I rebased).
Either something conflicting got committed meanwhile, or I screwed up somehow.
Quoted 1 line
Should it be based against some other branch?
No, master is fine.