On Fri, 21 Feb 2025 15:35:20 +0100 Mauro Carvalho Chehab <mchehab+hua...@kernel.org> wrote:
> Adds support to ARM virtualization to allow handling > generic error ACPI Event via GED & error source device. > > It is aligned with Linux Kernel patch: > https://lore.kernel.org/lkml/1272350481-27951-8-git-send-email-ying.hu...@intel.com/ > > Co-authored-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org> > Co-authored-by: Jonathan Cameron <jonathan.came...@huawei.com> > Signed-off-by: Jonathan Cameron <jonathan.came...@huawei.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org> > Acked-by: Igor Mammedov <imamm...@redhat.com> > > --- > > Changes from v8: > > - Added a call to the function that produces GHES generic > records, as this is now added earlier in this series. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org> > --- > hw/acpi/generic_event_device.c | 2 +- > hw/arm/virt-acpi-build.c | 1 + > hw/arm/virt.c | 12 +++++++++++- > include/hw/arm/virt.h | 1 + > 4 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c > index 180eebbce1cd..f5e899155d34 100644 > --- a/hw/acpi/generic_event_device.c > +++ b/hw/acpi/generic_event_device.c > @@ -331,7 +331,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, > AcpiEventStatusBits ev) > > static const Property acpi_ged_properties[] = { > DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0), > - DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState, > ghes_state.use_hest_addr, false), > + DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState, > ghes_state.use_hest_addr, true), irrelevant to this patch, see comment in 8/14 > }; > > static const VMStateDescription vmstate_memhp_state = { > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 9de51105a513..4f174795ed60 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -861,6 +861,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > VirtMachineState *vms) > } > > acpi_dsdt_add_power_button(scope); > + aml_append(scope, aml_error_device()); > #ifdef CONFIG_TPM > acpi_dsdt_add_tpm(scope, vms); > #endif > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 4a5a9666e916..3faf32f900b5 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -678,7 +678,7 @@ static inline DeviceState > *create_acpi_ged(VirtMachineState *vms) > DeviceState *dev; > MachineState *ms = MACHINE(vms); > int irq = vms->irqmap[VIRT_ACPI_GED]; > - uint32_t event = ACPI_GED_PWR_DOWN_EVT; > + uint32_t event = ACPI_GED_PWR_DOWN_EVT | ACPI_GED_ERROR_EVT; > > if (ms->ram_slots) { > event |= ACPI_GED_MEM_HOTPLUG_EVT; > @@ -1010,6 +1010,13 @@ static void virt_powerdown_req(Notifier *n, void > *opaque) > } > } > > +static void virt_generic_error_req(Notifier *n, void *opaque) > +{ > + VirtMachineState *s = container_of(n, VirtMachineState, > generic_error_notifier); > + > + acpi_send_event(s->acpi_dev, ACPI_GENERIC_ERROR); > +} > + > static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, > uint32_t phandle) > { > @@ -2404,6 +2411,9 @@ static void machvirt_init(MachineState *machine) > > if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) { > vms->acpi_dev = create_acpi_ged(vms); > + vms->generic_error_notifier.notify = virt_generic_error_req; > + notifier_list_add(&acpi_generic_error_notifiers, > + &vms->generic_error_notifier); > } else { > create_gpio_devices(vms, VIRT_GPIO, sysmem); > } > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > index c8e94e6aedc9..f3cf28436770 100644 > --- a/include/hw/arm/virt.h > +++ b/include/hw/arm/virt.h > @@ -176,6 +176,7 @@ struct VirtMachineState { > DeviceState *gic; > DeviceState *acpi_dev; > Notifier powerdown_notifier; > + Notifier generic_error_notifier; > PCIBus *bus; > char *oem_id; > char *oem_table_id;
