acpi: factor out common cpu hotplug code for PIIX4/Q35
.. so it could be used for adding CPU hotplug to Q35 machine Add an additional header with that will be shared between C and ASL code: include/hw/acpi/cpu_hotplug_defs.h 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
99fd437dee
commit
81cea5e7f2
@ -1 +1 @@
|
|||||||
common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o
|
common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o
|
||||||
|
64
hw/acpi/cpu_hotplug.c
Normal file
64
hw/acpi/cpu_hotplug.c
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
* QEMU ACPI hotplug utilities
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Red Hat Inc
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Igor Mammedov <imammedo@redhat.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
#include "hw/hw.h"
|
||||||
|
#include "hw/acpi/cpu_hotplug.h"
|
||||||
|
|
||||||
|
static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)
|
||||||
|
{
|
||||||
|
AcpiCpuHotplug *cpus = opaque;
|
||||||
|
uint64_t val = cpus->sts[addr];
|
||||||
|
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,
|
||||||
|
unsigned int size)
|
||||||
|
{
|
||||||
|
/* TODO: implement VCPU removal on guest signal that CPU can be removed */
|
||||||
|
}
|
||||||
|
|
||||||
|
static const MemoryRegionOps AcpiCpuHotplug_ops = {
|
||||||
|
.read = cpu_status_read,
|
||||||
|
.write = cpu_status_write,
|
||||||
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||||
|
.valid = {
|
||||||
|
.min_access_size = 1,
|
||||||
|
.max_access_size = 1,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu)
|
||||||
|
{
|
||||||
|
CPUClass *k = CPU_GET_CLASS(cpu);
|
||||||
|
int64_t cpu_id;
|
||||||
|
|
||||||
|
*gpe->sts = *gpe->sts | ACPI_CPU_HOTPLUG_STATUS;
|
||||||
|
cpu_id = k->get_arch_id(CPU(cpu));
|
||||||
|
g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
|
||||||
|
}
|
||||||
|
|
||||||
|
void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner,
|
||||||
|
AcpiCpuHotplug *gpe_cpu, uint16_t base)
|
||||||
|
{
|
||||||
|
CPUState *cpu;
|
||||||
|
|
||||||
|
CPU_FOREACH(cpu) {
|
||||||
|
CPUClass *cc = CPU_GET_CLASS(cpu);
|
||||||
|
int64_t id = cc->get_arch_id(cpu);
|
||||||
|
|
||||||
|
g_assert((id / 8) < ACPI_GPE_PROC_LEN);
|
||||||
|
gpe_cpu->sts[id / 8] |= (1 << (id % 8));
|
||||||
|
}
|
||||||
|
memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops,
|
||||||
|
gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);
|
||||||
|
memory_region_add_subregion(parent, base, &gpe_cpu->io);
|
||||||
|
}
|
@ -31,6 +31,7 @@
|
|||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "hw/acpi/piix4.h"
|
#include "hw/acpi/piix4.h"
|
||||||
#include "hw/acpi/pcihp.h"
|
#include "hw/acpi/pcihp.h"
|
||||||
|
#include "hw/acpi/cpu_hotplug.h"
|
||||||
|
|
||||||
//#define DEBUG
|
//#define DEBUG
|
||||||
|
|
||||||
@ -51,20 +52,14 @@
|
|||||||
#define PCI_RMV_BASE 0xae0c
|
#define PCI_RMV_BASE 0xae0c
|
||||||
|
|
||||||
#define PIIX4_PROC_BASE 0xaf00
|
#define PIIX4_PROC_BASE 0xaf00
|
||||||
#define PIIX4_PROC_LEN 32
|
|
||||||
|
|
||||||
#define PIIX4_PCI_HOTPLUG_STATUS 2
|
#define PIIX4_PCI_HOTPLUG_STATUS 2
|
||||||
#define PIIX4_CPU_HOTPLUG_STATUS 4
|
|
||||||
|
|
||||||
struct pci_status {
|
struct pci_status {
|
||||||
uint32_t up; /* deprecated, maintained for migration compatibility */
|
uint32_t up; /* deprecated, maintained for migration compatibility */
|
||||||
uint32_t down;
|
uint32_t down;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct CPUStatus {
|
|
||||||
uint8_t sts[PIIX4_PROC_LEN];
|
|
||||||
} CPUStatus;
|
|
||||||
|
|
||||||
typedef struct PIIX4PMState {
|
typedef struct PIIX4PMState {
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
PCIDevice parent_obj;
|
PCIDevice parent_obj;
|
||||||
@ -74,7 +69,6 @@ typedef struct PIIX4PMState {
|
|||||||
uint32_t io_base;
|
uint32_t io_base;
|
||||||
|
|
||||||
MemoryRegion io_gpe;
|
MemoryRegion io_gpe;
|
||||||
MemoryRegion io_cpu;
|
|
||||||
ACPIREGS ar;
|
ACPIREGS ar;
|
||||||
|
|
||||||
APMState apm;
|
APMState apm;
|
||||||
@ -102,7 +96,7 @@ typedef struct PIIX4PMState {
|
|||||||
uint8_t disable_s4;
|
uint8_t disable_s4;
|
||||||
uint8_t s4_val;
|
uint8_t s4_val;
|
||||||
|
|
||||||
CPUStatus gpe_cpu;
|
AcpiCpuHotplug gpe_cpu;
|
||||||
Notifier cpu_added_notifier;
|
Notifier cpu_added_notifier;
|
||||||
} PIIX4PMState;
|
} PIIX4PMState;
|
||||||
|
|
||||||
@ -683,61 +677,13 @@ static const MemoryRegionOps piix4_pci_ops = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)
|
|
||||||
{
|
|
||||||
PIIX4PMState *s = opaque;
|
|
||||||
CPUStatus *cpus = &s->gpe_cpu;
|
|
||||||
uint64_t val = cpus->sts[addr];
|
|
||||||
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,
|
|
||||||
unsigned int size)
|
|
||||||
{
|
|
||||||
/* TODO: implement VCPU removal on guest signal that CPU can be removed */
|
|
||||||
}
|
|
||||||
|
|
||||||
static const MemoryRegionOps cpu_hotplug_ops = {
|
|
||||||
.read = cpu_status_read,
|
|
||||||
.write = cpu_status_write,
|
|
||||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
||||||
.valid = {
|
|
||||||
.min_access_size = 1,
|
|
||||||
.max_access_size = 1,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
PLUG,
|
|
||||||
UNPLUG,
|
|
||||||
} HotplugEventType;
|
|
||||||
|
|
||||||
static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,
|
|
||||||
HotplugEventType action)
|
|
||||||
{
|
|
||||||
CPUStatus *g = &s->gpe_cpu;
|
|
||||||
ACPIGPE *gpe = &s->ar.gpe;
|
|
||||||
CPUClass *k = CPU_GET_CLASS(cpu);
|
|
||||||
int64_t cpu_id;
|
|
||||||
|
|
||||||
assert(s != NULL);
|
|
||||||
|
|
||||||
*gpe->sts = *gpe->sts | PIIX4_CPU_HOTPLUG_STATUS;
|
|
||||||
cpu_id = k->get_arch_id(CPU(cpu));
|
|
||||||
if (action == PLUG) {
|
|
||||||
g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
|
|
||||||
} else {
|
|
||||||
g->sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));
|
|
||||||
}
|
|
||||||
acpi_update_sci(&s->ar, s->irq);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void piix4_cpu_added_req(Notifier *n, void *opaque)
|
static void piix4_cpu_added_req(Notifier *n, void *opaque)
|
||||||
{
|
{
|
||||||
PIIX4PMState *s = container_of(n, PIIX4PMState, cpu_added_notifier);
|
PIIX4PMState *s = container_of(n, PIIX4PMState, cpu_added_notifier);
|
||||||
|
|
||||||
piix4_cpu_hotplug_req(s, CPU(opaque), PLUG);
|
assert(s != NULL);
|
||||||
|
AcpiCpuHotplug_add(&s->ar.gpe, &s->gpe_cpu, CPU(opaque));
|
||||||
|
acpi_update_sci(&s->ar, s->irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
|
static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
|
||||||
@ -746,8 +692,6 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
|
|||||||
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)
|
||||||
{
|
{
|
||||||
CPUState *cpu;
|
|
||||||
|
|
||||||
memory_region_init_io(&s->io_gpe, OBJECT(s), &piix4_gpe_ops, s,
|
memory_region_init_io(&s->io_gpe, OBJECT(s), &piix4_gpe_ops, s,
|
||||||
"acpi-gpe0", GPE_LEN);
|
"acpi-gpe0", GPE_LEN);
|
||||||
memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
|
memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
|
||||||
@ -762,16 +706,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
|
|||||||
pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s));
|
pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s));
|
||||||
}
|
}
|
||||||
|
|
||||||
CPU_FOREACH(cpu) {
|
AcpiCpuHotplug_init(parent, OBJECT(s), &s->gpe_cpu, PIIX4_PROC_BASE);
|
||||||
CPUClass *cc = CPU_GET_CLASS(cpu);
|
|
||||||
int64_t id = cc->get_arch_id(cpu);
|
|
||||||
|
|
||||||
g_assert((id / 8) < PIIX4_PROC_LEN);
|
|
||||||
s->gpe_cpu.sts[id / 8] |= (1 << (id % 8));
|
|
||||||
}
|
|
||||||
memory_region_init_io(&s->io_cpu, OBJECT(s), &cpu_hotplug_ops, s,
|
|
||||||
"acpi-cpu-hotplug", PIIX4_PROC_LEN);
|
|
||||||
memory_region_add_subregion(parent, PIIX4_PROC_BASE, &s->io_cpu);
|
|
||||||
s->cpu_added_notifier.notify = piix4_cpu_added_req;
|
s->cpu_added_notifier.notify = piix4_cpu_added_req;
|
||||||
qemu_register_cpu_added_notifier(&s->cpu_added_notifier);
|
qemu_register_cpu_added_notifier(&s->cpu_added_notifier);
|
||||||
}
|
}
|
||||||
|
27
include/hw/acpi/cpu_hotplug.h
Normal file
27
include/hw/acpi/cpu_hotplug.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* QEMU ACPI hotplug utilities
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Red Hat Inc
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Igor Mammedov <imammedo@redhat.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
#ifndef ACPI_HOTPLUG_H
|
||||||
|
#define ACPI_HOTPLUG_H
|
||||||
|
|
||||||
|
#include "hw/acpi/acpi.h"
|
||||||
|
#include "hw/acpi/cpu_hotplug_defs.h"
|
||||||
|
|
||||||
|
typedef struct AcpiCpuHotplug {
|
||||||
|
MemoryRegion io;
|
||||||
|
uint8_t sts[ACPI_GPE_PROC_LEN];
|
||||||
|
} AcpiCpuHotplug;
|
||||||
|
|
||||||
|
void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu);
|
||||||
|
|
||||||
|
void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner,
|
||||||
|
AcpiCpuHotplug *gpe_cpu, uint16_t base);
|
||||||
|
#endif
|
22
include/hw/acpi/cpu_hotplug_defs.h
Normal file
22
include/hw/acpi/cpu_hotplug_defs.h
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* QEMU ACPI hotplug utilities shared defines
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Red Hat Inc
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Igor Mammedov <imammedo@redhat.com>
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
#ifndef ACPI_HOTPLUG_DEFS_H
|
||||||
|
#define ACPI_HOTPLUG_DEFS_H
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ONLY DEFINEs are permited in this file since it's shared
|
||||||
|
* between C and ASL code.
|
||||||
|
*/
|
||||||
|
#define ACPI_CPU_HOTPLUG_STATUS 4
|
||||||
|
#define ACPI_GPE_PROC_LEN 32
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user