HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46237 )
Change subject: soc/intel/braswell: Convert to ASL 2.0 syntax ......................................................................
soc/intel/braswell: Convert to ASL 2.0 syntax
Change-Id: Ie353ee16c80cc720202c5e32a20c8630acbba84e Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/soc/intel/braswell/acpi/dptf/charger.asl M src/soc/intel/braswell/acpi/dptf/cpu.asl M src/soc/intel/braswell/acpi/dptf/dptf.asl M src/soc/intel/braswell/acpi/dptf/thermal.asl M src/soc/intel/braswell/acpi/dptf/wifi.asl M src/soc/intel/braswell/acpi/dptf/wwan.asl M src/soc/intel/braswell/acpi/globalnvs.asl M src/soc/intel/braswell/acpi/gpio.asl M src/soc/intel/braswell/acpi/irqlinks.asl M src/soc/intel/braswell/acpi/lpc.asl M src/soc/intel/braswell/acpi/lpe.asl M src/soc/intel/braswell/acpi/lpss.asl M src/soc/intel/braswell/acpi/scc.asl M src/soc/intel/braswell/acpi/southcluster.asl 14 files changed, 185 insertions(+), 186 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/46237/1
diff --git a/src/soc/intel/braswell/acpi/dptf/charger.asl b/src/soc/intel/braswell/acpi/dptf/charger.asl index fca9590..97c8355 100644 --- a/src/soc/intel/braswell/acpi/dptf/charger.asl +++ b/src/soc/intel/braswell/acpi/dptf/charger.asl @@ -9,7 +9,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) @@ -26,11 +26,11 @@ Method (PPPC) { /* Convert size of PPSS table to index */ - Store (SizeOf (_SB.CHPS), Local0) - Decrement (Local0) + Local0 = SizeOf (_SB.CHPS) + Local0--
/* Check if charging is disabled (AC removed) */ - If (LEqual (_SB.PCI0.LPCB.EC0.ACEX, Zero)) { + If (_SB.PCI0.LPCB.EC0.ACEX == 0) { /* Return last power state */ Return (Local0) } Else { @@ -45,8 +45,7 @@ Method (SPPC, 1) { /* Retrieve Control (index 4) for specified PPSS level */ - Store (DeRefOf (Index (DeRefOf (Index - (_SB.CHPS, ToInteger (Arg0))), 4)), Local0) + Local0 = DeRefOf (DeRefOf (_SB.CHPS [ToInteger (Arg0)]) [4])
/* Pass Control value to EC to limit charging */ _SB.PCI0.LPCB.EC0.CHGS (Local0) diff --git a/src/soc/intel/braswell/acpi/dptf/cpu.asl b/src/soc/intel/braswell/acpi/dptf/cpu.asl index e219c99..728d094 100644 --- a/src/soc/intel/braswell/acpi/dptf/cpu.asl +++ b/src/soc/intel/braswell/acpi/dptf/cpu.asl @@ -40,7 +40,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) @@ -100,8 +100,8 @@ Method (_TDL) { If (CondRefOf (_SB.CP00._TSS)) { - Store (SizeOf (_SB.CP00._TSS ()), Local0) - Decrement (Local0) + Local0 = SizeOf (_SB.CP00._TSS ()) + Local0-- Return (Local0) } Else { Return (0) @@ -119,7 +119,7 @@
Method (SPPC, 1) { - Store (Arg0, \PPCM) + \PPCM = Arg0
/* Notify OS to re-read _PPC limit on each CPU */ \PPCN () @@ -143,8 +143,8 @@ If (CondRefOf (_SB.MPDL)) { Return (_SB.MPDL) } ElseIf (CondRefOf (_SB.CP00._PSS)) { - Store (SizeOf (_SB.CP00._PSS ()), Local0) - Decrement (Local0) + Local0 = SizeOf (_SB.CP00._PSS ()) + Local0-- Return (Local0) } Else { Return (0) diff --git a/src/soc/intel/braswell/acpi/dptf/dptf.asl b/src/soc/intel/braswell/acpi/dptf/dptf.asl index b41effc..4897159 100644 --- a/src/soc/intel/braswell/acpi/dptf/dptf.asl +++ b/src/soc/intel/braswell/acpi/dptf/dptf.asl @@ -19,7 +19,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) @@ -36,7 +36,7 @@ Method (_OSC, 4, Serialized) { /* Check for Passive Policy UUID */ - If (LEqual (DeRefOf (Index (IDSP, 0)), Arg0)) { + If (DeRefOf (IDSP [0]) == Arg0) { /* Initialize Thermal Devices */ ^TINI ()
@@ -60,10 +60,10 @@ /* Convert from Degrees C to 1/10 Kelvin for ACPI */ Method (CTOK, 1) { /* 10th of Degrees C */ - Multiply (Arg0, 10, Local0) + Local0 = Arg0 * 10
/* Convert to Kelvin */ - Add (Local0, 2732, Local0) + Local0 += 2732
Return (Local0) } diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl index 3d92487..2f49ffe 100644 --- a/src/soc/intel/braswell/acpi/dptf/thermal.asl +++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl @@ -6,20 +6,20 @@ #if CONFIG(EC_SUPPORTS_DPTF_TEVT) Method (TEVT, 1, NotSerialized) { - Store (ToInteger (Arg0), Local0) + Local0 = ToInteger (Arg0)
#ifdef DPTF_TSR0_SENSOR_ID - If (LEqual (Local0, DPTF_TSR0_SENSOR_ID)) { + If (Local0 == DPTF_TSR0_SENSOR_ID) { Notify (^TSR0, 0x90) } #endif #ifdef DPTF_TSR1_SENSOR_ID - If (LEqual (Local0, DPTF_TSR1_SENSOR_ID)) { + If (Local0 == DPTF_TSR1_SENSOR_ID) { Notify (^TSR1, 0x90) } #endif #ifdef DPTF_TSR2_SENSOR_ID - If (LEqual (Local0, DPTF_TSR2_SENSOR_ID)) { + If (Local0 == DPTF_TSR2_SENSOR_ID) { Notify (^TSR2, 0x90) } #endif @@ -52,7 +52,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) @@ -108,7 +108,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) @@ -164,7 +164,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/soc/intel/braswell/acpi/dptf/wifi.asl b/src/soc/intel/braswell/acpi/dptf/wifi.asl index 0554d61..9ea9ef6 100644 --- a/src/soc/intel/braswell/acpi/dptf/wifi.asl +++ b/src/soc/intel/braswell/acpi/dptf/wifi.asl @@ -9,7 +9,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/soc/intel/braswell/acpi/dptf/wwan.asl b/src/soc/intel/braswell/acpi/dptf/wwan.asl index f40889d..91dbf93 100644 --- a/src/soc/intel/braswell/acpi/dptf/wwan.asl +++ b/src/soc/intel/braswell/acpi/dptf/wwan.asl @@ -9,7 +9,7 @@
Method (_STA) { - If (LEqual (\DPTE, One)) { + If (\DPTE == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index c983d93..a68fde1 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -66,27 +66,27 @@ /* Set flag to enable USB charging in S3 */ Method (S3UE) { - Store (One, \S3U0) - Store (One, \S3U1) + \S3U0 = 1 + \S3U1 = 1 }
/* Set flag to disable USB charging in S3 */ Method (S3UD) { - Store (Zero, \S3U0) - Store (Zero, \S3U1) + \S3U0 = 0 + \S3U1 = 0 }
/* Set flag to enable USB charging in S5 */ Method (S5UE) { - Store (One, \S5U0) - Store (One, \S5U1) + \S5U0 = 1 + \S5U1 = 1 }
/* Set flag to disable USB charging in S5 */ Method (S5UD) { - Store (Zero, \S5U0) - Store (Zero, \S5U1) + \S5U0 = 0 + \S5U1 = 0 } diff --git a/src/soc/intel/braswell/acpi/gpio.asl b/src/soc/intel/braswell/acpi/gpio.asl index ee26b3c3..36fdbe8 100644 --- a/src/soc/intel/braswell/acpi/gpio.asl +++ b/src/soc/intel/braswell/acpi/gpio.asl @@ -22,7 +22,7 @@ Method (_CRS) { CreateDwordField (^RBUF, ^RMEM._BAS, RBAS) - Add (IO_BASE_ADDRESS, COMMUNITY_OFFSET_GPSOUTHWEST, RBAS) + RBAS = IO_BASE_ADDRESS + COMMUNITY_OFFSET_GPSOUTHWEST Return (^RBUF) }
@@ -51,7 +51,7 @@ Method (_CRS) { CreateDwordField (^RBUF, ^RMEM._BAS, RBAS) - Add (IO_BASE_ADDRESS, COMMUNITY_OFFSET_GPNORTH, RBAS) + RBAS = IO_BASE_ADDRESS + COMMUNITY_OFFSET_GPNORTH, Return (^RBUF) }
@@ -80,7 +80,7 @@ Method (_CRS) { CreateDwordField (^RBUF, ^RMEM._BAS, RBAS) - Add (IO_BASE_ADDRESS, COMMUNITY_OFFSET_GPEAST, RBAS) + RBAS = IO_BASE_ADDRESS + COMMUNITY_OFFSET_GPEAST Return (^RBUF) }
@@ -109,7 +109,7 @@ Method (_CRS) { CreateDwordField (^RBUF, ^RMEM._BAS, RBAS) - Add (IO_BASE_ADDRESS, COMMUNITY_OFFSET_GPSOUTHEAST, RBAS) + RBAS = IO_BASE_ADDRESS + COMMUNITY_OFFSET_GPSOUTHEAST Return (^RBUF) }
diff --git a/src/soc/intel/braswell/acpi/irqlinks.asl b/src/soc/intel/braswell/acpi/irqlinks.asl index 6f88459..b1d9d6a 100644 --- a/src/soc/intel/braswell/acpi/irqlinks.asl +++ b/src/soc/intel/braswell/acpi/irqlinks.asl @@ -8,7 +8,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTA) + PRTA = 0x80 }
/* Possible Resource Settings for this Link */ @@ -28,10 +28,10 @@ CreateWordField(RTLA, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTA */ - ShiftLeft(1, And(PRTA, 0x0f), IRQ0) + IRQ0 = 1 << (PRTA & 0x0f)
Return (RTLA) } @@ -44,14 +44,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTA) + Local0-- + PRTA = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTA, 0x80)) { + If (PRTA & 0x80) { Return (0x9) } Else { Return (0xb) @@ -67,7 +67,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTB) + PRTB = 0x80 }
/* Possible Resource Settings for this Link */ @@ -87,10 +87,10 @@ CreateWordField(RTLB, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTB */ - ShiftLeft(1, And(PRTB, 0x0f), IRQ0) + IRQ0 = 1 << (PRTB & 0x0f)
Return (RTLB) } @@ -103,14 +103,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTB) + Local0-- + PRTB = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTB, 0x80)) { + If (PRTB & 0x80) { Return (0x9) } Else { Return (0xb) @@ -126,7 +126,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTC) + PRTC = 0x80 }
/* Possible Resource Settings for this Link */ @@ -146,10 +146,10 @@ CreateWordField(RTLC, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTC */ - ShiftLeft(1, And(PRTC, 0x0f), IRQ0) + IRQ0 = 1 << (PRTC & 0x0f)
Return (RTLC) } @@ -162,14 +162,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTC) + Local0-- + PRTC = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTC, 0x80)) { + If (PRTC & 0x80) { Return (0x9) } Else { Return (0xb) @@ -185,7 +185,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTD) + PRTD = 0x80 }
/* Possible Resource Settings for this Link */ @@ -205,10 +205,10 @@ CreateWordField(RTLD, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTD */ - ShiftLeft(1, And(PRTD, 0x0f), IRQ0) + IRQ0 = 1 << (PRTD & 0x0f)
Return (RTLD) } @@ -221,14 +221,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTD) + Local0-- + PRTD = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTD, 0x80)) { + If (PRTD & 0x80) { Return (0x9) } Else { Return (0xb) @@ -244,7 +244,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTE) + PRTE = 0x80 }
/* Possible Resource Settings for this Link */ @@ -264,10 +264,10 @@ CreateWordField(RTLE, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTE */ - ShiftLeft(1, And(PRTE, 0x0f), IRQ0) + IRQ0 = 1 << (PRTE & 0x0f)
Return (RTLE) } @@ -280,14 +280,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTE) + Local0-- + PRTE = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTE, 0x80)) { + If (PRTE & 0x80) { Return (0x9) } Else { Return (0xb) @@ -303,7 +303,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTF) + PRTF = 0x80 }
/* Possible Resource Settings for this Link */ @@ -323,10 +323,10 @@ CreateWordField(RTLF, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTF */ - ShiftLeft(1, And(PRTF, 0x0f), IRQ0) + IRQ0 = 1 << (PRTF & 0x0f)
Return (RTLF) } @@ -339,14 +339,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTF) + Local0-- + PRTF = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTF, 0x80)) { + If (PRTF & 0x80) { Return (0x9) } Else { Return (0xb) @@ -362,7 +362,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTG) + PRTG = 0x80 }
/* Possible Resource Settings for this Link */ @@ -382,10 +382,10 @@ CreateWordField(RTLG, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTG */ - ShiftLeft(1, And(PRTG, 0x0f), IRQ0) + IRQ0 = 1 << (PRTG & 0x0f)
Return (RTLG) } @@ -398,14 +398,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTG) + Local0-- + PRTG = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTG, 0x80)) { + If (PRTG & 0x80) { Return (0x9) } Else { Return (0xb) @@ -421,7 +421,7 @@ /* Disable method */ Method (_DIS, 0, Serialized) { - Store (0x80, PRTH) + PRTH = 0x80 }
/* Possible Resource Settings for this Link */ @@ -441,10 +441,10 @@ CreateWordField(RTLH, 1, IRQ0)
/* Clear the WordField */ - Store (Zero, IRQ0) + IRQ0 = 0
/* Set the bit from PRTH */ - ShiftLeft(1, And(PRTH, 0x0f), IRQ0) + IRQ0 = 1 << (PRTH & 0x0f)
Return (RTLH) } @@ -457,14 +457,14 @@ /* Which bit is set? */ FindSetRightBit(IRQ0, Local0)
- Decrement(Local0) - Store(Local0, PRTH) + Local0-- + PRTH = Local0 }
/* Status */ Method (_STA, 0, Serialized) { - If(And(PRTH, 0x80)) { + If (PRTH & 0x80) { Return (0x9) } Else { Return (0xb) diff --git a/src/soc/intel/braswell/acpi/lpc.asl b/src/soc/intel/braswell/acpi/lpc.asl index 0a22162..53598ef 100644 --- a/src/soc/intel/braswell/acpi/lpc.asl +++ b/src/soc/intel/braswell/acpi/lpc.asl @@ -35,9 +35,9 @@ { CreateDwordField (^RBUF, ^FBAR._BAS, FBAS) CreateDwordField (^RBUF, ^FBAR._LEN, FLEN) - Multiply(CONFIG_COREBOOT_ROMSIZE_KB, 1024, Local0) - Store(Local0, FLEN) - Add(Subtract(0xffffffff, Local0), 1, FBAS) + Local0 = CONFIG_COREBOOT_ROMSIZE_KB * 1024 + FLEN = Local0 + FBAS = 0xffffffff - Local0 + 1 Return (^RBUF) } } diff --git a/src/soc/intel/braswell/acpi/lpe.asl b/src/soc/intel/braswell/acpi/lpe.asl index d655ae8..8b8444a 100644 --- a/src/soc/intel/braswell/acpi/lpe.asl +++ b/src/soc/intel/braswell/acpi/lpe.asl @@ -43,15 +43,15 @@ { /* Update BAR0 from NVS */ CreateDwordField (^RBUF, ^BAR0._BAS, BAS0) - Store (\LPB0, BAS0) + BAS0 = \LPB0
/* Update BAR1 from NVS */ CreateDwordField (^RBUF, ^BAR1._BAS, BAS1) - Store (\LPB1, BAS1) + BAS1 = \LPB1
/* Update LPE FW from NVS */ CreateDwordField (^RBUF, ^BAR2._BAS, BAS2) - Store (\LPFW, BAS2) + BAS2 = \LPFW
/* Append any Mainboard defined GPIOs */ If (CondRefOf (^GBUF)) { @@ -64,7 +64,7 @@
Method (_STA) { - If (LEqual (\LPEN, 1)) { + If (\LPEN == 1) { Return (0xF) } Else { Return (0x0) @@ -87,14 +87,14 @@
Method (_OFF) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_ON) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } } } diff --git a/src/soc/intel/braswell/acpi/lpss.asl b/src/soc/intel/braswell/acpi/lpss.asl index 2516a9f..0080a4f 100644 --- a/src/soc/intel/braswell/acpi/lpss.asl +++ b/src/soc/intel/braswell/acpi/lpss.asl @@ -49,13 +49,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S0B0, RBAS) + RBAS = \S0B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S0EN, 1)) { + If (\S0EN == 1) { Return (0xF) } Else { Return (0x0) @@ -81,13 +81,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S8B0, RBAS) + RBAS = \S8B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S8EN, 1)) { + If (\S8EN == 1) { Return (0xF) } Else { Return (0x0) @@ -121,13 +121,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S1B0, RBAS) + RBAS = \S1B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -143,14 +143,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -180,13 +180,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S2B0, RBAS) + RBAS = \S2B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) @@ -202,14 +202,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -239,13 +239,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S3B0, RBAS) + RBAS = \S3B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S3EN, 1)) { + If (\S3EN == 1) { Return (0xF) } Else { Return (0x0) @@ -261,14 +261,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -298,13 +298,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S4B0, RBAS) + RBAS = \S4B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S4EN, 1)) { + If (\S4EN == 1) { Return (0xF) } Else { Return (0x0) @@ -320,14 +320,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -357,13 +357,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S5B0, RBAS) + RBAS = \S5B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S5EN, 1)) { + If (\S5EN == 1) { Return (0xF) } Else { Return (0x0) @@ -379,14 +379,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -416,13 +416,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S6B0, RBAS) + RBAS = \S6B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S6EN, 1)) { + If (\S6EN == 1) { Return (0xF) } Else { Return (0x0) @@ -438,14 +438,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -475,13 +475,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\S7B0, RBAS) + RBAS = \S7B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\S7EN, 1)) { + If (\S7EN == 1) { Return (0xF) } Else { Return (0x0) @@ -497,14 +497,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -528,13 +528,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\SCB0, RBAS) + RBAS = \SCB0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\SCEN, 1)) { + If (\SCEN == 1) { Return (0xF) } Else { Return (0x0) @@ -550,14 +550,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -581,13 +581,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\SDB0, RBAS) + RBAS = \SDB0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\SDEN, 1)) { + If (\SDEN == 1) { Return (0xF) } Else { Return (0x0) @@ -603,13 +603,13 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } } diff --git a/src/soc/intel/braswell/acpi/scc.asl b/src/soc/intel/braswell/acpi/scc.asl index 1260d0c..988e474 100644 --- a/src/soc/intel/braswell/acpi/scc.asl +++ b/src/soc/intel/braswell/acpi/scc.asl @@ -19,13 +19,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\C0B0, RBAS) + RBAS = \C0B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\C0EN, 1)) { + If (\C0EN == 1) { Return (0xF) } Else { Return (0x0) @@ -41,14 +41,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 }
Device (EM45) @@ -78,7 +78,7 @@
Method (_STA, 0, NotSerialized) { - If (LEqual (\C0EN, 1)) { + If (\C0EN == 1) { Return (0x0) } Else @@ -120,13 +120,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\C1B0, RBAS) + RBAS = \C1B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\C1EN, 1)) { + If (\C1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -142,14 +142,14 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } }
@@ -172,13 +172,13 @@ Method (_CRS) { CreateDwordField (^RBUF, ^BAR0._BAS, RBAS) - Store (\C2B0, RBAS) + RBAS = \C2B0 Return (^RBUF) }
Method (_STA) { - If (LEqual (\C2EN, 1)) { + If (\C2EN == 1) { Return (0xF) } Else { Return (0x0) @@ -194,13 +194,13 @@
Method (_PS3) { - Or (PSAT, 0x00000003, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT |= 0x00000003 + PSAT |= 0x00000000 }
Method (_PS0) { - And (PSAT, 0xfffffffc, PSAT) - Or (PSAT, 0x00000000, PSAT) + PSAT &= 0xfffffffc + PSAT |= 0x00000000 } } diff --git a/src/soc/intel/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl index 2c31d40..5deb0ff 100644 --- a/src/soc/intel/braswell/acpi/southcluster.asl +++ b/src/soc/intel/braswell/acpi/southcluster.asl @@ -161,17 +161,17 @@ CreateDWordField (MCRS, LMEM._MIN, LMIN) CreateDWordField (MCRS, LMEM._MAX, LMAX) CreateDWordField (MCRS, LMEM._LEN, LLEN) - If (LAnd (LNotEqual (LPFW, Zero), LEqual (LPEN, One))) + If ((LPFW != 0) && (LPEN == 1)) { - Store (LPFW, LMIN) - Store (Add (LMIN, 0x001FFFFF), LMAX) - Store (0x00200000, LLEN) + LMIN = LPFW + LMAX = LMIN + 0x001FFFFF + LLEN = 0x00200000 } Else { - Store (Zero, LMIN) - Store (Zero, LMAX) - Store (Zero, LLEN) + LMIN = 0 + LMAX = 0 + LLEN = 0 }
/* Update PCI resource area */ @@ -180,9 +180,9 @@ CreateDwordField(MCRS, PMEM._LEN, PLEN)
/* TOLM is BMBOUND accessible from IOSF so is saved in NVS */ - Store (\TOLM, PMIN) - Store (Subtract(CONFIG_MMCONF_BASE_ADDRESS, 1), PMAX) - Add (Subtract (PMAX, PMIN), 1, PLEN) + PMIN = \TOLM + PMAX = CONFIG_MMCONF_BASE_ADDRESS - 1 + PLEN = PMAX - PMIN + 1
Return (MCRS) } @@ -214,7 +214,7 @@ Method (_OSC, 4) { /* Check for proper GUID */ - If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) + If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) { /* Let OS control everything */ Return (Arg3) @@ -223,7 +223,7 @@ { /* Unrecognized UUID */ CreateDWordField (Arg3, 0, CDW1) - Or (CDW1, 4, CDW1) + CDW1 |= 4 Return (Arg3) } } @@ -244,7 +244,7 @@ Method (_CRS) { CreateDwordField (^RBUF, ^RBAR._BAS, RBAS) - Store (Add (MCFG_BASE_ADDRESS, 0xD0), RBAS) + RBAS = MCFG_BASE_ADDRESS + 0xD0 Return (^RBUF) } }