sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree: Replace Or(a,b,c) with ASL 2.0 syntax

Browse Source 
Replace `Or (a, b, c)` with `c = a | b`, respectively `c |= b` where
possible.

Change-Id: Icf194b248075f290de90fb4bc4e9a0cd9d76ec61
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70846
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer
2022-12-16 04:40:39 +01:00
parent 372573eaff
commit 86bc2e708d
25 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ec/google/chromeec/acpi/battery.asl
View File

@@ -175,7 +175,7 @@ Method (BBST, 4, Serialized)
// Check for critical battery level // Check for critical battery level
If (BFCR) { If (BFCR) {
Or (Local1, 0x04, Local1) Local1 |= 4
} }
Arg1[0] = Local1 Arg1[0] = Local1

2
src/ec/google/chromeec/acpi/ec.asl
View File

@@ -621,7 +621,7 @@ Device (EC0)
*/ */
Method (UPPS, 1, Serialized) Method (UPPS, 1, Serialized)
{ {
Or (USPP, 1 << Arg0, USPP) USPP |= 1 << Arg0
} }
/* /*

2
src/ec/kontron/it8516e/acpi/pm_channels.asl
View File

@@ -90,7 +90,7 @@ Device (PM2) {
} }
Release (EC_MUTEX) Release (EC_MUTEX)
Or (Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
Local0 *= 10 / 64 /* Convert to 10th °C */ Local0 *= 10 / 64 /* Convert to 10th °C */
Return (Local0 + 2732) /* Return as 10th Kelvin */ Return (Local0 + 2732) /* Return as 10th Kelvin */
} }

14
src/ec/lenovo/h8/acpi/thinkpad.asl
View File

