diff mbox

[06/11] acpi/ich9: add CPU hotplug handling to Q35 machine

Message ID 1386951736-929-7-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov Dec. 13, 2013, 4:22 p.m. UTC 
.. including readonly 'cpu-hotplug-io-base' property

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/acpi/ich9.c         | 27 +++++++++++++++++++++++++++
 include/hw/acpi/ich9.h |  4 ++++
 2 files changed, 31 insertions(+)

Comments

Michael S. Tsirkin Dec. 19, 2013, 2:18 p.m. UTC | #1 
On Fri, Dec 13, 2013 at 05:22:11PM +0100, Igor Mammedov wrote:
> .. including readonly 'cpu-hotplug-io-base' property
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Is this documented in the Q35 spec? Could not find it there.
If this is our PV code like PIIX, then we need to document this
interface.

> ---
>  hw/acpi/ich9.c         | 27 +++++++++++++++++++++++++++
>  include/hw/acpi/ich9.h |  4 ++++
>  2 files changed, 31 insertions(+)
> 
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 30f0df8..9c88109 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -44,6 +44,8 @@ do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0)
>  #define ICH9_DEBUG(fmt, ...)    do { } while (0)
>  #endif
>  
> +#define ICH9_PROC_BASE 0xa18
> +
>  static void ich9_pm_update_sci_fn(ACPIREGS *regs)
>  {
>      ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);
> @@ -185,6 +187,15 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
>      acpi_pm1_evt_power_down(&pm->acpi_regs);
>  }
>  
> +static void ich9_cpu_added_req(Notifier *n, void *opaque)
> +{
> +    ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier);
> +
> +    assert(pm != NULL);
> +    acpi_hotplug_cpu_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque));
> +    acpi_update_sci(&pm->acpi_regs, pm->irq);
> +}
> +
>  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>                    qemu_irq sci_irq)
>  {
> @@ -210,6 +221,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>      qemu_register_reset(pm_reset, pm);
>      pm->powerdown_notifier.notify = pm_powerdown_req;
>      qemu_register_powerdown_notifier(&pm->powerdown_notifier);
> +
> +    acpi_hotplug_cpu_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
> +                          &pm->gpe_cpu, pm->gpe_cpu.io_base);
> +    pm->cpu_added_notifier.notify = ich9_cpu_added_req;
> +    qemu_register_cpu_added_notifier(&pm->cpu_added_notifier);
>  }
>  
>  static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
> @@ -222,6 +238,14 @@ static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
>      visit_type_uint32(v, &value, name, errp);
>  }
>  
> +static void ich9_pm_get_cpu_io_base(Object *obj, Visitor *v, void *opaque,
> +                                    const char *name, Error **errp)
> +{
> +    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
> +
> +    visit_type_uint16(v, &s->pm.gpe_cpu.io_base, name, errp);
> +}
> +
>  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
>  {
>      static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
> @@ -233,4 +257,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
>                          NULL, NULL, pm, NULL);
>      object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
>                                     &gpe0_len, errp);
> +    pm->gpe_cpu.io_base = ICH9_PROC_BASE;
> +    object_property_add(obj, ACPI_CPU_HOTPLUG_IO_BASE_PROP, "int",
> +                        ich9_pm_get_cpu_io_base, NULL, NULL, NULL, NULL);
>  }
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index 82fcf9f..c71a9b4 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -22,6 +22,7 @@
>  #define HW_ACPI_ICH9_H
>  
>  #include "hw/acpi/acpi.h"
> +#include "hw/acpi/hotplug.h"
>  
>  typedef struct ICH9LPCPMRegs {
>      /*
> @@ -42,6 +43,9 @@ typedef struct ICH9LPCPMRegs {
>  
>      uint32_t pm_io_base;
>      Notifier powerdown_notifier;
> +
> +    AcpiCPUHotplug gpe_cpu;
> +    Notifier cpu_added_notifier;
>  } ICH9LPCPMRegs;
>  
>  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> -- 
> 1.8.3.1
Igor Mammedov Dec. 19, 2013, 3:17 p.m. UTC | #2 
On Thu, 19 Dec 2013 16:18:59 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Fri, Dec 13, 2013 at 05:22:11PM +0100, Igor Mammedov wrote:
> > .. including readonly 'cpu-hotplug-io-base' property
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> 
> Is this documented in the Q35 spec? Could not find it there.
> If this is our PV code like PIIX, then we need to document this
> interface.
It's PV code and I need to update docs/specs/acpi_cpu_hotplug.txt
with Q35 io range.
I'll respin remained patches on top of PCI branch.

> 
> > ---
> >  hw/acpi/ich9.c         | 27 +++++++++++++++++++++++++++
> >  include/hw/acpi/ich9.h |  4 ++++
> >  2 files changed, 31 insertions(+)
> > 
> > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> > index 30f0df8..9c88109 100644
> > --- a/hw/acpi/ich9.c
> > +++ b/hw/acpi/ich9.c
> > @@ -44,6 +44,8 @@ do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0)
> >  #define ICH9_DEBUG(fmt, ...)    do { } while (0)
> >  #endif
> >  
> > +#define ICH9_PROC_BASE 0xa18
> > +
> >  static void ich9_pm_update_sci_fn(ACPIREGS *regs)
> >  {
> >      ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);
> > @@ -185,6 +187,15 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
> >      acpi_pm1_evt_power_down(&pm->acpi_regs);
> >  }
> >  
> > +static void ich9_cpu_added_req(Notifier *n, void *opaque)
> > +{
> > +    ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier);
> > +
> > +    assert(pm != NULL);
> > +    acpi_hotplug_cpu_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque));
> > +    acpi_update_sci(&pm->acpi_regs, pm->irq);
> > +}
> > +
> >  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> >                    qemu_irq sci_irq)
> >  {
> > @@ -210,6 +221,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> >      qemu_register_reset(pm_reset, pm);
> >      pm->powerdown_notifier.notify = pm_powerdown_req;
> >      qemu_register_powerdown_notifier(&pm->powerdown_notifier);
> > +
> > +    acpi_hotplug_cpu_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
> > +                          &pm->gpe_cpu, pm->gpe_cpu.io_base);
> > +    pm->cpu_added_notifier.notify = ich9_cpu_added_req;
> > +    qemu_register_cpu_added_notifier(&pm->cpu_added_notifier);
> >  }
> >  
> >  static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
> > @@ -222,6 +238,14 @@ static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
> >      visit_type_uint32(v, &value, name, errp);
> >  }
> >  
> > +static void ich9_pm_get_cpu_io_base(Object *obj, Visitor *v, void *opaque,
> > +                                    const char *name, Error **errp)
> > +{
> > +    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
> > +
> > +    visit_type_uint16(v, &s->pm.gpe_cpu.io_base, name, errp);
> > +}
> > +
> >  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
> >  {
> >      static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
> > @@ -233,4 +257,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
> >                          NULL, NULL, pm, NULL);
> >      object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
> >                                     &gpe0_len, errp);
> > +    pm->gpe_cpu.io_base = ICH9_PROC_BASE;
> > +    object_property_add(obj, ACPI_CPU_HOTPLUG_IO_BASE_PROP, "int",
> > +                        ich9_pm_get_cpu_io_base, NULL, NULL, NULL, NULL);
> >  }
> > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> > index 82fcf9f..c71a9b4 100644
> > --- a/include/hw/acpi/ich9.h
> > +++ b/include/hw/acpi/ich9.h
> > @@ -22,6 +22,7 @@
> >  #define HW_ACPI_ICH9_H
> >  
> >  #include "hw/acpi/acpi.h"
> > +#include "hw/acpi/hotplug.h"
> >  
> >  typedef struct ICH9LPCPMRegs {
> >      /*
> > @@ -42,6 +43,9 @@ typedef struct ICH9LPCPMRegs {
> >  
> >      uint32_t pm_io_base;
> >      Notifier powerdown_notifier;
> > +
> > +    AcpiCPUHotplug gpe_cpu;
> > +    Notifier cpu_added_notifier;
> >  } ICH9LPCPMRegs;
> >  
> >  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> > -- 
> > 1.8.3.1
Michael S. Tsirkin Dec. 19, 2013, 3:33 p.m. UTC | #3 
On Thu, Dec 19, 2013 at 04:17:08PM +0100, Igor Mammedov wrote:
> On Thu, 19 Dec 2013 16:18:59 +0200
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> 
> > On Fri, Dec 13, 2013 at 05:22:11PM +0100, Igor Mammedov wrote:
> > > .. including readonly 'cpu-hotplug-io-base' property
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > 
> > Is this documented in the Q35 spec? Could not find it there.
> > If this is our PV code like PIIX, then we need to document this
> > interface.
> It's PV code and I need to update docs/specs/acpi_cpu_hotplug.txt
> with Q35 io range.

BTW doesn't some system out there implement cpu hotplug?
If yes would have been nice to reuse that, though not a must.

> I'll respin remained patches on top of PCI branch.
> 
> > 
> > > ---
> > >  hw/acpi/ich9.c         | 27 +++++++++++++++++++++++++++
> > >  include/hw/acpi/ich9.h |  4 ++++
> > >  2 files changed, 31 insertions(+)
> > > 
> > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> > > index 30f0df8..9c88109 100644
> > > --- a/hw/acpi/ich9.c
> > > +++ b/hw/acpi/ich9.c
> > > @@ -44,6 +44,8 @@ do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0)
> > >  #define ICH9_DEBUG(fmt, ...)    do { } while (0)
> > >  #endif
> > >  
> > > +#define ICH9_PROC_BASE 0xa18
> > > +
> > >  static void ich9_pm_update_sci_fn(ACPIREGS *regs)
> > >  {
> > >      ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);
> > > @@ -185,6 +187,15 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
> > >      acpi_pm1_evt_power_down(&pm->acpi_regs);
> > >  }
> > >  
> > > +static void ich9_cpu_added_req(Notifier *n, void *opaque)
> > > +{
> > > +    ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier);
> > > +
> > > +    assert(pm != NULL);
> > > +    acpi_hotplug_cpu_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque));
> > > +    acpi_update_sci(&pm->acpi_regs, pm->irq);
> > > +}
> > > +
> > >  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> > >                    qemu_irq sci_irq)
> > >  {
> > > @@ -210,6 +221,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> > >      qemu_register_reset(pm_reset, pm);
> > >      pm->powerdown_notifier.notify = pm_powerdown_req;
> > >      qemu_register_powerdown_notifier(&pm->powerdown_notifier);
> > > +
> > > +    acpi_hotplug_cpu_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
> > > +                          &pm->gpe_cpu, pm->gpe_cpu.io_base);
> > > +    pm->cpu_added_notifier.notify = ich9_cpu_added_req;
> > > +    qemu_register_cpu_added_notifier(&pm->cpu_added_notifier);
> > >  }
> > >  
> > >  static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
> > > @@ -222,6 +238,14 @@ static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
> > >      visit_type_uint32(v, &value, name, errp);
> > >  }
> > >  
> > > +static void ich9_pm_get_cpu_io_base(Object *obj, Visitor *v, void *opaque,
> > > +                                    const char *name, Error **errp)
> > > +{
> > > +    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
> > > +
> > > +    visit_type_uint16(v, &s->pm.gpe_cpu.io_base, name, errp);
> > > +}
> > > +
> > >  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
> > >  {
> > >      static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
> > > @@ -233,4 +257,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
> > >                          NULL, NULL, pm, NULL);
> > >      object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
> > >                                     &gpe0_len, errp);
> > > +    pm->gpe_cpu.io_base = ICH9_PROC_BASE;
> > > +    object_property_add(obj, ACPI_CPU_HOTPLUG_IO_BASE_PROP, "int",
> > > +                        ich9_pm_get_cpu_io_base, NULL, NULL, NULL, NULL);
> > >  }
> > > diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> > > index 82fcf9f..c71a9b4 100644
> > > --- a/include/hw/acpi/ich9.h
> > > +++ b/include/hw/acpi/ich9.h
> > > @@ -22,6 +22,7 @@
> > >  #define HW_ACPI_ICH9_H
> > >  
> > >  #include "hw/acpi/acpi.h"
> > > +#include "hw/acpi/hotplug.h"
> > >  
> > >  typedef struct ICH9LPCPMRegs {
> > >      /*
> > > @@ -42,6 +43,9 @@ typedef struct ICH9LPCPMRegs {
> > >  
> > >      uint32_t pm_io_base;
> > >      Notifier powerdown_notifier;
> > > +
> > > +    AcpiCPUHotplug gpe_cpu;
> > > +    Notifier cpu_added_notifier;
> > >  } ICH9LPCPMRegs;
> > >  
> > >  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
> > > -- 
> > > 1.8.3.1
diff mbox

Patch

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 30f0df8..9c88109 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -44,6 +44,8 @@  do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0)
 #define ICH9_DEBUG(fmt, ...)    do { } while (0)
 #endif
 
+#define ICH9_PROC_BASE 0xa18
+
 static void ich9_pm_update_sci_fn(ACPIREGS *regs)
 {
     ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs);
@@ -185,6 +187,15 @@  static void pm_powerdown_req(Notifier *n, void *opaque)
     acpi_pm1_evt_power_down(&pm->acpi_regs);
 }
 
+static void ich9_cpu_added_req(Notifier *n, void *opaque)
+{
+    ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier);
+
+    assert(pm != NULL);
+    acpi_hotplug_cpu_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque));
+    acpi_update_sci(&pm->acpi_regs, pm->irq);
+}
+
 void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
                   qemu_irq sci_irq)
 {
@@ -210,6 +221,11 @@  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
     qemu_register_reset(pm_reset, pm);
     pm->powerdown_notifier.notify = pm_powerdown_req;
     qemu_register_powerdown_notifier(&pm->powerdown_notifier);
+
+    acpi_hotplug_cpu_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
+                          &pm->gpe_cpu, pm->gpe_cpu.io_base);
+    pm->cpu_added_notifier.notify = ich9_cpu_added_req;
+    qemu_register_cpu_added_notifier(&pm->cpu_added_notifier);
 }
 
 static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
@@ -222,6 +238,14 @@  static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,
     visit_type_uint32(v, &value, name, errp);
 }
 
+static void ich9_pm_get_cpu_io_base(Object *obj, Visitor *v, void *opaque,
+                                    const char *name, Error **errp)
+{
+    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);
+
+    visit_type_uint16(v, &s->pm.gpe_cpu.io_base, name, errp);
+}
+
 void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
 {
     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
@@ -233,4 +257,7 @@  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
                         NULL, NULL, pm, NULL);
     object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN,
                                    &gpe0_len, errp);
+    pm->gpe_cpu.io_base = ICH9_PROC_BASE;
+    object_property_add(obj, ACPI_CPU_HOTPLUG_IO_BASE_PROP, "int",
+                        ich9_pm_get_cpu_io_base, NULL, NULL, NULL, NULL);
 }
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 82fcf9f..c71a9b4 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -22,6 +22,7 @@ 
 #define HW_ACPI_ICH9_H
 
 #include "hw/acpi/acpi.h"
+#include "hw/acpi/hotplug.h"
 
 typedef struct ICH9LPCPMRegs {
     /*
@@ -42,6 +43,9 @@  typedef struct ICH9LPCPMRegs {
 
     uint32_t pm_io_base;
     Notifier powerdown_notifier;
+
+    AcpiCPUHotplug gpe_cpu;
+    Notifier cpu_added_notifier;
 } ICH9LPCPMRegs;
 
 void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,