[Qemu-devel] [PATCH 14/19] pc: acpi: memhp: move MHPD.MEJ0 method into MHPT table

[Igor Mammedov <imammedo@redhat.com>]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/acpi/memory_hotplug_acpi_table.c | 17 +++++++++++++++--
 hw/i386/acpi-dsdt-mem-hotplug.dsl   |  8 --------
 include/hw/acpi/pc-hotplug.h        |  2 --
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 7300624..c74da76 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -14,6 +14,8 @@
 #define MEMORY_SLOT_OST_METHOD       "MOST"
 #define MEMORY_SLOT_OST_EVENT        "MOEV"
 #define MEMORY_SLOT_OST_STATUS       "MOSC"
+#define MEMORY_SLOT_EJECT_METHOD     "MEJ0"
+#define MEMORY_SLOT_EJECT            "MEJ"
 
 #define BASEPATH "\\_SB.PCI0." stringify(MEMORY_HOTPLUG_DEVICE) "."
 
@@ -73,7 +75,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem,
             aml_named_field(MEMORY_SLOT_REMOVE_EVENT, 1));
         aml_append(field,
             /* initiates device eject, write only */
-            aml_named_field(stringify(MEMORY_SLOT_EJECT), 1));
+            aml_named_field(MEMORY_SLOT_EJECT, 1));
         aml_append(ctrl_dev, field);
 
         field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_DWORD_ACC,
@@ -166,6 +168,17 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem,
             aml_append(method, aml_release(a_ctrl_lock));
         }
         aml_append(ctrl_dev, method);
+
+        method = aml_method(MEMORY_SLOT_EJECT_METHOD, 2);
+        {
+            Aml *a_eject = aml_name(MEMORY_SLOT_EJECT);
+
+            aml_append(method, aml_acquire(a_ctrl_lock, 0xFFFF));
+            aml_append(method, aml_store(a_slot_arg, a_slot_selector));
+            aml_append(method, aml_store(aml_int(1), a_eject));
+            aml_append(method, aml_release(a_ctrl_lock));
+        }
+        aml_append(ctrl_dev, method);
     }
     aml_append(table, ctrl_dev);
 
@@ -200,7 +213,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem,
         aml_append(dev, method);
 
         method = aml_method("_EJ0", 1);
-        s = BASEPATH stringify(MEMORY_SLOT_EJECT_METHOD);
+        s = BASEPATH MEMORY_SLOT_EJECT_METHOD;
         aml_append(method, aml_return(aml_call2(
                    s, aml_name("_UID"), aml_arg(0))));
         aml_append(dev, method);
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index 8889eca..87d8d66 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_EJECT, FieldUnitObj) // initiates device eject, write only
             External(MEMORY_SLOT_SLECTOR, FieldUnitObj) // DIMM selector, write only
             External(MEMORY_SLOT_LOCK, MutexObj)
 
@@ -92,12 +91,5 @@
                 Release(MEMORY_SLOT_LOCK)
                 Return(MR64)
             }
-
-            Method(MEMORY_SLOT_EJECT_METHOD, 2) {
-                Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
-                Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-                Store(1, MEMORY_SLOT_EJECT)
-                Release(MEMORY_SLOT_LOCK)
-            }
         } // Device()
     } // Scope()
diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h
index 203d449..7198c90 100644
--- a/include/hw/acpi/pc-hotplug.h
+++ b/include/hw/acpi/pc-hotplug.h
@@ -38,11 +38,9 @@
 #define MEMORY_SLOT_ADDR_HIGH        MRBH
 #define MEMORY_SLOT_SIZE_LOW         MRLL
 #define MEMORY_SLOT_SIZE_HIGH        MRLH
-#define MEMORY_SLOT_EJECT            MEJ
 #define MEMORY_SLOT_SLECTOR          MSEL
 #define MEMORY_SLOT_LOCK             MLCK
 #define MEMORY_SLOT_CRS_METHOD       MCRS
-#define MEMORY_SLOT_EJECT_METHOD     MEJ0
 #define MEMORY_SLOT_SCAN_METHOD      MSCN
 
 #endif
-- 
1.8.3.1