[Qemu-devel] [PATCH 31/74] pc: acpi: memhp: move MHPD.MOST method into SSDT

[Igor Mammedov]

Signed-off-by: Igor Mammedov <address@hidden>
---
 hw/acpi/memory_hotplug_acpi_table.c | 15 +++++++++++++++
 hw/i386/acpi-dsdt-mem-hotplug.dsl   | 10 ----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/hw/acpi/memory_hotplug_acpi_table.c 
b/hw/acpi/memory_hotplug_acpi_table.c
index 92591f6..5dfdab7 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -131,6 +131,21 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
             aml_append(method, aml_return(a_ret_val));
         }
         aml_append(ctrl_dev, method);
+
+        method = aml_method(stringify(MEMORY_SLOT_OST_METHOD), 4,
+                            AML_NOTSERIALIZED);
+        {
+            Aml *a_ost_evt = aml_name(stringify(MEMORY_SLOT_OST_EVENT));
+            Aml *a_ost_status = aml_name(stringify(MEMORY_SLOT_OST_STATUS));
+
+            aml_append(method, aml_acquire(a_ctrl_lock, 0xFFFF));
+            aml_append(method, aml_store(aml_to_integer(a_slot_arg0),
+                                         a_slot_selector));
+            aml_append(method, aml_store(aml_arg(1), a_ost_evt));
+            aml_append(method, aml_store(aml_arg(2), a_ost_status));
+            aml_append(method, aml_release(a_ctrl_lock));
+        }
+        aml_append(ctrl_dev, method);
     }
     aml_append(pci_scope, ctrl_dev);
     aml_append(ctx, pci_scope);
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl 
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index 02fecf2..8889eca 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -27,8 +27,6 @@
             External(MEMORY_SLOT_SIZE_HIGH, FieldUnitObj) // read only
             External(MEMORY_SLOT_EJECT, FieldUnitObj) // initiates device 
eject, write only
             External(MEMORY_SLOT_SLECTOR, FieldUnitObj) // DIMM selector, 
write only
-            External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code, 
write only
-            External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status 
code, write only
             External(MEMORY_SLOT_LOCK, MutexObj)
 
             Method(MEMORY_SLOT_CRS_METHOD, 1, Serialized) {
@@ -95,14 +93,6 @@
                 Return(MR64)
             }
 
-            Method(MEMORY_SLOT_OST_METHOD, 4) {
-                Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
-                Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-                Store(Arg1, MEMORY_SLOT_OST_EVENT)
-                Store(Arg2, MEMORY_SLOT_OST_STATUS)
-                Release(MEMORY_SLOT_LOCK)
-            }
-
             Method(MEMORY_SLOT_EJECT_METHOD, 2) {
                 Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
                 Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-- 
1.8.3.1