Add ACPI CPER firmware first error injection for Arm Processor
PATCH 1/6 arm/virt: Wire up GPIO error source for ACPI / GHES
In reply to Mauro Carvalho ChehabFrom: Jonathan Cameron <[email protected]>
Creates a GED - Generic Event Device and set a GPIO to be used or error injection.
--- hw/arm/virt-acpi-build.c | 29 +++++++++++++++++++++++++---- hw/arm/virt.c | 12 +++++++++++- include/hw/boards.h | 1 + 3 files changed, 37 insertions(+), 5 deletions(-)
hw/arm/virt-acpi-build.c +25 -4
@@ -63,6 +63,7 @@#define ARM_SPI_BASE 32 +#define ACPI_GENERIC_EVENT_DEVICE "GEDD"#define ACPI_BUILD_TABLE_SIZE 0x20000static void acpi_dsdt_add_cpus (Aml *scope,VirtMachineState *vms)
@@ -155,9 +156,14 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,Aml *aei =aml_resource_template ();/* Pin 3 for power button */ -const uint32_t pin_list[1 ] = {3 }; +uint32_t pin =3 ;aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , -AML_EXCLUSIVE ,AML_PULL_UP ,0 , pin_list,1 , +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 , +"GPO0" ,NULL ,0 )); + pin =6 ; +/* Pin 8 for generic error */ +aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 ,"GPO0" ,NULL ,0 ));aml_append (dev,aml_name_decl ("_AEI" , aei));
@@ -166,6 +172,11 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,aml_append (method,aml_notify (aml_name (ACPI_POWER_BUTTON_DEVICE ),aml_int (0x80 )));aml_append (dev, method); + method =aml_method ("_E06" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_notify (aml_name (ACPI_GENERIC_EVENT_DEVICE ), +aml_int (0x80 ))); +aml_append (dev, method); +aml_append (scope, dev); }
@@ -800,6 +811,15 @@ static void build_fadt_rev6(GArray *table_data, BIOSLinker *linker,build_fadt (table_data, linker, &fadt, vms->oem_id, vms->oem_table_id); } +static void acpi_dsdt_add_generic_event_device (Aml *scope) +{ +Aml *dev =aml_device (ACPI_GENERIC_EVENT_DEVICE ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0C33" ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); +aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xF ))); +aml_append (scope, dev); +} +/* DSDT */ static void build_dsdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)
@@ -842,9 +862,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) irqmap[VIRT_ACPI_GED ] +ARM_SPI_BASE ,AML_SYSTEM_MEMORY , memmap[VIRT_ACPI_GED].base); }else { -acpi_dsdt_add_gpio (scope, &memmap[VIRT_GPIO ], - (irqmap[VIRT_GPIO ] +ARM_SPI_BASE )); } +acpi_dsdt_add_gpio (scope, &memmap[VIRT_GPIO ], + (irqmap[VIRT_GPIO ] +ARM_SPI_BASE ));if (vms->acpi_dev) { uint32_t event = object_property_get_uint(OBJECT(vms->acpi_dev),
@@ -858,6 +878,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +acpi_dsdt_add_generic_event_device (scope);#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif
hw/arm/virt.c +11 -1
@@ -997,6 +997,13 @@ static void create_rtc(const VirtMachineState *vms) }static DeviceState *gpio_key_dev; + +static DeviceState *gpio_error_dev; +static void virt_set_error (void ) +{ +qemu_set_irq (qdev_get_gpio_in (gpio_error_dev,0 ),1 ); +} +static void virt_powerdown_req (Notifier *n,void *opaque) {VirtMachineState *s =container_of (n, VirtMachineState, powerdown_notifier);
@@ -1014,6 +1021,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, { gpio_key_dev =sysbus_create_simple ("gpio-key" ,-1 ,qdev_get_gpio_in (pl061_dev,3 )); + gpio_error_dev =sysbus_create_simple ("gpio-key" ,-1 , +qdev_get_gpio_in (pl061_dev,6 ));qemu_fdt_add_subnode (fdt,"/gpio-keys" );qemu_fdt_setprop_string (fdt,"/gpio-keys" ,"compatible" ,"gpio-keys" );
@@ -2385,8 +2394,8 @@ static void machvirt_init(MachineState *machine)if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms); }else { -create_gpio_devices (vms,VIRT_GPIO , sysmem); } +create_gpio_devices (vms,VIRT_GPIO , sysmem);if (vms->secure && !vmc->no_secure_gpio) {create_gpio_devices (vms,VIRT_SECURE_GPIO , secure_sysmem);
@@ -3100,6 +3109,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id ="mach-virt.ram" ; mc->default_nic ="virtio-net-pci" ; + mc->set_error = virt_set_error;object_class_property_add (oc,"acpi" ,"OnOffAuto" , virt_get_acpi, virt_set_acpi,NULL ,NULL );
include/hw/boards.h +1 -0
@@ -304,6 +304,7 @@ struct MachineClass {const CPUArchIdList *(*possible_cpu_arch_ids)(MachineState *machine);int64_t (*get_default_cpu_node_id)(const MachineState *ms,int idx);ram_addr_t (*fixup_ram_size)(ram_addr_t size); +void (*set_error)(void ); };/**
Signature · 1 line
2.45.2
PATCH 2/6 acpi/ghes: Support GPIO error source.
In reply to Mauro Carvalho ChehabFrom: Jonathan Cameron <[email protected]>
Add error notification to GHES v2 using the GPIO source.
--- hw/acpi/ghes.c | 8 ++++++-- include/hw/acpi/ghes.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
hw/acpi/ghes.c +6 -2
@@ -34,8 +34,8 @@/* 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 +/* Support ARMv8 SEA notification type error source and GPIO interrupt. */ +#define ACPI_GHES_ERROR_SOURCE_COUNT 2/* Generic Hardware Error Source version 2 */ #define ACPI_GHES_SOURCE_GENERIC_ERROR_V2 10
@@ -327,6 +327,9 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker)*/ build_ghes_hw_error_notification (table_data,ACPI_GHES_NOTIFY_SEA );break ; +case ACPI_HEST_SRC_ID_GPIO : +build_ghes_hw_error_notification (table_data,ACPI_GHES_NOTIFY_GPIO ); +break ;default :error_report ("Not support this error source" );abort ();
@@ -370,6 +373,7 @@ void acpi_build_hest(GArray *table_data, BIOSLinker *linker,/* 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,ACPI_HEST_SRC_ID_GPIO , linker);acpi_table_end (linker, &table); }
include/hw/acpi/ghes.h +1 -0
@@ -58,6 +58,7 @@ enum AcpiGhesNotifyType {enum {ACPI_HEST_SRC_ID_SEA =0 , +ACPI_HEST_SRC_ID_GPIO =1 ,/* future ids go here */ ACPI_HEST_SRC_ID_RESERVED , };
Signature · 1 line
2.45.2
PATCH 4/6 target/arm: preserve mpidr value
In reply to Mauro Carvalho ChehabThere is a logic at helper to properly fill the mpidr information. This is needed for ARM Processor error injection, so store the value inside a cpu opaque value, to allow it to be used.
--- target/arm/cpu.h | 1 + target/arm/helper.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
target/arm/cpu.h +1 -0
@@ -1026,6 +1026,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
@@ -4692,7 +4692,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);
@@ -4702,6 +4702,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 ,
@@ -9723,7 +9728,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[] = {
@@ -9733,6 +9738,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.45.2
PATCH 5/6 acpi/ghes: update comments to point to newer ACPI specs
In reply to Mauro Carvalho ChehabThere is one reference to ACPI 4.0 and several references to ACPI 6.x versions.
Update them to point to ACPI 6.5 whenever possible.
There's one reference that was kept pointing to ACPI 6.4, though, with HEST revision 1.
ACPI 6.5 now defines HEST revision 2, and defined a new way to handle source types starting from 12. According with ACPI 6.5 revision history:
2312 Update to the HEST table and adding new error
source descriptor - Table 18.2.
Yet, the spec doesn't define yet any new source descriptors. It just defines a different behavior when source type is above 11.
I also double-checked GHES implementation on an open source project (Linux Kernel). Currently upstream doesn't currently handle HEST revision, ignoring such field.
In any case, revision 2 seems to be backward-compatible with revison 1 when type <= 11 and just one error is contained on a HEST record.
So, while it is probably safe to update it, there's no real need. So, let's keep the implementation using an ACPI 6.4 compatible table, e. g. HEST revision 1.
--- hw/acpi/ghes.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-)
hw/acpi/ghes.c +28 -20
@@ -45,9 +45,9 @@#define GAS_ADDR_OFFSET 4/* -* The total size of Generic Error Data Entry -* ACPI 6.1/6.2: 18.3.2.7.1 Generic Error Data, -* Table 18-343 Generic Error Data Entry +* The total size of Generic Error Data Entry before data field +* ACPI 6.5: 18.3.2.7.1 Generic Error Data, +* Table 18.12 Generic Error Data Entry */ #define ACPI_GHES_DATA_LENGTH 72
@@ -65,8 +65,8 @@/* * Total size for Generic Error Status Block except Generic Error Data Entries -* ACPI 6.2: 18.3.2.7.1 Generic Error Data, -* Table 18-380 Generic Error Status Block +* ACPI 6.5: 18.3.2.7.1 Generic Error Data, +* Table 18.11 Generic Error Status Block */ #define ACPI_GHES_GESB_SIZE 20
@@ -82,7 +82,8 @@ enum AcpiGenericErrorSeverity {/* * Hardware Error Notification -* ACPI 4.0: 17.3.2.7 Hardware Error Notification +* ACPI 6.5: 18.3.2.9 Hardware Error Notification, +* Table 18.14 - Hardware Error Notification Structure * Composes dummy Hardware Error Notification descriptor of specified type */ static void build_ghes_hw_error_notification (GArray *table,const uint8_t type)
@@ -112,7 +113,8 @@ static void build_ghes_hw_error_notification(GArray *table, const uint8_t type)/* * Generic Error Data Entry -* ACPI 6.1: 18.3.2.7.1 Generic Error Data +* ACPI 6.5: 18.3.2.7.1 Generic Error Data, +* Table 18.12 - Generic Error Data Entry */ static void acpi_ghes_generic_error_data(GArray *table, const uint8_t *section_type, uint32_t error_severity,
@@ -148,7 +150,8 @@ static void acpi_ghes_generic_error_data(GArray *table,/* * Generic Error Status Block -* ACPI 6.1: 18.3.2.7.1 Generic Error Data +* ACPI 6.5: 18.3.2.7.1 Generic Error Data, +* Table 18.11 - Generic Hardware Error Source Structure */ static void acpi_ghes_generic_error_status(GArray *table, uint32_t block_status, uint32_t raw_data_offset, uint32_t raw_data_length,
@@ -429,15 +432,18 @@ void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) 0, sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, 0); } -/* Build Generic Hardware Error Source version 2 (GHESv2) */ +/* +* Build Generic Hardware Error Source version 2 (GHESv2) +* ACPI 6.5: 18.3.2.8 Generic Hardware Error Source version 2 (GHESv2 - Type 10), +* Table 18.13: Generic Hardware Error Source version 2 (GHESv2) +*/ static void build_ghes_v2 (GArray *table_data,int source_id,BIOSLinker *linker) {uint64_t address_offset; -/* -* Type: -* Generic Hardware Error Source version 2(GHESv2 - Type 10) -*/ +/* Type: (GHESv2 - Type 10) */ build_append_int_noprefix (table_data,ACPI_GHES_SOURCE_GENERIC_ERROR_V2 ,2 ); + +/* ACPI 6.5: Table 18.10 - Generic Hardware Error Source Structure */ /* Source Id */ build_append_int_noprefix (table_data, source_id,2 );/* Related Source Id */
@@ -481,11 +487,8 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker)/* Error Status Block Length */ build_append_int_noprefix (table_data,ACPI_GHES_MAX_RAW_DATA_LENGTH ,4 ); -/* -* Read Ack Register -* ACPI 6.1: 18.3.2.8 Generic Hardware Error Source -* version 2 (GHESv2 - Type 10) -*/ +/* ACPI 6.5: fields defined at GHESv2 table */ +/* Read Ack Register */ address_offset = table_data->len;build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0x40 ,0 ,4 /* QWord access */ ,0 );
@@ -504,11 +507,16 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker)build_append_int_noprefix (table_data,0x1 ,8 ); } -/* Build Hardware Error Source Table */ +/* +* Build Hardware Error Source Table +* ACPI 6.4: 18.3.2 ACPI Error Source +* Table 18.2: Hardware Error Source Table (HEST) +*/ void acpi_build_hest (GArray *table_data,BIOSLinker *linker,const char *oem_id,const char *oem_table_id) { -AcpiTable table = { .sig ="HEST" , .rev =1 , +AcpiTable table = { .sig ="HEST" , + .rev =1 ,/* ACPI 4.0 to 6.4 */ .oem_id = oem_id, .oem_table_id = oem_table_id };acpi_table_begin (&table, table_data);
Signature · 1 line
2.45.2
PATCH 3/6 acpi/ghes: Add a logic to handle block addresses and FW first ARM processor error injection
In reply to Mauro Carvalho ChehabFrom: Jonathan Cameron <[email protected]>
1. Some GHES functions require handling addresses. Add a helper function to support it.
2. Add support for ACPI CPER (firmware-first) ARM processor error injection.
Compliance with N.2.4.4 ARM Processor Error Section in UEFI 2.6 and upper specs, using error type bit encoding as detailed at UEFI 2.9A errata.
Error injection examples:
{ "execute": "qmp_capabilities" }
{ "execute": "arm-inject-error",
"arguments": {
"errortypes": ['cache-error']
}
}{ "execute": "arm-inject-error",
"arguments": {
"errortypes": ['tlb-error']
}
}{ "execute": "arm-inject-error",
"arguments": {
"errortypes": ['bus-error']
}
}{ "execute": "arm-inject-error",
"arguments": {
"errortypes": ['cache-error', 'tlb-error']
}
}{ "execute": "arm-inject-error",
"arguments": {
"errortypes": ['cache-error', 'tlb-error', 'bus-error', 'micro-arch-error']
}
}...
For Add a logic to handle block addresses,
For FW first ARM processor error injection,
--- configs/targets/aarch64-softmmu.mak | 1 + hw/acpi/ghes.c | 258 ++++++++++++++++++++++++++-- hw/arm/Kconfig | 4 + hw/arm/arm_error_inject.c | 35 ++++ hw/arm/arm_error_inject_stubs.c | 18 ++ hw/arm/meson.build | 3 + include/hw/acpi/ghes.h | 2 + qapi/arm-error-inject.json | 49 ++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 10 files changed, 361 insertions(+), 11 deletions(-) create mode 100644 hw/arm/arm_error_inject.c create mode 100644 hw/arm/arm_error_inject_stubs.c create mode 100644 qapi/arm-error-inject.json
configs/targets/aarch64-softmmu.mak +1 -0
@@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml gdb-xml/aarch64-pauth.xml # needed by boot.c TARGET_NEED_FDT=y +CONFIG_ARM_EINJ=y
hw/acpi/ghes.c +247 -11
294 lines not on this page · raw message
hw/arm/Kconfig +4 -0
@@ -712,3 +712,7 @@ config ARMSSE select UNIMP select SSE_COUNTER select SSE_TIMER + +config ARM_EINJ + bool + default y if AARCH64
hw/arm/arm_error_inject.c new file +35 -0
@@ -0,0 +1,35 @@ +/* +* ARM Processor 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-commands-arm-error-inject.h" +#include "hw/boards.h" +#include "hw/acpi/ghes.h" + +/* For ARM processor errors */ +void qmp_arm_inject_error (ArmProcessorErrorTypeList *errortypes,Error **errp) +{ +MachineState *machine =MACHINE (qdev_get_machine ()); +MachineClass *mc =MACHINE_GET_CLASS (machine); +uint8_t error_types =0 ; + +while (errortypes) { + error_types |=BIT (errortypes->value); + errortypes = errortypes->next; + } + +ghes_record_arm_errors (error_types,ACPI_GHES_NOTIFY_GPIO ); +if (mc->set_error) { + mc->set_error (); + } + +return ; +}
hw/arm/arm_error_inject_stubs.c new file +18 -0
@@ -0,0 +1,18 @@ +/* +* QMP stub for ARM processor 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-commands-arm-error-inject.h" + +void qmp_arm_inject_error (ArmProcessorErrorTypeList *errortypes,Error **errp) +{ +error_setg (errp,"ARM processor error support is not compiled in" ); +}
hw/arm/meson.build +3 -0
@@ -60,6 +60,7 @@ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c')) +arm_ss.add(when: 'CONFIG_ARM_EINJ', if_true: files('arm_error_inject.c')) system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) system_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c'))
@@ -77,5 +78,7 @@ system_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) system_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) system_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) system_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) +system_ss.add(when: 'CONFIG_ARM_EINJ', if_false: files('arm_error_inject_stubs.c')) +system_ss.add(when: 'CONFIG_ALL', if_true: files('arm_error_inject_stubs.c')) hw_arch += {'arm': arm_ss}
include/hw/acpi/ghes.h +2 -0
@@ -75,6 +75,8 @@ 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); +bool ghes_record_arm_errors (uint8_t error_types,uint32_t notify); +/** * acpi_ghes_present: Report whether ACPI GHES table is present *
qapi/arm-error-inject.json new file +49 -0
49 lines not on this page · raw message
qapi/meson.build +1 -0
@@ -22,6 +22,7 @@ if have_system or have_tools or have_ga endif qapi_all_modules = [ + 'arm-error-inject', 'authz', 'block', 'block-core',
qapi/qapi-schema.json +1 -0
@@ -81,3 +81,4 @@ { 'include': 'vfio.json' } { 'include': 'cryptodev.json' } { 'include': 'cxl.json' } +{ 'include': 'arm-error-inject.json' }
Signature · 1 line
2.45.2
PATCH 6/6 acpi/ghes: extend arm error injection logic
In reply to Mauro Carvalho ChehabEnrich CPER error injection logic for ARM processor to allow setting values to from UEFI 2.10 tables N.16 and N.17.
It should be noticed that, with such change, all arguments are now optional, so, once QMP is negotiated with:
{ "execute": "qmp_capabilities" }the simplest way to generate a cache error is to use:
{ "execute": "arm-inject-error" }Also, as now PEI is mapped into an array, it is possible to inject multiple errors at the same CPER record with:
{ "execute": "arm-inject-error", "arguments": {
"error": [ {"type": [ "cache-error" ]},
{"type": [ "tlb-error" ]} ] } }This would generate both cache and TLB errors, using default values for other fields.
As all fields from ARM Processor CPER are now mapped, all types of CPER records can be generated with the new QAPI.
--- hw/acpi/ghes.c | 168 +++++++------- hw/arm/arm_error_inject.c | 399 +++++++++++++++++++++++++++++++- hw/arm/arm_error_inject_stubs.c | 20 +- include/hw/acpi/ghes.h | 40 +++- qapi/arm-error-inject.json | 250 +++++++++++++++++++- tests/lcitool/libvirt-ci | 2 +- 6 files changed, 778 insertions(+), 101 deletions(-)
hw/acpi/ghes.c +89 -79
@@ -55,10 +55,10 @@#define ACPI_GHES_MEM_CPER_LENGTH 80/* -* ARM Processor section CPER size, UEFI 2.10: N.2.4.4 -* ARM Processor Error Section +* ARM Processor error section CPER sizes - UEFI 2.10: N.2.4.4 */ -#define ACPI_GHES_ARM_CPER_LENGTH (72 + 600) +#define ACPI_GHES_ARM_CPER_LENGTH 40 +#define ACPI_GHES_ARM_CPER_PEI_LENGTH 32/* Masks for block_status flags */ #define ACPI_GEBS_UNCORRECTABLE 1
@@ -242,94 +242,98 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address, }/* UEFI 2.9: N.2.4.4 ARM Processor Error Section */ -static void acpi_ghes_build_append_arm_cper (uint8_t error_types,GArray *table) +static void acpi_ghes_build_append_arm_cper (ArmError err,uint32_t cper_length, +GArray *table) { +unsigned int i, j; +/* * ARM Processor Error Record */ /* Validation Bits */ -build_append_int_noprefix (table, - (1ULL <<3 ) |/* Vendor specific info Valid */ - (1ULL <<2 ) |/* Running status Valid */ - (1ULL <<1 ) |/* Error affinity level Valid */ - (1ULL <<0 ),/* MPIDR Valid */ -4 ); +build_append_int_noprefix (table, err.validation,4 ); +/* Error Info Num */ -build_append_int_noprefix (table,1 ,2 ); +build_append_int_noprefix (table, err.err_info_num,2 ); +/* Context Info Num */ -build_append_int_noprefix (table,1 ,2 ); +build_append_int_noprefix (table, err.context_info_num,2 ); +/* Section length */ -build_append_int_noprefix (table,ACPI_GHES_ARM_CPER_LENGTH ,4 ); +build_append_int_noprefix (table, cper_length,4 ); +/* Error affinity level */ -build_append_int_noprefix (table,2 ,1 ); +build_append_int_noprefix (table, err.affinity_level,1 ); +/* Reserved */ build_append_int_noprefix (table,0 ,3 ); +/* MPIDR_EL1 */ -build_append_int_noprefix (table,0xAB12 ,8 ); +build_append_int_noprefix (table, err.mpidr_el1,8 ); +/* MIDR_EL1 */ -build_append_int_noprefix (table,0xCD24 ,8 ); +build_append_int_noprefix (table, err.midr_el1,8 ); +/* Running state */ -build_append_int_noprefix (table,0x1 ,4 ); -/* PSCI state */ -build_append_int_noprefix (table,0x1234 ,4 ); - -/* ARM Propcessor error information */ -/* Version */ -build_append_int_noprefix (table,0 ,1 ); -/* Length */ -build_append_int_noprefix (table,32 ,1 ); -/* Validation Bits */ -build_append_int_noprefix (table, - (1ULL <<4 ) |/* Physical fault address Valid */ - (1ULL <<3 ) |/* Virtual fault address Valid */ - (1ULL <<2 ) |/* Error information Valid */ - (1ULL <<1 ) |/* Flags Valid */ - (1ULL <<0 ),/* Multiple error count Valid */ -2 ); -/* Type */ -if (error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_CACHE_ERROR ) || - error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_TLB_ERROR ) || - error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_BUS_ERROR ) || - error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_MICRO_ARCH_ERROR )) { -build_append_int_noprefix (table, error_types,1 ); - }else { -return ; +build_append_int_noprefix (table, err.running_state,4 ); + +/* PSCI state: only valid when running state is zero */ +build_append_int_noprefix (table, err.psci_state,4 ); + +for (i =0 ; i < err.err_info_num; i++) { +/* ARM Propcessor error information */ +/* Version */ +build_append_int_noprefix (table,0 ,1 ); + +/* Length */ +build_append_int_noprefix (table,ACPI_GHES_ARM_CPER_PEI_LENGTH ,1 ); + +/* Validation Bits */ +build_append_int_noprefix (table, err.pei[i].validation,2 ); + +/* Type */ +build_append_int_noprefix (table, err.pei[i].type,1 ); + +/* Multiple error count */ +build_append_int_noprefix (table, err.pei[i].multiple_error,2 ); + +/* Flags */ +build_append_int_noprefix (table, err.pei[i].flags,1 ); + +/* Error information */ +build_append_int_noprefix (table, err.pei[i].error_info,8 ); + +/* Virtual fault address */ +build_append_int_noprefix (table, err.pei[i].virt_addr,8 ); + +/* Physical fault address */ +build_append_int_noprefix (table, err.pei[i].phy_addr,8 ); + } + +for (i =0 ; i < err.context_info_num; i++) { +/* ARM Propcessor error context information */ +/* Version */ +build_append_int_noprefix (table,0 ,2 ); + +/* Validation type */ +build_append_int_noprefix (table, err.context[i].type,2 ); + +/* Register array size */ +build_append_int_noprefix (table, err.context[i].size *8 ,4 ); + +/* Register array (byte 8 of Context info) */ +for (j =0 ; j < err.context[i].size; j++) { +build_append_int_noprefix (table, err.context[i].array[j],8 ); + } } -/* Multiple error count */ -build_append_int_noprefix (table,2 ,2 ); -/* Flags */ -build_append_int_noprefix (table,0xD ,1 ); -/* Error information */ -if (error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_CACHE_ERROR )) { -build_append_int_noprefix (table,0x0091000F ,8 ); - }else if (error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_TLB_ERROR )) { -build_append_int_noprefix (table,0x0054007F ,8 ); - }else if (error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_BUS_ERROR )) { -build_append_int_noprefix (table,0x80D6460FFF ,8 ); - }else if (error_types &BIT (ARM_PROCESSOR_ERROR_TYPE_MICRO_ARCH_ERROR )) { -build_append_int_noprefix (table,0x78DA03FF ,8 ); - }else { -return ; + +for (i =0 ; i < err.vendor_num; i++) { +build_append_int_noprefix (table, err.vendor[i],1 ); } -/* Virtual fault address */ -build_append_int_noprefix (table,0x67320230 ,8 ); -/* Physical fault address */ -build_append_int_noprefix (table,0x5CDFD492 ,8 ); - -/* ARM Propcessor error context information */ -/* Version */ -build_append_int_noprefix (table,0 ,2 ); -/* Validation Bits */ -/* AArch64 EL1 context registers Valid */ -build_append_int_noprefix (table,5 ,2 ); -/* Register array size */ -build_append_int_noprefix (table,592 ,4 ); -/* Register array */ -build_append_int_noprefix (table,0x12ABDE67 ,8 ); } -static int acpi_ghes_record_arm_error (uint8_t error_types, +static int acpi_ghes_record_arm_error (ArmError error,uint64_t error_block_address) {GArray *block;
@@ -344,12 +348,18 @@ static int acpi_ghes_record_arm_error(uint8_t error_types,* Table 17-13 Generic Error Data Entry */ QemuUUID fru_id = {}; -uint32_t data_length; +uint32_t cper_length, 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_ARM_CPER_LENGTH ; + cper_length =ACPI_GHES_ARM_CPER_LENGTH ; + cper_length +=ACPI_GHES_ARM_CPER_PEI_LENGTH * error.err_info_num; + cper_length += error.context_length; + cper_length += error.vendor_num; + + data_length =ACPI_GHES_DATA_LENGTH + cper_length; +/* * It should not run out of the preallocated memory if adding a new generic * error data entry
@@ -363,11 +373,11 @@ static int acpi_ghes_record_arm_error(uint8_t error_types,/* Build this new generic error data entry header */ acpi_ghes_generic_error_data (block, uefi_cper_arm_sec, -ACPI_CPER_SEV_RECOVERABLE ,0 ,0 , -ACPI_GHES_ARM_CPER_LENGTH , fru_id,0 ); +ACPI_CPER_SEV_RECOVERABLE ,0 ,0 , + cper_length, fru_id,0 );/* Build the ARM processor error section CPER */ -acpi_ghes_build_append_arm_cper (error_types, block); +acpi_ghes_build_append_arm_cper (error, cper_length, block);/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (error_block_address, block->data, block->len);
@@ -663,7 +673,7 @@ static bool ghes_get_addr(uint32_t notify, uint64_t *error_block_addr,return true; } -bool ghes_record_arm_errors (uint8_t error_types,uint32_t notify) +bool ghes_record_arm_errors (ArmError error,uint32_t notify) {int read_ack_register =0 ;uint64_t read_ack_register_addr =0 ;
@@ -689,7 +699,7 @@ bool ghes_record_arm_errors(uint8_t error_types, uint32_t notify) read_ack_register =cpu_to_le64 (0 );cpu_physical_memory_write (read_ack_register_addr, &read_ack_register,sizeof (uint64_t )); -return acpi_ghes_record_arm_error (error_types, error_block_addr); +return acpi_ghes_record_arm_error (error, error_block_addr); }bool acpi_ghes_present (void )
hw/arm/arm_error_inject.c +392 -7
415 lines not on this page · raw message
hw/arm/arm_error_inject_stubs.c +18 -2
@@ -10,9 +10,25 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi-commands-arm-error-inject.h" +#include "hw/acpi/ghes.h" -void qmp_arm_inject_error (ArmProcessorErrorTypeList *errortypes,Error **errp) +void qmp_arm_inject_error (bool has_validation, +ArmProcessorValidationBitsList *validation, +bool has_affinity_level, +uint8_t affinity_level, +bool has_mpidr_el1, +uint64_t mpidr_el1, +bool has_midr_el1, +uint64_t midr_el1, +bool has_running_state, +ArmProcessorRunningStateList *running_state, +bool has_psci_state, +uint32_t psci_state, +bool has_context,ArmProcessorContextList *context, +bool has_vendor_specific,uint8List *vendor_specific, +bool has_error, +ArmPeiList *error, +Error **errp) {error_setg (errp,"ARM processor error support is not compiled in" ); }
include/hw/acpi/ghes.h +39 -1
@@ -23,6 +23,7 @@#define ACPI_GHES_H #include "hw/acpi/bios-linker-loader.h" +#include "qapi/qapi-commands-arm-error-inject.h" /* * Values for Hardware Error Notification Type field
@@ -68,6 +69,43 @@ typedef struct AcpiGhesState {bool present;/* True if GHES is present at all on this board */ } AcpiGhesState; +typedef struct ArmPEI { +uint16_t validation; +uint8_t type; +uint16_t multiple_error; +uint8_t flags; +uint64_t error_info; +uint64_t virt_addr; +uint64_t phy_addr; +}ArmPEI ; + +typedef struct ArmContext { +uint16_t type; +uint32_t size; +uint64_t *array; +}ArmContext ; + +/* ARM processor - UEFI 2.10 table N.16 */ +typedef struct ArmError { +uint16_t validation; + +uint8_t affinity_level; +uint64_t mpidr_el1; +uint64_t midr_el1; +uint32_t running_state; +uint32_t psci_state; + +/* Those are calculated based on the input data */ +uint16_t err_info_num; +uint16_t context_info_num; +uint32_t vendor_num; +uint32_t context_length; + +ArmPEI *pei; +ArmContext *context; +uint8_t *vendor; +}ArmError ; +void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker);void acpi_build_hest (GArray *table_data,BIOSLinker *linker,const char *oem_id,const char *oem_table_id);
@@ -75,7 +113,7 @@ 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); -bool ghes_record_arm_errors (uint8_t error_types,uint32_t notify); +bool ghes_record_arm_errors (ArmError error,uint32_t notify);/** * acpi_ghes_present: Report whether ACPI GHES table is present
qapi/arm-error-inject.json +239 -11
285 lines not on this page · raw message
tests/lcitool/libvirt-ci +1 -1
@@ -1 +1 @@ -Subproject commit 0e9490cebc726ef772b6c9e27dac32e7ae99f9b2 +Subproject commit 77c800186f34b21be7660750577cc5582a914deb
Signature · 1 line
2.45.2
cover Add ACPI CPER firmware first error injection for Arm Processor
Testing OS kernel ACPI APEI CPER support is tricky, as one depends on having hardware with special-purpose BIOS and/or hardware.
With QEMU, it becomes a lot easier, as it can be done via QMP.
This series add support for ARM Processor CPER error injection, according with ACPI 6.x and UEFI 2.9A/2.10 specs.
This series consists of:
- three patches from Jonathan with basic EINJ features, already submitted as RFC (but not merged yet) at:
https://lore.kernel.org/qemu-devel/[email protected]/
- three patches from me extending it to optionally allow to generate all sorts of possible valid combinations for ARM Processor CPER record.
I've been using it to test a Linux Kernel patch series fixing UEFI 2.9A errata and ARM processor trace event:
https://lore.kernel.org/linux-edac/3853853f820a666253ca8ed6c7c724dc3d50044a.1720679234.git.mchehab+huawei@kernel.org/T/#t
I also wrote some Wiki pages for rasdaemon (a Linux daemon widely used to monitor and react to RAS events):
https://github.com/mchehab/rasdaemon/wiki/error-injection
Being really helpful to test the Linux Kernel behavior when firmware-first RAS events for ARM processor arrives there, helping to validate how CPER and GHES driver handles them (and further testing userspace apps like rasdaemon):
Sending this command to QMP:
{ "execute": "qmp_capabilities" }
{ "execute": "arm-inject-error", "arguments": {"error": [{"type": ["cache-error"]}]} }Produces a simple CPER register, properly handled by the Linux Kernel:
[ 839.952678] {4}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
[ 839.953145] {4}[Hardware Error]: event severity: recoverable
[ 839.953451] {4}[Hardware Error]: Error 0, type: recoverable
[ 839.953763] {4}[Hardware Error]: section_type: ARM processor error
[ 839.954094] {4}[Hardware Error]: MIDR: 0x0000000000000000
[ 839.954383] {4}[Hardware Error]: Multiprocessor Affinity Register (MPIDR): 0x0000000080000000
[ 839.954802] {4}[Hardware Error]: running state: 0x0
[ 839.955066] {4}[Hardware Error]: Power State Coordination Interface state: 0
[ 839.955424] {4}[Hardware Error]: Error info structure 0:
[ 839.955712] {4}[Hardware Error]: num errors: 1
[ 839.955983] {4}[Hardware Error]: first error captured
[ 839.956260] {4}[Hardware Error]: propagated error captured
[ 839.956561] {4}[Hardware Error]: error_type: 0x02: cache error
[ 839.956882] {4}[Hardware Error]: error_info: 0x000000000054007f
[ 839.957192] {4}[Hardware Error]: transaction type: Instruction
[ 839.957495] {4}[Hardware Error]: cache error, operation type: Instruction fetch
[ 839.957888] {4}[Hardware Error]: cache level: 1
[ 839.958166] {4}[Hardware Error]: processor context not corrupted
[ 839.958459] {4}[Hardware Error]: the error has not been corrected
[ 839.958771] {4}[Hardware Error]: PC is imprecise
[ 839.959074] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache errorrasdaemon output (rasdaemon still needs to be patched for UEFI 2.9A errata):
<...>-211 [002] d..1. 0.000129 arm_event 2024-07-11 09:50:45 +0000 affinity: -1 MPIDR: 0x80000000 MIDR: 0x0 running_state: 0 psci_state: 0 ARM Processor Err Info data len: 32
<CANT FIND FIELD buf>cpu: 0; error: 2; affinity level: 255; MPIDR: 0000000080000000; MIDR: 0000000000000000; running state: 0; PSCI state: 0; ARM Processor Err Info data len: 32; ARM Processor Err Info raw data: 00 20 06 00 02 00 00 05 7f 00 54 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00; ARM Processor Err Context Info data len: 0; ARM Processor Err Context Info raw data: ; Vendor Specific Err Info data len: 0; Vendor Specific Err Info raw data:
More complex events with multiple Processor Error Information structures can be produced like:
{ "execute": "arm-inject-error", "arguments": {
"validation": ["mpidr-valid", "affinity-valid", "running-state-valid", "vendor-specific-valid"],
"running-state": [], "psci-state": 1229279264,
"error": [{
"validation": ["multiple-error-valid", "flags-valid"],
"type": ["tlb-error", "bus-error", "micro-arch-error"],
"multiple-error": 3, "phy-addr": 57005, "virt-addr": 48879},
{"type": ["micro-arch-error"]},
{"type": ["tlb-error"]},
{"type": ["bus-error"]},
{"type": ["cache-error"]}],
"context": [{"register": [57005, 48879, 43962, 47787]}],
"vendor-specific": [12, 23, 53, 52, 3, 123, 243, 255]} }[ 925.340284] {5}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
[ 925.340662] {5}[Hardware Error]: event severity: recoverable
[ 925.340924] {5}[Hardware Error]: Error 0, type: recoverable
[ 925.341280] {5}[Hardware Error]: section_type: ARM processor error
[ 925.341631] {5}[Hardware Error]: MIDR: 0x0000000000000000
[ 925.341893] {5}[Hardware Error]: Multiprocessor Affinity Register (MPIDR): 0x0000000080000000
[ 925.342278] {5}[Hardware Error]: error affinity level: 0
[ 925.342571] {5}[Hardware Error]: running state: 0x0
[ 925.342835] {5}[Hardware Error]: Power State Coordination Interface state: 1229279264
[ 925.343157] {5}[Hardware Error]: Error info structure 0:
[ 925.343388] {5}[Hardware Error]: num errors: 4
[ 925.343602] {5}[Hardware Error]: error_type: 0x1c: TLB error|bus error|micro-architectural error
[ 925.343960] {5}[Hardware Error]: virtual fault address: 0x000000000000beef
[ 925.344241] {5}[Hardware Error]: physical fault address: 0x000000000000dead
[ 925.344526] {5}[Hardware Error]: Error info structure 1:
[ 925.344757] {5}[Hardware Error]: num errors: 1
[ 925.344965] {5}[Hardware Error]: first error captured
[ 925.345183] {5}[Hardware Error]: propagated error captured
[ 925.345416] {5}[Hardware Error]: error_type: 0x10: micro-architectural error
[ 925.345714] {5}[Hardware Error]: Error info structure 2:
[ 925.345946] {5}[Hardware Error]: num errors: 1
[ 925.346148] {5}[Hardware Error]: first error captured
[ 925.346413] {5}[Hardware Error]: propagated error captured
[ 925.346719] {5}[Hardware Error]: error_type: 0x04: TLB error
[ 925.346988] {5}[Hardware Error]: error_info: 0x00000080d6460fff
[ 925.347248] {5}[Hardware Error]: transaction type: Generic
[ 925.347492] {5}[Hardware Error]: TLB error, operation type: Generic read (type of instruction or data request cannot be determined)
[ 925.347945] {5}[Hardware Error]: TLB level: 1
[ 925.348153] {5}[Hardware Error]: processor context corrupted
[ 925.348392] {5}[Hardware Error]: the error has been corrected
[ 925.348635] {5}[Hardware Error]: PC is imprecise
[ 925.348848] {5}[Hardware Error]: Program execution can be restarted reliably at the PC associated with the error.
[ 925.349232] {5}[Hardware Error]: Error info structure 3:
[ 925.349459] {5}[Hardware Error]: num errors: 1
[ 925.349662] {5}[Hardware Error]: first error captured
[ 925.349884] {5}[Hardware Error]: propagated error captured
[ 925.350115] {5}[Hardware Error]: error_type: 0x08: bus error
[ 925.350371] {5}[Hardware Error]: error_info: 0x0000000078da03ff
[ 925.350629] {5}[Hardware Error]: transaction type: Generic
[ 925.350878] {5}[Hardware Error]: bus error, operation type: Prefetch
[ 925.351144] {5}[Hardware Error]: affinity level at which the bus error occurred: 3
[ 925.351451] {5}[Hardware Error]: processor context not corrupted
[ 925.351702] {5}[Hardware Error]: the error has not been corrected
[ 925.351960] {5}[Hardware Error]: PC is precise
[ 925.352164] {5}[Hardware Error]: Program execution can be restarted reliably at the PC associated with the error.
[ 925.352546] {5}[Hardware Error]: participation type: Generic
[ 925.352801] {5}[Hardware Error]: address space: External Memory Access
[ 925.353071] {5}[Hardware Error]: Error info structure 4:
[ 925.353299] {5}[Hardware Error]: num errors: 1
[ 925.353502] {5}[Hardware Error]: first error captured
[ 925.353720] {5}[Hardware Error]: propagated error captured
[ 925.353963] {5}[Hardware Error]: error_type: 0x02: cache error
[ 925.354222] {5}[Hardware Error]: error_info: 0x000000000054007f
[ 925.354478] {5}[Hardware Error]: transaction type: Instruction
[ 925.354782] {5}[Hardware Error]: cache error, operation type: Instruction fetch
[ 925.355203] {5}[Hardware Error]: cache level: 1
[ 925.355495] {5}[Hardware Error]: processor context not corrupted
[ 925.355848] {5}[Hardware Error]: the error has not been corrected
[ 925.356206] {5}[Hardware Error]: PC is imprecise
[ 925.356493] {5}[Hardware Error]: Context info structure 0:
[ 925.356809] {5}[Hardware Error]: register context type: AArch64 EL1 context registers
[ 925.357282] {5}[Hardware Error]: 00000000: 0000dead 00000000 0000beef 00000000
[ 925.357800] {5}[Hardware Error]: 00000010: 0000abba 00000000 0000baab 00000000
[ 925.358267] {5}[Hardware Error]: 00000020: 00000000 00000000
[ 925.358523] {5}[Hardware Error]: Vendor specific error info has 8 bytes:
[ 925.358822] {5}[Hardware Error]: 00000000: 3435170c fff37b03 ..54.{..
[ 925.359192] [Firmware Warn]: GHES: Unhandled processor error type 0x1c: TLB error|bus error|micro-architectural error
[ 925.359590] [Firmware Warn]: GHES: Unhandled processor error type 0x10: micro-architectural error
[ 925.359935] [Firmware Warn]: GHES: Unhandled processor error type 0x04: TLB error
[ 925.360235] [Firmware Warn]: GHES: Unhandled processor error type 0x08: bus error
[ 925.360534] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache errorJonathan Cameron (3):
arm/virt: Wire up GPIO error source for ACPI / GHES acpi/ghes: Support GPIO error source.
acpi/ghes: Add a logic to handle block addresses and FW first ARM
processor error injection
Mauro Carvalho Chehab (3):
target/arm: preserve mpidr value
acpi/ghes: update comments to point to newer ACPI specs acpi/ghes: extend arm error injection logic
configs/targets/aarch64-softmmu.mak | 1 + hw/acpi/ghes.c | 324 ++++++++++++++++++--- hw/arm/Kconfig | 4 + hw/arm/arm_error_inject.c | 420 ++++++++++++++++++++++++++++ hw/arm/arm_error_inject_stubs.c | 34 +++ hw/arm/meson.build | 3 + hw/arm/virt-acpi-build.c | 29 +- hw/arm/virt.c | 12 +- include/hw/acpi/ghes.h | 41 +++ include/hw/boards.h | 1 + qapi/arm-error-inject.json | 277 ++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + target/arm/cpu.h | 1 + target/arm/helper.c | 10 +- tests/lcitool/libvirt-ci | 2 +- 16 files changed, 1120 insertions(+), 41 deletions(-) create mode 100644 hw/arm/arm_error_inject.c create mode 100644 hw/arm/arm_error_inject_stubs.c create mode 100644 qapi/arm-error-inject.json
Signature · 1 line
2.45.2
Re: [PATCH 1/6] arm/virt: Wire up GPIO error source for ACPI / GHES
In reply to Mauro Carvalho ChehabQuoted 27 lines · Mauro Carvalho Chehab
From: Jonathan Cameron <[email protected]>
Creates a GED - Generic Event Device and set a GPIO to be used or error injection.
Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/arm/virt-acpi-build.c | 29 +++++++++++++++++++++++++---- hw/arm/virt.c | 12 +++++++++++- include/hw/boards.h | 1 + 3 files changed, 37 insertions(+), 5 deletions(-)hw/arm/virt-acpi-build.c +1
-0@@ -63,6 +63,7 @@#define ARM_SPI_BASE 32 +#define ACPI_GENERIC_EVENT_DEVICE "GEDD"#define ACPI_BUILD_TABLE_SIZE 0x20000static void acpi_dsdt_add_cpus (Aml *scope,VirtMachineState *vms)@@ -155,9 +156,14 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
hw/arm/virt-acpi-build.c static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap, · line 164
Quoted 10 lines
hw/arm/virt-acpi-build.c +5
-2Aml *aei =aml_resource_template ();/* Pin 3 for power button */ -const uint32_t pin_list[1 ] = {3 }; +uint32_t pin =3 ;aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , - AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1, +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 , +"GPO0" ,NULL ,0 )); + pin =6 ; +/* Pin 8 for generic error */
For real? Code says 6, comment says 8.
Comments must come before the code they comment, not after it, then this kind of thing won't happen.
Quoted 112 lines
hw/arm/virt-acpi-build.c +19
-2+aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 ,"GPO0" ,NULL ,0 ));aml_append (dev,aml_name_decl ("_AEI" , aei));@@ -166,6 +172,11 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,aml_append (method,aml_notify (aml_name (ACPI_POWER_BUTTON_DEVICE ),aml_int (0x80 )));aml_append (dev, method); + method =aml_method ("_E06" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_notify (aml_name (ACPI_GENERIC_EVENT_DEVICE ), +aml_int (0x80 ))); +aml_append (dev, method); +aml_append (scope, dev); }@@ -800,6 +811,15 @@ static void build_fadt_rev6(GArray *table_data, BIOSLinker *linker,build_fadt (table_data, linker, &fadt, vms->oem_id, vms->oem_table_id); } +static void acpi_dsdt_add_generic_event_device (Aml *scope) +{ +Aml *dev =aml_device (ACPI_GENERIC_EVENT_DEVICE ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0C33" ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); +aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xF ))); +aml_append (scope, dev); +} +/* DSDT */ static void build_dsdt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms)@@ -842,9 +862,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) irqmap[VIRT_ACPI_GED ] +ARM_SPI_BASE ,AML_SYSTEM_MEMORY , memmap[VIRT_ACPI_GED].base); }else { -acpi_dsdt_add_gpio (scope, &memmap[VIRT_GPIO ], - (irqmap[VIRT_GPIO ] +ARM_SPI_BASE )); } +acpi_dsdt_add_gpio (scope, &memmap[VIRT_GPIO ], + (irqmap[VIRT_GPIO ] +ARM_SPI_BASE ));if (vms->acpi_dev) { uint32_t event = object_property_get_uint(OBJECT(vms->acpi_dev),@@ -858,6 +878,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +acpi_dsdt_add_generic_event_device (scope);#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif hw/arm/virt.c +11
-1@@ -997,6 +997,13 @@ static void create_rtc(const VirtMachineState *vms) }static DeviceState *gpio_key_dev; + +static DeviceState *gpio_error_dev; +static void virt_set_error (void ) +{ +qemu_set_irq (qdev_get_gpio_in (gpio_error_dev,0 ),1 ); +} +static void virt_powerdown_req (Notifier *n,void *opaque) {VirtMachineState *s =container_of (n, VirtMachineState, powerdown_notifier);@@ -1014,6 +1021,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, { gpio_key_dev =sysbus_create_simple ("gpio-key" ,-1 ,qdev_get_gpio_in (pl061_dev,3 )); + gpio_error_dev =sysbus_create_simple ("gpio-key" ,-1 , +qdev_get_gpio_in (pl061_dev,6 ));qemu_fdt_add_subnode (fdt,"/gpio-keys" );qemu_fdt_setprop_string (fdt,"/gpio-keys" ,"compatible" ,"gpio-keys" );@@ -2385,8 +2394,8 @@ static void machvirt_init(MachineState *machine)if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms); }else { -create_gpio_devices (vms,VIRT_GPIO , sysmem); } +create_gpio_devices (vms,VIRT_GPIO , sysmem);if (vms->secure && !vmc->no_secure_gpio) {create_gpio_devices (vms,VIRT_SECURE_GPIO , secure_sysmem);@@ -3100,6 +3109,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id ="mach-virt.ram" ; mc->default_nic ="virtio-net-pci" ; + mc->set_error = virt_set_error;object_class_property_add (oc,"acpi" ,"OnOffAuto" , virt_get_acpi, virt_set_acpi,NULL ,NULL );include/hw/boards.h +1
-0@@ -304,6 +304,7 @@ struct MachineClass {const CPUArchIdList *(*possible_cpu_arch_ids)(MachineState *machine);int64_t (*get_default_cpu_node_id)(const MachineState *ms,int idx);ram_addr_t (*fixup_ram_size)(ram_addr_t size); +void (*set_error)(void ); };/** Signature · 1 line
2.45.2
Re: [PATCH 1/6] arm/virt: Wire up GPIO error source for ACPI / GHES
Quoted 42 lines · Michael S. Tsirkin
Quoted 27 lines · Mauro Carvalho Chehab
From: Jonathan Cameron <[email protected]>
Creates a GED - Generic Event Device and set a GPIO to be used or error injection.
Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/arm/virt-acpi-build.c | 29 +++++++++++++++++++++++++---- hw/arm/virt.c | 12 +++++++++++- include/hw/boards.h | 1 + 3 files changed, 37 insertions(+), 5 deletions(-)hw/arm/virt-acpi-build.c +1
-0@@ -63,6 +63,7 @@#define ARM_SPI_BASE 32 +#define ACPI_GENERIC_EVENT_DEVICE "GEDD"#define ACPI_BUILD_TABLE_SIZE 0x20000static void acpi_dsdt_add_cpus (Aml *scope,VirtMachineState *vms)@@ -155,9 +156,14 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,hw/arm/virt-acpi-build.c static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap, · line 164
Quoted 10 lines
hw/arm/virt-acpi-build.c +5
-2Aml *aei =aml_resource_template ();/* Pin 3 for power button */ -const uint32_t pin_list[1 ] = {3 }; +uint32_t pin =3 ;aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , - AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1, +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 , +"GPO0" ,NULL ,0 )); + pin =6 ; +/* Pin 8 for generic error */ For real? Code says 6, comment says 8.
Quoted 2 lines
Comments must come before the code they comment, not after it, then this kind of thing won't happen.
It might also be nice to have a symbolic constant for the pin number somewhere, so we don't rely on the magic number here and...
Quoted 6 lines
hw/arm/virt-acpi-build.c static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, · line 1025
Quoted 6 lines
hw/arm/virt-acpi-build.c +2
-0@@ -1014,6 +1021,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, { gpio_key_dev =sysbus_create_simple ("gpio-key" ,-1 ,qdev_get_gpio_in (pl061_dev,3 )); + gpio_error_dev =sysbus_create_simple ("gpio-key" ,-1 , +qdev_get_gpio_in (pl061_dev,6 ));
...here being the same.
Then if the code says "pin = VIRT_GPIO_ERROR_PIN" or something similar the comment isn't required because the code is clear without it.
(This is already a problem for the power-button pin 3, so we could do an initial cleanup patch to sort out pin 3 first).
thanks
-- PMM