[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/59] pc: acpi: memhp: move MHPD.MSCN method into
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 08/59] pc: acpi: memhp: move MHPD.MSCN method into SSDT |
Date: |
Sat, 9 Jan 2016 23:39:38 +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 | 60 +++++++++++++++++++++++++++++++++++++
hw/i386/acpi-dsdt-mem-hotplug.dsl | 27 +----------------
2 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/hw/acpi/memory_hotplug_acpi_table.c
b/hw/acpi/memory_hotplug_acpi_table.c
index c2bd928..86b8233 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);
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index a1e519b..92baf87 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -13,13 +13,12 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
- External(MEMORY_SLOT_NOTIFY_METHOD, MethodObj)
+ External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD,
MethodObj)
Scope(\_SB.PCI0) {
Device(MEMORY_HOTPLUG_DEVICE) {
Name(_HID, "PNP0A06")
Name(_UID, "Memory hotplug resources")
- External(MEMORY_SLOTS_NUMBER, IntObj)
/* Memory hotplug IO registers */
External(MEMORY_SLOT_ADDR_LOW, FieldUnitObj) // read only
@@ -28,36 +27,12 @@
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_INSERT_EVENT, FieldUnitObj) // (read) 1 if
has a insert event. (write) 1 to clear event
- External(MEMORY_SLOT_REMOVE_EVENT, FieldUnitObj) // (read) 1 if
has a remove event. (write) 1 to clear event
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_SCAN_METHOD, 0) {
- If (LEqual(MEMORY_SLOTS_NUMBER, Zero)) {
- Return(Zero)
- }
-
- Store(Zero, Local0) // Mem devs iterrator
- Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
- while (LLess(Local0, MEMORY_SLOTS_NUMBER)) {
- Store(Local0, MEMORY_SLOT_SLECTOR) // select Local0 DIMM
- If (LEqual(MEMORY_SLOT_INSERT_EVENT, One)) { // Memory
device needs check
- MEMORY_SLOT_NOTIFY_METHOD(Local0, 1)
- Store(1, MEMORY_SLOT_INSERT_EVENT)
- } Elseif (LEqual(MEMORY_SLOT_REMOVE_EVENT, One)) { //
Ejection request
- MEMORY_SLOT_NOTIFY_METHOD(Local0, 3)
- Store(1, MEMORY_SLOT_REMOVE_EVENT)
- }
- Add(Local0, One, Local0) // goto next DIMM
- }
- Release(MEMORY_SLOT_LOCK)
- Return(One)
- }
-
Method(MEMORY_SLOT_STATUS_METHOD, 1) {
Store(Zero, Local0)
--
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, 2016/01/09
- [Qemu-devel] [PULL v2 08/59] pc: acpi: memhp: move MHPD.MSCN method into SSDT,
Michael S. Tsirkin <=
- [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
- [Qemu-devel] [PULL v2 19/59] pc: acpi: cpuhp: move CPEJ() method to SSDT, Michael S. Tsirkin, 2016/01/09