Add ACPI CPER firmware first error injection on ARM emulation
v4 cover Add ACPI CPER firmware first error injection on ARM emulation
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 injecting CPER records on ARM emulation.
The QEMU side changes add a QAPI able to do CPER error injection on ARM, with a raw data parameter, making it very flexible.
A script is provided at the final patch implementing support for ARM Processor CPER error injection according with ACPI 6.x and UEFI 2.9A/2.10 specs, via QMP.
Injecting such errors can be done using the provided script:
$ ./scripts/ghes_inject.py arm
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 0, "major": 9}, "package": "v9.0.0-2621-g3de6991b870a"}, "capabilities": ["oob"]}}
{ "execute": "qmp_capabilities" }
{"return": {}}
{ "execute": "ghes-cper", "arguments": {"cper": {"notification-type": [22, 61, 158, 225, 17, 188, 228, 17, 156, 170, 194, 5, 29, 93, 70, 176], "raw-data": [0, 0, 0, 0, 1, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 4, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0]}} }
{"return": {}}Produces a simple CPER register, properly handled by the Linux Kernel:
[ 5876.041410] {18}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
[ 5876.041775] {18}[Hardware Error]: event severity: recoverable
[ 5876.042023] {18}[Hardware Error]: Error 0, type: recoverable
[ 5876.042280] {18}[Hardware Error]: section_type: ARM processor error
[ 5876.042538] {18}[Hardware Error]: MIDR: 0x0000000000000000
[ 5876.042781] {18}[Hardware Error]: Error info structure 0:
[ 5876.043013] {18}[Hardware Error]: num errors: 2
[ 5876.043222] {18}[Hardware Error]: error_type: 0x02: cache error
[ 5876.043500] {18}[Hardware Error]: error_info: 0x0000000000000000
[ 5876.043800] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache errorMore complex use cases can be done, like:
$ ./scripts/ghes_inject.py arm --mpidr 0x444 --running --affinity 1 --error-info 12345678 --vendor 0x13,123,4,5,1 --ctx-array 0,1,2,3,4,5 -t cache tlb bus vendor tlb,vendor
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 0, "major": 9}, "package": "v9.0.0-2621-g3de6991b870a"}, "capabilities": ["oob"]}}
{ "execute": "qmp_capabilities" }
{"return": {}}
{ "execute": "ghes-cper", "arguments": {"cper": {"notification-type": [22, 61, 158, 225, 17, 188, 228, 17, 156, 170, 194, 5, 29, 93, 70, 176], "raw-data": [7, 0, 0, 0, 5, 0, 1, 0, 13, 1, 0, 0, 1, 0, 0, 0, 68, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 32, 4, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0, 0, 32, 4, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0, 0, 32, 4, 0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0, 0, 32, 4, 0, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0, 0, 32, 0, 0, 20, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 0, 0, 0, 0, 173, 11, 186, 171, 0, 0, 0, 0, 0, 0, 5, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 123, 4, 5, 1]}} }
{"return": {}}964.134325] {19}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
[ 5964.134692] {19}[Hardware Error]: event severity: recoverable
[ 5964.134942] {19}[Hardware Error]: Error 0, type: recoverable
[ 5964.135200] {19}[Hardware Error]: section_type: ARM processor error
[ 5964.135466] {19}[Hardware Error]: MIDR: 0x0000000000000000
[ 5964.135700] {19}[Hardware Error]: Multiprocessor Affinity Register (MPIDR): 0x0000000000000444
[ 5964.136025] {19}[Hardware Error]: error affinity level: 1
[ 5964.136255] {19}[Hardware Error]: running state: 0x1
[ 5964.136468] {19}[Hardware Error]: Power State Coordination Interface state: 0
[ 5964.136767] {19}[Hardware Error]: Error info structure 0:
[ 5964.137001] {19}[Hardware Error]: num errors: 2
[ 5964.137210] {19}[Hardware Error]: error_type: 0x02: cache error
[ 5964.137472] {19}[Hardware Error]: error_info: 0x0000000000000000
[ 5964.137737] {19}[Hardware Error]: Error info structure 1:
[ 5964.137976] {19}[Hardware Error]: num errors: 2
[ 5964.138192] {19}[Hardware Error]: error_type: 0x04: TLB error
[ 5964.138459] {19}[Hardware Error]: error_info: 0x0000000000000000
[ 5964.138727] {19}[Hardware Error]: Error info structure 2:
[ 5964.138967] {19}[Hardware Error]: num errors: 2
[ 5964.139185] {19}[Hardware Error]: error_type: 0x08: bus error
[ 5964.139451] {19}[Hardware Error]: error_info: 0x0000000000000000
[ 5964.139751] {19}[Hardware Error]: Error info structure 3:
[ 5964.139993] {19}[Hardware Error]: num errors: 2
[ 5964.140210] {19}[Hardware Error]: error_type: 0x10: micro-architectural error
[ 5964.140522] {19}[Hardware Error]: error_info: 0x0000000000000000
[ 5964.140790] {19}[Hardware Error]: Error info structure 4:
[ 5964.141030] {19}[Hardware Error]: num errors: 2
[ 5964.141261] {19}[Hardware Error]: error_type: 0x14: TLB error|micro-architectural error
[ 5964.141599] {19}[Hardware Error]: Context info structure 0:
[ 5964.141843] {19}[Hardware Error]: register context type: AArch64 EL1 context registers
[ 5964.142195] {19}[Hardware Error]: 00000000: 00000000 00000000 00000001 00000000
[ 5964.142534] {19}[Hardware Error]: 00000010: 00000002 00000000 00000003 00000000
[ 5964.142867] {19}[Hardware Error]: 00000020: 00000004 00000000 00000005 00000000
[ 5964.143193] {19}[Hardware Error]: 00000030: 00000000 00000000
[ 5964.143464] {19}[Hardware Error]: Vendor specific error info has 5 bytes:
[ 5964.143750] {19}[Hardware Error]: 00000000: 13 7b 04 05 01 .{...
[ 5964.144164] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache error
[ 5964.144483] [Firmware Warn]: GHES: Unhandled processor error type 0x04: TLB error
[ 5964.144793] [Firmware Warn]: GHES: Unhandled processor error type 0x08: bus error
[ 5964.145099] [Firmware Warn]: GHES: Unhandled processor error type 0x10: micro-architectural error
[ 5964.145454] [Firmware Warn]: GHES: Unhandled processor error type 0x14: TLB error|micro-architectural error---
v4:
- CPER generation moved to happen outside QEMU;
- One patch adding support for mpidr query was removed.
v3:
- patch 1 cleanups with some comment changes and adding another place where the poweroff GPIO define should be used. No changes on other patches (except due to conflict resolution).
v2:
- added a new patch using a define for GPIO power pin;
- patch 2 changed to also use a define for generic error GPIO pin;
- a couple cleanups at patch 2 removing uneeded else clauses.
Jonathan Cameron (1):
acpi/ghes: Support GPIO error source
Mauro Carvalho Chehab (6):
arm/virt: place power button pin number on a define acpi/generic_event_device: add an APEI error device arm/virt: Wire up GPIO error source for ACPI / GHES qapi/ghes-cper: add an interface to do generic CPER error injection acpi/ghes: add support for generic error injection via QAPI scripts/ghes_inject: add a script to generate GHES error inject
MAINTAINERS | 8 + hw/acpi/Kconfig | 5 + hw/acpi/generic_event_device.c | 17 + hw/acpi/ghes.c | 178 ++++++- hw/acpi/ghes_cper.c | 53 ++ hw/acpi/meson.build | 2 + hw/arm/Kconfig | 5 + hw/arm/virt-acpi-build.c | 25 +- hw/arm/virt.c | 33 +- include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/generic_event_device.h | 3 + include/hw/acpi/ghes.h | 14 +- include/hw/arm/virt.h | 5 + qapi/ghes-cper.json | 54 ++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + scripts/ghes_inject.py | 673 +++++++++++++++++++++++++ 17 files changed, 1048 insertions(+), 30 deletions(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 qapi/ghes-cper.json create mode 100755 scripts/ghes_inject.py
Signature · 1 line
2.45.2
PATCH v4 1/7 arm/virt: place power button pin number on a define
Having magic numbers inside the code is not a good idea, as it is error-prone. So, instead, create a macro with the number definition.
--- hw/arm/virt-acpi-build.c | 6 +++--- hw/arm/virt.c | 7 ++++--- include/hw/arm/virt.h | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-)
hw/arm/virt-acpi-build.c +3 -3
@@ -154,10 +154,10 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,aml_append (dev,aml_name_decl ("_CRS" , crs));Aml *aei =aml_resource_template (); -/* Pin 3 for power button */ -const uint32_t pin_list[1 ] = {3 }; + +const uint32_t pin =GPIO_PIN_POWER_BUTTON ;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 ));aml_append (dev,aml_name_decl ("_AEI" , aei));
hw/arm/virt.c +4 -3
@@ -1004,7 +1004,7 @@ static void virt_powerdown_req(Notifier *n, void *opaque)if (s->acpi_dev) {acpi_send_event (s->acpi_dev,ACPI_POWER_DOWN_STATUS ); }else { -/* use gpio Pin 3 for power button event */ +/* use gpio Pin for power button event */ qemu_set_irq (qdev_get_gpio_in (gpio_key_dev,0 ),1 ); } }
@@ -1013,7 +1013,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, uint32_t phandle) { gpio_key_dev =sysbus_create_simple ("gpio-key" ,-1 , -qdev_get_gpio_in (pl061_dev,3 )); +qdev_get_gpio_in (pl061_dev, +GPIO_PIN_POWER_BUTTON ));qemu_fdt_add_subnode (fdt,"/gpio-keys" );qemu_fdt_setprop_string (fdt,"/gpio-keys" ,"compatible" ,"gpio-keys" );
@@ -1024,7 +1025,7 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev,qemu_fdt_setprop_cell (fdt,"/gpio-keys/poweroff" ,"linux,code" ,KEY_POWER );qemu_fdt_setprop_cells (fdt,"/gpio-keys/poweroff" , -"gpios" , phandle,3 ,0 ); +"gpios" , phandle,GPIO_PIN_POWER_BUTTON ,0 ); }#define SECURE_GPIO_POWEROFF 0
include/hw/arm/virt.h +3 -0
@@ -47,6 +47,9 @@/* See Linux kernel arch/arm64/include/asm/pvclock-abi.h */ #define PVTIME_SIZE_PER_CPU 64 +/* GPIO pins */ +#define GPIO_PIN_POWER_BUTTON 3 +enum {VIRT_FLASH ,VIRT_MEM ,
Signature · 1 line
2.45.2
PATCH v4 2/7 acpi/generic_event_device: add an APEI error device
In reply to Mauro Carvalho ChehabAdds a Generic Event Device to handle generic hardware error events, supporting General Purpose Event (GPE) 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 bios via ACPI APEI Generic Hardware Error Source (GHES).
--- hw/acpi/generic_event_device.c | 17 +++++++++++++++++ include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/generic_event_device.h | 3 +++ 3 files changed, 21 insertions(+)
hw/acpi/generic_event_device.c +17 -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"),
@@ -153,6 +159,15 @@ void acpi_dsdt_add_power_button(Aml *scope)aml_append (scope, dev); } +void acpi_dsdt_add_error_device (Aml *scope) +{ +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 ))); +aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xF ))); +aml_append (scope, dev); +} +/* Memory read by the GED _EVT AML dynamic method */ static uint64_t ged_evt_read (void *opaque,hwaddr addr,unsigned size) {
@@ -295,6 +310,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/generic_event_device.h +3 -0
@@ -66,6 +66,7 @@#include "qom/object.h" #define ACPI_POWER_BUTTON_DEVICE "PWRB" +#define ACPI_APEI_ERROR_DEVICE "GEDD"#define TYPE_ACPI_GED "acpi-ged"OBJECT_DECLARE_SIMPLE_TYPE (AcpiGedState,ACPI_GED )
@@ -98,6 +99,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;
@@ -120,5 +122,6 @@ struct AcpiGedState {void build_ged_aml (Aml *table,const char * name,HotplugHandler *hotplug_dev,uint32_t ged_irq,AmlRegionSpace rs,hwaddr ged_base);void acpi_dsdt_add_power_button (Aml *scope); +void acpi_dsdt_add_error_device (Aml *scope);#endif
Signature · 1 line
2.45.2
PATCH v4 3/7 arm/virt: Wire up GPIO error source for ACPI / GHES
In reply to Mauro Carvalho ChehabAdds support to ARM virtualization to allow handling a General Purpose Event (GPE) via GED error device.
It is aligned with Linux Kernel patch:
https://lore.kernel.org/lkml/[email protected]/
--- hw/acpi/ghes.c | 3 +++ hw/arm/virt-acpi-build.c | 21 +++++++++++++++++---- hw/arm/virt.c | 26 +++++++++++++++++++++++--- include/hw/acpi/ghes.h | 3 +++ include/hw/arm/virt.h | 2 ++ 5 files changed, 48 insertions(+), 7 deletions(-)
hw/acpi/ghes.c +3 -0
@@ -444,6 +444,9 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)return ret; } +NotifierList generic_error_notifiers = +NOTIFIER_LIST_INITIALIZER (error_device_notifiers); +bool acpi_ghes_present (void ) {AcpiGedState *acpi_ged_state;
hw/arm/virt-acpi-build.c +17 -4
@@ -142,6 +142,8 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,static void acpi_dsdt_add_gpio (Aml *scope,const MemMapEntry *gpio_memmap,uint32_t gpio_irq) { +uint32_t pin; +Aml *dev =aml_device ("GPO0" );aml_append (dev,aml_name_decl ("_HID" ,aml_string ("ARMH0061" )));aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 )));
@@ -155,7 +157,12 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,Aml *aei =aml_resource_template (); -const uint32_t pin =GPIO_PIN_POWER_BUTTON ; + pin =GPIO_PIN_POWER_BUTTON ; +aml_append (aei,aml_gpio_int (AML_CONSUMER ,AML_EDGE ,AML_ACTIVE_HIGH , +AML_EXCLUSIVE ,AML_PULL_UP ,0 , &pin,1 , +"GPO0" ,NULL ,0 )); + + pin =GPIO_PIN_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 ));
@@ -166,6 +173,12 @@ 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_APEI_ERROR_DEVICE ), +aml_int (0x80 ))); +aml_append (dev, method); +aml_append (scope, dev); }
@@ -841,10 +854,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)HOTPLUG_HANDLER (vms->acpi_dev), 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 +870,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +acpi_dsdt_add_error_device (scope);#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif
hw/arm/virt.c +23 -3
@@ -73,6 +73,7 @@#include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/ghes.h" #include "target/arm/cpu-qom.h" #include "target/arm/internals.h" #include "target/arm/multiprocessing.h"
@@ -677,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 ;
@@ -1009,12 +1010,28 @@ static void virt_powerdown_req(Notifier *n, void *opaque) } } +static DeviceState *gpio_error_dev; +static void virt_generic_error_req (Notifier *n,void *opaque) +{ +VirtMachineState *s =container_of (n, VirtMachineState, generic_error_notifier); + +if (s->acpi_dev) { +acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR ); + }else { +/* use gpio Pin for power button event */ +qemu_set_irq (qdev_get_gpio_in (gpio_error_dev,0 ),1 ); + } +} +static void create_gpio_keys (char *fdt,DeviceState *pl061_dev,uint32_t phandle) { gpio_key_dev =sysbus_create_simple ("gpio-key" ,-1 ,qdev_get_gpio_in (pl061_dev,GPIO_PIN_POWER_BUTTON )); + gpio_error_dev =sysbus_create_simple ("gpio-key" ,-1 , +qdev_get_gpio_in (pl061_dev, +GPIO_PIN_GENERIC_ERROR ));qemu_fdt_add_subnode (fdt,"/gpio-keys" );qemu_fdt_setprop_string (fdt,"/gpio-keys" ,"compatible" ,"gpio-keys" );
@@ -2385,9 +2402,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);
@@ -2397,6 +2413,10 @@ static void machvirt_init(MachineState *machine) vms->powerdown_notifier.notify = virt_powerdown_req;qemu_register_powerdown_notifier (&vms->powerdown_notifier); + vms->generic_error_notifier.notify = virt_generic_error_req; +notifier_list_add (&generic_error_notifiers, + &vms->generic_error_notifier); +/* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If * no backend is created the transport will just sit harmlessly idle.
include/hw/acpi/ghes.h +3 -0
@@ -23,6 +23,9 @@#define ACPI_GHES_H #include "hw/acpi/bios-linker-loader.h" +#include "qemu/notify.h" + +extern NotifierList generic_error_notifiers;/* * Values for Hardware Error Notification Type field
include/hw/arm/virt.h +2 -0
@@ -49,6 +49,7 @@/* GPIO pins */ #define GPIO_PIN_POWER_BUTTON 3 +#define GPIO_PIN_GENERIC_ERROR 6enum {VIRT_FLASH ,
@@ -175,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.45.2
PATCH v4 4/7 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.
[mchehab: do some cleanups at ACPI_HEST_SRC_ID_* checks]
--- hw/acpi/ghes.c | 16 ++++++++++------ include/hw/acpi/ghes.h | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-)
hw/acpi/ghes.c +10 -6
@@ -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
@@ -290,6 +290,9 @@ void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)static void build_ghes_v2 (GArray *table_data,int source_id,BIOSLinker *linker) {uint64_t address_offset; + +assert (source_id <ACPI_HEST_SRC_ID_RESERVED ); +/* * Type: * Generic Hardware Error Source version 2(GHESv2 - Type 10)
@@ -327,6 +330,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 +376,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); }
@@ -406,10 +413,7 @@ 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 (source_id <ACPI_HEST_SRC_ID_RESERVED ) { - 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));
include/hw/acpi/ghes.h +2 -1
@@ -59,9 +59,10 @@ enum AcpiGhesNotifyType { ACPI_GHES_NOTIFY_RESERVED = 12 }; +/* Those are used as table indexes when building GHES tables */ enum {ACPI_HEST_SRC_ID_SEA =0 , -/* future ids go here */ +ACPI_HEST_SRC_ID_GPIO ,ACPI_HEST_SRC_ID_RESERVED , };
Signature · 1 line
2.45.2
PATCH v4 5/7 qapi/ghes-cper: add an interface to do generic CPER error injection
In reply to Mauro Carvalho ChehabCreates a QAPI to be used for generic ACPI APEI hardware error injection (HEST) via GHESv2.
The actual GHES code will be added at the followup patch.
--- MAINTAINERS | 7 ++++++ hw/acpi/Kconfig | 5 ++++ hw/acpi/ghes_cper.c | 53 +++++++++++++++++++++++++++++++++++++++++ hw/acpi/meson.build | 2 ++ hw/arm/Kconfig | 5 ++++ include/hw/acpi/ghes.h | 6 +++++ qapi/ghes-cper.json | 54 ++++++++++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 9 files changed, 134 insertions(+) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 qapi/ghes-cper.json
MAINTAINERS +7 -0
@@ -2075,6 +2075,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/ghes-cper.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_cper.c new file +53 -0
53 lines not on this page · raw message
hw/acpi/meson.build +2 -0
@@ -34,4 +34,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/Kconfig +5 -0
@@ -712,3 +712,8 @@ config ARMSSE select UNIMP select SSE_COUNTER select SSE_TIMER + +config GHES_CPER + bool + depends on ARM + default y if AARCH64
include/hw/acpi/ghes.h +6 -0
@@ -78,6 +78,12 @@ 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); +typedef struct AcpiGhesCper { +uint8_t uuid[16 ]; +char *data; +uint32_t data_len; +}AcpiGhesCper ; +/** * acpi_ghes_present: Report whether ACPI GHES table is present *
qapi/ghes-cper.json new file +54 -0
54 lines not on this page · raw message
qapi/meson.build +1 -0
@@ -35,6 +35,7 @@ qapi_all_modules = [ 'dump', 'ebpf', 'error', + 'ghes-cper', 'introspect', 'job', 'machine-common',
qapi/qapi-schema.json +1 -0
@@ -81,3 +81,4 @@ { 'include': 'vfio.json' } { 'include': 'cryptodev.json' } { 'include': 'cxl.json' } +{ 'include': 'ghes-cper.json' }
Signature · 1 line
2.45.2
Re: [PATCH v4 5/7] qapi/ghes-cper: add an interface to do generic CPER error injection
Quoted 2 lines · Mauro Carvalho Chehab
Creates a QAPI to be used for generic ACPI APEI hardware error injection (HEST) via GHESv2.
Creates a QMP command
Quoted 35 lines
The actual GHES code will be added at the followup patch.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- MAINTAINERS | 7 ++++++ hw/acpi/Kconfig | 5 ++++ hw/acpi/ghes_cper.c | 53 +++++++++++++++++++++++++++++++++++++++++ hw/acpi/meson.build | 2 ++ hw/arm/Kconfig | 5 ++++ include/hw/acpi/ghes.h | 6 +++++ qapi/ghes-cper.json | 54 ++++++++++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 9 files changed, 134 insertions(+) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 qapi/ghes-cper.jsonMAINTAINERS +7
-0@@ -2075,6 +2075,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/ghes-cper.json + ppc4xx L: [email protected] S: Orphan
[...]
hw/acpi/meson.build endif · line 38
Quoted 10 lines
hw/acpi/meson.build +2
-0@@ -34,4 +34,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'))
../hw/acpi/meson.build:38:50: ERROR: File ghes_cper_stub.c does not exist.
Quoted 1 line
hw/acpi/meson.build +0
-0system_ss.add(files('acpi-qmp-cmds.c'))
[...]
qapi/ghes-cper.json
Quoted 5 lines
qapi/ghes-cper.json new file +0
-0
Would this fit into acpi.json?
If yes: would the maintainers of acpi.json be happy to take it? Michael, Igor?
Quoted 7 lines
qapi/ghes-cper.json new file +6
-0@@ -0,0 +1,54 @@ +# -*- Mode: Python -*- +# vim: filetype=python + +## +# = GHESv2 CPER Error Injection +#
qapi/ghes-cper.json line 16
Quoted 10 lines
qapi/ghes-cper.json new file +10
-0+# These are defined at +# ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 +# (GHESv2 - Type 10) +## + +## +# @CommonPlatformErrorRecord: +# +# Common Platform Error Record - CPER - as defined at the UEFI +# specification. See
Separate sentences with two spaces for consistency, please.
Quoted 7 lines
qapi/ghes-cper.json new file +7
-0+# https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#record-header +# for more details. +# +# @notification-type: pre-assigned GUID value indicating the record +# association with an error event notification type, as defined +# at https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#record-header +#
qapi/ghes-cper.json line 33
Quoted 10 lines
qapi/ghes-cper.json new file +10
-0+# @raw-data: Contains the payload of the CPER. +# +# Since: 9.2 +## +{ 'struct': 'CommonPlatformErrorRecord', + 'data': { + 'notification-type': ['uint8'], + 'raw-data': ['uint8'] + } +}
You use ['uint8'] for binary. We commonly represent binary as base64-encoded strings in QAPI.
If @notification-type is a UUID, we should use the usual text representation. qemu/uuid.h has functions to convert between binary and text.
Quoted 38 lines
qapi/ghes-cper.json new file +21
-0+ +## +# @ghes-cper: +# +# Inject ARM Processor error with data to be filled according with +# ACPI 6.2 GHESv2 spec. +# +# @cper: a single CPER record to be sent to the guest OS. +# +# Features: +# +# @unstable: This command is experimental. +# +# Since: 9.2 +## +{ 'command': 'ghes-cper', + 'data': { + 'cper': 'CommonPlatformErrorRecord' + }, + 'features': [ 'unstable' ] +}qapi/meson.build +1
-0@@ -35,6 +35,7 @@ qapi_all_modules = [ 'dump', 'ebpf', 'error', + 'ghes-cper', 'introspect', 'job', 'machine-common',qapi/qapi-schema.json +0
-0
qapi/qapi-schema.json line 84
Quoted 4 lines
qapi/qapi-schema.json +1
-0@@ -81,3 +81,4 @@ { 'include': 'vfio.json' } { 'include': 'cryptodev.json' } { 'include': 'cxl.json' } +{ 'include': 'ghes-cper.json' }
Put it next to acpi.json, perhaps?
PATCH v4 6/7 acpi/ghes: add support for generic error injection via QAPI
In reply to Mauro Carvalho ChehabProvide a generic interface for error injection via GHESv2.
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;
--- hw/acpi/ghes.c | 159 ++++++++++++++++++++++++++++++++++++++--- hw/acpi/ghes_cper.c | 2 +- include/hw/acpi/ghes.h | 2 + 3 files changed, 151 insertions(+), 12 deletions(-)
hw/acpi/ghes.c +148 -11
@@ -395,23 +395,22 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } +static uint64_t ghes_get_state_start_address (void ) +{ +AcpiGedState *acpi_ged_state = +ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL )); +AcpiGhesState *ags = &acpi_ged_state->ghes_state; + +return le64_to_cpu (ags->ghes_addr_le); +} +int acpi_ghes_record_errors (uint8_t source_id,uint64_t physical_address) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ; -uint64_t start_addr; +uint64_t start_addr =ghes_get_state_start_address ();bool ret =-1 ; -AcpiGedState *acpi_ged_state; -AcpiGhesState *ags; -assert (source_id <ACPI_HEST_SRC_ID_RESERVED ); - acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , -NULL )); -g_assert (acpi_ged_state); - ags = &acpi_ged_state->ghes_state; - - start_addr =le64_to_cpu (ags->ghes_addr_le); -if (physical_address) { start_addr += source_id *sizeof (uint64_t );
@@ -448,9 +447,147 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)return ret; } +/* +* Error register block data layout +* +* | +---------------------+ ges.ghes_addr_le +* | |error_block_address0 | +* | +---------------------+ +* | |error_block_address1 | +* | +---------------------+ --+-- +* | | ............. | GHES_ADDRESS_SIZE +* | +---------------------+ --+-- +* | |error_block_addressN | +* | +---------------------+ +* | | read_ack0 | +* | +---------------------+ --+-- +* | | read_ack1 | GHES_ADDRESS_SIZE +* | +---------------------+ --+-- +* | | ............. | +* | +---------------------+ +* | | read_ackN | +* | +---------------------+ --+-- +* | | CPER | | +* | | .... | GHES_MAX_RAW_DATA_LENGT +* | | CPER | | +* | +---------------------+ --+-- +* | | .......... | +* | +---------------------+ +* | | CPER | +* | | .... | +* | | CPER | +* | +---------------------+ +*/ + +/* Map from uint32_t notify to entry offset in GHES */ +static const uint8_t error_source_to_index[] = {0xff ,0xff ,0xff ,0xff , +0xff ,0xff ,0xff ,1 ,0 }; + +static bool ghes_get_addr (uint32_t notify,uint64_t *error_block_addr, +uint64_t *read_ack_addr) +{ +uint64_t base; + +if (notify >=ACPI_GHES_NOTIFY_RESERVED ) { +return false; + } + +/* Find and check the source id for this new CPER */ +if (error_source_to_index[notify] ==0xff ) { +return false; + } + + base =ghes_get_state_start_address (); + + *read_ack_addr = base + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ) + + error_source_to_index[notify] *sizeof (uint64_t ); + +/* Could also be read back from the error_block_address register */ + *error_block_addr = base + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ) + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ) + + error_source_to_index[notify] *ACPI_GHES_MAX_RAW_DATA_LENGTH ; + +return true; +} +NotifierList generic_error_notifiers =NOTIFIER_LIST_INITIALIZER (error_device_notifiers); +void ghes_record_cper_errors (AcpiGhesCper *cper,uint32_t notify) +{ +int read_ack =0 ; +uint32_t i; +uint64_t read_ack_addr =0 ; +uint64_t error_block_addr =0 ; +uint32_t data_length; +GArray *block; + +if (!ghes_get_addr (notify, &error_block_addr, &read_ack_addr)) { +error_report ("GHES: Invalid error block/ack address(es)" ); +return ; + } + +cpu_physical_memory_read (read_ack_addr, + &read_ack,sizeof (uint64_t )); + +/* zero means OSPM does not acknowledge the error */ +if (!read_ack) { +error_report ("Last time OSPM does not acknowledge the error," +" record CPER failed this time, set the ack value to" +" avoid blocking next time CPER record! exit" ); + read_ack =1 ; +cpu_physical_memory_write (read_ack_addr, + &read_ack,sizeof (uint64_t )); +return ; + } + + read_ack =cpu_to_le64 (0 ); +cpu_physical_memory_write (read_ack_addr, + &read_ack,sizeof (uint64_t )); + +/* Build CPER record */ + +/* +* Invalid fru id: ACPI 4.0: 17.3.2.6.1 Generic Error Data, +* Table 17-13 Generic Error Data Entry +*/ +QemuUUID fru_id = {}; + + block =g_array_new (false, true/* clear */ ,1 ); + data_length =ACPI_GHES_DATA_LENGTH + cper->data_len; + +/* +* 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, cper->uuid, +ACPI_CPER_SEV_RECOVERABLE ,0 ,0 , + cper->data_len, fru_id,0 ); + +/* Add CPER data */ +for (i =0 ; i < cper->data_len; i++) { +build_append_int_noprefix (block, cper->data[i],1 ); + } + +/* Write the generic error data entry into guest memory */ +cpu_physical_memory_write (error_block_addr, block->data, block->len); + +g_array_free (block, true); + +notifier_list_notify (&generic_error_notifiers,NULL ); +} +bool acpi_ghes_present (void ) {AcpiGedState *acpi_ged_state;
hw/acpi/ghes_cper.c +1 -1
@@ -47,7 +47,7 @@ void qmp_ghes_cper(CommonPlatformErrorRecord *qmp_cper, cper.data[i] = p->value; } -/* TODO: call a function at ghes */ +ghes_record_cper_errors (&cper,ACPI_GHES_NOTIFY_GPIO );g_free (cper.data); }
include/hw/acpi/ghes.h +2 -0
@@ -84,6 +84,8 @@ typedef struct AcpiGhesCper {uint32_t data_len; } AcpiGhesCper; +void ghes_record_cper_errors (AcpiGhesCper *cper,uint32_t notify); +/** * acpi_ghes_present: Report whether ACPI GHES table is present *
Signature · 1 line
2.45.2
PATCH v4 7/7 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 | 1 + scripts/ghes_inject.py | 673 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 674 insertions(+) create mode 100755 scripts/ghes_inject.py
MAINTAINERS +1 -0
@@ -2081,6 +2081,7 @@ S: Maintained F: hw/arm/ghes_cper.c F: hw/acpi/ghes_cper_stub.c F: qapi/ghes-cper.json +F: scripts/ghes_inject.py ppc4xx L: [email protected]
scripts/ghes_inject.py new file +673 -0
673 lines not on this page · raw message
Signature · 1 line
2.45.2