diff options
| author | Martin Roth <martinroth@google.com> | 2015-11-24 16:17:11 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-12-02 16:10:06 +0100 |
| commit | c7b26c381c119fe99b46695cf0fdd0227c441bc1 (patch) | |
| tree | 9f260b823b957c51ec3c87a9acfbb23ff8e5543d | |
| parent | b6acc3071fa1a488e845cb2d5625a44ff385c272 (diff) | |
lippert/frontronner-af & toucan-af: Fix IASL warnings
Not all the paths through the _OSC method returned a value. According
to the ACPI spec (5.0 & 6.0), bit 2 needs to be set for an unrecognized
GUID.
Fixes warnings for both platforms:
dsdt.aml 1143: Method(_OSC,4)
Warning 3115 - ^ Not all control paths return a value (_OSC)
dsdt.aml 1143: Method(_OSC,4)
Warning 3107 - ^ Reserved method must return a value
(Buffer required for _OSC)
Change-Id: Ibaf27c5244b1242b4fc1de474c371f54f930dcb6
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12530
Tested-by: build bot (Jenkins)
Reviewed-by: Jens Rottmann <JRottmann@LiPPERTembedded.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/mainboard/lippert/frontrunner-af/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/lippert/frontrunner-af/dsdt.asl | 16 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/dsdt.asl | 16 |
4 files changed, 24 insertions, 16 deletions
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index ebf362dcef..1ec219e931 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -76,8 +76,4 @@ config SB800_AHCI_ROM bool default n -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LIPPERT_FRONTRUNNER_AF diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl index a685b2c6c8..86eccb2eb0 100644 --- a/src/mainboard/lippert/frontrunner-af/dsdt.asl +++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl @@ -1158,14 +1158,22 @@ DefinitionBlock ( Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ /* Operating System Capabilities Method */ - Method(_OSC,4) - { /* Check for proper PCI/PCIe UUID */ - If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) + Method (_OSC, 4) + { + /* Check for PCI/PCI-X/PCIe GUID */ + If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { /* Let OS control everything */ Return (Arg3) } - } + Else + { + /* Unrecognized UUID, so set bit 2 of Arg3 to 1 */ + CreateDWordField (Arg3, 0, CDW1) + Or (CDW1, 4, CDW1) + Return (Arg3) + } + } /* End _OSC */ Method(_BBN, 0) { /* Bus number = 0 */ Return(0) diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index 9e29a85ae8..590909ba50 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -78,8 +78,4 @@ config SB800_AHCI_ROM bool default n -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LIPPERT_TOUCAN_AF diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl index 89c5c331ca..9c537fae36 100644 --- a/src/mainboard/lippert/toucan-af/dsdt.asl +++ b/src/mainboard/lippert/toucan-af/dsdt.asl @@ -1158,14 +1158,22 @@ DefinitionBlock ( Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ /* Operating System Capabilities Method */ - Method(_OSC,4) - { /* Check for proper PCI/PCIe UUID */ - If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) + Method (_OSC, 4) + { + /* Check for PCI/PCI-X/PCIe GUID */ + If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { /* Let OS control everything */ Return (Arg3) } - } + Else + { + /* Unrecognized UUID, so set bit 2 of Arg3 to 1 */ + CreateDWordField (Arg3, 0, CDW1) + Or (CDW1, 4, CDW1) + Return (Arg3) + } + } /* End _OSC */ Method(_BBN, 0) { /* Bus number = 0 */ Return(0) |