[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/51] pc: acpi: memhp: move MHPD._STA method int
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 03/51] pc: acpi: memhp: move MHPD._STA method into SSDT |
Date: |
Mon, 28 Dec 2015 18:02:10 +0100 |
Signed-off-by: Igor Mammedov <address@hidden>
---
v3:
- drop ASL comment
- s/ctrl_dev/mem_ctrl_dev/
- move locals 'zero', 'slots_nr' inside if block
v2:
- add parentheses around ifctx block
Suggested-by: Marcel Apfelbaum <address@hidden>
---
hw/acpi/memory_hotplug_acpi_table.c | 14 ++++++++++++++
hw/i386/acpi-dsdt-mem-hotplug.dsl | 8 --------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/memory_hotplug_acpi_table.c
b/hw/acpi/memory_hotplug_acpi_table.c
index 35fefba..a21ef6f 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -17,6 +17,8 @@
void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
uint16_t io_base, uint16_t io_len)
{
+ Aml *ifctx;
+ Aml *method;
Aml *pci_scope;
Aml *mem_ctrl_dev;
@@ -24,6 +26,18 @@ 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 *zero = aml_int(0);
+ Aml *slots_nr = aml_name(stringify(MEMORY_SLOTS_NUMBER));
+
+ method = aml_method("_STA", 0, AML_NOTSERIALIZED);
+ ifctx = aml_if(aml_equal(slots_nr, zero));
+ {
+ aml_append(ifctx, aml_return(zero));
+ }
+ aml_append(method, ifctx);
+ /* present, functioning, decoding, not shown in UI */
+ aml_append(method, aml_return(aml_int(0xB)));
+ 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 c2bb6a1..b4eacc9 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -35,14 +35,6 @@
External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code,
write only
External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status
code, write only
- Method(_STA, 0) {
- If (LEqual(MEMORY_SLOTS_NUMBER, Zero)) {
- Return(0x0)
- }
- /* present, functioning, decoding, not shown in UI */
- Return(0xB)
- }
-
Mutex (MEMORY_SLOT_LOCK, 0)
Method(MEMORY_SLOT_SCAN_METHOD, 0) {
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/51] pc: acpi: convert DSDT to AML API and drop ASL templates support, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 03/51] pc: acpi: memhp: move MHPD._STA method into SSDT,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 04/51] pc: acpi: memhp: move MHPD.MLCK mutex into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 01/51] tests: acpi: print ASL diff in verbose mode, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 02/51] pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT code, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 05/51] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 06/51] pc: acpi: memhp: move MHPD.MRST method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 08/51] pc: acpi: memhp: move MHPD.MOST method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 07/51] pc: acpi: memhp: move MHPD.MPXM method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 10/51] pc: acpi: memhp: move MHPD.MCRS method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 11/51] pc: acpi: memhp: move MHPD Device into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 15/51] pc: acpi: drop unused CPU_STATUS_LEN from DSDT, Igor Mammedov, 2015/12/28