@@ -87,7 +87,7 @@ Device (HKEY)
Local0 = One << (Arg0 - 1) Local0 = One << (Arg0 - 1)
If (Arg1) If (Arg1)
{ {
Or (DHKN, Local0, DHKN) DHKN |= Local0
} }
Else Else
{ {
@@ -165,9 +165,9 @@ Device (HKEY)
Local0 = One Local0 = One
If(\_SB.PCI0.LPCB.EC.BTEB) If(\_SB.PCI0.LPCB.EC.BTEB)
{ {
Or(Local0, 2, Local0) Local0 |= 2
} }
Or(Local0, WBDC << 2, Local0) Local0 |= WBDC << 2
Return (Local0) Return (Local0)
} Else { } Else {
Return (0) Return (0)
@@ -207,9 +207,9 @@ Device (HKEY)
Local0 = One Local0 = One
If(\_SB.PCI0.LPCB.EC.WWEB) If(\_SB.PCI0.LPCB.EC.WWEB)
{ {
Or(Local0, 2, Local0) Local0 |= 2
} }
Or(Local0, WWAN << 2, Local0) Local0 |= WWAN << 2
Return (Local0) Return (Local0)
} Else { } Else {
Return (0) Return (0)
@@ -243,7 +243,7 @@ Device (HKEY)
If (HKBL) { If (HKBL) {
Local0 = 0x200 Local0 = 0x200
/* FIXME: Support 2bit brightness control */ /* FIXME: Support 2bit brightness control */
Or (Local0, \_SB.PCI0.LPCB.EC.KBLT, Local0) Local0 |= \_SB.PCI0.LPCB.EC.KBLT
Return (Local0) Return (Local0)
} Else { } Else {
Return (0) Return (0)
@@ -273,7 +273,7 @@ Device (HKEY)
Local0 = One Local0 = One
If(\_SB.PCI0.LPCB.EC.UWBE) If(\_SB.PCI0.LPCB.EC.UWBE)
{ {
Or(Local0, 2, Local0) Local0 |= 2
} }
Return (Local0) Return (Local0)
} Else { } Else {

4
src/ec/quanta/it8518/acpi/battery.asl
View File

@@ -235,7 +235,7 @@ Device (BATX)
// Set critical flag if battery is empty // Set critical flag if battery is empty
If (And (HB0S, 0x0F) == 0) If (And (HB0S, 0x0F) == 0)
{ {
Or (Local0, 4, Local0) Local0 |= 4
} }
Local1 = Zero Local1 = Zero
@@ -254,7 +254,7 @@ Device (BATX)
// Flag if the battery level is critical // Flag if the battery level is critical
And (Local0, 0x04, Local4) And (Local0, 0x04, Local4)
Or (Local1, Local4, Local1) Local1 |= Local4
PBST[0] = Local1 PBST[0] = Local1
// //

4
src/ec/smsc/mec1308/acpi/battery.asl
View File

@@ -62,7 +62,7 @@ Device (BAT0)
Local0 = Arg0 >> 8 Local0 = Arg0 >> 8
Local1 = Arg0 << 8 Local1 = Arg0 << 8
And (Local1, 0xFF00, Local1) And (Local1, 0xFF00, Local1)
Or (Local0, Local1, Local0) Local0 |= Local1
If (Local0 == 0xFFFF) { If (Local0 == 0xFFFF) {
Local0 = 0xFFFFFFFF Local0 = 0xFFFFFFFF
} }
@@ -119,7 +119,7 @@ Device (BAT0)
// Flag if the battery level is critical // Flag if the battery level is critical
And (Local0, 0x04, Local4) And (Local0, 0x04, Local4)
Or (Local1, Local4, Local1) Local1 |= Local4
PBST[0] = Local1 PBST[0] = Local1
// Notify if battery state has changed since last time // Notify if battery state has changed since last time

4
src/mainboard/acer/aspire_vn7_572g/acpi/thermal.asl
View File

@@ -12,14 +12,14 @@ Scope (_TZ)
Local0 = \_SB.PCI0.LPCB.EC0.MS0T Local0 = \_SB.PCI0.LPCB.EC0.MS0T
Local1 = \_SB.PCI0.LPCB.EC0.MCSS Local1 = \_SB.PCI0.LPCB.EC0.MCSS
/* Suppress warning over reading status flag by dummy OR */ /* Suppress warning over reading status flag by dummy OR */
Or (Local1, 1, Local1) Local1 |= 1
Local2 = \_SB.PCI0.LPCB.EC0.MOSD Local2 = \_SB.PCI0.LPCB.EC0.MOSD
#else #else
Local0 = \_SB.PCI0.LPCB.EC0.ES0T Local0 = \_SB.PCI0.LPCB.EC0.ES0T
/* "MCSS": Considering neighbouring bits, likely /* "MCSS": Considering neighbouring bits, likely
"ESSF" in thermals, not "ECSS" in power notifications */ "ESSF" in thermals, not "ECSS" in power notifications */
Local1 = \_SB.PCI0.LPCB.EC0.ESSF Local1 = \_SB.PCI0.LPCB.EC0.ESSF
Or (Local1, 1, Local1) Local1 |= 1
Local2 = \_SB.PCI0.LPCB.EC0.EOSD Local2 = \_SB.PCI0.LPCB.EC0.EOSD
#endif #endif
If (Local2) // Thermal trip If (Local2) // Thermal trip

12
src/mainboard/aopen/dxplplusu/acpi/power.asl
View File

@@ -50,22 +50,22 @@ Scope (\_GPE)
/* Clear power buttons */ /* Clear power buttons */
Method (\_INI, 0, NotSerialized) Method (\_INI, 0, NotSerialized)
{ {
Or (\_SB.PCI0.ICH0.PS1H, 0x09, \_SB.PCI0.ICH0.PS1H) \_SB.PCI0.ICH0.PS1H |= 9
Or (\_SB.PCI0.ICH0.PE1H, 0x01, \_SB.PCI0.ICH0.PE1H) \_SB.PCI0.ICH0.PE1H |= 1
} }
/* Prepare To Sleep */ /* Prepare To Sleep */
Method (\_PTS, 1, NotSerialized) Method (\_PTS, 1, NotSerialized)
{ {
Or (\_SB.PCI0.ICH0.GS0H, 0x19, \_SB.PCI0.ICH0.GS0H) \_SB.PCI0.ICH0.GS0H |= 0x19
Or (\_SB.PCI0.ICH0.GS0L, 0x11, \_SB.PCI0.ICH0.GS0L) \_SB.PCI0.ICH0.GS0L |= 0x11
} }
/* System Wake */ /* System Wake */
Method (\_WAK, 1, NotSerialized) Method (\_WAK, 1, NotSerialized)
{ {
Or (\_SB.PCI0.ICH0.GS0H, 0x19, \_SB.PCI0.ICH0.GS0H) \_SB.PCI0.ICH0.GS0H |= 0x19
Or (\_SB.PCI0.ICH0.GS0L, 0x11, \_SB.PCI0.ICH0.GS0L) \_SB.PCI0.ICH0.GS0L |= 0x11
Return ( Package() { 0x0, 0x0 } ) Return ( Package() { 0x0, 0x0 } )
} }

14
src/mainboard/aopen/dxplplusu/acpi/superio.asl
View File

@@ -75,9 +75,9 @@ Method (_CRS, 0, NotSerialized)
\_SB.PCI0.ICH0.SMSC.LDN = 0x0A \_SB.PCI0.ICH0.SMSC.LDN = 0x0A
IOM1 = 0x00 IOM1 = 0x00
IOM2 = 0x00 IOM2 = 0x00
Or (\_SB.PCI0.ICH0.SMSC.IOAH, IOM1, IOM1) IOM1 |= \_SB.PCI0.ICH0.SMSC.IOAH
IOM1 <<= 8 IOM1 <<= 8
Or (\_SB.PCI0.ICH0.SMSC.IOAL, IOM1, IOM1) IOM1 |= \_SB.PCI0.ICH0.SMSC.IOAL
IOM2 = IOM1 IOM2 = IOM1
If (IOM1 != 0) If (IOM1 != 0)
{ {
@@ -111,28 +111,28 @@ Method (_INI, 0, NotSerialized)
/* GPIO initial output levels */ /* GPIO initial output levels */
Local0 = GP_1 Local0 = GP_1
And( Local0, 0x7C, Local0) And( Local0, 0x7C, Local0)
Or ( Local0, 0x81, Local0) Local0 |= 0x81
GP_1 = Local0 GP_1 = Local0
Local0 = GP_2 Local0 = GP_2
And( Local0, 0xFE, Local0) And( Local0, 0xFE, Local0)
Or ( Local0, 0x00, Local0) Local0 |= 0
GP_2 = Local0 GP_2 = Local0
Local0 = GP_3 Local0 = GP_3
And( Local0, 0x7F, Local0) And( Local0, 0x7F, Local0)
Or ( Local0, 0x80, Local0) Local0 |= 0x80
GP_3 = Local0 GP_3 = Local0
Local0 = GP_4 Local0 = GP_4
And( Local0, 0x7F, Local0) And( Local0, 0x7F, Local0)
Or ( Local0, 0x00, Local0) Local0 |= 0
GP_4 = Local0 GP_4 = Local0
/* Power Led */ /* Power Led */
Local0 = LED1 Local0 = LED1
And( Local0, 0xfc, Local0) And( Local0, 0xfc, Local0)
Or ( Local0, 0x01, Local0) Local0 |= 1
LED1 = Local0 LED1 = Local0
} }

4
src/mainboard/lenovo/s230u/acpi/gpe.asl
View File

@@ -6,7 +6,7 @@ Scope (_GPE)
Method (PNOT, 2, Serialized) { Method (PNOT, 2, Serialized) {
Local0 = Arg0 << Arg1 Local0 = Arg0 << Arg1
Not(One << Arg1, Local1) Not(One << Arg1, Local1)
Or (Local0, And (Local1, PDET), PDET) PDET = Local0 | And (Local1, PDET)
If (PDET == Zero) { If (PDET == Zero) {
// Palm removed // Palm removed
\_SB.PCI0.LPCB.EC0.HKEY.MHKQ (0x60B1) \_SB.PCI0.LPCB.EC0.HKEY.MHKQ (0x60B1)
@@ -22,7 +22,7 @@ Scope (_GPE)
Not (Local0, Local0) Not (Local0, Local0)
And (GIV0, Local0, GIV0) And (GIV0, Local0, GIV0)
} Else { } Else {
Or (GIV0, Local0, GIV0) GIV0 |= Local0
} }
} }

6
src/soc/intel/baytrail/acpi/lpe.asl
View File

@@ -87,14 +87,14 @@ Device (LPEA)
Method (_OFF) Method (_OFF)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_ON) Method (_ON)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
} }

60
src/soc/intel/baytrail/acpi/lpss.asl
View File

@@ -112,14 +112,14 @@ Device (I2C1)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -171,14 +171,14 @@ Device (I2C2)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -230,14 +230,14 @@ Device (I2C3)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -289,14 +289,14 @@ Device (I2C4)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -348,14 +348,14 @@ Device (I2C5)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -407,14 +407,14 @@ Device (I2C6)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -466,14 +466,14 @@ Device (I2C7)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -519,14 +519,14 @@ Device (SPI1)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -628,14 +628,14 @@ Device (UAR1)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -681,13 +681,13 @@ Device (UAR2)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }

