Change in coreboot[master]: soc/intel/icelake: Convert to ASL 2.0 syntax

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46241 )

Change subject: soc/intel/icelake: Convert to ASL 2.0 syntax
......................................................................

soc/intel/icelake: Convert to ASL 2.0 syntax

Change-Id: I4fdc68e87c02681407430fcd2fbb61d0b0f1656e
Signed-off-by: Elyes HAOUAS 
---
M src/soc/intel/icelake/acpi/pch_hda.asl
M src/soc/intel/icelake/acpi/scs.asl
2 files changed, 19 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/46241/1

diff --git a/src/soc/intel/icelake/acpi/pch_hda.asl b/src/soc/intel/icelake/acpi/pch_hda.asl
index f292901..13b4d3d 100644
--- a/src/soc/intel/icelake/acpi/pch_hda.asl
+++ b/src/soc/intel/icelake/acpi/pch_hda.asl
@@ -26,19 +26,17 @@
     */
    Method (_DSM, 4)
    {
-		If (LEqual (Arg0, ^UUID)) {
+		If (Arg0 == ^UUID) {
    		/*
    		 * Function 0: Function Support Query
    		 * Returns a bitmask of functions supported.
    		 */
-			If (LEqual (Arg2, Zero)) {
+			If (Arg2 == 0) {
    			/*
    			 * NHLT Query only supported for revision 1 and
    			 * if NHLT address and length are set in NVS.
    			 */
-				If (LAnd (LEqual (Arg1, One),
-					  LAnd (LNotEqual (NHLA, Zero),
-						LNotEqual (NHLL, Zero)))) {
+				If ((Arg1 == 1) && (NHLA != 0) && (NHLL != 0)) {
    				Return (Buffer (One) { 0x03 })
    			} Else {
    				Return (Buffer (One) { 0x01 })
@@ -52,14 +50,14 @@
    		 *
    		 * Returns a pointer to NHLT table in memory.
    		 */
-			If (LEqual (Arg2, One)) {
+			If (Arg2 == 1) {
    			CreateQWordField (NBUF, ^NHLT._MIN, NBAS)
    			CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
    			CreateQWordField (NBUF, ^NHLT._LEN, NLEN)

-				Store (NHLA, NBAS)
-				Store (NHLA, NMAS)
-				Store (NHLL, NLEN)
+				NBAS = NHLA
+				NMAS = NHLA
+				NLEN = NHLL

Return (NBUF)
    		}
diff --git a/src/soc/intel/icelake/acpi/scs.asl b/src/soc/intel/icelake/acpi/scs.asl
index dbc61c8..5883e1e 100644
--- a/src/soc/intel/icelake/acpi/scs.asl
+++ b/src/soc/intel/icelake/acpi/scs.asl
@@ -37,22 +37,22 @@
    	Method(_PS0, 0, Serialized) {
    		Stall (50) // Sleep 50 us

-			Store(0, PGEN) // Disable PG
+			PGEN = 0 // Disable PG

/* Clear register 0x1C20/0x4820 */
    		^^SCSC (PID_EMMC)

/* Set Power State to D0 */
-			And (PMCR, 0xFFFC, PMCR)
-			Store (PMCR, ^TEMP)
+			PMCR &= 0xFFFC
+			^TEMP = PMCR
    	}

Method(_PS3, 0, Serialized) {
-			Store(1, PGEN) // Enable PG
+			PGEN = 1 // Enable PG

/* Set Power State to D3 */
-			Or (PMCR, 0x0003, PMCR)
-			Store (PMCR, ^TEMP)
+			PMCR |= 0x0003
+			^TEMP = PMCR
    	}

Device (CARD)
@@ -90,23 +90,23 @@

Method (_PS0, 0, Serialized)
    	{
-			Store (0, PGEN) /* Disable PG */
+			PGEN = 0 /* Disable PG */

/* Clear register 0x1C20/0x4820 */
    		^^SCSC (PID_SDX)

/* Set Power State to D0 */
-			And (PMCR, 0xFFFC, PMCR)
-			Store (PMCR, ^TEMP)
+			PMCR &= 0xFFFC
+			^TEMP = PMCR
    	}

Method (_PS3, 0, Serialized)
    	{
-			Store (1, PGEN) /* Enable PG */
+			PGEN = 1 /* Enable PG */

/* Set Power State to D3 */
-			Or (PMCR, 0x0003, PMCR)
-			Store (PMCR, ^TEMP)
+			PMCR |= 0x0003
+			^TEMP = PMCR
    	}

Device (CARD)

[HAOUAS Elyes (Code Review)]

Hello build bot (Jenkins), Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46241

to look at the new patch set (#3).

Change subject: soc/intel/icelake: Convert to ASL 2.0 syntax
......................................................................

soc/intel/icelake: Convert to ASL 2.0 syntax

Change-Id: I4fdc68e87c02681407430fcd2fbb61d0b0f1656e
Signed-off-by: Elyes HAOUAS 
---
M src/soc/intel/icelake/acpi/pch_hda.asl
M src/soc/intel/icelake/acpi/scs.asl
2 files changed, 19 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/46241/3