[Qemu-devel] [PULL 10/59] pc: acpi: memhp: move MHPD.MPXM method into SSDT

[Michael S. Tsirkin]

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>
---
 hw/acpi/memory_hotplug_acpi_table.c | 14 ++++++++++++++
 hw/i386/acpi-dsdt-mem-hotplug.dsl   |  9 ---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/hw/acpi/memory_hotplug_acpi_table.c 
b/hw/acpi/memory_hotplug_acpi_table.c
index 07d78f0..5289014 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -123,6 +123,20 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
             aml_append(method, aml_return(ret_val));
         }
         aml_append(mem_ctrl_dev, method);
+
+        method = aml_method(stringify(MEMORY_SLOT_PROXIMITY_METHOD), 1,
+                            AML_NOTSERIALIZED);
+        {
+            Aml *proximity = aml_name(stringify(MEMORY_SLOT_PROXIMITY));
+
+            aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
+            aml_append(method, aml_store(aml_to_integer(slot_arg0),
+                                         slot_selector));
+            aml_append(method, aml_store(proximity, ret_val));
+            aml_append(method, aml_release(ctrl_lock));
+            aml_append(method, aml_return(ret_val));
+        }
+        aml_append(mem_ctrl_dev, method);
     }
     aml_append(pci_scope, mem_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 13e93dc..02fecf2 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -25,7 +25,6 @@
             External(MEMORY_SLOT_ADDR_HIGH, FieldUnitObj) // read only
             External(MEMORY_SLOT_SIZE_LOW, FieldUnitObj) // read only
             External(MEMORY_SLOT_SIZE_HIGH, FieldUnitObj) // read only
-            External(MEMORY_SLOT_PROXIMITY, 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
@@ -96,14 +95,6 @@
                 Return(MR64)
             }
 
-            Method(MEMORY_SLOT_PROXIMITY_METHOD, 1) {
-                Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
-                Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-                Store(MEMORY_SLOT_PROXIMITY, Local0)
-                Release(MEMORY_SLOT_LOCK)
-                Return(Local0)
-            }
-
             Method(MEMORY_SLOT_OST_METHOD, 4) {
                 Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
                 Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-- 
MST