18
src/soc/intel/baytrail/acpi/scc.asl
View File

@@ -41,14 +41,14 @@ Device (EMMC)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Device (EM45) Device (EM45)
@@ -104,14 +104,14 @@ Device (SDIO)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -156,13 +156,13 @@ Device (SDCD)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }

2
src/soc/intel/baytrail/acpi/southcluster.asl
View File

@@ -217,7 +217,7 @@ Method (_OSC, 4)
{ {
/* Unrecognized UUID */ /* Unrecognized UUID */
CreateDWordField (Arg3, 0, CDW1) CreateDWordField (Arg3, 0, CDW1)
Or (CDW1, 4, CDW1) CDW1 |= 4
Return (Arg3) Return (Arg3)
} }
} }

6
src/soc/intel/braswell/acpi/lpe.asl
View File

@@ -87,14 +87,14 @@ Device (LPEA)
Method (_OFF) Method (_OFF)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_ON) Method (_ON)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
} }

54
src/soc/intel/braswell/acpi/lpss.asl
View File

@@ -143,14 +143,14 @@ Device (I2C1)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -202,14 +202,14 @@ Device (I2C2)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -261,14 +261,14 @@ Device (I2C3)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -320,14 +320,14 @@ Device (I2C4)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -379,14 +379,14 @@ Device (I2C5)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -438,14 +438,14 @@ Device (I2C6)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -497,14 +497,14 @@ Device (I2C7)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -550,14 +550,14 @@ Device (UAR1)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -603,13 +603,13 @@ Device (UAR2)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }

