| Message ID | d0607d8f6116ff841b6c6a17d20f6d7077063045.1722634602.git.mchehab+huawei@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add ACPI CPER firmware first error injection on ARM emulation | expand |
On Fri, 2 Aug 2024 23:43:58 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: Do we need to rename this now there is a GED involved? Is it even technically a GPIO any more? Spec says in 18.3.2.7 HW-reduced ACPI platforms signal the error using a GPIO interrupt or another interrupt declared under a generic event device (Interrupt-signaled ACPI events) and goes on to say that a _CRS entry is used to list the interrupt. Give the Generic Event Device has a _CRS with aml_interrupt() as the type I think we should even have the hest entry say it's an interrupt (external?) rather than a gpio. > Adds 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/1272350481-27951-8-git-send-email-ying.huang@intel.com/ > > Co-authored-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Again, more or less fine with this Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> to go with that co-auth > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > hw/acpi/ghes.c | 3 +++ > hw/arm/virt-acpi-build.c | 1 + > hw/arm/virt.c | 16 +++++++++++++++- > include/hw/acpi/ghes.h | 3 +++ > include/hw/arm/virt.h | 1 + > 5 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c > index e9511d9b8f71..8d0262e6c1aa 100644 > --- a/hw/acpi/ghes.c > +++ b/hw/acpi/ghes.c > @@ -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; > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index f76fb117adff..f8bbe3e7a0b8 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -858,6 +858,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 > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 687fe0bb8bc9..8b315328154f 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -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,6 +1010,15 @@ 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); > + > + if (s->acpi_dev) { > + acpi_send_event(s->acpi_dev, ACPI_GENERIC_ERROR); > + } > +} > + > static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, > uint32_t phandle) > { > @@ -2397,6 +2407,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. > diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h > index 674f6958e905..6891eafff5ab 100644 > --- a/include/hw/acpi/ghes.h > +++ b/include/hw/acpi/ghes.h > @@ -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 > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > index a4d937ed45ac..ad9f6e94dcc5 100644 > --- a/include/hw/arm/virt.h > +++ b/include/hw/arm/virt.h > @@ -175,6 +175,7 @@ struct VirtMachineState { > DeviceState *gic; > DeviceState *acpi_dev; > Notifier powerdown_notifier; > + Notifier generic_error_notifier; > PCIBus *bus; > char *oem_id; > char *oem_table_id;
Em Mon, 5 Aug 2024 17:54:00 +0100 Jonathan Cameron <Jonathan.Cameron@Huawei.com> escreveu: > On Fri, 2 Aug 2024 23:43:58 +0200 > Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > > Do we need to rename this now there is a GED involved? > Is it even technically a GPIO any more? > Spec says in 18.3.2.7 > HW-reduced ACPI platforms signal the error using a GPIO > interrupt or another interrupt declared under > a generic event device (Interrupt-signaled ACPI events) > and goes on to say that a _CRS entry is used to > list the interrupt. > > Give the Generic Event Device has a _CRS > with aml_interrupt() as the type I think we should > even have the hest entry say it's an interrupt (external?) > rather than a gpio. True. I'll change patch description to: arm/virt: Wire up a GED error device for ACPI / GHES Adds 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/1272350481-27951-8-git-send-email-ying.huang@intel.com/ As the spec at https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html#event-notification-for-generic-error-sources revers to it as: "The implementation of Event notification requires the platform to define a device with PNP ID PNP0C33 in the ACPI namespace, referred to as the error device." > > Adds 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/1272350481-27951-8-git-send-email-ying.huang@intel.com/ > > > > Co-authored-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Again, more or less fine with this > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > to go with that co-auth Thanks! Mauro
On Fri, 2 Aug 2024 23:43:58 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: subj: s/GPIO/GED signaled/ > Adds support to ARM virtualization to allow handling > a General Purpose Event (GPE) via GED error device. s/General Purpose Event (GPE).../ generic error ACPI Event via GED & error source device > It is aligned with Linux Kernel patch: > https://lore.kernel.org/lkml/1272350481-27951-8-git-send-email-ying.huang@intel.com/ > > Co-authored-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > hw/acpi/ghes.c | 3 +++ > hw/arm/virt-acpi-build.c | 1 + > hw/arm/virt.c | 16 +++++++++++++++- > include/hw/acpi/ghes.h | 3 +++ > include/hw/arm/virt.h | 1 + > 5 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c > index e9511d9b8f71..8d0262e6c1aa 100644 > --- a/hw/acpi/ghes.c > +++ b/hw/acpi/ghes.c > @@ -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); s/generic_error_notifiers/acpi_generic_error_notifiers/ > bool acpi_ghes_present(void) > { > AcpiGedState *acpi_ged_state; > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index f76fb117adff..f8bbe3e7a0b8 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -858,6 +858,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > } > > acpi_dsdt_add_power_button(scope); > + acpi_dsdt_add_error_device(scope); with suggested change in 2/7, this will look like aml_append(scope, aml_foo_device()); > #ifdef CONFIG_TPM > acpi_dsdt_add_tpm(scope, vms); > #endif > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 687fe0bb8bc9..8b315328154f 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -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,6 +1010,15 @@ 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); > + > + if (s->acpi_dev) { I'd assert her, and move check to caller so it won't even add a notifier if acpi_dev is not present > + acpi_send_event(s->acpi_dev, ACPI_GENERIC_ERROR); > + } > +} > + > static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, > uint32_t phandle) > { > @@ -2397,6 +2407,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. > diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h > index 674f6958e905..6891eafff5ab 100644 > --- a/include/hw/acpi/ghes.h > +++ b/include/hw/acpi/ghes.h > @@ -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 > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > index a4d937ed45ac..ad9f6e94dcc5 100644 > --- a/include/hw/arm/virt.h > +++ b/include/hw/arm/virt.h > @@ -175,6 +175,7 @@ struct VirtMachineState { > DeviceState *gic; > DeviceState *acpi_dev; > Notifier powerdown_notifier; > + Notifier generic_error_notifier; > PCIBus *bus; > char *oem_id; > char *oem_table_id;
diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index e9511d9b8f71..8d0262e6c1aa 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -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; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index f76fb117adff..f8bbe3e7a0b8 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -858,6 +858,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 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 687fe0bb8bc9..8b315328154f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -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,6 +1010,15 @@ 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); + + if (s->acpi_dev) { + acpi_send_event(s->acpi_dev, ACPI_GENERIC_ERROR); + } +} + static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, uint32_t phandle) { @@ -2397,6 +2407,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. diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index 674f6958e905..6891eafff5ab 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -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 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index a4d937ed45ac..ad9f6e94dcc5 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -175,6 +175,7 @@ struct VirtMachineState { DeviceState *gic; DeviceState *acpi_dev; Notifier powerdown_notifier; + Notifier generic_error_notifier; PCIBus *bus; char *oem_id; char *oem_table_id;
Adds 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/1272350481-27951-8-git-send-email-ying.huang@intel.com/ Co-authored-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- hw/acpi/ghes.c | 3 +++ hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 16 +++++++++++++++- include/hw/acpi/ghes.h | 3 +++ include/hw/arm/virt.h | 1 + 5 files changed, 23 insertions(+), 1 deletion(-)