[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/59] pc: acpi: memhp: move MHPD Device into SSDT
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 14/59] pc: acpi: memhp: move MHPD Device into SSDT |
Date: |
Fri, 8 Jan 2016 16:19:13 +0200 |
From: Igor Mammedov <address@hidden>
move remnants of MHPD device from DSDT into SSDT.
i.e. Device(MHPD), _UID, _HID
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/acpi/memory_hotplug_acpi_table.c | 6 +++++-
hw/i386/acpi-dsdt-mem-hotplug.dsl | 7 -------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/memory_hotplug_acpi_table.c
b/hw/acpi/memory_hotplug_acpi_table.c
index 2428e84..83e739c 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -24,7 +24,7 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
/* scope for memory hotplug controller device node */
pci_scope = aml_scope("_SB.PCI0");
- mem_ctrl_dev = aml_scope(stringify(MEMORY_HOTPLUG_DEVICE));
+ mem_ctrl_dev = aml_device(stringify(MEMORY_HOTPLUG_DEVICE));
{
Aml *one = aml_int(1);
Aml *zero = aml_int(0);
@@ -34,6 +34,10 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
Aml *ctrl_lock = aml_name(stringify(MEMORY_SLOT_LOCK));
Aml *slot_selector = aml_name(stringify(MEMORY_SLOT_SLECTOR));
+ aml_append(mem_ctrl_dev, aml_name_decl("_HID", aml_string("PNP0A06")));
+ aml_append(mem_ctrl_dev,
+ aml_name_decl("_UID", aml_string("Memory hotplug resources")));
+
method = aml_method("_STA", 0, AML_NOTSERIALIZED);
ifctx = aml_if(aml_equal(slots_nr, zero));
{
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index 50b7541..20c5ec1 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -14,10 +14,3 @@
*/
External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD,
MethodObj)
-
- Scope(\_SB.PCI0) {
- Device(MEMORY_HOTPLUG_DEVICE) {
- Name(_HID, "PNP0A06")
- Name(_UID, "Memory hotplug resources")
- } // Device()
- } // Scope()
--
MST
- [Qemu-devel] [PULL 04/59] tests: acpi: print ASL diff in verbose mode, (continued)
- [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, 2016/01/08
- [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 <=
- [Qemu-devel] [PULL 16/59] pc: acpi: memhp: move \_GPE._E03 into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 15/59] pc: acpi: factor out memhp code from build_ssdt() into separate function, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 17/59] pc: acpi: memhp: drop not needed stringify(MEMORY_foo) usage, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 18/59] pc: acpi: drop unused CPU_STATUS_LEN from DSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 19/59] pc: acpi: cpuhp: move CPEJ() method to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 20/59] pc: acpi: cpuhp: move CPMA() method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 21/59] pc: acpi: cpuhp: move CPST() method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 22/59] pc: acpi: cpuhp: move PRSC() method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 25/59] pc: acpi: move HPET from DSDT to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 23/59] pc: acpi: cpuhp: move \_GPE._E02() into SSDT, Michael S. Tsirkin, 2016/01/08