diff mbox

[19/33] pc: piix4/ich9: add 'cpu-hotplug-legacy' property

Message ID 1463496205-251412-20-git-send-email-imammedo@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Igor Mammedov May 17, 2016, 2:43 p.m. UTC 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/acpi/ich9.c         | 29 ++++++++++++++++++++++++++---
 hw/acpi/piix4.c        | 12 +++++++++---
 include/hw/acpi/ich9.h |  1 +
 3 files changed, 36 insertions(+), 6 deletions(-)

Comments

Marcel Apfelbaum May 30, 2016, 6:59 p.m. UTC | #1 
On 05/17/2016 05:43 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   hw/acpi/ich9.c         | 29 ++++++++++++++++++++++++++---
>   hw/acpi/piix4.c        | 12 +++++++++---
>   include/hw/acpi/ich9.h |  1 +
>   3 files changed, 36 insertions(+), 6 deletions(-)
>
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 853c9c4..121e30c 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -273,8 +273,10 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>       pm->powerdown_notifier.notify = pm_powerdown_req;
>       qemu_register_powerdown_notifier(&pm->powerdown_notifier);
>
> -    legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
> -        OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
> +    if (pm->cpu_hotplug_legacy) {
> +        legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
> +            OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
> +    }
>
>       if (pm->acpi_memory_hotplug.is_enabled) {
>           acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
> @@ -306,6 +308,21 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value,
>       s->pm.acpi_memory_hotplug.is_enabled = value;
>   }
>
> +static bool ich9_pm_get_cpu_hotplug_legacy(Object *obj, Error **errp)
> +{
> +    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
> +
> +    return s->pm.cpu_hotplug_legacy;
> +}
> +
> +static void ich9_pm_set_cpu_hotplug_legacy(Object *obj, bool value,
> +                                           Error **errp)
> +{
> +    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
> +
> +    s->pm.cpu_hotplug_legacy = value;
> +}
> +
>   static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name,
>                                      void *opaque, Error **errp)
>   {
> @@ -397,6 +414,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
>   {
>       static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
>       pm->acpi_memory_hotplug.is_enabled = true;
> +    pm->cpu_hotplug_legacy = true;
>       pm->disable_s3 = 0;
>       pm->disable_s4 = 0;
>       pm->s4_val = 2;
> @@ -412,6 +430,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
>                                ich9_pm_get_memory_hotplug_support,
>                                ich9_pm_set_memory_hotplug_support,
>                                NULL);
> +    object_property_add_bool(obj, "cpu-hotplug-legacy",
> +                             ich9_pm_get_cpu_hotplug_legacy,
> +                             ich9_pm_set_cpu_hotplug_legacy,
> +                             NULL);
>       object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",
>                           ich9_pm_get_disable_s3,
>                           ich9_pm_set_disable_s3,
> @@ -439,7 +461,8 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
>           object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
>           acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug,
>                               dev, errp);
> -    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> +    } else if (lpc->pm.cpu_hotplug_legacy &&
> +               object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
>           legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp);
>       } else {
>           error_setg(errp, "acpi: device plug request for not supported device"
> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
> index c66d3ed..d25479c 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -85,6 +85,7 @@ typedef struct PIIX4PMState {
>       uint8_t disable_s4;
>       uint8_t s4_val;
>
> +    bool cpu_hotplug_legacy;
>       AcpiCpuHotplug gpe_cpu;
>
>       MemHotplugState acpi_memory_hotplug;
> @@ -350,7 +351,8 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
>           acpi_memory_plug_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp);
>       } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
>           acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp);
> -    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> +    } else if (s->cpu_hotplug_legacy &&
> +               object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
>           legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp);
>       } else {
>           error_setg(errp, "acpi: device plug request for not supported device"
> @@ -569,8 +571,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
>       acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
>                       s->use_acpi_pci_hotplug);
>
> -    legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
> -                                 PIIX4_CPU_HOTPLUG_IO_BASE);
> +    if (s->cpu_hotplug_legacy) {
> +        legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
> +                                     PIIX4_CPU_HOTPLUG_IO_BASE);
> +    }
>
>       if (s->acpi_memory_hotplug.is_enabled) {
>           acpi_memory_hotplug_init(parent, OBJECT(s), &s->acpi_memory_hotplug);
> @@ -600,6 +604,8 @@ static Property piix4_pm_properties[] = {
>                        use_acpi_pci_hotplug, true),
>       DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState,
>                        acpi_memory_hotplug.is_enabled, true),
> +    DEFINE_PROP_BOOL("cpu-hotplug-legacy", PIIX4PMState,
> +                     cpu_hotplug_legacy, true),
>       DEFINE_PROP_END_OF_LIST(),
>   };
>
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index bbd657c..e29a856 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -48,6 +48,7 @@ typedef struct ICH9LPCPMRegs {
>       uint32_t pm_io_base;
>       Notifier powerdown_notifier;
>
> +    bool cpu_hotplug_legacy;
>       AcpiCpuHotplug gpe_cpu;
>
>       MemHotplugState acpi_memory_hotplug;
>

Looks OK to me.

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>


Thanks,
Marcel
diff mbox

Patch

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 853c9c4..121e30c 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -273,8 +273,10 @@  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
     pm->powerdown_notifier.notify = pm_powerdown_req;
     qemu_register_powerdown_notifier(&pm->powerdown_notifier);
 
-    legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
-        OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
+    if (pm->cpu_hotplug_legacy) {
+        legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
+            OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
+    }
 
     if (pm->acpi_memory_hotplug.is_enabled) {
         acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
@@ -306,6 +308,21 @@  static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value,
     s->pm.acpi_memory_hotplug.is_enabled = value;
 }
 
+static bool ich9_pm_get_cpu_hotplug_legacy(Object *obj, Error **errp)
+{
+    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
+
+    return s->pm.cpu_hotplug_legacy;
+}
+
+static void ich9_pm_set_cpu_hotplug_legacy(Object *obj, bool value,
+                                           Error **errp)
+{
+    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
+
+    s->pm.cpu_hotplug_legacy = value;
+}
+
 static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name,
                                    void *opaque, Error **errp)
 {
@@ -397,6 +414,7 @@  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
 {
     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
     pm->acpi_memory_hotplug.is_enabled = true;
+    pm->cpu_hotplug_legacy = true;
     pm->disable_s3 = 0;
     pm->disable_s4 = 0;
     pm->s4_val = 2;
@@ -412,6 +430,10 @@  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
                              ich9_pm_get_memory_hotplug_support,
                              ich9_pm_set_memory_hotplug_support,
                              NULL);
+    object_property_add_bool(obj, "cpu-hotplug-legacy",
+                             ich9_pm_get_cpu_hotplug_legacy,
+                             ich9_pm_set_cpu_hotplug_legacy,
+                             NULL);
     object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",
                         ich9_pm_get_disable_s3,
                         ich9_pm_set_disable_s3,
@@ -439,7 +461,8 @@  void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
         object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
         acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug,
                             dev, errp);