18
src/soc/intel/braswell/acpi/scc.asl
View File

@@ -41,14 +41,14 @@ Device (EMMC)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Device (EM45) Device (EM45)
@@ -142,14 +142,14 @@ Device (SDIO)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }
@@ -194,13 +194,13 @@ Device (SDCD)
Method (_PS3) Method (_PS3)
{ {
Or (PSAT, 0x00000003, PSAT) PSAT |= 3
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
Method (_PS0) Method (_PS0)
{ {
And (PSAT, 0xfffffffc, PSAT) And (PSAT, 0xfffffffc, PSAT)
Or (PSAT, 0x00000000, PSAT) PSAT |= 0
} }
} }

2
src/soc/intel/braswell/acpi/southcluster.asl
View File

@@ -216,7 +216,7 @@ Method (_OSC, 4)
{ {
/* Unrecognized UUID */ /* Unrecognized UUID */
CreateDWordField (Arg3, 0, CDW1) CreateDWordField (Arg3, 0, CDW1)
Or (CDW1, 4, CDW1) CDW1 |= 4
Return (Arg3) Return (Arg3)
} }
} }

4
src/soc/intel/cannonlake/acpi/scs.asl
View File

@@ -53,7 +53,7 @@ Scope (\_SB.PCI0) {
PGEN = 1 // Enable PG PGEN = 1 // Enable PG
/* Set Power State to D3 */ /* Set Power State to D3 */
Or (PMCR, 0x0003, PMCR) PMCR |= 3
^TEMP = PMCR ^TEMP = PMCR
} }
@@ -223,7 +223,7 @@ Scope (\_SB.PCI0) {
PGEN = 1 /* Enable PG */ PGEN = 1 /* Enable PG */
/* Set Power State to D3 */ /* Set Power State to D3 */
Or (PMCR, 0x0003, PMCR) PMCR |= 3
^TEMP = PMCR ^TEMP = PMCR
#if CONFIG(MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE) #if CONFIG(MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE)

4
src/soc/intel/icelake/acpi/scs.asl
View File

@@ -51,7 +51,7 @@ Scope (\_SB.PCI0) {
PGEN = 1 // Enable PG PGEN = 1 // Enable PG
/* Set Power State to D3 */ /* Set Power State to D3 */
Or (PMCR, 0x0003, PMCR) PMCR |= 3
^TEMP = PMCR ^TEMP = PMCR
} }
@@ -105,7 +105,7 @@ Scope (\_SB.PCI0) {
PGEN = 1 /* Enable PG */ PGEN = 1 /* Enable PG */
/* Set Power State to D3 */ /* Set Power State to D3 */
Or (PMCR, 0x0003, PMCR) PMCR |= 3
^TEMP = PMCR ^TEMP = PMCR
} }

