{acpi,arch,soc}/acpi: Replace constant "One" with actual number

Change-Id: I3dfd7dd1de3bd27c35c195bd43c4a5b8c5a2dc53 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/71522 Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-by: Subrata Banik <subratabanik@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
2022-12-26 08:45:56 +01:00
parent dfbb634ae1
commit 7b8ac0030c
32 changed files with 88 additions and 88 deletions
--- a/src/soc/intel/alderlake/acpi/pch_hda.asl
+++ b/src/soc/intel/alderlake/acpi/pch_hda.asl
@@ -37,9 +37,9 @@ Device (HDAS)
 				 * if NHLT address and length are set in NVS.
 				 */
 				If ((Arg1 == 1) && (NHLA != 0) && (NHLL != 0)) {
-					Return (Buffer (One) { 0x03 })
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/apollolake/acpi/pch_hda.asl
+++ b/src/soc/intel/apollolake/acpi/pch_hda.asl
@@ -40,10 +40,10 @@ Device (HDAS)
 				 * if NHLT address and length are set in NVS.
 				 */
 				If (Arg1 == 1 && NHLA != 0 && NHLL != 0) {
-					Return (Buffer (One) { 0x03 })
+					Return (Buffer (1) { 0x03 })
 				}
 				Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -65,6 +65,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/baytrail/acpi/dptf/charger.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/charger.asl
@@ -9,7 +9,7 @@ Device (TCHG)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/baytrail/acpi/dptf/cpu.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/cpu.asl
@@ -13,7 +13,7 @@ Device (TCPU)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/baytrail/acpi/dptf/dptf.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/dptf.asl
@@ -19,7 +19,7 @@ Device (DPTF)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
@@ -52,7 +52,7 @@ Device (TSR0)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -108,7 +108,7 @@ Device (TSR1)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -164,7 +164,7 @@ Device (TSR2)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/baytrail/acpi/southcluster.asl
@@ -155,11 +155,11 @@ Method (_CRS, 0, Serialized)
 	CreateDWordField (MCRS, ^LMEM._MIN, LMIN)
 	CreateDWordField (MCRS, ^LMEM._MAX, LMAX)
 	CreateDWordField (MCRS, ^LMEM._LEN, LLEN)
-	If (LPFW != Zero && LPEN == One)
+	If (LPFW != Zero && LPEN == 1)
 	{
 		LMIN = LPFW
 		LLEN = 0x00100000
-		LMAX = LMIN + LLEN - One
+		LMAX = LMIN + LLEN - 1
 	}
 	Else
 	{
--- a/src/soc/intel/baytrail/acpi/xhci.asl
+++ b/src/soc/intel/baytrail/acpi/xhci.asl
@@ -21,7 +21,7 @@ Device (XHCI)
 			REV = 0x02

 			// VISI: Port visibility to user per port
-			CreateField (DerefOf (PCKG[0]), 0x40, One, VISI)
+			CreateField (DerefOf (PCKG[0]), 0x40, 1, VISI)
 			VISI = Arg0
 			Return (PCKG)
 		}
--- a/src/soc/intel/braswell/acpi/dptf/charger.asl
+++ b/src/soc/intel/braswell/acpi/dptf/charger.asl
@@ -9,7 +9,7 @@ Device (TCHG)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/dptf/cpu.asl
+++ b/src/soc/intel/braswell/acpi/dptf/cpu.asl
@@ -40,7 +40,7 @@ Device (B0DB)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/dptf/dptf.asl
+++ b/src/soc/intel/braswell/acpi/dptf/dptf.asl
@@ -19,7 +19,7 @@ Device (DPTF)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl
+++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl
@@ -52,7 +52,7 @@ Device (TSR0)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -108,7 +108,7 @@ Device (TSR1)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -164,7 +164,7 @@ Device (TSR2)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/dptf/wifi.asl
+++ b/src/soc/intel/braswell/acpi/dptf/wifi.asl
@@ -9,7 +9,7 @@ Device (WIFI)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/dptf/wwan.asl
+++ b/src/soc/intel/braswell/acpi/dptf/wwan.asl
@@ -9,7 +9,7 @@ Device (WWAN)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/braswell/acpi/southcluster.asl
+++ b/src/soc/intel/braswell/acpi/southcluster.asl
@@ -154,7 +154,7 @@ Method (_CRS, 0, Serialized)
 	CreateDWordField (MCRS, LMEM._MIN, LMIN)
 	CreateDWordField (MCRS, LMEM._MAX, LMAX)
 	CreateDWordField (MCRS, LMEM._LEN, LLEN)
-	If (LPFW != Zero && LPEN == One)
+	If (LPFW != Zero && LPEN == 1)
 	{
 		LMIN = LPFW
 		LMAX = LMIN + 0x001FFFFF
--- a/src/soc/intel/cannonlake/acpi/pch_hda.asl
+++ b/src/soc/intel/cannonlake/acpi/pch_hda.asl
@@ -37,9 +37,9 @@ Device (HDAS)
 				 * if NHLT address and length are set in NVS.
 				 */
 				If (Arg1 == 1 && NHLA != 0 && NHLL != 0) {
-					Return (Buffer (One) { 0x03 })
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/cannonlake/acpi/xhci.asl
+++ b/src/soc/intel/cannonlake/acpi/xhci.asl
@@ -46,7 +46,7 @@ Method (UWES, 3, Serialized)
 {
 	Local0 = Arg0

-	While (One) {
+	While (1) {
 		FindSetRightBit (Local0, Local1)
 		If (Local1 == Zero) {
 			Break
--- a/src/soc/intel/common/acpi/dptf/charger.asl
+++ b/src/soc/intel/common/acpi/dptf/charger.asl
@@ -10,7 +10,7 @@ Device (TCHG)

 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
--- a/src/soc/intel/elkhartlake/acpi/pch_hda.asl
+++ b/src/soc/intel/elkhartlake/acpi/pch_hda.asl
@@ -36,10 +36,10 @@ Device (HDAS)
 				 * NHLT Query only supported for revision 1 and
 				 * if NHLT address and length are set in NVS.
 				 */
-				If ((Arg1 == One) && ((NHLA != Zero) && (NHLL != Zero))) {
-					Return (Buffer (One) { 0x03 })
+				If ((Arg1 == 1) && ((NHLA != Zero) && (NHLL != Zero))) {
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -50,7 +50,7 @@ Device (HDAS)
 			 *
 			 * Returns a pointer to NHLT table in memory.
 			 */
-			If (Arg2 == One) {
+			If (Arg2 == 1) {
 				CreateQWordField (NBUF, ^NHLT._MIN, NBAS)
 				CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
 				CreateQWordField (NBUF, ^NHLT._LEN, NLEN)
@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/icelake/acpi/pch_hda.asl
+++ b/src/soc/intel/icelake/acpi/pch_hda.asl
@@ -36,10 +36,10 @@ Device (HDAS)
 				 * NHLT Query only supported for revision 1 and
 				 * if NHLT address and length are set in NVS.
 				 */
-				If (Arg1 == One && NHLA != Zero && NHLL != Zero) {
-					Return (Buffer (One) { 0x03 })
+				If (Arg1 == 1 && NHLA != Zero && NHLL != Zero) {
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -50,7 +50,7 @@ Device (HDAS)
 			 *
 			 * Returns a pointer to NHLT table in memory.
 			 */
-			If (Arg2 == One) {
+			If (Arg2 == 1) {
 				CreateQWordField (NBUF, ^NHLT._MIN, NBAS)
 				CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
 				CreateQWordField (NBUF, ^NHLT._LEN, NLEN)
@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/jasperlake/acpi/pch_hda.asl
+++ b/src/soc/intel/jasperlake/acpi/pch_hda.asl
@@ -36,10 +36,10 @@ Device (HDAS)
 				 * NHLT Query only supported for revision 1 and
 				 * if NHLT address and length are set in NVS.
 				 */
-				If ((Arg1 == One) && ((NHLA != Zero) && (NHLL != Zero))) {
-					Return (Buffer (One) { 0x03 })
+				If ((Arg1 == 1) && ((NHLA != Zero) && (NHLL != Zero))) {
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -50,7 +50,7 @@ Device (HDAS)
 			 *
 			 * Returns a pointer to NHLT table in memory.
 			 */
-			If (Arg2 == One) {
+			If (Arg2 == 1) {
 				CreateQWordField (NBUF, ^NHLT._MIN, NBAS)
 				CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
 				CreateQWordField (NBUF, ^NHLT._LEN, NLEN)
@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/skylake/acpi/pch_hda.asl
+++ b/src/soc/intel/skylake/acpi/pch_hda.asl
@@ -37,9 +37,9 @@ Device (HDAS)
 				 * if NHLT address and length are set in NVS.
 				 */
 				If ((Arg1 == 1) && (NHLA != 0) && (NHLL != 0)) {
-					Return (Buffer (One) { 0x03 })
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/skylake/acpi/xhci.asl
+++ b/src/soc/intel/skylake/acpi/xhci.asl
@@ -44,7 +44,7 @@ Method (UWES, 3, Serialized)
 {
 	Local0 = Arg0

-	While (One) {
+	While (1) {
 		FindSetRightBit (Local0, Local1)
 		If (Local1 == Zero) {
 			Break
@@ -225,7 +225,7 @@ Device (XHCI)
 			REV = 0x02

 			// VISI: Port visibility to user per port
-			CreateField (DerefOf (PCKG[0]), 0x40, One, VISI)
+			CreateField (DerefOf (PCKG[0]), 0x40, 1, VISI)
 			VISI = Arg0

 			Return (PCKG)
--- a/src/soc/intel/tigerlake/acpi/pch_hda.asl
+++ b/src/soc/intel/tigerlake/acpi/pch_hda.asl
@@ -37,9 +37,9 @@ Device (HDAS)
 				 * if NHLT address and length are set in NVS.
 				 */
 				If ((Arg1 == 1) && (NHLA != 0) && (NHLL != 0)) {
-					Return (Buffer (One) { 0x03 })
+					Return (Buffer (1) { 0x03 })
 				} Else {
-					Return (Buffer (One) { 0x01 })
+					Return (Buffer (1) { 0x01 })
 				}
 			}

@@ -63,6 +63,6 @@ Device (HDAS)
 			}
 		}

-		Return (Buffer (One) { 0x00 })
+		Return (Buffer (1) { 0x00 })
 	}
 }
--- a/src/soc/intel/xeon_sp/acpi/iiostack.asl
+++ b/src/soc/intel/xeon_sp/acpi/iiostack.asl
@@ -43,7 +43,7 @@
 				CTRL &= 0x1D					\
 				/* Disable Native PCIe AER handling from OS */	\
 				CTRL &= 0x17					\
-				If ((Arg1 != One)) /* unknown revision */	\
+				If ((Arg1 != 1)) /* unknown revision */	\
 				{						\
 					CDW1 |= 0x08				\
 				}						\