-    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+    } else if (lpc->pm.cpu_hotplug_legacy &&
+               object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
         legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp);
     } else {
         error_setg(errp, "acpi: device plug request for not supported device"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index c66d3ed..d25479c 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -85,6 +85,7 @@  typedef struct PIIX4PMState {
     uint8_t disable_s4;
     uint8_t s4_val;
 
+    bool cpu_hotplug_legacy;
     AcpiCpuHotplug gpe_cpu;
 
     MemHotplugState acpi_memory_hotplug;
@@ -350,7 +351,8 @@  static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
         acpi_memory_plug_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
         acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp);
-    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+    } else if (s->cpu_hotplug_legacy &&
+               object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
         legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp);
     } else {
         error_setg(errp, "acpi: device plug request for not supported device"
@@ -569,8 +571,10 @@  static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
     acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
                     s->use_acpi_pci_hotplug);
 
-    legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
-                                 PIIX4_CPU_HOTPLUG_IO_BASE);
+    if (s->cpu_hotplug_legacy) {
+        legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
+                                     PIIX4_CPU_HOTPLUG_IO_BASE);
+    }
 
     if (s->acpi_memory_hotplug.is_enabled) {
         acpi_memory_hotplug_init(parent, OBJECT(s), &s->acpi_memory_hotplug);
@@ -600,6 +604,8 @@  static Property piix4_pm_properties[] = {
                      use_acpi_pci_hotplug, true),
     DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState,
                      acpi_memory_hotplug.is_enabled, true),
+    DEFINE_PROP_BOOL("cpu-hotplug-legacy", PIIX4PMState,
+                     cpu_hotplug_legacy, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index bbd657c..e29a856 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -48,6 +48,7 @@  typedef struct ICH9LPCPMRegs {
     uint32_t pm_io_base;
     Notifier powerdown_notifier;
 
+    bool cpu_hotplug_legacy;
     AcpiCpuHotplug gpe_cpu;
 
     MemHotplugState acpi_memory_hotplug;