summaryrefslogtreecommitdiff
path: root/hw/acpi
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-12-28 18:02:14 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-01-08 16:01:38 +0200
commitfb775d9074e2b6047f2ea82bb3652ae197eec394 (patch)
tree5864febfa34de79d13ba674ab358d3150afab7cb /hw/acpi
parentb98401223de33a0754b2f2081f3c0962229d5674 (diff)
downloadqemu-fb775d9074e2b6047f2ea82bb3652ae197eec394.tar.gz
pc: acpi: memhp: move MHPD.MPXM 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')
-rw-r--r--hw/acpi/memory_hotplug_acpi_table.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 07d78f05af..5289014612 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);