[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/35] ACPI: Fix AppleSMC _STA size
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 03/35] ACPI: Fix AppleSMC _STA size |
Date: |
Sun, 26 Jan 2014 18:05:28 +0200 |
From: "Gabriel L. Somlo" <address@hidden>
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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 11 +++++------
hw/i386/acpi-dsdt-isa.dsl | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 30bfcd2..1d62866 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 46942c1..deb37de 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 }
--
MST
- [Qemu-devel] [PULL v2 00/35] acpi, pci, pc, virtio fixes and enhancements, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 01/35] Python-lang gdb script to extract x86_64 guest vmcore from qemu coredump, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 02/35] Add DSDT node for AppleSMC, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 03/35] ACPI: Fix AppleSMC _STA size,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 04/35] virtio: Fix return value for dummy function vhost_net_virtqueue_pending, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 05/35] acpi unit-test: add test files, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 06/35] configure: added acpi unit-test files, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 07/35] acpi unit-test: compare DSDT and SSDT tables against expected values, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 08/35] configure: add CONFIG_IASL to config-host.h, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 10/35] acpi unit-test: added script to rebuild the expected aml files, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 09/35] acpi unit-test: extract iasl executable from configuration, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 11/35] acpi unit-test: hook to rebuild expected aml files, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 12/35] tests: fix acpi to work on bigendian host, Michael S. Tsirkin, 2014/01/26
- [Qemu-devel] [PULL v2 13/35] acpi unit-test: renamed ssdt_tables to tables, Michael S. Tsirkin, 2014/01/26