[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 19/47] pc: acpi-build: generate _S[345] packages dynam
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [RFC 19/47] pc: acpi-build: generate _S[345] packages dynamically |
Date: |
Fri, 19 Dec 2014 02:02:14 +0000 |
Replaces template patching with packages composed
using ASL API.
Note on behavior change:
If S3 or S4 is disabled, respective packages won't
be created and put into SSDT. Which saves us some
space in SSDT and doesn't confuse guest OS with
mangled package names as it was done originally.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-build.c | 39 ++++++++++++++++++++++++++++++---------
hw/i386/ssdt-misc.dsl | 33 ---------------------------------
2 files changed, 30 insertions(+), 42 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b520f4f..48a72ad 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -754,6 +754,7 @@ build_ssdt(GArray *table_data, GArray *linker,
int ssdt_start = table_data->len;
AcpiAml table_aml = { .buf = table_data };
uint8_t *ssdt_ptr;
+ AcpiAml pkg, scope;
int i;
/* The current AML generator can cover the APIC ID range [0..255],
@@ -761,17 +762,9 @@ build_ssdt(GArray *table_data, GArray *linker,
QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256);
g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT);
- /* Copy header and patch values in the S3_ / S4_ / S5_ packages */
+ /* Copy header and ssdt template and patch values */
ssdt_ptr = acpi_data_push(table_data, sizeof(ssdp_misc_aml));
memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml));
- if (pm->s3_disabled) {
- ssdt_ptr[acpi_s3_name[0]] = 'X';
- }
- if (pm->s4_disabled) {
- ssdt_ptr[acpi_s4_name[0]] = 'X';
- } else {
- ssdt_ptr[acpi_s4_pkg[0] + 1] = pm->s4_val;
- }
patch_pci_windows(pci, ssdt_ptr, sizeof(ssdp_misc_aml));
@@ -781,6 +774,34 @@ build_ssdt(GArray *table_data, GArray *linker,
ACPI_BUILD_SET_LE(ssdt_ptr, sizeof(ssdp_misc_aml),
ssdt_mctrl_nr_slots[0], 32, nr_mem);
+ /* create S3_ / S4_ / S5_ packages if necessary */
+ scope = acpi_scope("\\");
+ if (!pm->s3_disabled) {
+ pkg = acpi_package(4);
+ aml_append(&pkg, acpi_int(1)); /* PM1a_CNT.SLP_TYP */
+ aml_append(&pkg, acpi_int(0)); /* PM1b_CNT.SLP_TYP not impl. */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&scope, acpi_name_decl("_S3", pkg));
+ }
+
+ if (!pm->s4_disabled) {
+ pkg = acpi_package(4);
+ aml_append(&pkg, acpi_int(pm->s4_val)); /* PM1a_CNT.SLP_TYP */
+ aml_append(&pkg, acpi_int(0)); /* PM1b_CNT.SLP_TYP not impl. */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&scope, acpi_name_decl("_S4", pkg));
+ }
+
+ pkg = acpi_package(4);
+ aml_append(&pkg, acpi_int(0)); /* PM1a_CNT.SLP_TYP */
+ aml_append(&pkg, acpi_int(0)); /* PM1b_CNT.SLP_TYP not impl. */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&pkg, acpi_int(0)); /* reserved */
+ aml_append(&scope, acpi_name_decl("_S5", pkg));
+ aml_append(&table_aml, scope);
+
{
AcpiAml sb_scope = acpi_scope("_SB");
diff --git a/hw/i386/ssdt-misc.dsl b/hw/i386/ssdt-misc.dsl
index 96382a6..26b9241 100644
--- a/hw/i386/ssdt-misc.dsl
+++ b/hw/i386/ssdt-misc.dsl
@@ -41,39 +41,6 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC",
"BXSSDTSUSP", 0x1)
}
-/****************************************************************
- * Suspend
- ****************************************************************/
-
- Scope(\) {
- /*
- * S3 (suspend-to-ram), S4 (suspend-to-disk) and S5 (power-off) type codes:
- * must match piix4 emulation.
- */
-
- ACPI_EXTRACT_NAME_STRING acpi_s3_name
- Name(_S3, Package(0x04) {
- One, /* PM1a_CNT.SLP_TYP */
- Zero, /* PM1b_CNT.SLP_TYP, QEMU doesn't provide it */
- Zero, /* reserved */
- Zero /* reserved */
- })
- ACPI_EXTRACT_NAME_STRING acpi_s4_name
- ACPI_EXTRACT_PKG_START acpi_s4_pkg
- Name(_S4, Package(0x04) {
- 0x2, /* PM1a_CNT.SLP_TYP */
- Zero, /* PM1b_CNT.SLP_TYP, QEMU doesn't provide it */
- Zero, /* reserved */
- Zero /* reserved */
- })
- Name(_S5, Package(0x04) {
- Zero, /* PM1a_CNT.SLP_TYP */
- Zero, /* PM1b_CNT.SLP_TYP */
- Zero, /* reserved */
- Zero /* reserved */
- })
- }
-
External(\_SB.PCI0, DeviceObj)
External(\_SB.PCI0.ISA, DeviceObj)
--
1.8.3.1
- [Qemu-devel] [RFC 11/47] acpi: add acpi_arg0(), acpi_arg1(), acpi_arg2(), acpi_arg3() terms, (continued)
- [Qemu-devel] [RFC 11/47] acpi: add acpi_arg0(), acpi_arg1(), acpi_arg2(), acpi_arg3() terms, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 12/47] acpi: add acpi_store() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 14/47] acpi: add acpi_notify() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 16/47] pc: acpi-build: drop template patching and create PCI bus tree dinamically, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 13/47] acpi: add acpi_and() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 08/47] acpi: extend build_append_{value|int}() to support 64-bit values, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 15/47] acpi: add acpi_call1(), acpi_call2(), acpi_call3(), acpi_call4() helpers, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 09/47] acpi: add acpi_int() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 17/47] acpi: add acpi_package() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 18/47] pc: acpi-build: drop unsupported PM1b_CNT.SLP_TYP, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 19/47] pc: acpi-build: generate _S[345] packages dynamically,
Igor Mammedov <=
- [Qemu-devel] [RFC 20/47] acpi: add acpi_buffer() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 21/47] acpi: add acpi_resource_template() helper, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 22/47] acpi: add acpi_io() helper, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 25/47] acpi: add acpi_field() & acpi_named_field() terms, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 24/47] acpi: add acpi_operation_region() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 26/47] acpi: add acpi_local0() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 28/47] pc: acpi-build: generate pvpanic device description dynamically, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 23/47] acpi: include PkgLength size only when requested, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 30/47] acpi: add acpi_equal() term, Igor Mammedov, 2014/12/18
- [Qemu-devel] [RFC 29/47] acpi: add acpi_varpackage() term, Igor Mammedov, 2014/12/18