hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
This initializes the GED device with base memory and irq, configures ged memory hotplug event and builds the corresponding aml code. With this, both hot and cold plug of device memory is enabled now for Guest with ACPI boot. Memory cold plug support with Guest DT boot is not yet supported. As DSDT table gets changed by this, update bios-tables-test-allowed-diff.h to avoid "make check" failure. Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> Message-Id: <20190918130633.4872-6-shameerali.kolothum.thodi@huawei.com> Acked-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
parent
1f283ae124
commit
cff51ac978
|
@ -22,6 +22,8 @@ config ARM_VIRT
|
||||||
select ACPI_PCI
|
select ACPI_PCI
|
||||||
select MEM_DEVICE
|
select MEM_DEVICE
|
||||||
select DIMM
|
select DIMM
|
||||||
|
select ACPI_MEMORY_HOTPLUG
|
||||||
|
select ACPI_HW_REDUCED
|
||||||
|
|
||||||
config CHEETAH
|
config CHEETAH
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -39,6 +39,8 @@
|
||||||
#include "hw/acpi/aml-build.h"
|
#include "hw/acpi/aml-build.h"
|
||||||
#include "hw/acpi/utils.h"
|
#include "hw/acpi/utils.h"
|
||||||
#include "hw/acpi/pci.h"
|
#include "hw/acpi/pci.h"
|
||||||
|
#include "hw/acpi/memory_hotplug.h"
|
||||||
|
#include "hw/acpi/generic_event_device.h"
|
||||||
#include "hw/pci/pcie_host.h"
|
#include "hw/pci/pcie_host.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "hw/arm/virt.h"
|
#include "hw/arm/virt.h"
|
||||||
|
@ -708,6 +710,7 @@ static void
|
||||||
build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||||||
{
|
{
|
||||||
Aml *scope, *dsdt;
|
Aml *scope, *dsdt;
|
||||||
|
MachineState *ms = MACHINE(vms);
|
||||||
const MemMapEntry *memmap = vms->memmap;
|
const MemMapEntry *memmap = vms->memmap;
|
||||||
const int *irqmap = vms->irqmap;
|
const int *irqmap = vms->irqmap;
|
||||||
|
|
||||||
|
@ -732,6 +735,24 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||||||
vms->highmem, vms->highmem_ecam);
|
vms->highmem, vms->highmem_ecam);
|
||||||
acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
|
acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
|
||||||
(irqmap[VIRT_GPIO] + ARM_SPI_BASE));
|
(irqmap[VIRT_GPIO] + ARM_SPI_BASE));
|
||||||
|
if (vms->acpi_dev) {
|
||||||
|
build_ged_aml(scope, "\\_SB."GED_DEVICE,
|
||||||
|
HOTPLUG_HANDLER(vms->acpi_dev),
|
||||||
|
irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, AML_SYSTEM_MEMORY,
|
||||||
|
memmap[VIRT_ACPI_GED].base);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vms->acpi_dev) {
|
||||||
|
uint32_t event = object_property_get_uint(OBJECT(vms->acpi_dev),
|
||||||
|
"ged-event", &error_abort);
|
||||||
|
|
||||||
|
if (event & ACPI_GED_MEM_HOTPLUG_EVT) {
|
||||||
|
build_memory_hotplug_aml(scope, ms->ram_slots, "\\_SB", NULL,
|
||||||
|
AML_SYSTEM_MEMORY,
|
||||||
|
memmap[VIRT_PCDIMM_ACPI].base);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
acpi_dsdt_add_power_button(scope);
|
acpi_dsdt_add_power_button(scope);
|
||||||
|
|
||||||
aml_append(dsdt, scope);
|
aml_append(dsdt, scope);
|
||||||
|
|
|
@ -70,6 +70,7 @@
|
||||||
#include "target/arm/internals.h"
|
#include "target/arm/internals.h"
|
||||||
#include "hw/mem/pc-dimm.h"
|
#include "hw/mem/pc-dimm.h"
|
||||||
#include "hw/mem/nvdimm.h"
|
#include "hw/mem/nvdimm.h"
|
||||||
|
#include "hw/acpi/generic_event_device.h"
|
||||||
|
|
||||||
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
|
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
|
||||||
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
|
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
|
||||||
|
@ -140,6 +141,8 @@ static const MemMapEntry base_memmap[] = {
|
||||||
[VIRT_GPIO] = { 0x09030000, 0x00001000 },
|
[VIRT_GPIO] = { 0x09030000, 0x00001000 },
|
||||||
[VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
|
[VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
|
||||||
[VIRT_SMMU] = { 0x09050000, 0x00020000 },
|
[VIRT_SMMU] = { 0x09050000, 0x00020000 },
|
||||||
|
[VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
|
||||||
|
[VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN },
|
||||||
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
|
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
|
||||||
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
|
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
|
||||||
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
|
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
|
||||||
|
@ -175,6 +178,7 @@ static const int a15irqmap[] = {
|
||||||
[VIRT_PCIE] = 3, /* ... to 6 */
|
[VIRT_PCIE] = 3, /* ... to 6 */
|
||||||
[VIRT_GPIO] = 7,
|
[VIRT_GPIO] = 7,
|
||||||
[VIRT_SECURE_UART] = 8,
|
[VIRT_SECURE_UART] = 8,
|
||||||
|
[VIRT_ACPI_GED] = 9,
|
||||||
[VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */
|
[VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */
|
||||||
[VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */
|
[VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */
|
||||||
[VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */
|
[VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */
|
||||||
|
@ -527,6 +531,29 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
|
||||||
|
{
|
||||||
|
DeviceState *dev;
|
||||||
|
MachineState *ms = MACHINE(vms);
|
||||||
|
int irq = vms->irqmap[VIRT_ACPI_GED];
|
||||||
|
uint32_t event = 0;
|
||||||
|
|
||||||
|
if (ms->ram_slots) {
|
||||||
|
event = ACPI_GED_MEM_HOTPLUG_EVT;
|
||||||
|
}
|
||||||
|
|
||||||
|
dev = qdev_create(NULL, TYPE_ACPI_GED);
|
||||||
|
qdev_prop_set_uint32(dev, "ged-event", event);
|
||||||
|
|
||||||
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, vms->memmap[VIRT_ACPI_GED].base);
|
||||||
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, vms->memmap[VIRT_PCDIMM_ACPI].base);
|
||||||
|
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[irq]);
|
||||||
|
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
|
||||||
|
return dev;
|
||||||
|
}
|
||||||
|
|
||||||
static void create_its(VirtMachineState *vms, DeviceState *gicdev)
|
static void create_its(VirtMachineState *vms, DeviceState *gicdev)
|
||||||
{
|
{
|
||||||
const char *itsclass = its_class_name();
|
const char *itsclass = its_class_name();
|
||||||
|
@ -1491,6 +1518,7 @@ static void machvirt_init(MachineState *machine)
|
||||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||||
bool firmware_loaded;
|
bool firmware_loaded;
|
||||||
bool aarch64 = true;
|
bool aarch64 = true;
|
||||||
|
bool has_ged = !vmc->no_ged;
|
||||||
unsigned int smp_cpus = machine->smp.cpus;
|
unsigned int smp_cpus = machine->smp.cpus;
|
||||||
unsigned int max_cpus = machine->smp.max_cpus;
|
unsigned int max_cpus = machine->smp.max_cpus;
|
||||||
|
|
||||||
|
@ -1705,6 +1733,10 @@ static void machvirt_init(MachineState *machine)
|
||||||
|
|
||||||
create_gpio(vms, pic);
|
create_gpio(vms, pic);
|
||||||
|
|
||||||
|
if (has_ged && aarch64 && firmware_loaded && acpi_enabled) {
|
||||||
|
vms->acpi_dev = create_acpi_ged(vms, pic);
|
||||||
|
}
|
||||||
|
|
||||||
/* Create mmio transports, so the user can create virtio backends
|
/* Create mmio transports, so the user can create virtio backends
|
||||||
* (which will be automatically plugged in to the transports). If
|
* (which will be automatically plugged in to the transports). If
|
||||||
* no backend is created the transport will just sit harmlessly idle.
|
* no backend is created the transport will just sit harmlessly idle.
|
||||||
|
@ -1881,14 +1913,17 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
|
||||||
static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
|
||||||
|
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
|
||||||
|
|
||||||
/*
|
if (is_nvdimm) {
|
||||||
* The device memory is not yet exposed to the Guest either through
|
error_setg(errp, "nvdimm is not yet supported");
|
||||||
* DT or ACPI and hence both cold/hot plug of memory is explicitly
|
return;
|
||||||
* disabled for now.
|
}
|
||||||
*/
|
|
||||||
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
if (!vms->acpi_dev) {
|
||||||
error_setg(errp, "memory cold/hot plug is not yet supported");
|
error_setg(errp,
|
||||||
|
"memory hotplug is not enabled: missing acpi-ged device");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1898,11 +1933,18 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
static void virt_memory_plug(HotplugHandler *hotplug_dev,
|
static void virt_memory_plug(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
|
HotplugHandlerClass *hhc;
|
||||||
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
|
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
|
pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
|
||||||
|
hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort);
|
||||||
|
out:
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2109,8 +2151,11 @@ DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)
|
||||||
|
|
||||||
static void virt_machine_4_1_options(MachineClass *mc)
|
static void virt_machine_4_1_options(MachineClass *mc)
|
||||||
{
|
{
|
||||||
|
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
|
||||||
|
|
||||||
virt_machine_4_2_options(mc);
|
virt_machine_4_2_options(mc);
|
||||||
compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len);
|
compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len);
|
||||||
|
vmc->no_ged = true;
|
||||||
}
|
}
|
||||||
DEFINE_VIRT_MACHINE(4, 1)
|
DEFINE_VIRT_MACHINE(4, 1)
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,8 @@ enum {
|
||||||
VIRT_GPIO,
|
VIRT_GPIO,
|
||||||
VIRT_SECURE_UART,
|
VIRT_SECURE_UART,
|
||||||
VIRT_SECURE_MEM,
|
VIRT_SECURE_MEM,
|
||||||
|
VIRT_PCDIMM_ACPI,
|
||||||
|
VIRT_ACPI_GED,
|
||||||
VIRT_LOWMEMMAP_LAST,
|
VIRT_LOWMEMMAP_LAST,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -106,6 +108,7 @@ typedef struct {
|
||||||
bool claim_edge_triggered_timers;
|
bool claim_edge_triggered_timers;
|
||||||
bool smbios_old_sys_ver;
|
bool smbios_old_sys_ver;
|
||||||
bool no_highmem_ecam;
|
bool no_highmem_ecam;
|
||||||
|
bool no_ged; /* Machines < 4.2 has no support for ACPI GED device */
|
||||||
} VirtMachineClass;
|
} VirtMachineClass;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -133,6 +136,7 @@ typedef struct {
|
||||||
uint32_t iommu_phandle;
|
uint32_t iommu_phandle;
|
||||||
int psci_conduit;
|
int psci_conduit;
|
||||||
hwaddr highest_gpa;
|
hwaddr highest_gpa;
|
||||||
|
DeviceState *acpi_dev;
|
||||||
} VirtMachineState;
|
} VirtMachineState;
|
||||||
|
|
||||||
#define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
|
#define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
/* List of comma-separated changed AML files to ignore */
|
/* List of comma-separated changed AML files to ignore */
|
||||||
|
"tests/data/acpi/virt/DSDT",
|
||||||
|
|
Loading…
Reference in a new issue