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

soc/intel/denverton_ns: Convert to ASL 2.0 syntax

Browse Source 
Change-Id: I261add8142c3192ab944845e8e1a362a3aca00c8
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46240
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Mariusz Szafrański <mariuszx.szafranski@intel.com>
This commit is contained in:
Elyes HAOUAS
2020-10-09 15:04:49 +02:00
committed by Patrick Georgi
parent d3a1560609
commit e49856dfa8
4 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/soc/intel/denverton_ns/acpi/globalnvs.asl
View File

@ -62,27 +62,27 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
/* Set flag to enable USB charging in S3 */ /* Set flag to enable USB charging in S3 */
Method (S3UE) Method (S3UE)
{ {
Store (One, \S3U0) \S3U0 = 1
Store (One, \S3U1) \S3U1 = 1
} }
/* Set flag to disable USB charging in S3 */ /* Set flag to disable USB charging in S3 */
Method (S3UD) Method (S3UD)
{ {
Store (Zero, \S3U0) \S3U0 = 0
Store (Zero, \S3U1) \S3U1 = 0
} }
/* Set flag to enable USB charging in S5 */ /* Set flag to enable USB charging in S5 */
Method (S5UE) Method (S5UE)
{ {
Store (One, \S5U0) \S5U0 = 1
Store (One, \S5U1) \S5U1 = 1
} }
/* Set flag to disable USB charging in S5 */ /* Set flag to disable USB charging in S5 */
Method (S5UD) Method (S5UD)
{ {
Store (Zero, \S5U0) \S5U0 = 0
Store (Zero, \S5U1) \S5U1 = 0
} }

96
src/soc/intel/denverton_ns/acpi/irqlinks.asl
View File

