Hi Igor, > From: Igor Mammedov <[email protected]> > Sent: Friday, October 27, 2023 2:18 PM > To: Salil Mehta <[email protected]> > Cc: [email protected]; [email protected]; [email protected]; jean- > [email protected]; Jonathan Cameron <[email protected]>; > [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; zhukeqian > <[email protected]>; wangxiongfeng (C) <[email protected]>; > wangyanan (Y) <[email protected]>; [email protected]; > [email protected]; [email protected]; Linuxarm <[email protected]> > Subject: Re: [PATCH V6 7/9] hw/acpi: Update ACPI GED framework to support > vCPU Hotplug > > On Fri, 13 Oct 2023 11:51:27 +0100 > Salil Mehta <[email protected]> wrote: > > > ACPI GED shall be used to convey to the guest kernel about any CPU > > hot-(un)plug > > events. Therefore, existing ACPI GED framework inside QEMU needs to be > > enhanced > > to support CPU hotplug state and events. > > > > This is a part of hw wiring which you started to introduce in 4/9 > Given patches are small, I'd merge this into 4/9 to avoid broken context. > So essentially GED improvement would consist from hw and aml parts. > with some extra refactoring (5/9) in a separate patch.
No issues. Will merge. Thanks Salil. > > Co-developed-by: Keqian Zhu <[email protected]> > > Signed-off-by: Keqian Zhu <[email protected]> > > Signed-off-by: Salil Mehta <[email protected]> > > Reviewed-by: Jonathan Cameron <[email protected]> > > Reviewed-by: Gavin Shan <[email protected]> > > Tested-by: Vishnu Pajjuri <[email protected]> > > Tested-by: Xianglai Li <[email protected]> > > --- > > hw/acpi/generic_event_device.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c > > index 62d504d231..0d5f0140e5 100644 > > --- a/hw/acpi/generic_event_device.c > > +++ b/hw/acpi/generic_event_device.c > > @@ -12,6 +12,7 @@ > > #include "qemu/osdep.h" > > #include "qapi/error.h" > > #include "hw/acpi/acpi.h" > > +#include "hw/acpi/cpu.h" > > #include "hw/acpi/generic_event_device.h" > > #include "hw/irq.h" > > #include "hw/mem/pc-dimm.h" > > @@ -239,6 +240,8 @@ static void acpi_ged_device_plug_cb(HotplugHandler > > *hotplug_dev, > > } else { > > acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp); > > } > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_plug_cb(hotplug_dev, &s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "virt: device plug request for unsupported device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -253,6 +256,8 @@ static void acpi_ged_unplug_request_cb(HotplugHandler > > *hotplug_dev, > > if ((object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) && > > !(object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)))) { > > acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, dev, > > errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, > > errp); > > } else { > > error_setg(errp, "acpi: device unplug request for unsupported > > device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -266,6 +271,8 @@ static void acpi_ged_unplug_cb(HotplugHandler > > *hotplug_dev, > > > > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > > acpi_memory_unplug_cb(&s->memhp_state, dev, errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_cb(&s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "acpi: device unplug for unsupported device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -277,6 +284,7 @@ static void acpi_ged_ospm_status(AcpiDeviceIf *adev, > > ACPIOSTInfoList ***list) > > AcpiGedState *s = ACPI_GED(adev); > > > > acpi_memory_ospm_status(&s->memhp_state, list); > > + acpi_cpu_ospm_status(&s->cpuhp_state, list); > > } > > > > static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) > > @@ -291,6 +299,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, > > AcpiEventStatusBits ev) > > sel = ACPI_GED_PWR_DOWN_EVT; > > } else if (ev & ACPI_NVDIMM_HOTPLUG_STATUS) { > > sel = ACPI_GED_NVDIMM_HOTPLUG_EVT; > > + } else if (ev & ACPI_CPU_HOTPLUG_STATUS) { > > + sel = ACPI_GED_CPU_HOTPLUG_EVT; > > } else { > > /* Unknown event. Return without generating interrupt. */ > > warn_report("GED: Unsupported event %d. No irq injected", ev);