2
src/southbridge/intel/bd82x6x/acpi/pch.asl
View File

@@ -252,7 +252,7 @@ Method (_OSC, 4)
/* Else Return Unrecognized UUID */ /* Else Return Unrecognized UUID */
CreateDWordField (Arg3, 0, CDW1) CreateDWordField (Arg3, 0, CDW1)
Or (CDW1, 4, CDW1) CDW1 |= 4
Return (Arg3) Return (Arg3)
} }

2
src/southbridge/intel/i82801ix/acpi/ich9.asl
View File

@@ -173,7 +173,7 @@ Method (_OSC, 4)
{ {
/* Unrecognized UUID */ /* Unrecognized UUID */
CreateDWordField (Arg3, 0, CDW1) CreateDWordField (Arg3, 0, CDW1)
Or (CDW1, 4, CDW1) CDW1 |= 4
Return (Arg3) Return (Arg3)
} }
} }

2
src/southbridge/intel/i82801jx/acpi/ich10.asl
View File

@@ -175,7 +175,7 @@ Method (_OSC, 4)
{ {
/* Unrecognized UUID */ /* Unrecognized UUID */
CreateDWordField (Arg3, 0, CDW1) CreateDWordField (Arg3, 0, CDW1)
Or (CDW1, 4, CDW1) CDW1 |= 4
Return (Arg3) Return (Arg3)
} }
} }

2
src/superio/acpi/pnp.asl
View File