@ -8,7 +8,7 @@ Device (LNKA)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTA) PRTA = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -28,10 +28,10 @@ Device (LNKA)
CreateWordField(RTLA, 1, IRQ0) CreateWordField(RTLA, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTA // Set the bit from PRTA
ShiftLeft(1, And(PRTA, 0x0f), IRQ0) IRQ0 = 1 << (PRTA & 0x0f)
Return (RTLA) Return (RTLA)
} }
@ -44,14 +44,14 @@ Device (LNKA)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTA) PRTA = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTA, 0x80)) { If (PRTA & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -67,7 +67,7 @@ Device (LNKB)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTB) PRTB = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -87,10 +87,10 @@ Device (LNKB)
CreateWordField(RTLB, 1, IRQ0) CreateWordField(RTLB, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTB // Set the bit from PRTB
ShiftLeft(1, And(PRTB, 0x0f), IRQ0) IRQ0 = 1 << (PRTB & 0x0f)
Return (RTLB) Return (RTLB)
} }
@ -103,14 +103,14 @@ Device (LNKB)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTB) PRTB = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTB, 0x80)) { If (PRTB & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -126,7 +126,7 @@ Device (LNKC)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTC) PRTC = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -146,10 +146,10 @@ Device (LNKC)
CreateWordField(RTLC, 1, IRQ0) CreateWordField(RTLC, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTC // Set the bit from PRTC
ShiftLeft(1, And(PRTC, 0x0f), IRQ0) IRQ0 = 1 << (PRTC & 0x0f)
Return (RTLC) Return (RTLC)
} }
@ -162,14 +162,14 @@ Device (LNKC)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTC) PRTC = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTC, 0x80)) { If (PRTC & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -185,7 +185,7 @@ Device (LNKD)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTD) PRTD = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -205,10 +205,10 @@ Device (LNKD)
CreateWordField(RTLD, 1, IRQ0) CreateWordField(RTLD, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTD // Set the bit from PRTD
ShiftLeft(1, And(PRTD, 0x0f), IRQ0) IRQ0 = 1 << (PRTD & 0x0f)
Return (RTLD) Return (RTLD)
} }
@ -221,14 +221,14 @@ Device (LNKD)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTD) PRTD = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTD, 0x80)) { If (PRTD & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -244,7 +244,7 @@ Device (LNKE)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTE) PRTE = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -264,10 +264,10 @@ Device (LNKE)
CreateWordField(RTLE, 1, IRQ0) CreateWordField(RTLE, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTE // Set the bit from PRTE
ShiftLeft(1, And(PRTE, 0x0f), IRQ0) IRQ0 = 1 << (PRTE & 0x0f)
Return (RTLE) Return (RTLE)
} }
@ -280,14 +280,14 @@ Device (LNKE)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTE) PRTE = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTE, 0x80)) { If (PRTE & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -303,7 +303,7 @@ Device (LNKF)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTF) PRTF = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -323,10 +323,10 @@ Device (LNKF)
CreateWordField(RTLF, 1, IRQ0) CreateWordField(RTLF, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTF // Set the bit from PRTF
ShiftLeft(1, And(PRTF, 0x0f), IRQ0) IRQ0 = 1 << (PRTF & 0x0f)
Return (RTLF) Return (RTLF)
} }
@ -339,14 +339,14 @@ Device (LNKF)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTF) PRTF = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTF, 0x80)) { If (PRTF & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -362,7 +362,7 @@ Device (LNKG)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTG) PRTG = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -382,10 +382,10 @@ Device (LNKG)
CreateWordField(RTLG, 1, IRQ0) CreateWordField(RTLG, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTG // Set the bit from PRTG
ShiftLeft(1, And(PRTG, 0x0f), IRQ0) IRQ0 = 1 << (PRTG & 0x0f)
Return (RTLG) Return (RTLG)
} }
@ -398,14 +398,14 @@ Device (LNKG)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTG) PRTG = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTG, 0x80)) { If (PRTG & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)
@ -421,7 +421,7 @@ Device (LNKH)
// Disable method // Disable method
Method (_DIS, 0, Serialized) Method (_DIS, 0, Serialized)
{ {
Store (0x80, PRTH) PRTH = 0x80
} }
// Possible Resource Settings for this Link // Possible Resource Settings for this Link
@ -441,10 +441,10 @@ Device (LNKH)
CreateWordField(RTLH, 1, IRQ0) CreateWordField(RTLH, 1, IRQ0)
// Clear the WordField // Clear the WordField
Store (Zero, IRQ0) IRQ0 = 0
// Set the bit from PRTH // Set the bit from PRTH
ShiftLeft(1, And(PRTH, 0x0f), IRQ0) IRQ0 = 1 << (PRTH & 0x0f)
Return (RTLH) Return (RTLH)
} }
@ -457,14 +457,14 @@ Device (LNKH)
// Which bit is set? // Which bit is set?
FindSetRightBit(IRQ0, Local0) FindSetRightBit(IRQ0, Local0)
Decrement(Local0) Local0--
Store(Local0, PRTH) PRTH = Local0
} }
// Status // Status
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
{ {
If(And(PRTH, 0x80)) { If (PRTH & 0x80) {
Return (0x9) Return (0x9)
} Else { } Else {
Return (0xb) Return (0xb)

16
src/soc/intel/denverton_ns/acpi/northcluster.asl
View File

@ -97,9 +97,9 @@ Method (_CRS, 0, Serialized)
CreateDwordField(MCRS, ^PM01._LEN, PLEN) CreateDwordField(MCRS, ^PM01._LEN, PLEN)
// MMIO Low is saved in NVS // MMIO Low is saved in NVS
Store (\MMOB, PMIN) PMIN = \MMOB
Store (\MMOL, PMAX) PMAX = \MMOL
Add (Subtract (PMAX, PMIN), 1, PLEN) PLEN = PMAX - PMIN + 1
// Find PCI resource area in MCRS // Find PCI resource area in MCRS
CreateQWordField(MCRS, ^PM02._MIN, P2MN) CreateQWordField(MCRS, ^PM02._MIN, P2MN)
@ -107,9 +107,9 @@ Method (_CRS, 0, Serialized)
CreateQWordField(MCRS, ^PM02._LEN, P2LN) CreateQWordField(MCRS, ^PM02._LEN, P2LN)
// MMIO High is saved in NVS // MMIO High is saved in NVS
Store(\MMHB, P2MN) P2MN = \MMHB
Store(\MMHL, P2MX) P2MX = \MMHL
Add(Subtract(P2MX,P2MN),1,P2LN) P2LN = P2MX - P2MN +1
Return (MCRS) Return (MCRS)
} // End _CRS } // End _CRS
@ -132,9 +132,9 @@ Device (PDRC)
{ {
// Fix up 32-bit TSEG // Fix up 32-bit TSEG
CreateDWordField(PDRS, ^TSMB._BAS, TSMN) CreateDWordField(PDRS, ^TSMB._BAS, TSMN)
Store(\TSGB, TSMN) TSMN = \TSGB
CreateDWordField(PDRS, ^TSMB._LEN, TSLN) CreateDWordField(PDRS, ^TSMB._LEN, TSLN)
Store(\TSSZ, TSLN) TSLN = \TSSZ
Return(PDRS) Return(PDRS)
} }
} }

4
src/soc/intel/denverton_ns/acpi/southcluster.asl
View File

@ -128,7 +128,7 @@ Device (P2SB)
Method (_OSC, 4) Method (_OSC, 4)
{ {
/* Check for proper GUID */ /* 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 */ /* Let OS control everything */
Return (Arg3) Return (Arg3)
@ -137,7 +137,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)
} }
} }