soc/intel/apollolake: Convert to ASL 2.0

Change-Id: Ieb362b5be05421b6ad2b2a3126c2943b7d55d135
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61243
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>

7 files changed, 80 insertions, 84 deletions

diff --git a/src/soc/intel/apollolake/acpi/gpio.asl b/src/soc/intel/apollolake/acpi/gpio.asl
index 1fe58e1da8..f5795ef6ce 100644
--- a/src/soc/intel/apollolake/acpi/gpio.asl
+++ b/src/soc/intel/apollolake/acpi/gpio.asl
@@ -25,8 +25,8 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^RMEM._BAS, RBAS)
-			ShiftLeft (GPIO_COMM0_PID, PCR_PORTID_SHIFT, Local0)
-			Or (CONFIG_PCR_BASE_ADDRESS, Local0, RBAS)
+			Local0 = GPIO_COMM0_PID << PCR_PORTID_SHIFT
+			RBAS = CONFIG_PCR_BASE_ADDRESS | Local0
 			Return (^RBUF)
 		}
 
@@ -55,8 +55,8 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^RMEM._BAS, RBAS)
-			ShiftLeft (GPIO_COMM1_PID, PCR_PORTID_SHIFT, Local0)
-			Or (CONFIG_PCR_BASE_ADDRESS, Local0, RBAS)
+			Local0 = GPIO_COMM1_PID << PCR_PORTID_SHIFT
+			RBAS = CONFIG_PCR_BASE_ADDRESS | Local0
 			Return (^RBUF)
 		}
 
@@ -85,8 +85,8 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^RMEM._BAS, RBAS)
-			ShiftLeft (GPIO_COMM2_PID, PCR_PORTID_SHIFT, Local0)
-			Or (CONFIG_PCR_BASE_ADDRESS, Local0, RBAS)
+			Local0 = GPIO_COMM2_PID << PCR_PORTID_SHIFT
+			RBAS = CONFIG_PCR_BASE_ADDRESS | Local0
 			Return (^RBUF)
 		}
 
@@ -115,8 +115,8 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^RMEM._BAS, RBAS)
-			ShiftLeft (GPIO_COMM3_PID, PCR_PORTID_SHIFT, Local0)
-			Or (CONFIG_PCR_BASE_ADDRESS, Local0, RBAS)
+			Local0 = GPIO_COMM3_PID << PCR_PORTID_SHIFT
+			RBAS = CONFIG_PCR_BASE_ADDRESS | Local0
 			Return (^RBUF)
 		}
 
@@ -137,9 +137,9 @@ scope (\_SB) {
 			 * local1 - to toggle Tx pin of Dw0
 			 * local2 - Address of PERST
 			 */
-			Store (Arg0, Local2)
-			Store (\_SB.GPC0 (Local2), Local1)
-			Or (Local1, PAD_CFG0_TX_STATE, Local1)
+			Local2 = Arg0
+			Local1 = \_SB.GPC0 (Local2)
+			Local1 |= PAD_CFG0_TX_STATE
 			\_SB.SPC0 (Local2, Local1)
 		}
 
@@ -151,9 +151,9 @@ scope (\_SB) {
 			 * local1 - to toggle Tx pin of Dw0
 			 * local2 - Address of PERST
 			 */
-			Store (Arg0, Local2)
-			Store (\_SB.GPC0 (Local2), Local1)
-			And (Local1, Not (PAD_CFG0_TX_STATE), Local1)
+			Local2 = Arg0
+			Local1 = \_SB.GPC0 (Local2)
+			Local1 &= ~PAD_CFG0_TX_STATE
 			\_SB.SPC0 (Local2, Local1)
 		}
 	}
