[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/59] pc: acpi: memhp: move MHPD.MRST method into
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 09/59] pc: acpi: memhp: move MHPD.MRST method into SSDT |
Date: |
Sat, 9 Jan 2016 23:39:42 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/acpi/memory_hotplug_acpi_table.c | 23 +++++++++++++++++++++++
hw/i386/acpi-dsdt-mem-hotplug.dsl | 15 ---------------
2 files changed, 23 insertions(+), 15 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);
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index 92baf87..13e93dc 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -26,27 +26,12 @@
External(MEMORY_SLOT_SIZE_LOW, FieldUnitObj) // read only
External(MEMORY_SLOT_SIZE_HIGH, FieldUnitObj) // read only
External(MEMORY_SLOT_PROXIMITY, FieldUnitObj) // read only
- External(MEMORY_SLOT_ENABLED, FieldUnitObj) // 1 if enabled, read
only
External(MEMORY_SLOT_EJECT, FieldUnitObj) // initiates device
eject, write only
External(MEMORY_SLOT_SLECTOR, FieldUnitObj) // DIMM selector,
write only
External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code,
write only
External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status
code, write only
External(MEMORY_SLOT_LOCK, MutexObj)
- Method(MEMORY_SLOT_STATUS_METHOD, 1) {
- Store(Zero, Local0)
-
- Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
- Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
-
- If (LEqual(MEMORY_SLOT_ENABLED, One)) {
- Store(0xF, Local0)
- }
-
- Release(MEMORY_SLOT_LOCK)
- Return(Local0)
- }
-
Method(MEMORY_SLOT_CRS_METHOD, 1, Serialized) {
Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
--
MST
- [Qemu-devel] [PULL v2 00/59] acpi dsdt rework, misc fixes, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 01/59] nvdimm: fix header pointer in nvdimm_build_nfit(), Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 02/59] igd-passthrough: fix use of host_pci_config_read, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 03/59] hw/i386: fill in the CENTURY field of the FADT (FACP) ACPI table, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 04/59] tests: acpi: print ASL diff in verbose mode, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 05/59] pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT code, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 06/59] pc: acpi: memhp: move MHPD._STA method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 07/59] pc: acpi: memhp: move MHPD.MLCK mutex into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 09/59] pc: acpi: memhp: move MHPD.MRST method into SSDT,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 08/59] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 10/59] pc: acpi: memhp: move MHPD.MPXM method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 12/59] pc: acpi: memhp: move MHPD.MEJ0 method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 11/59] pc: acpi: memhp: move MHPD.MOST method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 13/59] pc: acpi: memhp: move MHPD.MCRS method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 14/59] pc: acpi: memhp: move MHPD Device into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 16/59] pc: acpi: memhp: move \_GPE._E03 into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 15/59] pc: acpi: factor out memhp code from build_ssdt() into separate function, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 17/59] pc: acpi: memhp: drop not needed stringify(MEMORY_foo) usage, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 18/59] pc: acpi: drop unused CPU_STATUS_LEN from DSDT, Michael S. Tsirkin, 2016/01/09