[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/59] pc: acpi: memhp: prepare context in SSDT for m
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 05/59] pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT code |
Date: |
Fri, 8 Jan 2016 16:18:46 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/acpi/memory_hotplug.h | 4 ++++
hw/acpi/memory_hotplug_acpi_table.c | 30 ++++++++++++++++++++++++++++++
hw/i386/acpi-build.c | 3 +++
hw/acpi/Makefile.objs | 2 +-
4 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 hw/acpi/memory_hotplug_acpi_table.c
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
index 1342adb..b6e9f50 100644
--- a/include/hw/acpi/memory_hotplug.h
+++ b/include/hw/acpi/memory_hotplug.h
@@ -4,6 +4,7 @@
#include "hw/qdev-core.h"
#include "hw/acpi/acpi.h"
#include "migration/vmstate.h"
+#include "hw/acpi/aml-build.h"
/**
* MemStatus:
@@ -45,4 +46,7 @@ extern const VMStateDescription vmstate_memory_hotplug;
vmstate_memory_hotplug, MemHotplugState)
void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list);
+
+void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
+ uint16_t io_base, uint16_t io_len);
#endif
diff --git a/hw/acpi/memory_hotplug_acpi_table.c
b/hw/acpi/memory_hotplug_acpi_table.c
new file mode 100644
index 0000000..35fefba
--- /dev/null
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -0,0 +1,30 @@
+/*
+ * Memory hotplug AML code of DSDT ACPI table
+ *
+ * Copyright (C) 2015 Red Hat Inc
+ *
+ * Author: Igor Mammedov <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include <stdbool.h>
+#include "hw/acpi/memory_hotplug.h"
+#include "include/hw/acpi/pc-hotplug.h"
+#include "hw/boards.h"
+
+void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
+ uint16_t io_base, uint16_t io_len)
+{
+ Aml *pci_scope;
+ Aml *mem_ctrl_dev;
+
+ /* scope for memory hotplug controller device node */
+ pci_scope = aml_scope("_SB.PCI0");
+ mem_ctrl_dev = aml_scope(stringify(MEMORY_HOTPLUG_DEVICE));
+ {
+ }
+ aml_append(pci_scope, mem_ctrl_dev);
+ aml_append(ctx, pci_scope);
+}
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a5a3e3c..52e4a15 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -956,6 +956,9 @@ build_ssdt(GArray *table_data, GArray *linker,
/* Reserve space for header */
acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
+ build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base,
+ pm->mem_hp_io_len);
+
bus = PC_MACHINE(machine)->bus;
if (bus) {
QLIST_FOREACH(bus, &bus->child, sibling) {
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 095597f..052be62 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,7 +1,7 @@
common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
-common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
+common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
memory_hotplug_acpi_table.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI) += acpi_interface.o
common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
--
MST
- [Qemu-devel] [PULL 00/59] acpi dsdt rework, misc fixes, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 04/59] tests: acpi: print ASL diff in verbose mode, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 05/59] pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT code,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/59] pc: acpi: memhp: move MHPD._STA method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 07/59] pc: acpi: memhp: move MHPD.MLCK mutex into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 08/59] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 09/59] pc: acpi: memhp: move MHPD.MRST method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 11/59] pc: acpi: memhp: move MHPD.MOST method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 10/59] pc: acpi: memhp: move MHPD.MPXM method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 12/59] pc: acpi: memhp: move MHPD.MEJ0 method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 13/59] pc: acpi: memhp: move MHPD.MCRS method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 14/59] pc: acpi: memhp: move MHPD Device into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 16/59] pc: acpi: memhp: move \_GPE._E03 into SSDT, Michael S. Tsirkin, 2016/01/08