HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46052 )
Change subject: mb/*/*/dsdt.asl: Convert to ASL 2.0 syntax ......................................................................
mb/*/*/dsdt.asl: Convert to ASL 2.0 syntax
Change-Id: I1ccc3c7212ba0d5aaa81854f0035fa2945cab784 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/asus/p2b/dsdt.asl M src/mainboard/emulation/qemu-i440fx/dsdt.asl M src/mainboard/emulation/qemu-q35/dsdt.asl M src/mainboard/lippert/frontrunner-af/dsdt.asl 4 files changed, 103 insertions(+), 103 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/46052/1
diff --git a/src/mainboard/asus/p2b/dsdt.asl b/src/mainboard/asus/p2b/dsdt.asl index a2a12ba..4b01070 100644 --- a/src/mainboard/asus/p2b/dsdt.asl +++ b/src/mainboard/asus/p2b/dsdt.asl @@ -66,23 +66,23 @@ Method (_PTS, 1, NotSerialized) { /* Disable fan, blink power LED, if not turning off */ - If (LNotEqual (Arg0, 0x05)) + If (Arg0 != 0x05) { - Store (Zero, FANM) - Store (Zero, PLED) + FANM = 0 + PLED = 0 }
/* Arms SMI for device 12 */ - Store (One, TO12) + TO12 = 1 /* Put out a POST code */ - Or (Arg0, 0xF0, P80) + P80 = Arg0 | 0xF0 }
Method (_WAK, 1, NotSerialized) { /* Re-enable fan, stop power led blinking */ - Store (One, FANM) - Store (One, PLED) + FANM = 1 + PLED = 1 /* wake OK */ Return(Package(0x02){0x00, 0x00}) } @@ -211,10 +211,10 @@ CreateWordField (BUF1, _Y07._MIN, SBLO) CreateWordField (BUF1, _Y07._MAX, SBRL)
- And (_SB.PCI0.PX43.PM00, 0xFFFE, PMLO) - And (_SB.PCI0.PX43.SB00, 0xFFFE, SBLO) - Store (PMLO, PMRL) - Store (SBLO, SBRL) + PMLO = _SB.PCI0.PX43.PM00 & 0xFFFE + SBLO = _SB.PCI0.PX43.SB00 & 0xFFFE + PMRL = PMLO + SBRL = SBLO Return (BUF1) } } @@ -245,13 +245,13 @@ { Method (_MSG, 1, NotSerialized) { - If (LEqual (Arg0, Zero)) + If (Arg0 == 0) { - Store (One, MSG0) + MSG0 = 1 } Else { - Store (Zero, MSG0) + MSG0 = 0 } } } diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl index 6fd4467..6ef05f7 100644 --- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl +++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl @@ -48,7 +48,7 @@ Return (0x00) } Method(_S3D, 0, NotSerialized) { - If (LEqual(VEND, 0x1001b36)) { + If (VEND == 0x1001b36) { Return (0x03) // QXL } Else { Return (0x00) @@ -120,7 +120,7 @@ /* Methods called by hotplug devices */ Method(PCEJ, 1, NotSerialized) { // _EJ0 method - eject callback - Store(ShiftLeft(1, Arg0), B0EJ) + B0EJ = 1 << Arg0 Return (0x0) }
@@ -130,13 +130,13 @@ /* PCI hotplug notify method */ Method(PCNF, 0) { // Local0 = iterator - Store(Zero, Local0) - While (LLess(Local0, 31)) { - Increment(Local0) - If (And(PCIU, ShiftLeft(1, Local0))) { + Local0 = 0 + While (Local0 < 31) { + Local0++ + If (PCIU & (1 << Local0)) { PCNT(Local0, 1) } - If (And(PCID, ShiftLeft(1, Local0))) { + If (PCID & (1 << Local0)) { PCNT(Local0, 3) } } @@ -212,7 +212,7 @@
Method(IQST, 1, NotSerialized) { // _STA method - get status - If (And(0x80, Arg0)) { + If (0x80 & Arg0) { Return (0x09) } Return (0x0B) @@ -223,8 +223,8 @@ Interrupt(, Level, ActiveHigh, Shared) { 0 } }) CreateDWordField(PRR0, 0x05, PRRI) - If (LLess(Arg0, 0x80)) { - Store(Arg0, PRRI) + If (Arg0 < 0x80) { + PRRI = Arg0 } Return (PRR0) } @@ -242,14 +242,14 @@ Return (IQST(reg)) \ } \ Method(_DIS, 0, NotSerialized) { \ - Or(reg, 0x80, reg) \ + reg |= 0x80 \ } \ Method(_CRS, 0, NotSerialized) { \ Return (IQCR(reg)) \ } \ Method(_SRS, 1, NotSerialized) { \ CreateDWordField(Arg0, 0x05, PRRI) \ - Store(PRRI, reg) \ + reg = PRRI \ } \ }
diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl index d89d67f..8f7b7eb 100644 --- a/src/mainboard/emulation/qemu-q35/dsdt.asl +++ b/src/mainboard/emulation/qemu-q35/dsdt.asl @@ -45,31 +45,31 @@ CreateDWordField(Arg3, 0, CDW1)
// Check for proper UUID - If (LEqual(Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { + If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) { // Create DWORD-addressable fields from the Capabilities Buffer CreateDWordField(Arg3, 4, CDW2) CreateDWordField(Arg3, 8, CDW3)
// Save Capabilities DWORD2 & 3 - Store(CDW2, SUPP) - Store(CDW3, CTRL) + SUPP = CDW2 + CTRL = CDW3
// Always allow native PME, AER (no dependencies) // Never allow SHPC (no SHPC controller in this system) - And(CTRL, 0x1D, CTRL) + CTRL &= 0x1D
- If (LNotEqual(Arg1, One)) { + If (Arg1 != 1) { // Unknown revision - Or(CDW1, 0x08, CDW1) + CDW1 |= 0x08 } - If (LNotEqual(CDW3, CTRL)) { + If (CDW3 != CTRL) { // Capabilities bits were masked - Or(CDW1, 0x10, CDW1) + CDW1 |= 0x10 } // Update DWORD3 in the buffer - Store(CTRL, CDW3) + CDW3 = CTRL } Else { - Or(CDW1, 4, CDW1) // Unrecognized UUID + CDW1 |= 4 // Unrecognized UUID } Return (Arg3) } @@ -144,7 +144,7 @@ /* Zero => PIC mode, One => APIC Mode */ Name(\PICF, Zero) Method(_PIC, 1, NotSerialized) { - Store(Arg0, \PICF) + \PICF = Arg0 }
Scope(_SB) { @@ -268,7 +268,7 @@ section 6.2.8.1 */ /* Note: we provide the same info as the PCI routing table of the Bochs BIOS */ - If (LEqual(\PICF, Zero)) { + If (\PICF == 0) { Return (PRTP) } Else { Return (PRTA) @@ -291,7 +291,7 @@
Method(IQST, 1, NotSerialized) { // _STA method - get status - If (And(0x80, Arg0)) { + If (0x80 & Arg0) { Return (0x09) } Return (0x0B) @@ -302,7 +302,7 @@ Interrupt(, Level, ActiveHigh, Shared) { 0 } }) CreateDWordField(PRR0, 0x05, PRRI) - Store(And(Arg0, 0x0F), PRRI) + PRRI = Arg0 & 0x0F Return (PRR0) }
@@ -319,14 +319,14 @@ Return (IQST(reg)) \ } \ Method(_DIS, 0, NotSerialized) { \ - Or(reg, 0x80, reg) \ + reg |= 0x80 \ } \ Method(_CRS, 0, NotSerialized) { \ Return (IQCR(reg)) \ } \ Method(_SRS, 1, NotSerialized) { \ CreateDWordField(Arg0, 0x05, PRRI) \ - Store(PRRI, reg) \ + reg = PRRI \ } \ }
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl index ffae0d9..0401989 100644 --- a/src/mainboard/lippert/frontrunner-af/dsdt.asl +++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl @@ -370,20 +370,20 @@
Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) @@ -395,17 +395,17 @@ { _SB.CIRQ() } - Store(Arg0, PMOD) + PMOD = Arg0 } Method(CIRQ, 0x00, NotSerialized){ - Store(0, PIRA) - Store(0, PIRB) - Store(0, PIRC) - Store(0, PIRD) - Store(0, PIRE) - Store(0, PIRF) - Store(0, PIRG) - Store(0, PIRH) + PIRA = 0 + PIRB = 0 + PIRC = 0 + PIRD = 0 + PIRE = 0 + PIRF = 0 + PIRG = 0 + PIRH = 0 }
Name(IRQB, ResourceTemplate(){ @@ -433,7 +433,7 @@ } /* End Method(_SB.INTA._STA) */
Method(_DIS ,0) { - Store(0, PIRA) + PIRA = 0 } /* End Method(_SB.INTA._DIS) */
Method(_PRS ,0) { @@ -442,7 +442,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRA, IRQN) + IRQN = 1 << PIRA Return(IRQB) } /* Method(_SB.INTA._CRS) */
@@ -452,9 +452,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRA) + PIRA = Local0 } /* End Method(_SB.INTA._SRS) */ } /* End Device(INTA) */
@@ -471,7 +471,7 @@ } /* End Method(_SB.INTB._STA) */
Method(_DIS ,0) { - Store(0, PIRB) + PIRB = 0 } /* End Method(_SB.INTB._DIS) */
Method(_PRS ,0) { @@ -480,7 +480,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRB, IRQN) + IRQN = 1 << PIRB Return(IRQB) } /* Method(_SB.INTB._CRS) */
@@ -490,9 +490,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRB) + PIRB = Local0 } /* End Method(_SB.INTB._SRS) */ } /* End Device(INTB) */
@@ -509,7 +509,7 @@ } /* End Method(_SB.INTC._STA) */
Method(_DIS ,0) { - Store(0, PIRC) + PIRC = 0 } /* End Method(_SB.INTC._DIS) */
Method(_PRS ,0) { @@ -518,7 +518,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRC, IRQN) + IRQN = 1 << PIRC Return(IRQB) } /* Method(_SB.INTC._CRS) */
@@ -528,9 +528,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRC) + PIRC = Local0 } /* End Method(_SB.INTC._SRS) */ } /* End Device(INTC) */
@@ -547,7 +547,7 @@ } /* End Method(_SB.INTD._STA) */
Method(_DIS ,0) { - Store(0, PIRD) + PIRD = 0 } /* End Method(_SB.INTD._DIS) */
Method(_PRS ,0) { @@ -556,7 +556,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRD, IRQN) + IRQN = 1 << PIRD Return(IRQB) } /* Method(_SB.INTD._CRS) */
@@ -566,9 +566,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRD) + PIRD = Local0 } /* End Method(_SB.INTD._SRS) */ } /* End Device(INTD) */
@@ -585,7 +585,7 @@ } /* End Method(_SB.INTE._STA) */
Method(_DIS ,0) { - Store(0, PIRE) + PIRE = 0 } /* End Method(_SB.INTE._DIS) */
Method(_PRS ,0) { @@ -594,7 +594,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRE, IRQN) + IRQN = 1 << PIRE Return(IRQB) } /* Method(_SB.INTE._CRS) */
@@ -604,9 +604,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRE) + PIRE = Local0 } /* End Method(_SB.INTE._SRS) */ } /* End Device(INTE) */
@@ -623,7 +623,7 @@ } /* End Method(_SB.INTF._STA) */
Method(_DIS ,0) { - Store(0, PIRF) + PIRF = 0 } /* End Method(_SB.INTF._DIS) */
Method(_PRS ,0) { @@ -632,7 +632,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRF, IRQN) + IRQN = 1 << PIRF Return(IRQB) } /* Method(_SB.INTF._CRS) */
@@ -642,9 +642,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRF) + PIRF = Local0 } /* End Method(_SB.INTF._SRS) */ } /* End Device(INTF) */
@@ -661,7 +661,7 @@ } /* End Method(_SB.INTG._STA) */
Method(_DIS ,0) { - Store(0, PIRG) + PIRG = 0 } /* End Method(_SB.INTG._DIS) */
Method(_PRS ,0) { @@ -670,7 +670,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRG, IRQN) + IRQN = 1 << PIRG Return(IRQB) } /* Method(_SB.INTG._CRS) */
@@ -680,9 +680,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRG) + PIRG = Local0 } /* End Method(_SB.INTG._SRS) */ } /* End Device(INTG) */
@@ -699,7 +699,7 @@ } /* End Method(_SB.INTH._STA) */
Method(_DIS ,0) { - Store(0, PIRH) + PIRH = 0 } /* End Method(_SB.INTH._DIS) */
Method(_PRS ,0) { @@ -708,7 +708,7 @@
Method(_CRS ,0) { CreateWordField(IRQB, 0x1, IRQN) - ShiftLeft(1, PIRH, IRQN) + IRQN = 1 << PIRH Return(IRQB) } /* Method(_SB.INTH._CRS) */
@@ -718,9 +718,9 @@ /* Use lowest available IRQ */ FindSetRightBit(IRQM, Local0) if (Local0) { - Decrement(Local0) + Local0-- } - Store(Local0, PIRH) + PIRH = Local0 } /* End Method(_SB.INTH._SRS) */ } /* End Device(INTH) */
@@ -751,13 +751,13 @@ Method(_PTS, 1) {
/* Don't allow PCIRST# to reset USB */ - if (LEqual(Arg0,3)){ - Store(0,URRE) + if (Arg0 == 3){ + URRE = 0 }
/* Clear wake status structure. */ - Store(0, Index(WKST,0)) - Store(0, Index(WKST,1)) + WKST [0] = 0 + WKST [1] = 0 } /* End Method(_PTS) */
/* @@ -778,16 +778,16 @@ Method(_WAK, 1) {
/* Re-enable HPET */ - Store(1,HPDE) + HPDE = 1
/* Restore PCIRST# so it resets USB */ - if (LEqual(Arg0,3)){ - Store(1,URRE) + if (Arg0 == 3){ + URRE = 1 }
/* Arbitrarily clear PciExpWakeStatus */ - Store(PWST, Local1) - Store(Local1, PWST) + Local1 = PWST + PWST = Local1
Return(WKST) } /* End Method(_WAK) */ @@ -862,7 +862,7 @@ Method (_OSC, 4) { /* Check for PCI/PCI-X/PCIe GUID */ - If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) + If (Arg0 == ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) { /* Let OS control everything */ Return (Arg3) @@ -871,7 +871,7 @@ { /* Unrecognized UUID, so set bit 2 of Arg3 to 1 */ CreateDWordField (Arg3, 0, CDW1) - Or (CDW1, 4, CDW1) + CDW1 |= 4 Return (Arg3) } } /* End _OSC */ @@ -1211,10 +1211,10 @@ * 32bit (0x00000000 - TOM1) will wrap and give the same * result as 64bit (0x100000000 - TOM1). */ - Store(TOM1, MM1B) - ShiftLeft(0x10000000, 4, Local0) - Subtract(Local0, TOM1, Local0) - Store(Local0, MM1L) + MM1B = TOM1 + Local0 = 0x10000000 << 4 + Local0 -= TOM1 + MM1L = Local0
Return(CRES) /* note to change the Name buffer */ } /* end of Method(_SB.PCI0._CRS) */
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46052
to look at the new patch set (#2).
Change subject: mb/*/*/dsdt.asl: Convert to ASL 2.0 syntax ......................................................................
mb/*/*/dsdt.asl: Convert to ASL 2.0 syntax
Generated build/dsdt.dsl files for the 4 platforms with and without this patch are same.
Change-Id: I1ccc3c7212ba0d5aaa81854f0035fa2945cab784 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/asus/p2b/dsdt.asl M src/mainboard/emulation/qemu-i440fx/dsdt.asl M src/mainboard/emulation/qemu-q35/dsdt.asl M src/mainboard/lippert/frontrunner-af/dsdt.asl 4 files changed, 103 insertions(+), 103 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/46052/2
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/46052 )
Change subject: mb/*/*/dsdt.asl: Convert to ASL 2.0 syntax ......................................................................
Abandoned
squashed
-
HAOUAS Elyes (Code Review)