[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 30/74] pc: acpi: memhp: move MHPD.MPXM method into S
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 30/74] pc: acpi: memhp: move MHPD.MPXM method into SSDT |
Date: |
Thu, 10 Dec 2015 00:41:24 +0100 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/acpi/memory_hotplug_acpi_table.c | 14 ++++++++++++++
hw/i386/acpi-dsdt-mem-hotplug.dsl | 9 ---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/hw/acpi/memory_hotplug_acpi_table.c
b/hw/acpi/memory_hotplug_acpi_table.c
index b76694d..92591f6 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -117,6 +117,20 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
aml_append(method, aml_return(a_ret_val));
}
aml_append(ctrl_dev, method);
+
+ method = aml_method(stringify(MEMORY_SLOT_PROXIMITY_METHOD), 1,
+ AML_NOTSERIALIZED);
+ {
+ Aml *a_proximity = aml_name(stringify(MEMORY_SLOT_PROXIMITY));
+
+ 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_proximity, a_ret_val));
+ aml_append(method, aml_release(a_ctrl_lock));
+ aml_append(method, aml_return(a_ret_val));
+ }
+ aml_append(ctrl_dev, method);
}
aml_append(pci_scope, 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 13e93dc..02fecf2 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -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_PROXIMITY, 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_OST_EVENT, FieldUnitObj) // _OST event code,
write only
@@ -96,14 +95,6 @@
Return(MR64)
}
- Method(MEMORY_SLOT_PROXIMITY_METHOD, 1) {
- Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
- Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
- Store(MEMORY_SLOT_PROXIMITY, Local0)
- Release(MEMORY_SLOT_LOCK)
- Return(Local0)
- }
-
Method(MEMORY_SLOT_OST_METHOD, 4) {
Acquire(MEMORY_SLOT_LOCK, 0xFFFF)
Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, (continued)
- Re: [Qemu-devel] [PATCH 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Marcel Apfelbaum, 2015/12/16
- [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Igor Mammedov, 2015/12/16
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Marcel Apfelbaum, 2015/12/20
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Michael S. Tsirkin, 2015/12/20
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Igor Mammedov, 2015/12/21
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Igor Mammedov, 2015/12/21
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Michael S. Tsirkin, 2015/12/22
- Re: [Qemu-devel] [PATCH v2 26/74] pc: acpi: memhp: move MHPD._STA method into SSDT, Igor Mammedov, 2015/12/22
[Qemu-devel] [PATCH 28/74] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Igor Mammedov, 2015/12/09
[Qemu-devel] [PATCH 30/74] pc: acpi: memhp: move MHPD.MPXM method into SSDT,
Igor Mammedov <=
[Qemu-devel] [PATCH 16/74] acpi: add aml_lor(), Igor Mammedov, 2015/12/09
[Qemu-devel] [PATCH 10/74] acpi: add aml_call0() helper, Igor Mammedov, 2015/12/09
[Qemu-devel] [PATCH 14/74] acpi: add aml_sleep(), Igor Mammedov, 2015/12/09
[Qemu-devel] [PATCH 34/74] pc: acpi: memhp: move MHPD Device into SSDT, Igor Mammedov, 2015/12/09
[Qemu-devel] [PATCH 13/74] acpi: add aml_alias(), Igor Mammedov, 2015/12/09