[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/74] pc: acpi: memhp: move MHPD Device into SSDT
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 34/74] pc: acpi: memhp: move MHPD Device into SSDT |
Date: |
Thu, 10 Dec 2015 00:41:28 +0100 |
move remnants of MHPD device from DSDT into SSDT.
i.e. Device(MHPD), _UID, _HID
Signed-off-by: Igor Mammedov <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 622cd5c..b913edc 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -39,13 +39,17 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
/* scope for memory hotplug controller device node */
pci_scope = aml_scope("_SB.PCI0");
- ctrl_dev = aml_scope(stringify(MEMORY_HOTPLUG_DEVICE));
+ ctrl_dev = aml_device(stringify(MEMORY_HOTPLUG_DEVICE));
{
Aml *a_ctrl_lock = aml_name(stringify(MEMORY_SLOT_LOCK));
Aml *a_slot_selector = aml_name(stringify(MEMORY_SLOT_SLECTOR));
Aml *a_ret_val = aml_local(0);
Aml *a_slot_arg0 = aml_arg(0);
+ aml_append(ctrl_dev, aml_name_decl("_HID", aml_string("PNP0A06")));
+ aml_append(ctrl_dev,
+ aml_name_decl("_UID", aml_string("Memory hotplug resources")));
+
/* MHPD._STA() method */
method = aml_method("_STA", 0, AML_NOTSERIALIZED);
ifctx = aml_if(aml_equal(a_slots_nr, a_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()
--
1.8.3.1
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, (continued)
- [Qemu-devel] [PATCH 28/74] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 30/74] pc: acpi: memhp: move MHPD.MPXM method into SSDT, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 16/74] acpi: add aml_lor(), Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 10/74] acpi: add aml_call0() helper, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 14/74] acpi: add aml_sleep(), Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 34/74] pc: acpi: memhp: move MHPD Device into SSDT,
Igor Mammedov <=
- [Qemu-devel] [PATCH 13/74] acpi: add aml_alias(), Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 22/74] acpi: extend aml_or() to accept target argument, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 33/74] pc: acpi: memhp: move MHPD.MCRS method into SSDT, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 35/74] pc: acpi: factor out memhp code from build_ssdt() into separate function, Igor Mammedov, 2015/12/09
- [Qemu-devel] [PATCH 38/74] pc: acpi: drop unused CPU_STATUS_LEN from DSDT, Igor Mammedov, 2015/12/09