Patch set updated for coreboot: lippert/frontronner-af & toucan-af: Fix IASL warnings

[Martin Roth]

Martin Roth ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12530

-gerrit

commit 51fda75d7687b2c1898105740cec6123a70fdf72
Author: Martin Roth <[e-mail]>
Date:   Tue Nov 24 16:17:11 2015 -0700

    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 <[e-mail]>
---
 src/mainboard/lippert/frontrunner-af/Kconfig  |  4 ----
 src/mainboard/lippert/frontrunner-af/dsdt.asl | 16 ++++++++++++----
 src/mainboard/lippert/toucan-af/Kconfig       |  4 ----
 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 ebf362d..1ec219e 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 a685b2c..86eccb2 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 9e29a85..590909b 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 89c5c33..9c537fa 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)