aboutsummaryrefslogtreecommitdiff
path: root/hw/acpi
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-12-28 18:02:13 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-01-08 16:01:38 +0200
commitb98401223de33a0754b2f2081f3c0962229d5674 (patch)
treecb7b7b56d0f7e8fd475b06f6faeabf36b6b11f4c /hw/acpi
parente8f9db491dcec1b24029df3cf9932e2eb6082787 (diff)
downloadqemu-b98401223de33a0754b2f2081f3c0962229d5674.zip
qemu-b98401223de33a0754b2f2081f3c0962229d5674.tar.gz
qemu-b98401223de33a0754b2f2081f3c0962229d5674.tar.bz2
pc: acpi: memhp: move MHPD.MRST 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.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 86b8233..07d78f0 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -28,6 +28,8 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
{
Aml *one = aml_int(1);
Aml *zero = aml_int(0);
+ Aml *ret_val = aml_local(0);
+ Aml *slot_arg0 = aml_arg(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));
@@ -100,6 +102,27 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
aml_append(method, aml_return(one));
}
aml_append(mem_ctrl_dev, method);
+
+ method = aml_method(stringify(MEMORY_SLOT_STATUS_METHOD), 1,
+ AML_NOTSERIALIZED);
+ {
+ Aml *slot_enabled = aml_name(stringify(MEMORY_SLOT_ENABLED));
+
+ aml_append(method, aml_store(zero, ret_val));
+ aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
+ aml_append(method,
+ aml_store(aml_to_integer(slot_arg0), slot_selector));
+
+ ifctx = aml_if(aml_equal(slot_enabled, one));
+ {
+ aml_append(ifctx, aml_store(aml_int(0xF), ret_val));
+ }
+ aml_append(method, ifctx);
+
+ 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);