diff --git a/src/soc/intel/apollolake/acpi/gpiolib.asl b/src/soc/intel/apollolake/acpi/gpiolib.asl
index 31599f2553..a9c0b122b6 100644
--- a/src/soc/intel/apollolake/acpi/gpiolib.asl
+++ b/src/soc/intel/apollolake/acpi/gpiolib.asl
@@ -6,7 +6,7 @@ Scope (\_SB)
 	Method (GPC0, 0x1, Serialized)
 	{
 		/* Arg0 - GPIO DW0 address */
-		Store (Arg0, Local0)
+		Local0 = Arg0
 		OperationRegion (PDW0, SystemMemory, Local0, 4)
 		Field (PDW0, AnyAcc, NoLock, Preserve) {
 			TEMP, 32
@@ -19,19 +19,19 @@ Scope (\_SB)
 	{
 		/* Arg0 - GPIO DW0 address */
 		/* Arg1 - Value for DW0 register */
-		Store (Arg0, Local0)
+		Local0 = Arg0
 		OperationRegion (PDW0, SystemMemory, Local0, 4)
 		Field (PDW0, AnyAcc, NoLock, Preserve) {
 			TEMP,32
 		}
-		Store (Arg1, TEMP)
+		TEMP = Arg1
 	}
 
 	/* Get Pad Configuration DW1 register value */
 	Method (GPC1, 0x1, Serialized)
 	{
 		/* Arg0 - GPIO DW0 address */
-		Store (Arg0 + 4, Local0)
+		Local0 = Arg0 + 4
 		OperationRegion (PDW1, SystemMemory, Local0, 4)
 		Field (PDW1, AnyAcc, NoLock, Preserve) {
 			TEMP, 32
@@ -44,12 +44,12 @@ Scope (\_SB)
 	{
 		/* Arg0 - GPIO DW0 address */
 		/* Arg1 - Value for DW1 register */
-		Store (Arg0 + 4, Local0)
+		Local0 = Arg0 + 4
 		OperationRegion (PDW1, SystemMemory, Local0, 4)
 		Field(PDW1, AnyAcc, NoLock, Preserve) {
 			TEMP,32
 		}
-		Store (Arg1, TEMP)
+		TEMP = Arg1
 	}
 
 	/* Get DW0 address of a given pad */
@@ -57,10 +57,9 @@ Scope (\_SB)
 	{
 		/* Arg0 - GPIO portid */
 		/* Arg1 - GPIO pad offset relative to the community */
-		Store (0, Local1)
-		Or( Or (ShiftLeft (Arg0, 16), CONFIG_PCR_BASE_ADDRESS),
-					Local1, Local1)
-		Or(PAD_CFG_BASE + Arg1 * GPIO_NUM_PAD_CFG_REGS * 4, Local1, Local1)
+		Local1 = 0
+		Local1 |= (Arg0 << 16) | CONFIG_PCR_BASE_ADDRESS
+		Local1 |= (PAD_CFG_BASE + Arg1 * GPIO_NUM_PAD_CFG_REGS * 4)
 		Return (Local1)
 	}
 
@@ -77,10 +76,9 @@ Scope (\_SB)
 	{
 		/* Arg0 - GPIO portid */
 		/* Arg1 - GPIO pad offset relative to the community */
-		Store (CHSA (Arg1), Local1)
 
-		OperationRegion (SHO0, SystemMemory, Or ( Or
-			(CONFIG_PCR_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4)
+		OperationRegion (SHO0, SystemMemory, CONFIG_PCR_BASE_ADDRESS |
+			(Arg0 << 16) | CHSA (Arg1), 4)
 		Field (SHO0, AnyAcc, NoLock, Preserve) {
 			TEMP, 32
 		}
@@ -93,13 +91,12 @@ Scope (\_SB)
 		/* Arg0 - GPIO portid */
 		/* Arg1 - GPIO pad offset relative to the community */
 		/* Arg2 - Value for Host own register */
-		Store (CHSA (Arg1), Local1)
 
-		OperationRegion (SHO0, SystemMemory, Or ( Or
-			(CONFIG_PCR_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4)
+		OperationRegion (SHO0, SystemMemory, CONFIG_PCR_BASE_ADDRESS |
+			(Arg0 << 16) | CHSA (Arg1), 4)
 		Field (SHO0, AnyAcc, NoLock, Preserve) {
 			TEMP, 32
 		}
-		Store (Arg2, TEMP)
+		TEMP = Arg2
 	}
 }
diff --git a/src/soc/intel/apollolake/acpi/northbridge.asl b/src/soc/intel/apollolake/acpi/northbridge.asl
index 6791e15670..834e5e4170 100644
--- a/src/soc/intel/apollolake/acpi/northbridge.asl
+++ b/src/soc/intel/apollolake/acpi/northbridge.asl
@@ -78,9 +78,9 @@ Method (_CRS, 0, Serialized)
 	CreateDwordField (MCRS, PM01._LEN, PLEN)
 
 	/* Read C-Unit PCI CFG Reg. 0xBC for TOLUD (shadow from B-Unit) */
-	And(\_SB.PCI0.MCHC.TLUD, 0xFFF00000, PMIN)
+	PMIN = \_SB.PCI0.MCHC.TLUD & 0xFFF00000
 	/* Read MMCONF base */
-	And(\_SB.PCI0.MCHC.MCNF, 0xF0000000, PMAX)
+	PMAX = \_SB.PCI0.MCHC.MCNF & 0xF0000000
 
 	/* Calculate PCI MMIO Length */
 	PLEN = PMAX - PMIN + 1
@@ -91,24 +91,24 @@ Method (_CRS, 0, Serialized)
 	CreateDwordField(MCRS, STOM._LEN, GLEN)
 
 	/* Read BGSM */
-	And(\_SB.PCI0.MCHC.BGSM, 0xFFF00000, GMIN)
+	GMIN = \_SB.PCI0.MCHC.BGSM & 0xFFF00000
 
 	/* Read TOLUD */
-	And(\_SB.PCI0.MCHC.TLUD, 0xFFF00000, GMAX)
+	GMAX = \_SB.PCI0.MCHC.TLUD & 0xFFF00000
 	GMAX--
 	GLEN = GMAX - GMIN + 1
 
 	/* Patch PM02 range based on Memory Size */
-	If (LEqual (A4GS, 0)) {
+	If (A4GS == 0) {
 		CreateQwordField (MCRS, PM02._LEN, MSEN)
-		Store (0, MSEN)
+		MSEN = 0
 	} Else {
 		CreateQwordField (MCRS, PM02._MIN, MMIN)
 		CreateQwordField (MCRS, PM02._MAX, MMAX)
 		CreateQwordField (MCRS, PM02._LEN, MLEN)
 		/* Set 64bit MMIO resource base and length */
-		Store (A4GS, MLEN)
-		Store (A4GB, MMIN)
+		MLEN = A4GS
+		MMIN = A4GB
 		MMAX = MMIN + MLEN - 1
 	}
 
diff --git a/src/soc/intel/apollolake/acpi/pch_hda.asl b/src/soc/intel/apollolake/acpi/pch_hda.asl
index 6c9a14a690..1b595e9417 100644
--- a/src/soc/intel/apollolake/acpi/pch_hda.asl
+++ b/src/soc/intel/apollolake/acpi/pch_hda.asl
@@ -29,17 +29,17 @@ Device (HDAS)
 	 * Arg2 - Function Index
 	*/
 	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 (LEqual (Arg1, One) && LNotEqual (NHLA, Zero) && LNotEqual (NHLL, Zero)) {
+				If (Arg1 == 1 && NHLA != 0 && NHLL != 0) {
 					Return (Buffer (One) { 0x03 })
 				}
 				Else {
@@ -54,13 +54,13 @@ Device (HDAS)
 			 *
 			 * 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/apollolake/acpi/pcie_port.asl b/src/soc/intel/apollolake/acpi/pcie_port.asl
index 34e2a73042..f1382715ce 100644
--- a/src/soc/intel/apollolake/acpi/pcie_port.asl
+++ b/src/soc/intel/apollolake/acpi/pcie_port.asl
@@ -39,8 +39,8 @@ PowerResource (PXP, 0, 0)
 	/* Define the PowerResource for PCIe slot */
 	Method (_STA, 0, Serialized)
 	{
-		Store (PDS, PDST)
-		If (LEqual (PDS, 1)) {
+		PDST = PDS
+		If (PDS == 1) {
 			Return (0xf)
 		} Else {
 			Return (0)
@@ -49,7 +49,7 @@ PowerResource (PXP, 0, 0)
 
 	Method (_ON, 0, Serialized)
 	{
-		If (LEqual (PDST, 1) && LNotEqual (\PRT0, 0)) {
+		If (PDST == 1 && \PRT0 != 0) {
 			/* Enter this condition if device
 			 * is connected
 			 */
@@ -57,21 +57,21 @@ PowerResource (PXP, 0, 0)
 			/* De-assert PERST */
 			\_SB.PCI0.PRDA (\PRT0)
 
-			Store (0, BDQA) /* Set BLKDQDA to 0 */
-			Store (0, BPLL) /* Set BLKPLLEN to 0 */
+			BDQA  = 0 /* Set BLKDQDA to 0 */
+			BPLL  = 0 /* Set BLKPLLEN to 0 */
 
 			/* Set L23_Rdy to Detect Transition
 			 * (L23R2DT)
 			 */
-			Store (1, L23R)
+			L23R = 1
 			Sleep (16)
-			Store (0, Local0)
+			Local0 = 0
 
 			/* Delay for transition Detect
 			 * and link to train
 			 */
 			While (L23R) {
-				If (Lgreater (Local0, 4)) {
+				If (Local0 > 4) {
 					Break
 				}
 				Sleep (16)
@@ -83,22 +83,22 @@ PowerResource (PXP, 0, 0)
 	Method (_OFF, 0, Serialized)
 	{
 		/* Set L23_Rdy Entry Request (L23ER) */
-		If (LEqual (PDST, 1) && LNotEqual (\PRT0, 0)) {
+		If (PDST == 1 && \PRT0 != 0) {
 			/* enter this condition if device
 			 * is connected
 			 */
-			Store (1, L23E)
+			L23E = 1
 			Sleep (16)
-			Store (0, Local0)
+			Local0 = 0
 			While (L23E) {
-				If (Lgreater (Local0, 4)) {
+				If (Local0 > 4) {
 					Break
 				}
 				Sleep (16)
 				Local0++
 			}
-			Store (1, BDQA) /* Set BLKDQDA to 1 */
-			Store (1, BPLL) /* Set BLKPLLEN to 1 */
+			BDQA  = 1 /* Set BLKDQDA to 1 */
+			BPLL  = 1 /* Set BLKPLLEN to 1 */
 
 			/* Assert PERST */
 			\_SB.PCI0.PRAS (\PRT0)
diff --git a/src/soc/intel/apollolake/acpi/pmc_ipc.asl b/src/soc/intel/apollolake/acpi/pmc_ipc.asl
index b41a21aa93..d90b42ea82 100644
--- a/src/soc/intel/apollolake/acpi/pmc_ipc.asl
+++ b/src/soc/intel/apollolake/acpi/pmc_ipc.asl
@@ -30,15 +30,15 @@ scope (\_SB) {
 		Method (_CRS, 0x0, NotSerialized)
 		{
 			CreateDwordField (^RBUF, ^IBAR._BAS, IBAS)
-			Store (PCH_PWRM_BASE_ADDRESS, IBAS)
+			IBAS = PCH_PWRM_BASE_ADDRESS
 
 			CreateDwordField (^RBUF, ^MDAT._BAS, MDBA)
-			Store (MCH_BASE_ADDRESS + MAILBOX_DATA, MDBA)
+			MDBA = MCH_BASE_ADDRESS + MAILBOX_DATA
 			CreateDwordField (^RBUF, ^MINF._BAS, MIBA)
-			Store (MCH_BASE_ADDRESS + MAILBOX_INTF, MIBA)
+			MIBA = MCH_BASE_ADDRESS + MAILBOX_INTF
 
 			CreateDwordField (^RBUF, ^SBAR._BAS, SBAS)
-			Store (SRAM_BASE_0, SBAS)
+			SBAS = SRAM_BASE_0
 
 			Return (^RBUF)
 		}
diff --git a/src/soc/intel/apollolake/acpi/scs.asl b/src/soc/intel/apollolake/acpi/scs.asl
index a5a1f06e60..9a2ccd5b43 100644
--- a/src/soc/intel/apollolake/acpi/scs.asl
+++ b/src/soc/intel/apollolake/acpi/scs.asl
@@ -4,8 +4,7 @@ Scope (\_SB.PCI0) {
 	/* 0xD6- is the port address */
 	/* 0x600- is the dynamic clock gating control register offset (GENR) */
 	OperationRegion (SBMM, SystemMemory,
-		Or ( Or (CONFIG_PCR_BASE_ADDRESS,
-			ShiftLeft(0xD6, PCR_PORTID_SHIFT)), 0x0600), 0x18)
+		CONFIG_PCR_BASE_ADDRESS | (0xD6 << PCR_PORTID_SHIFT) | 0x0600, 0x18)
 	Field (SBMM, DWordAcc, NoLock, Preserve)
 	{
 		GENR, 32,
@@ -23,10 +22,10 @@ Scope (\_SB.PCI0) {
 	 */
 	Method (SCPG, 2, Serialized)
 	{
-		if (LEqual(Arg0, 0x1)) {
-			Or (^GENR, Arg1, ^GENR)
-		} ElseIf (LEqual(Arg0, 0x0)){
-			And (^GENR, Arg1, ^GENR)
+		if (Arg0 == 1) {
+			^GENR |= Arg1
+		} ElseIf (Arg0 == 0) {
+			^GENR &= Arg1
 		}
 	}
 
@@ -44,13 +43,13 @@ Scope (\_SB.PCI0) {
 		 */
 		Method (_DSM, 4)
 		{
-			If (LEqual (Arg0, ^UUID)) {
+			If (Arg0 == ^UUID) {
 				/*
 				 * Function 9: Device Readiness Durations
 				 * Returns a package of five integers covering
 				 * various device related delays in PCIe Base Spec.
 				 */
-				If (LEqual (Arg2, 9)) {
+				If (Arg2 == 9) {
 					/*
 					 * Function 9 support for revision 3.
 					 * ECN link for function definitions
@@ -58,7 +57,7 @@ Scope (\_SB.PCI0) {
 					 * specification_documents/
 					 * ECN_fw_latency_optimization_final.pdf]
 					 */
-					If (LEqual (Arg1, 3)) {
+					If (Arg1 == 3) {
 						/*
 						 * Integer 0: FW reset time.
 						 * Integer 1: FW data link up time.
@@ -118,14 +117,14 @@ Scope (\_SB.PCI0) {
 		Method (_INI, 0)
 		{
 			/* Check SDCard CD port is valid */
-			If (LNotEqual (\SCDP, 0) && LNotEqual (\SCDO, 0))
+			If (\SCDP != 0 && \SCDO != 0)
 			{
 				/* Store DW0 address of SD_CD */
-				Store (GDW0 (\SCDP, \SCDO), SCD0)
+				SCD0 = GDW0 (\SCDP, \SCDO)
 				/* Get the current SD_CD ownership */
-				Store (\_SB.GHO (\SCDP, \SCDO), Local0)
+				Local0 = \_SB.GHO (\SCDP, \SCDO)
 				/* Set host ownership as GPIO in HOSTSW_OWN reg */
-				Or (Local0, ShiftLeft (1,  Mod (\SCDO, 32)), Local0)
+				Local0 |= 1 << (\SCDO % 32)
 				\_SB.SHO (\SCDP, \SCDO, Local0)
 			}
 		}
@@ -133,20 +132,20 @@ Scope (\_SB.PCI0) {
 		Method (_PS0, 0, NotSerialized)
 		{
 			/* Check SDCard CD port is valid */
-			If (LNotEqual (\SCDP, 0) && LNotEqual (\SCDO, 0))
+			If (\SCDP != 0 && \SCDO != 0)
 			{
 				/* Store DW0 into local0 to get rxstate of GPIO */
-				Store (\_SB.GPC0 (SCD0), Local0)
+				Local0 = \_SB.GPC0 (SCD0)
 				/* Extract rxstate [bit 1] of sdcard card detect pin */
-				And (Local0, PAD_CFG0_RX_STATE, Local0)
+				Local0 &= PAD_CFG0_RX_STATE
 				/* If the sdcard is present, rxstate is low.
 				 * If sdcard is not present, rxstate is High.
 				 * Write the inverted value of rxstate to GRR3.
 				 */
-				If (LEqual (Local0, 0)) {
-					Store (1, ^^GRR3)
+				If (Local0 == 0) {
+					^^GRR3 = 1
 				} Else {
-					Store (0, ^^GRR3)
+					^^GRR3 = 0
 				}
 				Sleep (2)
 			}
@@ -155,7 +154,7 @@ Scope (\_SB.PCI0) {
 		Method (_PS3, 0, NotSerialized)
 		{
 			/* Clear GRR3 to Power Gate SD Controller */
-			Store (0, ^^GRR3)
+			^^GRR3 = 0
 		}
 
 		Device (CARD)