summary refs log tree commit diff stats
path: root/hw/acpi/memory_hotplug_acpi_table.c
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-12-28 18:02:12 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-01-08 16:01:38 +0200
commite8f9db491dcec1b24029df3cf9932e2eb6082787 (patch)
tree4adc1491962c144fd3bf46611febf3a20a4884b8 /hw/acpi/memory_hotplug_acpi_table.c
parent12fdadb5747f0c627c39ceb7107be90e4678ec9b (diff)
downloadfocaccia-qemu-e8f9db491dcec1b24029df3cf9932e2eb6082787.tar.gz
focaccia-qemu-e8f9db491dcec1b24029df3cf9932e2eb6082787.zip
pc: acpi: memhp: move MHPD.MSCN method into SSDT
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


Diffstat (limited to 'hw/acpi/memory_hotplug_acpi_table.c')
-rw-r--r--hw/acpi/memory_hotplug_acpi_table.c60
1 files changed, 60 insertions, 0 deletions
diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index c2bd9283bd..86b8233309 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -26,8 +26,11 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
     pci_scope = aml_scope("_SB.PCI0");
     mem_ctrl_dev = aml_scope(stringify(MEMORY_HOTPLUG_DEVICE));
     {
+        Aml *one = aml_int(1);
         Aml *zero = aml_int(0);
         Aml *slots_nr = aml_name(stringify(MEMORY_SLOTS_NUMBER));
+        Aml *ctrl_lock = aml_name(stringify(MEMORY_SLOT_LOCK));
+        Aml *slot_selector = aml_name(stringify(MEMORY_SLOT_SLECTOR));
 
         method = aml_method("_STA", 0, AML_NOTSERIALIZED);
         ifctx = aml_if(aml_equal(slots_nr, zero));
@@ -40,6 +43,63 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
         aml_append(mem_ctrl_dev, method);
 
         aml_append(mem_ctrl_dev, aml_mutex(stringify(MEMORY_SLOT_LOCK), 0));
+
+        method = aml_method(stringify(MEMORY_SLOT_SCAN_METHOD), 0,
+                            AML_NOTSERIALIZED);
+        {
+            Aml *else_ctx;
+            Aml *while_ctx;
+            Aml *idx = aml_local(0);
+            Aml *eject_req = aml_int(3);
+            Aml *dev_chk = aml_int(1);
+
+            ifctx = aml_if(aml_equal(slots_nr, zero));
+            {
+                aml_append(ifctx, aml_return(zero));
+            }
+            aml_append(method, ifctx);
+
+            aml_append(method, aml_store(zero, idx));
+            aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
+            /* build AML that:
+             * loops over all slots and Notifies DIMMs with
+             * Device Check or Eject Request notifications if
+             * slot has corresponding status bit set and clears
+             * slot status.
+             */
+            while_ctx = aml_while(aml_lless(idx, slots_nr));
+            {
+                Aml *ins_evt = aml_name(stringify(MEMORY_SLOT_INSERT_EVENT));
+                Aml *rm_evt = aml_name(stringify(MEMORY_SLOT_REMOVE_EVENT));
+
+                aml_append(while_ctx, aml_store(idx, slot_selector));
+                ifctx = aml_if(aml_equal(ins_evt, one));
+                {
+                    aml_append(ifctx,
+                               aml_call2(stringify(MEMORY_SLOT_NOTIFY_METHOD),
+                                         idx, dev_chk));
+                    aml_append(ifctx, aml_store(one, ins_evt));
+                }
+                aml_append(while_ctx, ifctx);
+
+                else_ctx = aml_else();
+                ifctx = aml_if(aml_equal(rm_evt, one));
+                {
+                    aml_append(ifctx,
+                        aml_call2(stringify(MEMORY_SLOT_NOTIFY_METHOD),
+                                  idx, eject_req));
+                    aml_append(ifctx, aml_store(one, rm_evt));
+                }
+                aml_append(else_ctx, ifctx);
+                aml_append(while_ctx, else_ctx);
+
+                aml_append(while_ctx, aml_add(idx, one, idx));
+            }
+            aml_append(method, while_ctx);
+            aml_append(method, aml_release(ctrl_lock));
+            aml_append(method, aml_return(one));
+        }
+        aml_append(mem_ctrl_dev, method);
     }
     aml_append(pci_scope, mem_ctrl_dev);
     aml_append(ctx, pci_scope);