* [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
@ 2019-05-22 16:22 Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 1/8] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum
` (8 more replies)
0 siblings, 9 replies; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
This series is an attempt to provide device memory hotplug support
on ARM virt platform. This is based on Eric's recent works here[1]
and carries some of the pc-dimm related patches dropped from his
series.
The kernel support for arm64 memory hot add was added recently by
Robin and hence the guest kernel should be => 5.0-rc1.
NVDIM support is not included currently as we still have an unresolved
issue while hot adding NVDIMM[2]. However NVDIMM cold plug patches
can be included, but not done for now, for keeping it simple.
This makes use of GED device to sent hotplug ACPI events to the
Guest. GED code is based on Nemu. Thanks to the efforts of Samuel and
Sebastien to add the hardware-reduced support to Nemu using GED
device[3]. (Please shout if I got the author/signed-off wrong for
those patches or missed any names).
This is sanity tested on a HiSilicon ARM64 platform and appreciate
any further testing.
Thanks,
Shameer
[1] https://patchwork.kernel.org/cover/10837565/
[2] https://patchwork.kernel.org/cover/10783589/
[3] https://github.com/intel/nemu/blob/topic/virt-x86/hw/acpi/ged.c
[4] http://lists.infradead.org/pipermail/linux-arm-kernel/2019-May/651763.html
v4 --> v5
-Removed gsi/ged-irq routing in virt.
-Added Migration support.
-Dropped support for DT coldplug case based on the discussions
here[4]
-Added system_powerdown support through GED.
v3 --> v4
Addressed comments from Igor and Eric,
-Renamed "virt-acpi" to "acpi-ged".
-Changed ged device parent to TYPE_DEVICE.
-Introduced DT memory node property "hotpluggable" to resolve device
memory being treated as early boot memory issue(patch #7).
-Combined patches #3 and #9 from v3 into #3.
v2 --> v3
Addressed comments from Igor and Eric,
-Made virt acpi device platform independent and moved
to hw/acpi/generic_event_device.c
-Moved ged specific code into hw/acpi/generic_event_device.c
-Introduced an opt-in feature "fdt" to resolve device-memory being
treated as early boot memory.
-Dropped patch #1 from v2.
RFC --> v2
-Use GED device instead of GPIO for ACPI hotplug events.
-Removed NVDIMM support for now.
-Includes dropped patches from Eric's v9 series.
Eric Auger (1):
hw/arm/virt: Add memory hotplug framework
Samuel Ortiz (2):
hw/acpi: Do not create memory hotplug method when handler is not
defined
hw/acpi: Add ACPI Generic Event Device Support
Shameer Kolothum (5):
hw/acpi: Make ACPI IO address space configurable
hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
hw/arm/virt-acpi-build: Add PC-DIMM in SRAT
hw/acpi: Add system power down support to GED
hw/arm: Use GED for system_powerdown event
hw/acpi/Kconfig | 4 +
hw/acpi/Makefile.objs | 1 +
hw/acpi/generic_event_device.c | 348 +++++++++++++++++++++++++
hw/acpi/memory_hotplug.c | 35 +--
hw/arm/Kconfig | 4 +
hw/arm/virt-acpi-build.c | 58 ++---
hw/arm/virt.c | 88 ++++++-
hw/i386/acpi-build.c | 3 +-
include/hw/acpi/generic_event_device.h | 106 ++++++++
include/hw/acpi/memory_hotplug.h | 9 +-
include/hw/arm/virt.h | 3 +
11 files changed, 603 insertions(+), 56 deletions(-)
create mode 100644 hw/acpi/generic_event_device.c
create mode 100644 include/hw/acpi/generic_event_device.h
--
2.17.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 1/8] hw/acpi: Make ACPI IO address space configurable
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum
` (7 subsequent siblings)
8 siblings, 0 replies; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
This is in preparation for adding support for ARM64 platforms
where it doesn't use port mapped IO for ACPI IO space.
Also move few MEMORY_* definitions to header so that other memory
hotplug event signalling mechanisms (eg. Generic Event Device on
HW-reduced acpi platforms) can use the same from their respective
event handler code.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/acpi/memory_hotplug.c | 25 ++++++++++++++-----------
hw/i386/acpi-build.c | 3 ++-
include/hw/acpi/memory_hotplug.h | 9 +++++++--
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 297812d5f7..c724f5f1e4 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -29,12 +29,9 @@
#define MEMORY_SLOT_PROXIMITY_METHOD "MPXM"
#define MEMORY_SLOT_EJECT_METHOD "MEJ0"
#define MEMORY_SLOT_NOTIFY_METHOD "MTFY"
-#define MEMORY_SLOT_SCAN_METHOD "MSCN"
#define MEMORY_HOTPLUG_DEVICE "MHPD"
-#define MEMORY_HOTPLUG_IO_LEN 24
-#define MEMORY_DEVICES_CONTAINER "\\_SB.MHPC"
-static uint16_t memhp_io_base;
+static hwaddr memhp_io_base;
static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)
{
@@ -209,7 +206,7 @@ static const MemoryRegionOps acpi_memory_hotplug_ops = {
};
void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,
- MemHotplugState *state, uint16_t io_base)
+ MemHotplugState *state, hwaddr io_base)
{
MachineState *machine = MACHINE(qdev_get_machine());
@@ -342,7 +339,8 @@ const VMStateDescription vmstate_memory_hotplug = {
void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
const char *res_root,
- const char *event_handler_method)
+ const char *event_handler_method,
+ AmlRegionSpace rs)
{
int i;
Aml *ifctx;
@@ -365,14 +363,19 @@ void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
aml_name_decl("_UID", aml_string("Memory hotplug resources")));
crs = aml_resource_template();
- aml_append(crs,
- aml_io(AML_DECODE16, memhp_io_base, memhp_io_base, 0,
- MEMORY_HOTPLUG_IO_LEN)
- );
+ if (rs == AML_SYSTEM_IO) {
+ aml_append(crs,
+ aml_io(AML_DECODE16, memhp_io_base, memhp_io_base, 0,
+ MEMORY_HOTPLUG_IO_LEN)
+ );
+ } else {
+ aml_append(crs, aml_memory32_fixed(memhp_io_base,
+ MEMORY_HOTPLUG_IO_LEN, AML_READ_WRITE));
+ }
aml_append(mem_ctrl_dev, aml_name_decl("_CRS", crs));
aml_append(mem_ctrl_dev, aml_operation_region(
- MEMORY_HOTPLUG_IO_REGION, AML_SYSTEM_IO,
+ MEMORY_HOTPLUG_IO_REGION, rs,
aml_int(memhp_io_base), MEMORY_HOTPLUG_IO_LEN)
);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b4ec14e349..fe263fd558 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1864,7 +1864,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
"\\_SB.PCI0", "\\_GPE._E02");
}
- build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0", "\\_GPE._E03");
+ build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0",
+ "\\_GPE._E03", AML_SYSTEM_IO);
scope = aml_scope("_GPE");
{
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
index 77c65765d6..e3a4b89235 100644
--- a/include/hw/acpi/memory_hotplug.h
+++ b/include/hw/acpi/memory_hotplug.h
@@ -5,6 +5,10 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
+#define MEMORY_SLOT_SCAN_METHOD "MSCN"
+#define MEMORY_DEVICES_CONTAINER "\\_SB.MHPC"
+#define MEMORY_HOTPLUG_IO_LEN 24
+
/**
* MemStatus:
* @is_removing: the memory device in slot has been requested to be ejected.
@@ -29,7 +33,7 @@ typedef struct MemHotplugState {
} MemHotplugState;
void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,
- MemHotplugState *state, uint16_t io_base);
+ MemHotplugState *state, hwaddr io_base);
void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState *mem_st,
DeviceState *dev, Error **errp);
@@ -48,5 +52,6 @@ void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list);
void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
const char *res_root,
- const char *event_handler_method);
+ const char *event_handler_method,
+ AmlRegionSpace rs);
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 1/8] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-20 12:45 ` Igor Mammedov
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum
` (6 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
From: Samuel Ortiz <sameo@linux.intel.com>
With Hardware-reduced ACPI, the GED device will manage ACPI
hotplug entirely. As a consequence, make the memory specific
events AML generation optional. The code will only be added
when the method name is not NULL.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
hw/acpi/memory_hotplug.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index c724f5f1e4..7e30e6f886 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -719,10 +719,12 @@ void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
}
aml_append(table, dev_container);
- method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
- aml_append(method,
- aml_call0(MEMORY_DEVICES_CONTAINER "." MEMORY_SLOT_SCAN_METHOD));
- aml_append(table, method);
+ if (event_handler_method) {
+ method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
+ aml_append(method, aml_call0(MEMORY_DEVICES_CONTAINER "."
+ MEMORY_SLOT_SCAN_METHOD));
+ aml_append(table, method);
+ }
g_free(mhp_res_path);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 1/8] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-18 12:40 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework Shameer Kolothum
` (5 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
From: Samuel Ortiz <sameo@linux.intel.com>
The ACPI Generic Event Device (GED) is a hardware-reduced specific
device[ACPI v6.1 Section 5.6.9] that handles all platform events,
including the hotplug ones.This patch generates the AML code that
defines GEDs.
Platforms need to specify their own GED Event bitmap to describe
what kind of events they want to support through GED. Also this
uses a a single interrupt for the GED device, relying on IO
memory region to communicate the type of device affected by the
interrupt. This way, we can support up to 32 events with a unique
interrupt.
This supports only memory hotplug for now.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
v4-->v5
-Removed gsi/irq routing code.
-Changed GED Event array to bitmap.
-Added Migration support.
---
hw/acpi/Kconfig | 4 +
hw/acpi/Makefile.objs | 1 +
hw/acpi/generic_event_device.c | 332 +++++++++++++++++++++++++
include/hw/acpi/generic_event_device.h | 102 ++++++++
4 files changed, 439 insertions(+)
create mode 100644 hw/acpi/generic_event_device.c
create mode 100644 include/hw/acpi/generic_event_device.h
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index eca3beed75..01a8b41ef5 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -27,3 +27,7 @@ config ACPI_VMGENID
bool
default y
depends on PC
+
+config ACPI_HW_REDUCED
+ bool
+ depends on ACPI
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 2d46e3789a..b753232323 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -6,6 +6,7 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
+common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
common-obj-y += acpi_interface.o
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
new file mode 100644
index 0000000000..914fe64716
--- /dev/null
+++ b/hw/acpi/generic_event_device.c
@@ -0,0 +1,332 @@
+/*
+ *
+ * Copyright (c) 2018 Intel Corporation
+ * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
+ * Written by Samuel Ortiz, Shameer Kolothum
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2 or later, as published by the Free Software Foundation.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "exec/address-spaces.h"
+#include "hw/sysbus.h"
+#include "hw/acpi/acpi.h"
+#include "hw/acpi/generic_event_device.h"
+#include "hw/mem/pc-dimm.h"
+#include "qemu/error-report.h"
+
+static const uint32_t ged_supported_events[] = {
+ ACPI_GED_MEM_HOTPLUG_EVT,
+};
+
+/*
+ * The ACPI Generic Event Device (GED) is a hardware-reduced specific
+ * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
+ * including the hotplug ones. Platforms need to specify their own
+ * GED Event bitmap to describe what kind of events they want to support
+ * through GED. This routine uses a single interrupt for the GED device,
+ * relying on IO memory region to communicate the type of device
+ * affected by the interrupt. This way, we can support up to 32 events
+ * with a unique interrupt.
+ */
+void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
+ uint32_t ged_irq, AmlRegionSpace rs)
+{
+ AcpiGedState *s = ACPI_GED(hotplug_dev);
+ Aml *crs = aml_resource_template();
+ Aml *evt, *field;
+ Aml *dev = aml_device("%s", name);
+ Aml *evt_sel = aml_local(0);
+ Aml *esel = aml_name(AML_GED_EVT_SEL);
+
+ assert(s->ged_base);
+
+ /* _CRS interrupt */
+ aml_append(crs, aml_interrupt(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH,
+ AML_EXCLUSIVE, &ged_irq, 1));
+
+ aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0013")));
+ aml_append(dev, aml_name_decl("_UID", aml_string(GED_DEVICE)));
+ aml_append(dev, aml_name_decl("_CRS", crs));
+
+ /* Append IO region */
+ aml_append(dev, aml_operation_region(AML_GED_EVT_REG, rs,
+ aml_int(s->ged_base + ACPI_GED_EVT_SEL_OFFSET),
+ ACPI_GED_EVT_SEL_LEN));
+ field = aml_field(AML_GED_EVT_REG, AML_DWORD_ACC, AML_NOLOCK,
+ AML_WRITE_AS_ZEROS);
+ aml_append(field, aml_named_field(AML_GED_EVT_SEL,
+ ACPI_GED_EVT_SEL_LEN * BITS_PER_BYTE));
+ aml_append(dev, field);
+
+ /*
+ * For each GED event we:
+ * - Add a conditional block for each event, inside a loop.
+ * - Call a method for each supported GED event type.
+ *
+ * The resulting ASL code looks like:
+ *
+ * Local0 = ESEL
+ * If ((Local0 & One) == One)
+ * {
+ * MethodEvent0()
+ * }
+ *
+ * If ((Local0 & 0x2) == 0x2)
+ * {
+ * MethodEvent1()
+ * }
+ * ...
+ */
+ evt = aml_method("_EVT", 1, AML_SERIALIZED);
+ {
+ Aml *if_ctx;
+ uint32_t i;
+ uint32_t ged_events = ctpop32(s->ged_event_bitmap);
+
+ /* Local0 = ESEL */
+ aml_append(evt, aml_store(esel, evt_sel));
+
+ for (i = 0; i < ARRAY_SIZE(ged_supported_events) && ged_events; i++) {
+ uint32_t event = s->ged_event_bitmap & ged_supported_events[i];
+
+ if (!event) {
+ continue;
+ }
+
+ if_ctx = aml_if(aml_equal(aml_and(evt_sel, aml_int(event), NULL),
+ aml_int(event)));
+ switch (event) {
+ case ACPI_GED_MEM_HOTPLUG_EVT:
+ aml_append(if_ctx, aml_call0(MEMORY_DEVICES_CONTAINER "."
+ MEMORY_SLOT_SCAN_METHOD));
+ break;
+ default:
+ /*
+ * Please make sure all the events in ged_supported_events[]
+ * are handled above.
+ */
+ g_assert_not_reached();
+ }
+
+ aml_append(evt, if_ctx);
+ ged_events--;
+ }
+
+ if (ged_events) {
+ error_report("GED: Unsupported events specified");
+ exit(1);
+ }
+ }
+
+ /* Append _EVT method */
+ aml_append(dev, evt);
+
+ aml_append(table, dev);
+}
+
+/* Memory read by the GED _EVT AML dynamic method */
+static uint64_t ged_read(void *opaque, hwaddr addr, unsigned size)
+{
+ uint64_t val = 0;
+ GEDState *ged_st = opaque;
+
+ switch (addr) {
+ case ACPI_GED_EVT_SEL_OFFSET:
+ /* Read the selector value and reset it */
+ qemu_mutex_lock(&ged_st->lock);
+ val = ged_st->sel;
+ ged_st->sel = 0;
+ qemu_mutex_unlock(&ged_st->lock);
+ break;
+ default:
+ break;
+ }
+
+ return val;
+}
+
+/* Nothing is expected to be written to the GED memory region */
+static void ged_write(void *opaque, hwaddr addr, uint64_t data,
+ unsigned int size)
+{
+}
+
+static const MemoryRegionOps ged_ops = {
+ .read = ged_read,
+ .write = ged_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
+};
+
+static void acpi_ged_event(AcpiGedState *s, uint32_t sel)
+{
+ GEDState *ged_st = &s->ged_state;
+ /*
+ * Set the GED IRQ selector to the expected device type value. This
+ * way, the ACPI method will be able to trigger the right code based
+ * on a unique IRQ.
+ */
+ qemu_mutex_lock(&ged_st->lock);
+ ged_st->sel |= sel;
+ qemu_mutex_unlock(&ged_st->lock);
+
+ /* Trigger the event by sending an interrupt to the guest. */
+ qemu_irq_pulse(s->irq);
+}
+
+static void acpi_ged_init(MemoryRegion *as, DeviceState *dev, GEDState *ged_st)
+{
+ AcpiGedState *s = ACPI_GED(dev);
+
+ assert(s->ged_base);
+
+ qemu_mutex_init(&ged_st->lock);
+ memory_region_init_io(&ged_st->io, OBJECT(dev), &ged_ops, ged_st,
+ TYPE_ACPI_GED, ACPI_GED_REG_LEN);
+ memory_region_add_subregion(as, s->ged_base, &ged_st->io);
+ qdev_init_gpio_out_named(DEVICE(s), &s->irq, "ged-irq", 1);
+}
+
+static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ AcpiGedState *s = ACPI_GED(hotplug_dev);
+
+ if (s->memhp_state.is_enabled &&
+ object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ acpi_memory_plug_cb(hotplug_dev, &s->memhp_state,
+ dev, errp);
+ } else {
+ error_setg(errp, "virt: device plug request for unsupported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
+}
+
+static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
+{
+ AcpiGedState *s = ACPI_GED(adev);
+ uint32_t sel;
+
+ if (ev & ACPI_MEMORY_HOTPLUG_STATUS) {
+ sel = ACPI_GED_MEM_HOTPLUG_EVT;
+ } else {
+ /* Unknown event. Return without generating interrupt. */
+ return;
+ }
+
+ /*
+ * We inject the hotplug interrupt. The IRQ selector will make
+ * the difference from the ACPI table.
+ */
+ acpi_ged_event(s, sel);
+}
+
+static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
+{
+ AcpiGedState *s = ACPI_GED(dev);
+
+ if (s->memhp_state.is_enabled) {
+ acpi_memory_hotplug_init(get_system_memory(), OBJECT(dev),
+ &s->memhp_state,
+ s->memhp_base);
+ }
+
+ acpi_ged_init(get_system_memory(), dev, &s->ged_state);
+}
+
+static Property acpi_ged_properties[] = {
+ /*
+ * Memory hotplug base address is a property of GED here,
+ * because GED handles memory hotplug event and MEMORY_HOTPLUG_DEVICE
+ * gets initialized when GED device is realized.
+ */
+ DEFINE_PROP_UINT64("memhp-base", AcpiGedState, memhp_base, 0),
+ DEFINE_PROP_BOOL("memory-hotplug-support", AcpiGedState,
+ memhp_state.is_enabled, true),
+ DEFINE_PROP_UINT64("ged-base", AcpiGedState, ged_base, 0),
+ DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static bool vmstate_test_use_memhp(void *opaque)
+{
+ AcpiGedState *s = opaque;
+ return s->memhp_state.is_enabled;
+}
+
+static const VMStateDescription vmstate_memhp_state = {
+ .name = "acpi-ged/memhp",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = vmstate_test_use_memhp,
+ .fields = (VMStateField[]) {
+ VMSTATE_MEMORY_HOTPLUG(memhp_state, AcpiGedState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static const VMStateDescription vmstate_ged_state = {
+ .name = "acpi-ged-state",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(sel, GEDState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static const VMStateDescription vmstate_acpi_ged = {
+ .name = "acpi-ged",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT(ged_state, AcpiGedState, 1, vmstate_ged_state, GEDState),
+ VMSTATE_END_OF_LIST(),
+ },
+ .subsections = (const VMStateDescription * []) {
+ &vmstate_memhp_state,
+ NULL
+ }
+};
+
+static void acpi_ged_class_init(ObjectClass *class, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(class);
+ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(class);
+ AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
+
+ dc->desc = "ACPI";
+ dc->props = acpi_ged_properties;
+ dc->realize = acpi_ged_device_realize;
+ dc->vmsd = &vmstate_acpi_ged;
+
+ hc->plug = acpi_ged_device_plug_cb;
+
+ adevc->send_event = acpi_ged_send_event;
+}
+
+static const TypeInfo acpi_ged_info = {
+ .name = TYPE_ACPI_GED,
+ .parent = TYPE_DEVICE,
+ .instance_size = sizeof(AcpiGedState),
+ .class_init = acpi_ged_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_HOTPLUG_HANDLER },
+ { TYPE_ACPI_DEVICE_IF },
+ { }
+ }
+};
+
+static void acpi_ged_register_types(void)
+{
+ type_register_static(&acpi_ged_info);
+}
+
+type_init(acpi_ged_register_types)
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
new file mode 100644
index 0000000000..f69d084c89
--- /dev/null
+++ b/include/hw/acpi/generic_event_device.h
@@ -0,0 +1,102 @@
+/*
+ *
+ * Copyright (c) 2018 Intel Corporation
+ * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
+ * Written by Samuel Ortiz, Shameer Kolothum
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2 or later, as published by the Free Software Foundation.
+ *
+ * The ACPI Generic Event Device (GED) is a hardware-reduced specific
+ * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
+ * including the hotplug ones. Generic Event Device allows platforms
+ * to handle interrupts in ACPI ASL statements. It follows a very
+ * similar approach like the _EVT method from GPIO events. All
+ * interrupts are listed in _CRS and the handler is written in _EVT
+ * method. Here, we use a single interrupt for the GED device, relying
+ * on IO memory region to communicate the type of device affected by
+ * the interrupt. This way, we can support up to 32 events with a
+ * unique interrupt.
+ *
+ * Here is an example.
+ *
+ * Device (\_SB.GED)
+ * {
+ * Name (_HID, "ACPI0013")
+ * Name (_UID, Zero)
+ * Name (_CRS, ResourceTemplate ()
+ * {
+ * Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
+ * {
+ * 0x00000029,
+ * }
+ * })
+ * OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
+ * Field (EREG, DWordAcc, NoLock, WriteAsZeros)
+ * {
+ * ESEL, 32
+ * }
+ *
+ * Method (_EVT, 1, Serialized) // _EVT: Event
+ * {
+ * Local0 = ESEL // ESEL = IO memory region which specifies the
+ * // device type.
+ * If (((Local0 & One) == One))
+ * {
+ * MethodEvent1()
+ * }
+ * If ((Local0 & 0x2) == 0x2)
+ * {
+ * MethodEvent2()
+ * }
+ * ...
+ * }
+ * }
+ *
+ */
+
+#ifndef HW_ACPI_GED_H
+#define HW_ACPI_GED_H
+
+#include "hw/acpi/memory_hotplug.h"
+
+#define TYPE_ACPI_GED "acpi-ged"
+#define ACPI_GED(obj) \
+ OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
+
+#define ACPI_GED_EVT_SEL_OFFSET 0x0
+#define ACPI_GED_EVT_SEL_LEN 0x4
+#define ACPI_GED_REG_LEN 0x4
+
+#define GED_DEVICE "GED"
+#define AML_GED_EVT_REG "EREG"
+#define AML_GED_EVT_SEL "ESEL"
+
+/*
+ * Platforms need to specify the GED event bitmap
+ * to describe what kind of events they want to support
+ * through GED.
+ */
+#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
+
+typedef struct GEDState {
+ MemoryRegion io;
+ uint32_t sel;
+ QemuMutex lock;
+} GEDState;
+
+typedef struct AcpiGedState {
+ DeviceClass parent_obj;
+ MemHotplugState memhp_state;
+ hwaddr memhp_base;
+ hwaddr ged_base;
+ GEDState ged_state;
+ uint32_t ged_event_bitmap;
+ qemu_irq irq;
+} AcpiGedState;
+
+void build_ged_aml(Aml *table, const char* name, HotplugHandler *hotplug_dev,
+ uint32_t ged_irq, AmlRegionSpace rs);
+
+#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (2 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-18 12:42 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum
` (4 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
From: Eric Auger <eric.auger@redhat.com>
This patch adds the memory hot-plug/hot-unplug infrastructure
in machvirt. The device memory is not yet exposed to the Guest
either through DT or ACPI and hence both cold/hot plug of memory
is explicitly disabled for now.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
hw/arm/Kconfig | 2 ++
hw/arm/virt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index af8cffde9c..6ef22439b5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -19,6 +19,8 @@ config ARM_VIRT
select PLATFORM_BUS
select SMBIOS
select VIRTIO_MMIO
+ select MEM_DEVICE
+ select DIMM
config CHEETAH
bool
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 5331ab71e2..3df8c389ff 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -62,6 +62,8 @@
#include "hw/arm/smmuv3.h"
#include "hw/acpi/acpi.h"
#include "target/arm/internals.h"
+#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -1862,6 +1864,40 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
return ms->possible_cpus;
}
+static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
+ Error **errp)
+{
+
+ /*
+ * The device memory is not yet exposed to the Guest either through
+ * DT or ACPI and hence both cold/hot plug of memory is explicitly
+ * disabled for now.
+ */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ error_setg(errp, "memory cold/hot plug is not yet supported");
+ return;
+ }
+
+ pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
+}
+
+static void virt_memory_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
+
+ pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
+
+}
+
+static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ virt_memory_pre_plug(hotplug_dev, dev, errp);
+ }
+}
+
static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
@@ -1873,12 +1909,23 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
SYS_BUS_DEVICE(dev));
}
}
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ virt_memory_plug(hotplug_dev, dev, errp);
+ }
+}
+
+static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ error_setg(errp, "device unplug request for unsupported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
}
static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
- if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE) ||
+ (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) {
return HOTPLUG_HANDLER(machine);
}
@@ -1942,7 +1989,9 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
mc->kvm_type = virt_kvm_type;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
+ hc->pre_plug = virt_machine_device_pre_plug_cb;
hc->plug = virt_machine_device_plug_cb;
+ hc->unplug_request = virt_machine_device_unplug_request_cb;
}
static void virt_instance_init(Object *obj)
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (3 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-18 12:43 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 6/8] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT Shameer Kolothum
` (3 subsequent siblings)
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
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.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
v4-->v5
-Removed gsi/ged-irq routing instead set irq directly.
-Create GED only for ACPI case.
---
hw/arm/Kconfig | 2 ++
hw/arm/virt-acpi-build.c | 14 ++++++++++++
hw/arm/virt.c | 48 ++++++++++++++++++++++++++++++++++------
include/hw/arm/virt.h | 3 +++
4 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 6ef22439b5..4bb498d093 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -21,6 +21,8 @@ config ARM_VIRT
select VIRTIO_MMIO
select MEM_DEVICE
select DIMM
+ select ACPI_MEMORY_HOTPLUG
+ select ACPI_HW_REDUCED
config CHEETAH
bool
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index bf9c0bc2f4..5abab6dfcd 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -40,6 +40,8 @@
#include "hw/loader.h"
#include "hw/hw.h"
#include "hw/acpi/aml-build.h"
+#include "hw/acpi/memory_hotplug.h"
+#include "hw/acpi/generic_event_device.h"
#include "hw/pci/pcie_host.h"
#include "hw/pci/pci.h"
#include "hw/arm/virt.h"
@@ -727,6 +729,7 @@ static void
build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
Aml *scope, *dsdt;
+ MachineState *ms = MACHINE(vms);
const MemMapEntry *memmap = vms->memmap;
const int *irqmap = vms->irqmap;
@@ -751,6 +754,17 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
vms->highmem, vms->highmem_ecam);
acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
(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);
+ }
+
+ if (vms->acpi_dev && ms->ram_slots) {
+ build_memory_hotplug_aml(scope, ms->ram_slots, "\\_SB", NULL,
+ AML_SYSTEM_MEMORY);
+ }
+
acpi_dsdt_add_power_button(scope);
aml_append(dsdt, scope);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 3df8c389ff..8dfd7537b9 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -64,6 +64,7 @@
#include "target/arm/internals.h"
#include "hw/mem/pc-dimm.h"
#include "hw/mem/nvdimm.h"
+#include "hw/acpi/generic_event_device.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -134,6 +135,8 @@ static const MemMapEntry base_memmap[] = {
[VIRT_GPIO] = { 0x09030000, 0x00001000 },
[VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
[VIRT_SMMU] = { 0x09050000, 0x00020000 },
+ [VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
+ [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_REG_LEN },
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
@@ -169,6 +172,7 @@ static const int a15irqmap[] = {
[VIRT_PCIE] = 3, /* ... to 6 */
[VIRT_GPIO] = 7,
[VIRT_SECURE_UART] = 8,
+ [VIRT_ACPI_GED] = 9,
[VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */
[VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */
[VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */
@@ -517,6 +521,25 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
}
}
+static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
+{
+ DeviceState *dev;
+ int irq = vms->irqmap[VIRT_ACPI_GED];
+ uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
+
+ dev = DEVICE(object_new(TYPE_ACPI_GED));
+ qdev_prop_set_uint64(dev, "memhp-base",
+ vms->memmap[VIRT_PCDIMM_ACPI].base);
+ qdev_prop_set_uint64(dev, "ged-base", vms->memmap[VIRT_ACPI_GED].base);
+ qdev_prop_set_uint32(dev, "ged-event", event);
+ object_property_add_child(qdev_get_machine(), "acpi-ged",
+ OBJECT(dev), NULL);
+ qdev_init_nofail(dev);
+ qdev_connect_gpio_out_named(dev, "ged-irq", 0, pic[irq]);
+
+ return dev;
+}
+
static void create_its(VirtMachineState *vms, DeviceState *gicdev)
{
const char *itsclass = its_class_name();
@@ -1689,6 +1712,10 @@ static void machvirt_init(MachineState *machine)
create_gpio(vms, pic);
+ if (aarch64 && firmware_loaded && acpi_enabled) {
+ vms->acpi_dev = create_acpi_ged(vms, pic);
+ }
+
/* Create mmio transports, so the user can create virtio backends
* (which will be automatically plugged in to the transports). If
* no backend is created the transport will just sit harmlessly idle.
@@ -1867,27 +1894,34 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp)
{
+ VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
+ const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
- /*
- * The device memory is not yet exposed to the Guest either through
- * DT or ACPI and hence both cold/hot plug of memory is explicitly
- * disabled for now.
- */
- if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- error_setg(errp, "memory cold/hot plug is not yet supported");
+ if (is_nvdimm) {
+ error_setg(errp, "nvdimm is not yet supported");
return;
}
+ if (!vms->acpi_dev) {
+ error_setg(errp, "memory hotplug is not enabled: missing acpi device");
+ return;
+ }
+
+ hotplug_handler_pre_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, errp);
+
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
}
static void virt_memory_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ HotplugHandlerClass *hhc;
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
+ hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
+ hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, NULL);
}
static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 424070924e..f004c5cf72 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -78,6 +78,8 @@ enum {
VIRT_GPIO,
VIRT_SECURE_UART,
VIRT_SECURE_MEM,
+ VIRT_PCDIMM_ACPI,
+ VIRT_ACPI_GED,
VIRT_LOWMEMMAP_LAST,
};
@@ -134,6 +136,7 @@ typedef struct {
uint32_t iommu_phandle;
int psci_conduit;
hwaddr highest_gpa;
+ DeviceState *acpi_dev;
} VirtMachineState;
#define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 6/8] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (4 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED Shameer Kolothum
` (2 subsequent siblings)
8 siblings, 0 replies; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Generate Memory Affinity Structures for PC-DIMM ranges.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/arm/virt-acpi-build.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 5abab6dfcd..ed8e0cee3a 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -518,6 +518,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
int i, srat_start;
uint64_t mem_base;
MachineClass *mc = MACHINE_GET_CLASS(vms);
+ MachineState *ms = MACHINE(vms);
const CPUArchIdList *cpu_list = mc->possible_cpu_arch_ids(MACHINE(vms));
srat_start = table_data->len;
@@ -543,6 +544,14 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
}
}
+ if (ms->device_memory) {
+ numamem = acpi_data_push(table_data, sizeof *numamem);
+ build_srat_memory(numamem, ms->device_memory->base,
+ memory_region_size(&ms->device_memory->mr),
+ nb_numa_nodes - 1,
+ MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
+ }
+
build_header(linker, table_data, (void *)(table_data->data + srat_start),
"SRAT", table_data->len - srat_start, 3, NULL, NULL);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (5 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 6/8] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-18 12:43 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event Shameer Kolothum
2019-06-18 12:52 ` [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Auger Eric
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
This adds support to use GED for system power down event.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
hw/acpi/generic_event_device.c | 16 ++++++++++++++++
include/hw/acpi/generic_event_device.h | 4 ++++
2 files changed, 20 insertions(+)
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 914fe64716..27c1bb40d4 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -20,6 +20,7 @@
static const uint32_t ged_supported_events[] = {
ACPI_GED_MEM_HOTPLUG_EVT,
+ ACPI_GED_PWR_DOWN_EVT,
};
/*
@@ -104,6 +105,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
aml_append(if_ctx, aml_call0(MEMORY_DEVICES_CONTAINER "."
MEMORY_SLOT_SCAN_METHOD));
break;
+ case ACPI_GED_PWR_DOWN_EVT:
+ aml_append(if_ctx,
+ aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
+ aml_int(0x80)));
+ break;
default:
/*
* Please make sure all the events in ged_supported_events[]
@@ -228,6 +234,13 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
acpi_ged_event(s, sel);
}
+static void acpi_ged_pm_powerdown_req(Notifier *n, void *opaque)
+{
+ AcpiGedState *s = container_of(n, AcpiGedState, powerdown_notifier);
+
+ acpi_ged_event(s, ACPI_GED_PWR_DOWN_EVT);
+}
+
static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
{
AcpiGedState *s = ACPI_GED(dev);
@@ -239,6 +252,9 @@ static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
}
acpi_ged_init(get_system_memory(), dev, &s->ged_state);
+
+ s->powerdown_notifier.notify = acpi_ged_pm_powerdown_req;
+ qemu_register_powerdown_notifier(&s->powerdown_notifier);
}
static Property acpi_ged_properties[] = {
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index f69d084c89..9e63b72cb9 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -61,6 +61,8 @@
#include "hw/acpi/memory_hotplug.h"
+#define ACPI_POWER_BUTTON_DEVICE "PWRB"
+
#define TYPE_ACPI_GED "acpi-ged"
#define ACPI_GED(obj) \
OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
@@ -79,6 +81,7 @@
* through GED.
*/
#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
+#define ACPI_GED_PWR_DOWN_EVT 0x2
typedef struct GEDState {
MemoryRegion io;
@@ -88,6 +91,7 @@ typedef struct GEDState {
typedef struct AcpiGedState {
DeviceClass parent_obj;
+ Notifier powerdown_notifier;
MemHotplugState memhp_state;
hwaddr memhp_base;
hwaddr ged_base;
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (6 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED Shameer Kolothum
@ 2019-05-22 16:22 ` Shameer Kolothum
2019-06-18 12:49 ` Auger Eric
2019-06-18 12:52 ` [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Auger Eric
8 siblings, 1 reply; 21+ messages in thread
From: Shameer Kolothum @ 2019-05-22 16:22 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Use GED for system_powerdown event instead of GPIO for ACPI.
Guest boot with DT still uses GPIO.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
hw/arm/virt-acpi-build.c | 37 +------------------------------------
hw/arm/virt.c | 7 +++----
2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index ed8e0cee3a..f23b276d77 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -49,7 +49,6 @@
#include "kvm_arm.h"
#define ARM_SPI_BASE 32
-#define ACPI_POWER_BUTTON_DEVICE "PWRB"
static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
{
@@ -328,37 +327,6 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
aml_append(scope, dev);
}
-static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
- uint32_t gpio_irq)
-{
- Aml *dev = aml_device("GPO0");
- aml_append(dev, aml_name_decl("_HID", aml_string("ARMH0061")));
- aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
- aml_append(dev, aml_name_decl("_UID", aml_int(0)));
-
- Aml *crs = aml_resource_template();
- aml_append(crs, aml_memory32_fixed(gpio_memmap->base, gpio_memmap->size,
- AML_READ_WRITE));
- aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
- AML_EXCLUSIVE, &gpio_irq, 1));
- aml_append(dev, aml_name_decl("_CRS", crs));
-
- Aml *aei = aml_resource_template();
- /* Pin 3 for power button */
- const uint32_t pin_list[1] = {3};
- aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH,
- AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1,
- "GPO0", NULL, 0));
- aml_append(dev, aml_name_decl("_AEI", aei));
-
- /* _E03 is handle for power button */
- Aml *method = aml_method("_E03", 0, AML_NOTSERIALIZED);
- aml_append(method, aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
- aml_int(0x80)));
- aml_append(dev, method);
- aml_append(scope, dev);
-}
-
static void acpi_dsdt_add_power_button(Aml *scope)
{
Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
@@ -761,9 +729,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
(irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
vms->highmem, vms->highmem_ecam);
- acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
- (irqmap[VIRT_GPIO] + ARM_SPI_BASE));
if (vms->acpi_dev) {
+ acpi_dsdt_add_power_button(scope);
build_ged_aml(scope, "\\_SB."GED_DEVICE,
HOTPLUG_HANDLER(vms->acpi_dev),
irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, AML_SYSTEM_MEMORY);
@@ -774,8 +741,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
AML_SYSTEM_MEMORY);
}
- acpi_dsdt_add_power_button(scope);
-
aml_append(dsdt, scope);
/* copy AML table into ACPI tables blob and patch header there */
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8dfd7537b9..bb83160888 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -525,7 +525,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
{
DeviceState *dev;
int irq = vms->irqmap[VIRT_ACPI_GED];
- uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
+ uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT | ACPI_GED_PWR_DOWN_EVT;
dev = DEVICE(object_new(TYPE_ACPI_GED));
qdev_prop_set_uint64(dev, "memhp-base",
@@ -1710,12 +1710,11 @@ static void machvirt_init(MachineState *machine)
create_pcie(vms, pic);
- create_gpio(vms, pic);
-
if (aarch64 && firmware_loaded && acpi_enabled) {
vms->acpi_dev = create_acpi_ged(vms, pic);
+ } else {
+ create_gpio(vms, pic);
}
-
/* Create mmio transports, so the user can create virtio backends
* (which will be automatically plugged in to the transports). If
* no backend is created the transport will just sit harmlessly idle.
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum
@ 2019-06-18 12:40 ` Auger Eric
2019-06-19 8:14 ` Shameerali Kolothum Thodi
0 siblings, 1 reply; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:40 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> From: Samuel Ortiz <sameo@linux.intel.com>
>
> The ACPI Generic Event Device (GED) is a hardware-reduced specific
> device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> including the hotplug ones.This patch generates the AML code that
. This patch
> defines GEDs.
>
> Platforms need to specify their own GED Event bitmap to describe
> what kind of events they want to support through GED. Also this
> uses a a single interrupt for the GED device, relying on IO
> memory region to communicate the type of device affected by the
> interrupt. This way, we can support up to 32 events with a unique
> interrupt.
>
> This supports only memory hotplug for now.
>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> v4-->v5
> -Removed gsi/irq routing code.
> -Changed GED Event array to bitmap.
> -Added Migration support.
>
> ---
> hw/acpi/Kconfig | 4 +
> hw/acpi/Makefile.objs | 1 +
> hw/acpi/generic_event_device.c | 332 +++++++++++++++++++++++++
> include/hw/acpi/generic_event_device.h | 102 ++++++++
> 4 files changed, 439 insertions(+)
> create mode 100644 hw/acpi/generic_event_device.c
> create mode 100644 include/hw/acpi/generic_event_device.h
>
> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
> index eca3beed75..01a8b41ef5 100644
> --- a/hw/acpi/Kconfig
> +++ b/hw/acpi/Kconfig
> @@ -27,3 +27,7 @@ config ACPI_VMGENID
> bool
> default y
> depends on PC
> +
> +config ACPI_HW_REDUCED
> + bool
> + depends on ACPI
> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
> index 2d46e3789a..b753232323 100644
> --- a/hw/acpi/Makefile.objs
> +++ b/hw/acpi/Makefile.objs
> @@ -6,6 +6,7 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
> common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
> common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
> common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
> +common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
> common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
>
> common-obj-y += acpi_interface.o
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> new file mode 100644
> index 0000000000..914fe64716
> --- /dev/null
> +++ b/hw/acpi/generic_event_device.c
> @@ -0,0 +1,332 @@
> +/*
> + *
> + * Copyright (c) 2018 Intel Corporation
> + * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
> + * Written by Samuel Ortiz, Shameer Kolothum
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "exec/address-spaces.h"
> +#include "hw/sysbus.h"
not needed
> +#include "hw/acpi/acpi.h"
> +#include "hw/acpi/generic_event_device.h"
> +#include "hw/mem/pc-dimm.h"
> +#include "qemu/error-report.h"
> +
> +static const uint32_t ged_supported_events[] = {
> + ACPI_GED_MEM_HOTPLUG_EVT,
> +};
> +
> +/*
> + * The ACPI Generic Event Device (GED) is a hardware-reduced specific
> + * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> + * including the hotplug ones. Platforms need to specify their own
> + * GED Event bitmap to describe what kind of events they want to support
> + * through GED. This routine uses a single interrupt for the GED device,
> + * relying on IO memory region to communicate the type of device
> + * affected by the interrupt. This way, we can support up to 32 events
> + * with a unique interrupt.
> + */
> +void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
> + uint32_t ged_irq, AmlRegionSpace rs)
> +{
> + AcpiGedState *s = ACPI_GED(hotplug_dev);
> + Aml *crs = aml_resource_template();
> + Aml *evt, *field;
> + Aml *dev = aml_device("%s", name);
> + Aml *evt_sel = aml_local(0);
> + Aml *esel = aml_name(AML_GED_EVT_SEL);
> +
> + assert(s->ged_base);
> +
> + /* _CRS interrupt */
> + aml_append(crs, aml_interrupt(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH,
> + AML_EXCLUSIVE, &ged_irq, 1));
> +
> + aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0013")));
> + aml_append(dev, aml_name_decl("_UID", aml_string(GED_DEVICE)));
> + aml_append(dev, aml_name_decl("_CRS", crs));
> +
> + /* Append IO region */
> + aml_append(dev, aml_operation_region(AML_GED_EVT_REG, rs,
> + aml_int(s->ged_base + ACPI_GED_EVT_SEL_OFFSET),
> + ACPI_GED_EVT_SEL_LEN));
> + field = aml_field(AML_GED_EVT_REG, AML_DWORD_ACC, AML_NOLOCK,
> + AML_WRITE_AS_ZEROS);
> + aml_append(field, aml_named_field(AML_GED_EVT_SEL,
> + ACPI_GED_EVT_SEL_LEN * BITS_PER_BYTE));
> + aml_append(dev, field);
> +
> + /*
> + * For each GED event we:
> + * - Add a conditional block for each event, inside a loop.
> + * - Call a method for each supported GED event type.
> + *
> + * The resulting ASL code looks like:
> + *
> + * Local0 = ESEL
> + * If ((Local0 & One) == One)
> + * {
> + * MethodEvent0()
> + * }
> + *
> + * If ((Local0 & 0x2) == 0x2)
> + * {
> + * MethodEvent1()
> + * }
> + * ...
> + */
> + evt = aml_method("_EVT", 1, AML_SERIALIZED);
> + {
> + Aml *if_ctx;
> + uint32_t i;
> + uint32_t ged_events = ctpop32(s->ged_event_bitmap);
> +
> + /* Local0 = ESEL */
> + aml_append(evt, aml_store(esel, evt_sel));
> +
> + for (i = 0; i < ARRAY_SIZE(ged_supported_events) && ged_events; i++) {
> + uint32_t event = s->ged_event_bitmap & ged_supported_events[i];
> +
> + if (!event) {
> + continue;
> + }
> +
> + if_ctx = aml_if(aml_equal(aml_and(evt_sel, aml_int(event), NULL),
> + aml_int(event)));
> + switch (event) {
> + case ACPI_GED_MEM_HOTPLUG_EVT:
> + aml_append(if_ctx, aml_call0(MEMORY_DEVICES_CONTAINER "."
> + MEMORY_SLOT_SCAN_METHOD));
> + break;
> + default:
> + /*
> + * Please make sure all the events in ged_supported_events[]
> + * are handled above.
> + */
> + g_assert_not_reached();
> + }
> +
> + aml_append(evt, if_ctx);
> + ged_events--;
> + }
> +
> + if (ged_events) {
> + error_report("GED: Unsupported events specified");
> + exit(1);
> + }
> + }
> +
> + /* Append _EVT method */
> + aml_append(dev, evt);
> +
> + aml_append(table, dev);
> +}
> +
> +/* Memory read by the GED _EVT AML dynamic method */
> +static uint64_t ged_read(void *opaque, hwaddr addr, unsigned size)
> +{
> + uint64_t val = 0;
> + GEDState *ged_st = opaque;
> +
> + switch (addr) {
> + case ACPI_GED_EVT_SEL_OFFSET:
> + /* Read the selector value and reset it */
> + qemu_mutex_lock(&ged_st->lock);
> + val = ged_st->sel;
> + ged_st->sel = 0;
> + qemu_mutex_unlock(&ged_st->lock);
> + break;
> + default:
> + break;
> + }
> +
> + return val;
> +}
> +
> +/* Nothing is expected to be written to the GED memory region */
> +static void ged_write(void *opaque, hwaddr addr, uint64_t data,
> + unsigned int size)
> +{
> +}
> +
> +static const MemoryRegionOps ged_ops = {
> + .read = ged_read,
> + .write = ged_write,
> + .endianness = DEVICE_LITTLE_ENDIAN,
> + .valid = {
> + .min_access_size = 4,
> + .max_access_size = 4,
> + },
> +};
> +
> +static void acpi_ged_event(AcpiGedState *s, uint32_t sel)
> +{
> + GEDState *ged_st = &s->ged_state;
> + /*
> + * Set the GED IRQ selector to the expected device type value. This
> + * way, the ACPI method will be able to trigger the right code based
> + * on a unique IRQ.
> + */
> + qemu_mutex_lock(&ged_st->lock);
> + ged_st->sel |= sel;
> + qemu_mutex_unlock(&ged_st->lock);
> +
> + /* Trigger the event by sending an interrupt to the guest. */
> + qemu_irq_pulse(s->irq);
> +}
> +
> +static void acpi_ged_init(MemoryRegion *as, DeviceState *dev, GEDState *ged_st)
> +{
> + AcpiGedState *s = ACPI_GED(dev);
> +
> + assert(s->ged_base);
> +
> + qemu_mutex_init(&ged_st->lock);
> + memory_region_init_io(&ged_st->io, OBJECT(dev), &ged_ops, ged_st,
> + TYPE_ACPI_GED, ACPI_GED_REG_LEN);
> + memory_region_add_subregion(as, s->ged_base, &ged_st->io);
> + qdev_init_gpio_out_named(DEVICE(s), &s->irq, "ged-irq", 1);
> +}
> +
> +static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + AcpiGedState *s = ACPI_GED(hotplug_dev);
> +
> + if (s->memhp_state.is_enabled &&
> + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state,
> + dev, errp);
> + } else {
> + error_setg(errp, "virt: device plug request for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
This also can fail if !s->memhp_state.is_enabled. May be worth producing
2 different messages?
> + }
> +}
> +
> +static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
> +{
> + AcpiGedState *s = ACPI_GED(adev);
> + uint32_t sel;
> +
> + if (ev & ACPI_MEMORY_HOTPLUG_STATUS) {
> + sel = ACPI_GED_MEM_HOTPLUG_EVT;
> + } else {
> + /* Unknown event. Return without generating interrupt. */
Shouldn't we produce an error message here?
> + return;
> + }
> +
> + /*
> + * We inject the hotplug interrupt. The IRQ selector will make
> + * the difference from the ACPI table.
> + */
> + acpi_ged_event(s, sel);
> +}
> +
> +static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
> +{
> + AcpiGedState *s = ACPI_GED(dev);
> +
> + if (s->memhp_state.is_enabled) {
> + acpi_memory_hotplug_init(get_system_memory(), OBJECT(dev),
> + &s->memhp_state,
> + s->memhp_base);
> + }
> +
> + acpi_ged_init(get_system_memory(), dev, &s->ged_state);
> +}
> +
> +static Property acpi_ged_properties[] = {
> + /*
> + * Memory hotplug base address is a property of GED here,
> + * because GED handles memory hotplug event and MEMORY_HOTPLUG_DEVICE
MEMORY_HOTPLUG_DEVICE? Didn't you mean acpi-mem-hotplug region?
> + * gets initialized when GED device is realized.
> + */
> + DEFINE_PROP_UINT64("memhp-base", AcpiGedState, memhp_base, 0),
> + DEFINE_PROP_BOOL("memory-hotplug-support", AcpiGedState,
> + memhp_state.is_enabled, true),
> + DEFINE_PROP_UINT64("ged-base", AcpiGedState, ged_base, 0),
> + DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static bool vmstate_test_use_memhp(void *opaque)
> +{
> + AcpiGedState *s = opaque;
> + return s->memhp_state.is_enabled;
> +}
> +
> +static const VMStateDescription vmstate_memhp_state = {
> + .name = "acpi-ged/memhp",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = vmstate_test_use_memhp,
> + .fields = (VMStateField[]) {
> + VMSTATE_MEMORY_HOTPLUG(memhp_state, AcpiGedState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +static const VMStateDescription vmstate_ged_state = {
> + .name = "acpi-ged-state",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT32(sel, GEDState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +static const VMStateDescription vmstate_acpi_ged = {
> + .name = "acpi-ged",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_STRUCT(ged_state, AcpiGedState, 1, vmstate_ged_state, GEDState),
> + VMSTATE_END_OF_LIST(),
> + },
> + .subsections = (const VMStateDescription * []) {
> + &vmstate_memhp_state,
> + NULL
> + }
> +};
> +
> +static void acpi_ged_class_init(ObjectClass *class, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(class);
> + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(class);
> + AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
> +
> + dc->desc = "ACPI";
Choose a more explicit description?
> + dc->props = acpi_ged_properties;
> + dc->realize = acpi_ged_device_realize;
> + dc->vmsd = &vmstate_acpi_ged;
> +
> + hc->plug = acpi_ged_device_plug_cb;
> +
> + adevc->send_event = acpi_ged_send_event;
> +}
> +
> +static const TypeInfo acpi_ged_info = {
> + .name = TYPE_ACPI_GED,
> + .parent = TYPE_DEVICE,
> + .instance_size = sizeof(AcpiGedState),
> + .class_init = acpi_ged_class_init,
> + .interfaces = (InterfaceInfo[]) {
> + { TYPE_HOTPLUG_HANDLER },
> + { TYPE_ACPI_DEVICE_IF },
> + { }
> + }
> +};
> +
> +static void acpi_ged_register_types(void)
> +{
> + type_register_static(&acpi_ged_info);
> +}
> +
> +type_init(acpi_ged_register_types)
> diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
> new file mode 100644
> index 0000000000..f69d084c89
> --- /dev/null
> +++ b/include/hw/acpi/generic_event_device.h
> @@ -0,0 +1,102 @@
> +/*
> + *
> + * Copyright (c) 2018 Intel Corporation
> + * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
> + * Written by Samuel Ortiz, Shameer Kolothum
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + *
> + * The ACPI Generic Event Device (GED) is a hardware-reduced specific
> + * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> + * including the hotplug ones. Generic Event Device allows platforms
> + * to handle interrupts in ACPI ASL statements. It follows a very
> + * similar approach like the _EVT method from GPIO events. All
> + * interrupts are listed in _CRS and the handler is written in _EVT
> + * method. Here, we use a single interrupt for the GED device, relying
> + * on IO memory region to communicate the type of device affected by
> + * the interrupt. This way, we can support up to 32 events with a
> + * unique interrupt.
> + *
> + * Here is an example.
> + *
> + * Device (\_SB.GED)
> + * {
> + * Name (_HID, "ACPI0013")
> + * Name (_UID, Zero)
> + * Name (_CRS, ResourceTemplate ()
> + * {
> + * Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
> + * {
> + * 0x00000029,
> + * }
> + * })
> + * OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
> + * Field (EREG, DWordAcc, NoLock, WriteAsZeros)
> + * {
> + * ESEL, 32
> + * }
> + *
> + * Method (_EVT, 1, Serialized) // _EVT: Event
> + * {
> + * Local0 = ESEL // ESEL = IO memory region which specifies the
> + * // device type.
> + * If (((Local0 & One) == One))
> + * {
> + * MethodEvent1()
> + * }
> + * If ((Local0 & 0x2) == 0x2)
> + * {
> + * MethodEvent2()
> + * }
> + * ...
> + * }
> + * }
> + *
> + */
> +
> +#ifndef HW_ACPI_GED_H
> +#define HW_ACPI_GED_H
> +
> +#include "hw/acpi/memory_hotplug.h"
> +
> +#define TYPE_ACPI_GED "acpi-ged"
> +#define ACPI_GED(obj) \
> + OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
> +
> +#define ACPI_GED_EVT_SEL_OFFSET 0x0
> +#define ACPI_GED_EVT_SEL_LEN 0x4
> +#define ACPI_GED_REG_LEN 0x4
> +
> +#define GED_DEVICE "GED"
> +#define AML_GED_EVT_REG "EREG"
> +#define AML_GED_EVT_SEL "ESEL"
> +
> +/*
> + * Platforms need to specify the GED event bitmap
> + * to describe what kind of events they want to support
> + * through GED.
> + */
> +#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
> +
> +typedef struct GEDState {
> + MemoryRegion io;
> + uint32_t sel;
> + QemuMutex lock;
> +} GEDState;
> +
> +typedef struct AcpiGedState {
> + DeviceClass parent_obj;
> + MemHotplugState memhp_state;
> + hwaddr memhp_base;
> + hwaddr ged_base;
> + GEDState ged_state;
> + uint32_t ged_event_bitmap;
> + qemu_irq irq;
> +} AcpiGedState;
> +
> +void build_ged_aml(Aml *table, const char* name, HotplugHandler *hotplug_dev,
> + uint32_t ged_irq, AmlRegionSpace rs);
> +
> +#endif
>
Besides looks good to me
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework Shameer Kolothum
@ 2019-06-18 12:42 ` Auger Eric
2019-06-19 8:16 ` Shameerali Kolothum Thodi
0 siblings, 1 reply; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:42 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> From: Eric Auger <eric.auger@redhat.com>
>
> This patch adds the memory hot-plug/hot-unplug infrastructure
> in machvirt. The device memory is not yet exposed to the Guest
> either through DT or ACPI and hence both cold/hot plug of memory
> is explicitly disabled for now.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> hw/arm/Kconfig | 2 ++
> hw/arm/virt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 52 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index af8cffde9c..6ef22439b5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -19,6 +19,8 @@ config ARM_VIRT
> select PLATFORM_BUS
> select SMBIOS
> select VIRTIO_MMIO
small conflict to be resolved here after addition of "select ACPI_PCI".
> + select MEM_DEVICE
> + select DIMM
>
> config CHEETAH
> bool
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 5331ab71e2..3df8c389ff 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -62,6 +62,8 @@
> #include "hw/arm/smmuv3.h"
> #include "hw/acpi/acpi.h"
> #include "target/arm/internals.h"
> +#include "hw/mem/pc-dimm.h"
> +#include "hw/mem/nvdimm.h">
> #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
> static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
> @@ -1862,6 +1864,40 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
> return ms->possible_cpus;
> }
>
> +static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp)
> +{
> +
> + /*
> + * The device memory is not yet exposed to the Guest either through> + * DT or ACPI and hence both cold/hot plug of memory is explicitly
> + * disabled for now.
> + */
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + error_setg(errp, "memory cold/hot plug is not yet supported");
> + return;
> + }
> +
> + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
> +}
> +
> +static void virt_memory_plug(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> +
> + pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
> +
> +}
> +
> +static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + virt_memory_pre_plug(hotplug_dev, dev, errp);
> + }
> +}
> +
> static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> @@ -1873,12 +1909,23 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> SYS_BUS_DEVICE(dev));
> }
> }
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + virt_memory_plug(hotplug_dev, dev, errp);
> + }
> +}
> +
> +static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + error_setg(errp, "device unplug request for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> }
>
> static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,
> DeviceState *dev)
> {
> - if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) {
> + if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE) ||
> + (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) {
> return HOTPLUG_HANDLER(machine);
> }
>
> @@ -1942,7 +1989,9 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
> mc->kvm_type = virt_kvm_type;
> assert(!mc->get_hotplug_handler);
> mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
> + hc->pre_plug = virt_machine_device_pre_plug_cb;
> hc->plug = virt_machine_device_plug_cb;
> + hc->unplug_request = virt_machine_device_unplug_request_cb;
> }
>
> static void virt_instance_init(Object *obj)
>
Thanks
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum
@ 2019-06-18 12:43 ` Auger Eric
0 siblings, 0 replies; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:43 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> 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.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> v4-->v5
>
> -Removed gsi/ged-irq routing instead set irq directly.
> -Create GED only for ACPI case.
>
> ---
> hw/arm/Kconfig | 2 ++
> hw/arm/virt-acpi-build.c | 14 ++++++++++++
> hw/arm/virt.c | 48 ++++++++++++++++++++++++++++++++++------
> include/hw/arm/virt.h | 3 +++
> 4 files changed, 60 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 6ef22439b5..4bb498d093 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -21,6 +21,8 @@ config ARM_VIRT
> select VIRTIO_MMIO
> select MEM_DEVICE
> select DIMM
> + select ACPI_MEMORY_HOTPLUG
> + select ACPI_HW_REDUCED
>
> config CHEETAH
> bool
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index bf9c0bc2f4..5abab6dfcd 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -40,6 +40,8 @@
> #include "hw/loader.h"
> #include "hw/hw.h"
> #include "hw/acpi/aml-build.h"
> +#include "hw/acpi/memory_hotplug.h"
> +#include "hw/acpi/generic_event_device.h"
> #include "hw/pci/pcie_host.h"
> #include "hw/pci/pci.h"
> #include "hw/arm/virt.h"
> @@ -727,6 +729,7 @@ static void
> build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> {
> Aml *scope, *dsdt;
> + MachineState *ms = MACHINE(vms);
> const MemMapEntry *memmap = vms->memmap;
> const int *irqmap = vms->irqmap;
>
> @@ -751,6 +754,17 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> vms->highmem, vms->highmem_ecam);
> acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
> (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);
> + }
> +
> + if (vms->acpi_dev && ms->ram_slots) {
> + build_memory_hotplug_aml(scope, ms->ram_slots, "\\_SB", NULL,
> + AML_SYSTEM_MEMORY);
> + }
> +
> acpi_dsdt_add_power_button(scope);
>
> aml_append(dsdt, scope);
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 3df8c389ff..8dfd7537b9 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -64,6 +64,7 @@
> #include "target/arm/internals.h"
> #include "hw/mem/pc-dimm.h"
> #include "hw/mem/nvdimm.h"
> +#include "hw/acpi/generic_event_device.h"
>
> #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
> static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
> @@ -134,6 +135,8 @@ static const MemMapEntry base_memmap[] = {
> [VIRT_GPIO] = { 0x09030000, 0x00001000 },
> [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
> [VIRT_SMMU] = { 0x09050000, 0x00020000 },
> + [VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
> + [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_REG_LEN },
> [VIRT_MMIO] = { 0x0a000000, 0x00000200 },
> /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
> [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
> @@ -169,6 +172,7 @@ static const int a15irqmap[] = {
> [VIRT_PCIE] = 3, /* ... to 6 */
> [VIRT_GPIO] = 7,
> [VIRT_SECURE_UART] = 8,
> + [VIRT_ACPI_GED] = 9,
> [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */
> [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */
> [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */
> @@ -517,6 +521,25 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
> }
> }
>
> +static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
> +{
> + DeviceState *dev;
> + int irq = vms->irqmap[VIRT_ACPI_GED];
> + uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
> +
> + dev = DEVICE(object_new(TYPE_ACPI_GED));
> + qdev_prop_set_uint64(dev, "memhp-base",
> + vms->memmap[VIRT_PCDIMM_ACPI].base);
> + qdev_prop_set_uint64(dev, "ged-base", vms->memmap[VIRT_ACPI_GED].base);
> + qdev_prop_set_uint32(dev, "ged-event", event);
> + object_property_add_child(qdev_get_machine(), "acpi-ged",
> + OBJECT(dev), NULL);
> + qdev_init_nofail(dev);
> + qdev_connect_gpio_out_named(dev, "ged-irq", 0, pic[irq]);
> +
> + return dev;
> +}
> +
> static void create_its(VirtMachineState *vms, DeviceState *gicdev)
> {
> const char *itsclass = its_class_name();
> @@ -1689,6 +1712,10 @@ static void machvirt_init(MachineState *machine)
>
> create_gpio(vms, pic);
>
> + if (aarch64 && firmware_loaded && acpi_enabled) {
> + vms->acpi_dev = create_acpi_ged(vms, pic);
> + }
> +
> /* Create mmio transports, so the user can create virtio backends
> * (which will be automatically plugged in to the transports). If
> * no backend is created the transport will just sit harmlessly idle.
> @@ -1867,27 +1894,34 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
> static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
> Error **errp)
> {
> + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
>
> - /*
> - * The device memory is not yet exposed to the Guest either through
> - * DT or ACPI and hence both cold/hot plug of memory is explicitly
> - * disabled for now.
> - */
> - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> - error_setg(errp, "memory cold/hot plug is not yet supported");
> + if (is_nvdimm) {
> + error_setg(errp, "nvdimm is not yet supported");
> return;
> }
>
> + if (!vms->acpi_dev) {
> + error_setg(errp, "memory hotplug is not enabled: missing acpi device");
> + return;
> + }
> +
> + hotplug_handler_pre_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, errp);
> +
> pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
> }
>
> static void virt_memory_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> + HotplugHandlerClass *hhc;
> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
>
> pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
>
> + hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
> + hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, NULL);
> }
>
> static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 424070924e..f004c5cf72 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -78,6 +78,8 @@ enum {
> VIRT_GPIO,
> VIRT_SECURE_UART,
> VIRT_SECURE_MEM,
> + VIRT_PCDIMM_ACPI,
> + VIRT_ACPI_GED,
> VIRT_LOWMEMMAP_LAST,
> };
>
> @@ -134,6 +136,7 @@ typedef struct {
> uint32_t iommu_phandle;
> int psci_conduit;
> hwaddr highest_gpa;
> + DeviceState *acpi_dev;
> } VirtMachineState;
>
> #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED Shameer Kolothum
@ 2019-06-18 12:43 ` Auger Eric
0 siblings, 0 replies; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:43 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> This adds support to use GED for system power down event.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> hw/acpi/generic_event_device.c | 16 ++++++++++++++++
> include/hw/acpi/generic_event_device.h | 4 ++++
> 2 files changed, 20 insertions(+)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 914fe64716..27c1bb40d4 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -20,6 +20,7 @@
>
> static const uint32_t ged_supported_events[] = {
> ACPI_GED_MEM_HOTPLUG_EVT,
> + ACPI_GED_PWR_DOWN_EVT,
> };
>
> /*
> @@ -104,6 +105,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
> aml_append(if_ctx, aml_call0(MEMORY_DEVICES_CONTAINER "."
> MEMORY_SLOT_SCAN_METHOD));
> break;
> + case ACPI_GED_PWR_DOWN_EVT:
> + aml_append(if_ctx,
> + aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
> + aml_int(0x80)));
> + break;
> default:
> /*
> * Please make sure all the events in ged_supported_events[]
> @@ -228,6 +234,13 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
> acpi_ged_event(s, sel);
> }
>
> +static void acpi_ged_pm_powerdown_req(Notifier *n, void *opaque)
> +{
> + AcpiGedState *s = container_of(n, AcpiGedState, powerdown_notifier);
> +
> + acpi_ged_event(s, ACPI_GED_PWR_DOWN_EVT);
> +}
> +
> static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
> {
> AcpiGedState *s = ACPI_GED(dev);
> @@ -239,6 +252,9 @@ static void acpi_ged_device_realize(DeviceState *dev, Error **errp)
> }
>
> acpi_ged_init(get_system_memory(), dev, &s->ged_state);
> +
> + s->powerdown_notifier.notify = acpi_ged_pm_powerdown_req;
> + qemu_register_powerdown_notifier(&s->powerdown_notifier);
> }
>
> static Property acpi_ged_properties[] = {
> diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
> index f69d084c89..9e63b72cb9 100644
> --- a/include/hw/acpi/generic_event_device.h
> +++ b/include/hw/acpi/generic_event_device.h
> @@ -61,6 +61,8 @@
>
> #include "hw/acpi/memory_hotplug.h"
>
> +#define ACPI_POWER_BUTTON_DEVICE "PWRB"
> +
> #define TYPE_ACPI_GED "acpi-ged"
> #define ACPI_GED(obj) \
> OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
> @@ -79,6 +81,7 @@
> * through GED.
> */
> #define ACPI_GED_MEM_HOTPLUG_EVT 0x1
> +#define ACPI_GED_PWR_DOWN_EVT 0x2
>
> typedef struct GEDState {
> MemoryRegion io;
> @@ -88,6 +91,7 @@ typedef struct GEDState {
>
> typedef struct AcpiGedState {
> DeviceClass parent_obj;
> + Notifier powerdown_notifier;
> MemHotplugState memhp_state;
> hwaddr memhp_base;
> hwaddr ged_base;
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event Shameer Kolothum
@ 2019-06-18 12:49 ` Auger Eric
0 siblings, 0 replies; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:49 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> Use GED for system_powerdown event instead of GPIO for ACPI.
> Guest boot with DT still uses GPIO.>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> hw/arm/virt-acpi-build.c | 37 +------------------------------------
> hw/arm/virt.c | 7 +++----
> 2 files changed, 4 insertions(+), 40 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index ed8e0cee3a..f23b276d77 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -49,7 +49,6 @@
> #include "kvm_arm.h"
>
> #define ARM_SPI_BASE 32
> -#define ACPI_POWER_BUTTON_DEVICE "PWRB">
> static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
> {
> @@ -328,37 +327,6 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
> aml_append(scope, dev);
> }
>
> -static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
> - uint32_t gpio_irq)
> -{
> - Aml *dev = aml_device("GPO0");
> - aml_append(dev, aml_name_decl("_HID", aml_string("ARMH0061")));
> - aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
> - aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> -
> - Aml *crs = aml_resource_template();
> - aml_append(crs, aml_memory32_fixed(gpio_memmap->base, gpio_memmap->size,
> - AML_READ_WRITE));
> - aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
> - AML_EXCLUSIVE, &gpio_irq, 1));
> - aml_append(dev, aml_name_decl("_CRS", crs));
> -
> - Aml *aei = aml_resource_template();
> - /* Pin 3 for power button */
> - const uint32_t pin_list[1] = {3};
> - aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH,
> - AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1,
> - "GPO0", NULL, 0));
> - aml_append(dev, aml_name_decl("_AEI", aei));
> -
> - /* _E03 is handle for power button */
> - Aml *method = aml_method("_E03", 0, AML_NOTSERIALIZED);
> - aml_append(method, aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
> - aml_int(0x80)));
> - aml_append(dev, method);
> - aml_append(scope, dev);
> -}
> -
> static void acpi_dsdt_add_power_button(Aml *scope)
> {
> Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
> @@ -761,9 +729,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
> acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
> vms->highmem, vms->highmem_ecam);
> - acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
> - (irqmap[VIRT_GPIO] + ARM_SPI_BASE));
> if (vms->acpi_dev) {
> + acpi_dsdt_add_power_button(scope);
> build_ged_aml(scope, "\\_SB."GED_DEVICE,
> HOTPLUG_HANDLER(vms->acpi_dev),
> irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, AML_SYSTEM_MEMORY);
> @@ -774,8 +741,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> AML_SYSTEM_MEMORY);
> }
>
> - acpi_dsdt_add_power_button(scope);
> -
> aml_append(dsdt, scope);
>
> /* copy AML table into ACPI tables blob and patch header there */
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 8dfd7537b9..bb83160888 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -525,7 +525,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
> {
> DeviceState *dev;
> int irq = vms->irqmap[VIRT_ACPI_GED];
> - uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
> + uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT | ACPI_GED_PWR_DOWN_EVT;
>
> dev = DEVICE(object_new(TYPE_ACPI_GED));
> qdev_prop_set_uint64(dev, "memhp-base",
> @@ -1710,12 +1710,11 @@ static void machvirt_init(MachineState *machine)
>
> create_pcie(vms, pic);
>
> - create_gpio(vms, pic);
> -
> if (aarch64 && firmware_loaded && acpi_enabled) {
> vms->acpi_dev = create_acpi_ged(vms, pic);
> + } else {
> + create_gpio(vms, pic);
> }
> -
> /* Create mmio transports, so the user can create virtio backends
> * (which will be automatically plugged in to the transports). If
> * no backend is created the transport will just sit harmlessly idle.
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
` (7 preceding siblings ...)
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event Shameer Kolothum
@ 2019-06-18 12:52 ` Auger Eric
2019-06-18 12:57 ` Peter Maydell
8 siblings, 1 reply; 21+ messages in thread
From: Auger Eric @ 2019-06-18 12:52 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, linuxarm, xuwei5,
shannon.zhaosl, sebastien.boeuf, lersek
Hi Shameer,
On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> This series is an attempt to provide device memory hotplug support
> on ARM virt platform. This is based on Eric's recent works here[1]
> and carries some of the pc-dimm related patches dropped from his
> series.
>
> The kernel support for arm64 memory hot add was added recently by
> Robin and hence the guest kernel should be => 5.0-rc1.
>
> NVDIM support is not included currently as we still have an unresolved
> issue while hot adding NVDIMM[2]. However NVDIMM cold plug patches
> can be included, but not done for now, for keeping it simple.
>
> This makes use of GED device to sent hotplug ACPI events to the
> Guest. GED code is based on Nemu. Thanks to the efforts of Samuel and
> Sebastien to add the hardware-reduced support to Nemu using GED
> device[3]. (Please shout if I got the author/signed-off wrong for
> those patches or missed any names).
>
> This is sanity tested on a HiSilicon ARM64 platform and appreciate
> any further testing.
I tested cold-plug and hot-plug of PCDIMM slots. I also tested
system_powerdown and system_reset. The series has minor conflicts with
master.
Feel free to add my T-b on next version:
Tested-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
>
> Thanks,
> Shameer
>
> [1] https://patchwork.kernel.org/cover/10837565/
> [2] https://patchwork.kernel.org/cover/10783589/
> [3] https://github.com/intel/nemu/blob/topic/virt-x86/hw/acpi/ged.c
> [4] http://lists.infradead.org/pipermail/linux-arm-kernel/2019-May/651763.html
>
> v4 --> v5
> -Removed gsi/ged-irq routing in virt.
> -Added Migration support.
> -Dropped support for DT coldplug case based on the discussions
> here[4]
> -Added system_powerdown support through GED.
>
> v3 --> v4
> Addressed comments from Igor and Eric,
> -Renamed "virt-acpi" to "acpi-ged".
> -Changed ged device parent to TYPE_DEVICE.
> -Introduced DT memory node property "hotpluggable" to resolve device
> memory being treated as early boot memory issue(patch #7).
> -Combined patches #3 and #9 from v3 into #3.
>
> v2 --> v3
>
> Addressed comments from Igor and Eric,
> -Made virt acpi device platform independent and moved
> to hw/acpi/generic_event_device.c
> -Moved ged specific code into hw/acpi/generic_event_device.c
> -Introduced an opt-in feature "fdt" to resolve device-memory being
> treated as early boot memory.
> -Dropped patch #1 from v2.
>
> RFC --> v2
>
> -Use GED device instead of GPIO for ACPI hotplug events.
> -Removed NVDIMM support for now.
> -Includes dropped patches from Eric's v9 series.
>
> Eric Auger (1):
> hw/arm/virt: Add memory hotplug framework
>
> Samuel Ortiz (2):
> hw/acpi: Do not create memory hotplug method when handler is not
> defined
> hw/acpi: Add ACPI Generic Event Device Support
>
> Shameer Kolothum (5):
> hw/acpi: Make ACPI IO address space configurable
> hw/arm/virt: Enable device memory cold/hot plug with ACPI boot
> hw/arm/virt-acpi-build: Add PC-DIMM in SRAT
> hw/acpi: Add system power down support to GED
> hw/arm: Use GED for system_powerdown event
>
> hw/acpi/Kconfig | 4 +
> hw/acpi/Makefile.objs | 1 +
> hw/acpi/generic_event_device.c | 348 +++++++++++++++++++++++++
> hw/acpi/memory_hotplug.c | 35 +--
> hw/arm/Kconfig | 4 +
> hw/arm/virt-acpi-build.c | 58 ++---
> hw/arm/virt.c | 88 ++++++-
> hw/i386/acpi-build.c | 3 +-
> include/hw/acpi/generic_event_device.h | 106 ++++++++
> include/hw/acpi/memory_hotplug.h | 9 +-
> include/hw/arm/virt.h | 3 +
> 11 files changed, 603 insertions(+), 56 deletions(-)
> create mode 100644 hw/acpi/generic_event_device.c
> create mode 100644 include/hw/acpi/generic_event_device.h
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
2019-06-18 12:52 ` [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Auger Eric
@ 2019-06-18 12:57 ` Peter Maydell
2019-06-18 13:44 ` Auger Eric
0 siblings, 1 reply; 21+ messages in thread
From: Peter Maydell @ 2019-06-18 12:57 UTC (permalink / raw)
To: Auger Eric
Cc: Samuel Ortiz, Ard Biesheuvel, QEMU Developers, Shameer Kolothum,
Linuxarm, Shannon Zhao, qemu-arm, Xu Wei, Igor Mammedov,
sebastien.boeuf, Laszlo Ersek
On Tue, 18 Jun 2019 at 13:52, Auger Eric <eric.auger@redhat.com> wrote:
> Feel free to add my T-b on next version:
> Tested-by: Eric Auger <eric.auger@redhat.com>
I'm not sure we should carry across Tested-by tags like that: any
respin might accidentally introduce bugs that make it stop working...
thanks
-- PMM
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
2019-06-18 12:57 ` Peter Maydell
@ 2019-06-18 13:44 ` Auger Eric
2019-06-19 8:18 ` Shameerali Kolothum Thodi
0 siblings, 1 reply; 21+ messages in thread
From: Auger Eric @ 2019-06-18 13:44 UTC (permalink / raw)
To: Peter Maydell
Cc: Samuel Ortiz, Ard Biesheuvel, QEMU Developers, Shameer Kolothum,
Linuxarm, Shannon Zhao, qemu-arm, Xu Wei, Igor Mammedov,
sebastien.boeuf, Laszlo Ersek
Hi Peter,
On 6/18/19 2:57 PM, Peter Maydell wrote:
> I'm not sure we should carry across Tested-by tags like that: any
> respin might accidentally introduce bugs that make it stop working...
OK. No problem. I will test the next version then.
Thanks
Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support
2019-06-18 12:40 ` Auger Eric
@ 2019-06-19 8:14 ` Shameerali Kolothum Thodi
0 siblings, 0 replies; 21+ messages in thread
From: Shameerali Kolothum Thodi @ 2019-06-19 8:14 UTC (permalink / raw)
To: Auger Eric, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, Linuxarm, shannon.zhaosl,
sebastien.boeuf, xuwei (O),
lersek
Hi Eric,
> -----Original Message-----
> From: Auger Eric [mailto:eric.auger@redhat.com]
> Sent: 18 June 2019 13:41
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>;
> qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com
> Cc: peter.maydell@linaro.org; shannon.zhaosl@gmail.com;
> sameo@linux.intel.com; sebastien.boeuf@intel.com; xuwei (O)
> <xuwei5@huawei.com>; lersek@redhat.com; ard.biesheuvel@linaro.org;
> Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support
>
> Hi Shameer,
>
> On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> > From: Samuel Ortiz <sameo@linux.intel.com>
> >
> > The ACPI Generic Event Device (GED) is a hardware-reduced specific
> > device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> > including the hotplug ones.This patch generates the AML code that
> . This patch
> > defines GEDs.
> >
> > Platforms need to specify their own GED Event bitmap to describe what
> > kind of events they want to support through GED. Also this uses a a
> > single interrupt for the GED device, relying on IO memory region to
> > communicate the type of device affected by the interrupt. This way, we
> > can support up to 32 events with a unique interrupt.
> >
> > This supports only memory hotplug for now.
> >
> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > ---
> > v4-->v5
> > -Removed gsi/irq routing code.
> > -Changed GED Event array to bitmap.
> > -Added Migration support.
> >
> > ---
> > hw/acpi/Kconfig | 4 +
> > hw/acpi/Makefile.objs | 1 +
> > hw/acpi/generic_event_device.c | 332
> +++++++++++++++++++++++++
> > include/hw/acpi/generic_event_device.h | 102 ++++++++
> > 4 files changed, 439 insertions(+)
> > create mode 100644 hw/acpi/generic_event_device.c create mode
> 100644
> > include/hw/acpi/generic_event_device.h
> >
> > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index
> > eca3beed75..01a8b41ef5 100644
> > --- a/hw/acpi/Kconfig
> > +++ b/hw/acpi/Kconfig
> > @@ -27,3 +27,7 @@ config ACPI_VMGENID
> > bool
> > default y
> > depends on PC
> > +
> > +config ACPI_HW_REDUCED
> > + bool
> > + depends on ACPI
> > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index
> > 2d46e3789a..b753232323 100644
> > --- a/hw/acpi/Makefile.objs
> > +++ b/hw/acpi/Makefile.objs
> > @@ -6,6 +6,7 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) +=
> > memory_hotplug.o
> > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
> > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
> > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
> > +common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
> > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
> >
> > common-obj-y += acpi_interface.o
> > diff --git a/hw/acpi/generic_event_device.c
> > b/hw/acpi/generic_event_device.c new file mode 100644 index
> > 0000000000..914fe64716
> > --- /dev/null
> > +++ b/hw/acpi/generic_event_device.c
> > @@ -0,0 +1,332 @@
> > +/*
> > + *
> > + * Copyright (c) 2018 Intel Corporation
> > + * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
> > + * Written by Samuel Ortiz, Shameer Kolothum
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify it
> > + * under the terms and conditions of the GNU General Public License,
> > + * version 2 or later, as published by the Free Software Foundation.
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qapi/error.h"
> > +#include "exec/address-spaces.h"
> > +#include "hw/sysbus.h"
> not needed
True. Missed that.
> > +#include "hw/acpi/acpi.h"
> > +#include "hw/acpi/generic_event_device.h"
> > +#include "hw/mem/pc-dimm.h"
> > +#include "qemu/error-report.h"
> > +
> > +static const uint32_t ged_supported_events[] = {
> > + ACPI_GED_MEM_HOTPLUG_EVT,
> > +};
> > +
> > +/*
> > + * The ACPI Generic Event Device (GED) is a hardware-reduced specific
> > + * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> > + * including the hotplug ones. Platforms need to specify their own
> > + * GED Event bitmap to describe what kind of events they want to
> > +support
> > + * through GED. This routine uses a single interrupt for the GED
> > +device,
> > + * relying on IO memory region to communicate the type of device
> > + * affected by the interrupt. This way, we can support up to 32
> > +events
> > + * with a unique interrupt.
> > + */
> > +void build_ged_aml(Aml *table, const char *name, HotplugHandler
> *hotplug_dev,
> > + uint32_t ged_irq, AmlRegionSpace rs) {
> > + AcpiGedState *s = ACPI_GED(hotplug_dev);
> > + Aml *crs = aml_resource_template();
> > + Aml *evt, *field;
> > + Aml *dev = aml_device("%s", name);
> > + Aml *evt_sel = aml_local(0);
> > + Aml *esel = aml_name(AML_GED_EVT_SEL);
> > +
> > + assert(s->ged_base);
> > +
> > + /* _CRS interrupt */
> > + aml_append(crs, aml_interrupt(AML_CONSUMER, AML_EDGE,
> AML_ACTIVE_HIGH,
> > + AML_EXCLUSIVE, &ged_irq, 1));
> > +
> > + aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0013")));
> > + aml_append(dev, aml_name_decl("_UID", aml_string(GED_DEVICE)));
> > + aml_append(dev, aml_name_decl("_CRS", crs));
> > +
> > + /* Append IO region */
> > + aml_append(dev, aml_operation_region(AML_GED_EVT_REG, rs,
> > + aml_int(s->ged_base + ACPI_GED_EVT_SEL_OFFSET),
> > + ACPI_GED_EVT_SEL_LEN));
> > + field = aml_field(AML_GED_EVT_REG, AML_DWORD_ACC,
> AML_NOLOCK,
> > + AML_WRITE_AS_ZEROS);
> > + aml_append(field, aml_named_field(AML_GED_EVT_SEL,
> > + ACPI_GED_EVT_SEL_LEN *
> BITS_PER_BYTE));
> > + aml_append(dev, field);
> > +
> > + /*
> > + * For each GED event we:
> > + * - Add a conditional block for each event, inside a loop.
> > + * - Call a method for each supported GED event type.
> > + *
> > + * The resulting ASL code looks like:
> > + *
> > + * Local0 = ESEL
> > + * If ((Local0 & One) == One)
> > + * {
> > + * MethodEvent0()
> > + * }
> > + *
> > + * If ((Local0 & 0x2) == 0x2)
> > + * {
> > + * MethodEvent1()
> > + * }
> > + * ...
> > + */
> > + evt = aml_method("_EVT", 1, AML_SERIALIZED);
> > + {
> > + Aml *if_ctx;
> > + uint32_t i;
> > + uint32_t ged_events = ctpop32(s->ged_event_bitmap);
> > +
> > + /* Local0 = ESEL */
> > + aml_append(evt, aml_store(esel, evt_sel));
> > +
> > + for (i = 0; i < ARRAY_SIZE(ged_supported_events) && ged_events;
> i++) {
> > + uint32_t event = s->ged_event_bitmap &
> > + ged_supported_events[i];
> > +
> > + if (!event) {
> > + continue;
> > + }
> > +
> > + if_ctx = aml_if(aml_equal(aml_and(evt_sel, aml_int(event),
> NULL),
> > + aml_int(event)));
> > + switch (event) {
> > + case ACPI_GED_MEM_HOTPLUG_EVT:
> > + aml_append(if_ctx,
> aml_call0(MEMORY_DEVICES_CONTAINER "."
> > +
> MEMORY_SLOT_SCAN_METHOD));
> > + break;
> > + default:
> > + /*
> > + * Please make sure all the events in
> ged_supported_events[]
> > + * are handled above.
> > + */
> > + g_assert_not_reached();
> > + }
> > +
> > + aml_append(evt, if_ctx);
> > + ged_events--;
> > + }
> > +
> > + if (ged_events) {
> > + error_report("GED: Unsupported events specified");
> > + exit(1);
> > + }
> > + }
> > +
> > + /* Append _EVT method */
> > + aml_append(dev, evt);
> > +
> > + aml_append(table, dev);
> > +}
> > +
> > +/* Memory read by the GED _EVT AML dynamic method */ static uint64_t
> > +ged_read(void *opaque, hwaddr addr, unsigned size) {
> > + uint64_t val = 0;
> > + GEDState *ged_st = opaque;
> > +
> > + switch (addr) {
> > + case ACPI_GED_EVT_SEL_OFFSET:
> > + /* Read the selector value and reset it */
> > + qemu_mutex_lock(&ged_st->lock);
> > + val = ged_st->sel;
> > + ged_st->sel = 0;
> > + qemu_mutex_unlock(&ged_st->lock);
> > + break;
> > + default:
> > + break;
> > + }
> > +
> > + return val;
> > +}
> > +
> > +/* Nothing is expected to be written to the GED memory region */
> > +static void ged_write(void *opaque, hwaddr addr, uint64_t data,
> > + unsigned int size) { }
> > +
> > +static const MemoryRegionOps ged_ops = {
> > + .read = ged_read,
> > + .write = ged_write,
> > + .endianness = DEVICE_LITTLE_ENDIAN,
> > + .valid = {
> > + .min_access_size = 4,
> > + .max_access_size = 4,
> > + },
> > +};
> > +
> > +static void acpi_ged_event(AcpiGedState *s, uint32_t sel) {
> > + GEDState *ged_st = &s->ged_state;
> > + /*
> > + * Set the GED IRQ selector to the expected device type value. This
> > + * way, the ACPI method will be able to trigger the right code based
> > + * on a unique IRQ.
> > + */
> > + qemu_mutex_lock(&ged_st->lock);
> > + ged_st->sel |= sel;
> > + qemu_mutex_unlock(&ged_st->lock);
> > +
> > + /* Trigger the event by sending an interrupt to the guest. */
> > + qemu_irq_pulse(s->irq);
> > +}
> > +
> > +static void acpi_ged_init(MemoryRegion *as, DeviceState *dev,
> > +GEDState *ged_st) {
> > + AcpiGedState *s = ACPI_GED(dev);
> > +
> > + assert(s->ged_base);
> > +
> > + qemu_mutex_init(&ged_st->lock);
> > + memory_region_init_io(&ged_st->io, OBJECT(dev), &ged_ops, ged_st,
> > + TYPE_ACPI_GED, ACPI_GED_REG_LEN);
> > + memory_region_add_subregion(as, s->ged_base, &ged_st->io);
> > + qdev_init_gpio_out_named(DEVICE(s), &s->irq, "ged-irq", 1); }
> > +
> > +static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp)
> {
> > + AcpiGedState *s = ACPI_GED(hotplug_dev);
> > +
> > + if (s->memhp_state.is_enabled &&
> > + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state,
> > + dev, errp);
> > + } else {
> > + error_setg(errp, "virt: device plug request for unsupported
> device"
> > + " type: %s", object_get_typename(OBJECT(dev)));
> This also can fail if !s->memhp_state.is_enabled. May be worth producing
> 2 different messages?
Ok. I will add the check and treat that differently.
> > + }
> > +}
> > +
> > +static void acpi_ged_send_event(AcpiDeviceIf *adev,
> > +AcpiEventStatusBits ev) {
> > + AcpiGedState *s = ACPI_GED(adev);
> > + uint32_t sel;
> > +
> > + if (ev & ACPI_MEMORY_HOTPLUG_STATUS) {
> > + sel = ACPI_GED_MEM_HOTPLUG_EVT;
> > + } else {
> > + /* Unknown event. Return without generating interrupt. */
> Shouldn't we produce an error message here?
Ok.
> > + return;
> > + }
> > +
> > + /*
> > + * We inject the hotplug interrupt. The IRQ selector will make
> > + * the difference from the ACPI table.
> > + */
> > + acpi_ged_event(s, sel);
> > +}
> > +
> > +static void acpi_ged_device_realize(DeviceState *dev, Error **errp) {
> > + AcpiGedState *s = ACPI_GED(dev);
> > +
> > + if (s->memhp_state.is_enabled) {
> > + acpi_memory_hotplug_init(get_system_memory(), OBJECT(dev),
> > + &s->memhp_state,
> > + s->memhp_base);
> > + }
> > +
> > + acpi_ged_init(get_system_memory(), dev, &s->ged_state); }
> > +
> > +static Property acpi_ged_properties[] = {
> > + /*
> > + * Memory hotplug base address is a property of GED here,
> > + * because GED handles memory hotplug event and
> > +MEMORY_HOTPLUG_DEVICE
> MEMORY_HOTPLUG_DEVICE? Didn't you mean acpi-mem-hotplug region?
Yes. It is the memory region initialization. I will change that.
> > + * gets initialized when GED device is realized.
> > + */
> > + DEFINE_PROP_UINT64("memhp-base", AcpiGedState, memhp_base,
> 0),
> > + DEFINE_PROP_BOOL("memory-hotplug-support", AcpiGedState,
> > + memhp_state.is_enabled, true),
> > + DEFINE_PROP_UINT64("ged-base", AcpiGedState, ged_base, 0),
> > + DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap,
> 0),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> > +
> > +static bool vmstate_test_use_memhp(void *opaque) {
> > + AcpiGedState *s = opaque;
> > + return s->memhp_state.is_enabled; }
> > +
> > +static const VMStateDescription vmstate_memhp_state = {
> > + .name = "acpi-ged/memhp",
> > + .version_id = 1,
> > + .minimum_version_id = 1,
> > + .needed = vmstate_test_use_memhp,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_MEMORY_HOTPLUG(memhp_state, AcpiGedState),
> > + VMSTATE_END_OF_LIST()
> > + }
> > +};
> > +
> > +static const VMStateDescription vmstate_ged_state = {
> > + .name = "acpi-ged-state",
> > + .version_id = 1,
> > + .minimum_version_id = 1,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_UINT32(sel, GEDState),
> > + VMSTATE_END_OF_LIST()
> > + }
> > +};
> > +
> > +static const VMStateDescription vmstate_acpi_ged = {
> > + .name = "acpi-ged",
> > + .version_id = 1,
> > + .minimum_version_id = 1,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_STRUCT(ged_state, AcpiGedState, 1,
> vmstate_ged_state, GEDState),
> > + VMSTATE_END_OF_LIST(),
> > + },
> > + .subsections = (const VMStateDescription * []) {
> > + &vmstate_memhp_state,
> > + NULL
> > + }
> > +};
> > +
> > +static void acpi_ged_class_init(ObjectClass *class, void *data) {
> > + DeviceClass *dc = DEVICE_CLASS(class);
> > + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(class);
> > + AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
> > +
> > + dc->desc = "ACPI";
> Choose a more explicit description?
Ok.
> > + dc->props = acpi_ged_properties;
> > + dc->realize = acpi_ged_device_realize;
> > + dc->vmsd = &vmstate_acpi_ged;
> > +
> > + hc->plug = acpi_ged_device_plug_cb;
> > +
> > + adevc->send_event = acpi_ged_send_event; }
> > +
> > +static const TypeInfo acpi_ged_info = {
> > + .name = TYPE_ACPI_GED,
> > + .parent = TYPE_DEVICE,
> > + .instance_size = sizeof(AcpiGedState),
> > + .class_init = acpi_ged_class_init,
> > + .interfaces = (InterfaceInfo[]) {
> > + { TYPE_HOTPLUG_HANDLER },
> > + { TYPE_ACPI_DEVICE_IF },
> > + { }
> > + }
> > +};
> > +
> > +static void acpi_ged_register_types(void) {
> > + type_register_static(&acpi_ged_info);
> > +}
> > +
> > +type_init(acpi_ged_register_types)
> > diff --git a/include/hw/acpi/generic_event_device.h
> > b/include/hw/acpi/generic_event_device.h
> > new file mode 100644
> > index 0000000000..f69d084c89
> > --- /dev/null
> > +++ b/include/hw/acpi/generic_event_device.h
> > @@ -0,0 +1,102 @@
> > +/*
> > + *
> > + * Copyright (c) 2018 Intel Corporation
> > + * Copyright (c) 2019 Huawei Technologies R & D (UK) Ltd
> > + * Written by Samuel Ortiz, Shameer Kolothum
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify it
> > + * under the terms and conditions of the GNU General Public License,
> > + * version 2 or later, as published by the Free Software Foundation.
> > + *
> > + * The ACPI Generic Event Device (GED) is a hardware-reduced specific
> > + * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
> > + * including the hotplug ones. Generic Event Device allows platforms
> > + * to handle interrupts in ACPI ASL statements. It follows a very
> > + * similar approach like the _EVT method from GPIO events. All
> > + * interrupts are listed in _CRS and the handler is written in _EVT
> > + * method. Here, we use a single interrupt for the GED device,
> > +relying
> > + * on IO memory region to communicate the type of device affected by
> > + * the interrupt. This way, we can support up to 32 events with a
> > + * unique interrupt.
> > + *
> > + * Here is an example.
> > + *
> > + * Device (\_SB.GED)
> > + * {
> > + * Name (_HID, "ACPI0013")
> > + * Name (_UID, Zero)
> > + * Name (_CRS, ResourceTemplate ()
> > + * {
> > + * Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )
> > + * {
> > + * 0x00000029,
> > + * }
> > + * })
> > + * OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
> > + * Field (EREG, DWordAcc, NoLock, WriteAsZeros)
> > + * {
> > + * ESEL, 32
> > + * }
> > + *
> > + * Method (_EVT, 1, Serialized) // _EVT: Event
> > + * {
> > + * Local0 = ESEL // ESEL = IO memory region which specifies the
> > + * // device type.
> > + * If (((Local0 & One) == One))
> > + * {
> > + * MethodEvent1()
> > + * }
> > + * If ((Local0 & 0x2) == 0x2)
> > + * {
> > + * MethodEvent2()
> > + * }
> > + * ...
> > + * }
> > + * }
> > + *
> > + */
> > +
> > +#ifndef HW_ACPI_GED_H
> > +#define HW_ACPI_GED_H
> > +
> > +#include "hw/acpi/memory_hotplug.h"
> > +
> > +#define TYPE_ACPI_GED "acpi-ged"
> > +#define ACPI_GED(obj) \
> > + OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
> > +
> > +#define ACPI_GED_EVT_SEL_OFFSET 0x0
> > +#define ACPI_GED_EVT_SEL_LEN 0x4
> > +#define ACPI_GED_REG_LEN 0x4
> > +
> > +#define GED_DEVICE "GED"
> > +#define AML_GED_EVT_REG "EREG"
> > +#define AML_GED_EVT_SEL "ESEL"
> > +
> > +/*
> > + * Platforms need to specify the GED event bitmap
> > + * to describe what kind of events they want to support
> > + * through GED.
> > + */
> > +#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
> > +
> > +typedef struct GEDState {
> > + MemoryRegion io;
> > + uint32_t sel;
> > + QemuMutex lock;
> > +} GEDState;
> > +
> > +typedef struct AcpiGedState {
> > + DeviceClass parent_obj;
> > + MemHotplugState memhp_state;
> > + hwaddr memhp_base;
> > + hwaddr ged_base;
> > + GEDState ged_state;
> > + uint32_t ged_event_bitmap;
> > + qemu_irq irq;
> > +} AcpiGedState;
> > +
> > +void build_ged_aml(Aml *table, const char* name, HotplugHandler
> *hotplug_dev,
> > + uint32_t ged_irq, AmlRegionSpace rs);
> > +
> > +#endif
> >
> Besides looks good to me
>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks,
Shameer
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework
2019-06-18 12:42 ` Auger Eric
@ 2019-06-19 8:16 ` Shameerali Kolothum Thodi
0 siblings, 0 replies; 21+ messages in thread
From: Shameerali Kolothum Thodi @ 2019-06-19 8:16 UTC (permalink / raw)
To: Auger Eric, qemu-devel, qemu-arm, imammedo
Cc: peter.maydell, sameo, ard.biesheuvel, Linuxarm, shannon.zhaosl,
sebastien.boeuf, xuwei (O),
lersek
Hi Eric,
> -----Original Message-----
> From: Auger Eric [mailto:eric.auger@redhat.com]
> Sent: 18 June 2019 13:42
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>;
> qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com
> Cc: peter.maydell@linaro.org; shannon.zhaosl@gmail.com;
> sameo@linux.intel.com; sebastien.boeuf@intel.com; xuwei (O)
> <xuwei5@huawei.com>; lersek@redhat.com; ard.biesheuvel@linaro.org;
> Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework
>
> Hi Shameer,
>
> On 5/22/19 6:22 PM, Shameer Kolothum wrote:
> > From: Eric Auger <eric.auger@redhat.com>
> >
> > This patch adds the memory hot-plug/hot-unplug infrastructure in
> > machvirt. The device memory is not yet exposed to the Guest either
> > through DT or ACPI and hence both cold/hot plug of memory is
> > explicitly disabled for now.
> >
> > Signed-off-by: Eric Auger <eric.auger@redhat.com>
> > Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > ---
> > hw/arm/Kconfig | 2 ++
> > hw/arm/virt.c | 51
> > +++++++++++++++++++++++++++++++++++++++++++++++++-
> > 2 files changed, 52 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index
> > af8cffde9c..6ef22439b5 100644
> > --- a/hw/arm/Kconfig
> > +++ b/hw/arm/Kconfig
> > @@ -19,6 +19,8 @@ config ARM_VIRT
> > select PLATFORM_BUS
> > select SMBIOS
> > select VIRTIO_MMIO
> small conflict to be resolved here after addition of "select ACPI_PCI".
Ok. I will address that in next revision.
Thanks,
Shameer
> > + select MEM_DEVICE
> > + select DIMM
> >
> > config CHEETAH
> > bool
> > diff --git a/hw/arm/virt.c b/hw/arm/virt.c index
> > 5331ab71e2..3df8c389ff 100644
> > --- a/hw/arm/virt.c
> > +++ b/hw/arm/virt.c
> > @@ -62,6 +62,8 @@
> > #include "hw/arm/smmuv3.h"
> > #include "hw/acpi/acpi.h"
> > #include "target/arm/internals.h"
> > +#include "hw/mem/pc-dimm.h"
> > +#include "hw/mem/nvdimm.h">
> > #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
> > static void virt_##major##_##minor##_class_init(ObjectClass *oc,
> > \ @@ -1862,6 +1864,40 @@ static const CPUArchIdList
> *virt_possible_cpu_arch_ids(MachineState *ms)
> > return ms->possible_cpus;
> > }
> >
> > +static void virt_memory_pre_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev,
> > + Error **errp) {
> > +
> > + /*
> > + * The device memory is not yet exposed to the Guest either through>
> + * DT or ACPI and hence both cold/hot plug of memory is explicitly
> > + * disabled for now.
> > + */
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > + error_setg(errp, "memory cold/hot plug is not yet supported");
> > + return;
> > + }
> > +
> > + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL,
> errp);
> > +}
> > +
> > +static void virt_memory_plug(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp) {
> > + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> > +
> > + pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
> > +
> > +}
> > +
> > +static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev,
> Error
> > +**errp) {
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > + virt_memory_pre_plug(hotplug_dev, dev, errp);
> > + }
> > +}
> > +
> > static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> > DeviceState *dev, Error
> > **errp) { @@ -1873,12 +1909,23 @@ static void
> > virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> > SYS_BUS_DEVICE(dev));
> > }
> > }
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > + virt_memory_plug(hotplug_dev, dev, errp);
> > + }
> > +}
> > +
> > +static void virt_machine_device_unplug_request_cb(HotplugHandler
> *hotplug_dev,
> > + DeviceState *dev, Error
> > +**errp) {
> > + error_setg(errp, "device unplug request for unsupported device"
> > + " type: %s", object_get_typename(OBJECT(dev)));
> > }
> >
> > static HotplugHandler *virt_machine_get_hotplug_handler(MachineState
> *machine,
> >
> DeviceState
> > *dev) {
> > - if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) {
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE) ||
> > + (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) {
> > return HOTPLUG_HANDLER(machine);
> > }
> >
> > @@ -1942,7 +1989,9 @@ static void virt_machine_class_init(ObjectClass
> *oc, void *data)
> > mc->kvm_type = virt_kvm_type;
> > assert(!mc->get_hotplug_handler);
> > mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
> > + hc->pre_plug = virt_machine_device_pre_plug_cb;
> > hc->plug = virt_machine_device_plug_cb;
> > + hc->unplug_request = virt_machine_device_unplug_request_cb;
> > }
> >
> > static void virt_instance_init(Object *obj)
> >
> Thanks
>
> Eric
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
2019-06-18 13:44 ` Auger Eric
@ 2019-06-19 8:18 ` Shameerali Kolothum Thodi
0 siblings, 0 replies; 21+ messages in thread
From: Shameerali Kolothum Thodi @ 2019-06-19 8:18 UTC (permalink / raw)
To: Auger Eric, Peter Maydell
Cc: Samuel Ortiz, Ard Biesheuvel, QEMU Developers, Linuxarm,
Shannon Zhao, qemu-arm, xuwei (O),
Igor Mammedov, sebastien.boeuf, Laszlo Ersek
Hi Eric,
> -----Original Message-----
> From: Auger Eric [mailto:eric.auger@redhat.com]
> Sent: 18 June 2019 14:45
> To: Peter Maydell <peter.maydell@linaro.org>
> Cc: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>;
> QEMU Developers <qemu-devel@nongnu.org>; qemu-arm
> <qemu-arm@nongnu.org>; Igor Mammedov <imammedo@redhat.com>;
> Shannon Zhao <shannon.zhaosl@gmail.com>; Samuel Ortiz
> <sameo@linux.intel.com>; sebastien.boeuf@intel.com; xuwei (O)
> <xuwei5@huawei.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>; Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v5 0/8] ARM virt: ACPI memory hotplug support
>
> Hi Peter,
> On 6/18/19 2:57 PM, Peter Maydell wrote:
> > I'm not sure we should carry across Tested-by tags like that: any
> > respin might accidentally introduce bugs that make it stop working...
>
> OK. No problem. I will test the next version then.
Thanks for testing and verifying. I will respin this soon.
Cheers,
Shameer
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum
@ 2019-06-20 12:45 ` Igor Mammedov
0 siblings, 0 replies; 21+ messages in thread
From: Igor Mammedov @ 2019-06-20 12:45 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, sameo, ard.biesheuvel, shannon.zhaosl, qemu-devel,
xuwei5, linuxarm, eric.auger, qemu-arm, sebastien.boeuf, lersek
On Wed, 22 May 2019 17:22:46 +0100
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> From: Samuel Ortiz <sameo@linux.intel.com>
>
> With Hardware-reduced ACPI, the GED device will manage ACPI
> hotplug entirely. As a consequence, make the memory specific
> events AML generation optional. The code will only be added
> when the method name is not NULL.
>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/acpi/memory_hotplug.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
> index c724f5f1e4..7e30e6f886 100644
> --- a/hw/acpi/memory_hotplug.c
> +++ b/hw/acpi/memory_hotplug.c
> @@ -719,10 +719,12 @@ void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
> }
> aml_append(table, dev_container);
>
> - method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
> - aml_append(method,
> - aml_call0(MEMORY_DEVICES_CONTAINER "." MEMORY_SLOT_SCAN_METHOD));
> - aml_append(table, method);
> + if (event_handler_method) {
> + method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
> + aml_append(method, aml_call0(MEMORY_DEVICES_CONTAINER "."
> + MEMORY_SLOT_SCAN_METHOD));
> + aml_append(table, method);
> + }
>
> g_free(mhp_res_path);
> }
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-06-20 12:55 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 16:22 [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 1/8] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum
2019-06-20 12:45 ` Igor Mammedov
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 3/8] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum
2019-06-18 12:40 ` Auger Eric
2019-06-19 8:14 ` Shameerali Kolothum Thodi
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework Shameer Kolothum
2019-06-18 12:42 ` Auger Eric
2019-06-19 8:16 ` Shameerali Kolothum Thodi
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum
2019-06-18 12:43 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 6/8] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT Shameer Kolothum
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 7/8] hw/acpi: Add system power down support to GED Shameer Kolothum
2019-06-18 12:43 ` Auger Eric
2019-05-22 16:22 ` [Qemu-devel] [PATCH v5 8/8] hw/arm: Use GED for system_powerdown event Shameer Kolothum
2019-06-18 12:49 ` Auger Eric
2019-06-18 12:52 ` [Qemu-devel] [PATCH v5 0/8] ARM virt: ACPI memory hotplug support Auger Eric
2019-06-18 12:57 ` Peter Maydell
2019-06-18 13:44 ` Auger Eric
2019-06-19 8:18 ` Shameerali Kolothum Thodi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).