aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel L. Somlo <gsomlo@gmail.com>2014-01-13 15:27:13 -0500
committerMichael S. Tsirkin <mst@redhat.com>2014-01-26 13:06:48 +0200
commit8977557ae418f9b9ff5c35ee39161a33f2368e6a (patch)
tree7708ac8549c90848454e298d8d942a650e174251
parent15bce1b7c55c69f47e13c9eb2a4b80f41da26581 (diff)
downloadqemu-arm-8977557ae418f9b9ff5c35ee39161a33f2368e6a.tar.gz
ACPI: Fix AppleSMC _STA size
Minimize the storage used for AppleSMC's _STA (8bit), relying on ASL to implicitly convert it to the officially specified 32bit value. Signed-off-by: Gabriel Somlo <somlo@cmu.edu> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/i386/acpi-build.c11
-rw-r--r--hw/i386/acpi-dsdt-isa.dsl4
2 files changed, 7 insertions, 8 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 30bfcd2b4a..1d62866ec4 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -81,7 +81,7 @@ typedef struct AcpiMiscInfo {
static void acpi_get_dsdt(AcpiMiscInfo *info)
{
- unsigned short applesmc_sta_val, *applesmc_sta_off;
+ uint16_t *applesmc_sta;
Object *piix = piix4_pm_find();
Object *lpc = ich9_lpc_find();
assert(!!piix != !!lpc);
@@ -89,18 +89,17 @@ static void acpi_get_dsdt(AcpiMiscInfo *info)
if (piix) {
info->dsdt_code = AcpiDsdtAmlCode;
info->dsdt_size = sizeof AcpiDsdtAmlCode;
- applesmc_sta_off = piix_dsdt_applesmc_sta;
+ applesmc_sta = piix_dsdt_applesmc_sta;
}
if (lpc) {
info->dsdt_code = Q35AcpiDsdtAmlCode;
info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
- applesmc_sta_off = q35_dsdt_applesmc_sta;
+ applesmc_sta = q35_dsdt_applesmc_sta;
}
/* Patch in appropriate value for AppleSMC _STA */
- applesmc_sta_val = applesmc_find() ? 0x0b : 0x00;
- *(uint16_t *)(info->dsdt_code + *applesmc_sta_off) =
- cpu_to_le16(applesmc_sta_val);
+ *(uint8_t *)(info->dsdt_code + *applesmc_sta) =
+ applesmc_find() ? 0x0b : 0x00;
}
static
diff --git a/hw/i386/acpi-dsdt-isa.dsl b/hw/i386/acpi-dsdt-isa.dsl
index 46942c12aa..deb37de92e 100644
--- a/hw/i386/acpi-dsdt-isa.dsl
+++ b/hw/i386/acpi-dsdt-isa.dsl
@@ -19,8 +19,8 @@ Scope(\_SB.PCI0.ISA) {
Device (SMC) {
Name(_HID, EisaId("APP0001"))
/* _STA will be patched to 0x0B if AppleSMC is present */
- ACPI_EXTRACT_NAME_WORD_CONST DSDT_APPLESMC_STA
- Name(_STA, 0xFF00)
+ ACPI_EXTRACT_NAME_BYTE_CONST DSDT_APPLESMC_STA
+ Name(_STA, 0xF0)
Name(_CRS, ResourceTemplate () {
IO (Decode16, 0x0300, 0x0300, 0x01, 0x20)
IRQNoFlags() { 6 }