mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
pc: piix4/ich9: add 'cpu-hotplug-legacy' property
It will be used to select which hotplug call-back is called and for switching from legacy mode into new one. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
abd49bc2ed
commit
16bcab97eb
|
@ -306,6 +306,21 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value,
|
||||||
s->pm.acpi_memory_hotplug.is_enabled = 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,
|
static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name,
|
||||||
void *opaque, Error **errp)
|
void *opaque, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -397,6 +412,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
||||||
{
|
{
|
||||||
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
||||||
pm->acpi_memory_hotplug.is_enabled = true;
|
pm->acpi_memory_hotplug.is_enabled = true;
|
||||||
|
pm->cpu_hotplug_legacy = true;
|
||||||
pm->disable_s3 = 0;
|
pm->disable_s3 = 0;
|
||||||
pm->disable_s4 = 0;
|
pm->disable_s4 = 0;
|
||||||
pm->s4_val = 2;
|
pm->s4_val = 2;
|
||||||
|
@ -412,6 +428,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
||||||
ich9_pm_get_memory_hotplug_support,
|
ich9_pm_get_memory_hotplug_support,
|
||||||
ich9_pm_set_memory_hotplug_support,
|
ich9_pm_set_memory_hotplug_support,
|
||||||
NULL);
|
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",
|
object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",
|
||||||
ich9_pm_get_disable_s3,
|
ich9_pm_get_disable_s3,
|
||||||
ich9_pm_set_disable_s3,
|
ich9_pm_set_disable_s3,
|
||||||
|
@ -439,7 +459,8 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
||||||
acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug,
|
acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug,
|
||||||
dev, errp);
|
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);
|
legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp);
|
||||||
} else {
|
} else {
|
||||||
error_setg(errp, "acpi: device plug request for not supported device"
|
error_setg(errp, "acpi: device plug request for not supported device"
|
||||||
|
|
|
@ -86,6 +86,7 @@ typedef struct PIIX4PMState {
|
||||||
uint8_t disable_s4;
|
uint8_t disable_s4;
|
||||||
uint8_t s4_val;
|
uint8_t s4_val;
|
||||||
|
|
||||||
|
bool cpu_hotplug_legacy;
|
||||||
AcpiCpuHotplug gpe_cpu;
|
AcpiCpuHotplug gpe_cpu;
|
||||||
|
|
||||||
MemHotplugState acpi_memory_hotplug;
|
MemHotplugState acpi_memory_hotplug;
|
||||||
|
@ -351,7 +352,8 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
|
||||||
acpi_memory_plug_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp);
|
acpi_memory_plug_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp);
|
||||||
} else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
|
||||||
acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp);
|
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);
|
legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp);
|
||||||
} else {
|
} else {
|
||||||
error_setg(errp, "acpi: device plug request for not supported device"
|
error_setg(errp, "acpi: device plug request for not supported device"
|
||||||
|
@ -560,6 +562,21 @@ static const MemoryRegionOps piix4_gpe_ops = {
|
||||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static bool piix4_get_cpu_hotplug_legacy(Object *obj, Error **errp)
|
||||||
|
{
|
||||||
|
PIIX4PMState *s = PIIX4_PM(obj);
|
||||||
|
|
||||||
|
return s->cpu_hotplug_legacy;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void piix4_set_cpu_hotplug_legacy(Object *obj, bool value, Error **errp)
|
||||||
|
{
|
||||||
|
PIIX4PMState *s = PIIX4_PM(obj);
|
||||||
|
|
||||||
|
s->cpu_hotplug_legacy = value;
|
||||||
|
}
|
||||||
|
|
||||||
static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
|
static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
|
||||||
PCIBus *bus, PIIX4PMState *s)
|
PCIBus *bus, PIIX4PMState *s)
|
||||||
{
|
{
|
||||||
|
@ -570,6 +587,11 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
|
||||||
acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
|
acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
|
||||||
s->use_acpi_pci_hotplug);
|
s->use_acpi_pci_hotplug);
|
||||||
|
|
||||||
|
s->cpu_hotplug_legacy = true;
|
||||||
|
object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
|
||||||
|
piix4_get_cpu_hotplug_legacy,
|
||||||
|
piix4_set_cpu_hotplug_legacy,
|
||||||
|
NULL);
|
||||||
legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
|
legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
|
||||||
PIIX4_CPU_HOTPLUG_IO_BASE);
|
PIIX4_CPU_HOTPLUG_IO_BASE);
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@ typedef struct ICH9LPCPMRegs {
|
||||||
uint32_t pm_io_base;
|
uint32_t pm_io_base;
|
||||||
Notifier powerdown_notifier;
|
Notifier powerdown_notifier;
|
||||||
|
|
||||||
|
bool cpu_hotplug_legacy;
|
||||||
AcpiCpuHotplug gpe_cpu;
|
AcpiCpuHotplug gpe_cpu;
|
||||||
|
|
||||||
MemHotplugState acpi_memory_hotplug;
|
MemHotplugState acpi_memory_hotplug;
|
||||||
|
|
Loading…
Reference in a new issue