@@ -146,6 +146,19 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
aml_append(method, aml_release(a_ctrl_lock));
}
aml_append(ctrl_dev, method);
+
+ method = aml_method(stringify(MEMORY_SLOT_EJECT_METHOD), 2,
+ AML_NOTSERIALIZED);
+ {
+ Aml *a_eject = aml_name(stringify(MEMORY_SLOT_EJECT));
+
+ aml_append(method, aml_acquire(a_ctrl_lock, 0xFFFF));
+ aml_append(method, aml_store(aml_to_integer(a_slot_arg0),
+ a_slot_selector));
+ aml_append(method, aml_store(a_one, a_eject));
+ aml_append(method, aml_release(a_ctrl_lock));
+ }
+ aml_append(ctrl_dev, method);
}
aml_append(pci_scope, ctrl_dev);
aml_append(ctx, pci_scope);
@@ -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()
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/acpi/memory_hotplug_acpi_table.c | 13 +++++++++++++ hw/i386/acpi-dsdt-mem-hotplug.dsl | 8 -------- 2 files changed, 13 insertions(+), 8 deletions(-)