@@ -102,7 +102,7 @@
#define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \ #define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \
CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\
CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MAX, IO_TAG##A)\ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MAX, IO_TAG##A)\
Or (IO_FROM##_HIGH_BYTE << 8, IO_FROM##_LOW_BYTE, Local0)\ Local0 = (IO_FROM##_HIGH_BYTE << 8) | IO_FROM##_LOW_BYTE \
IO_TAG##I = Local0 \ IO_TAG##I = Local0 \
IO_TAG##A = Local0 IO_TAG##A = Local0

32
src/superio/winbond/w83627hf/acpi/superio.asl
View File

@@ -259,7 +259,7 @@ Device(SIO) {
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
/* Calculate full IO port address */ /* Calculate full IO port address */
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
/* Modify the resource template and return it */ /* Modify the resource template and return it */
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
@@ -305,7 +305,7 @@ Device(SIO) {
Local2 = IO1L Local2 = IO1L
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Local1 <<= 8 Local1 <<= 8
Or(Local1, Local2, Local1) Local1 |= Local2
If (!Local0) { If (!Local0) {
Return (FDE) Return (FDE)
} }
@@ -402,7 +402,7 @@ Device(SIO) {
And(Arg0, 0x07, Local0) And(Arg0, 0x07, Local0)
ENTER_CONFIG_MODE (1) ENTER_CONFIG_MODE (1)
And(OPT1, 0x3, Local1) And(OPT1, 0x3, Local1)
Or(Local1, Local0, OPT1) OPT1 = Local1 | Local0
EXIT_CONFIG_MODE() EXIT_CONFIG_MODE()
} }
@@ -483,7 +483,7 @@ Device(SIO) {
Local5 = IRQ0 Local5 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
/* Calculate IO port and modify template */ /* Calculate IO port and modify template */
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
IOP0 = Local1 IOP0 = Local1
IOR0 = Local1 IOR0 = Local1
@@ -579,7 +579,7 @@ Device(SIO) {
/* Mode */ /* Mode */
Local3 = OPT1 Local3 = OPT1
And (Local3, 0xF8, Local3) And (Local3, 0xF8, Local3)
Or (Local2, Local3, OPT1) OPT1 = Local2 | Local3
/* DMA off */ /* DMA off */
DMA0 = 0x04 DMA0 = 0x04
/* IRQ */ /* IRQ */
@@ -651,7 +651,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@@ -776,7 +776,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@@ -901,7 +901,7 @@ Device(SIO) {
Local0 = IO1L Local0 = IO1L
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@@ -1004,7 +1004,7 @@ Device(SIO) {
Local1 = IO1H Local1 = IO1H
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@@ -1099,8 +1099,8 @@ Device(SIO) {
Local4 = IRQ0 Local4 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
Or(Local3 << 8, Local2, Local2) Local2 |= Local3 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
IMIN = Local0 IMIN = Local0
@@ -1268,7 +1268,7 @@ Device(SIO) {
Local2 = IRQ0 Local2 = IRQ0
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)
@@ -1323,7 +1323,7 @@ Device(SIO) {
Local2 = IRQ1 Local2 = IRQ1
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)
@@ -1348,7 +1348,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (9) ENTER_CONFIG_MODE (9)
Local0 = OPT4 Local0 = OPT4
And(Local0, 63, Local0) And(Local0, 63, Local0)
Or(Local0, And(Arg0, 0x03) << 6, OPT4) OPT4 = Local0 | (And(Arg0, 0x03) << 6)
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
} }
@@ -1358,7 +1358,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (8) ENTER_CONFIG_MODE (8)
Local0 = OPT4 Local0 = OPT4
And(Local0, 63, Local0) And(Local0, 63, Local0)
Or(Local0, And(Arg0, 0x03) << 6, OPT4) OPT4 = Local0 | (And(Arg0, 0x03) << 6)
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
} }
@@ -1422,7 +1422,7 @@ Device(SIO) {
Local2 = IRQ1 Local2 = IRQ1
EXIT_CONFIG_MODE () EXIT_CONFIG_MODE ()
Or(Local1 << 8, Local0, Local0) Local0 |= Local1 << 8
CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MIN, IMIN)
CreateWordField (CRS, IO0._MAX, IMAX) CreateWordField (CRS, IO0._MAX, IMAX)