GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soc/intel/skylake/acpi/gpio.asl: Use ASL 2.0 syntax

Browse source 
While we're at it, fix up cosmetics on a few comments.

Some methods deliberately remain untouched in this commit, so as not to
collide with another patch train that already takes care of them.

Tested with BUILD_TIMELESS=1, Purism Librem 15v4 does not change.

Change-Id: Ib27c5b48459e3ea7eabc34457cb204994ee9b617
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45691
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-09-24 16:15:07 +02:00
parent 1d70a331cb
commit 5d207ce654
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/soc/intel/skylake/acpi/gpio.asl
View file

@ -22,29 +22,28 @@ Device (GPIO)
/* GPIO Community 0 */ /* GPIO Community 0 */
CreateDWordField (^RBUF, ^COM0._BAS, BAS0) CreateDWordField (^RBUF, ^COM0._BAS, BAS0)
CreateDWordField (^RBUF, ^COM0._LEN, LEN0) CreateDWordField (^RBUF, ^COM0._LEN, LEN0)
Store (^^PCRB (PID_GPIOCOM0), BAS0) BAS0 = ^^PCRB (PID_GPIOCOM0)
Store (GPIO_BASE_SIZE, LEN0) LEN0 = GPIO_BASE_SIZE
/* GPIO Community 1 */ /* GPIO Community 1 */
CreateDWordField (^RBUF, ^COM1._BAS, BAS1) CreateDWordField (^RBUF, ^COM1._BAS, BAS1)
CreateDWordField (^RBUF, ^COM1._LEN, LEN1) CreateDWordField (^RBUF, ^COM1._LEN, LEN1)
Store (^^PCRB (PID_GPIOCOM1), BAS1) BAS1 = ^^PCRB (PID_GPIOCOM1)
Store (GPIO_BASE_SIZE, LEN1) LEN1 = GPIO_BASE_SIZE
/* GPIO Community 3 */ /* GPIO Community 3 */
CreateDWordField (^RBUF, ^COM3._BAS, BAS3) CreateDWordField (^RBUF, ^COM3._BAS, BAS3)
CreateDWordField (^RBUF, ^COM3._LEN, LEN3) CreateDWordField (^RBUF, ^COM3._LEN, LEN3)
Store (^^PCRB (PID_GPIOCOM3), BAS3) BAS3 = ^^PCRB (PID_GPIOCOM3)
Store (GPIO_BASE_SIZE, LEN3) LEN3 = GPIO_BASE_SIZE
CreateDWordField (^RBUF, ^GIRQ._INT, IRQN) CreateDWordField (^RBUF, ^GIRQ._INT, IRQN)
And (^^PCRR (PID_GPIOCOM0, GPIO_MISCCFG), Local0 = ^^PCRR (PID_GPIOCOM0, GPIO_MISCCFG) & GPIO_DRIVER_IRQ_ROUTE_MASK
GPIO_DRIVER_IRQ_ROUTE_MASK, Local0)
If (LEqual (Local0, GPIO_DRIVER_IRQ_ROUTE_IRQ14)) { If (Local0 == GPIO_DRIVER_IRQ_ROUTE_IRQ14) {
Store (GPIO_IRQ14, IRQN) IRQN = GPIO_IRQ14
} Else { } Else {
Store (GPIO_IRQ15, IRQN) IRQN = GPIO_IRQ15
} }
Return (RBUF) Return (RBUF)
@ -64,44 +63,45 @@ Method (GADD, 1, NotSerialized)
{ {
#if CONFIG(SKYLAKE_SOC_PCH_H) #if CONFIG(SKYLAKE_SOC_PCH_H)
/* GPIO Community 0 */ /* GPIO Community 0 */
If (LAnd (LGreaterEqual (Arg0, GPP_A0), LLessEqual (Arg0, GPP_B23))) If ((Arg0 >= GPP_A0) && (Arg0 <= GPP_B23))
{ {
Store (PID_GPIOCOM0, Local0) Local0 = PID_GPIOCOM0
Subtract (Arg0, GPP_A0, Local1) Local1 = Arg0 - GPP_A0
} }
/* GPIO Community 1 */ /* GPIO Community 1 */
If (LAnd (LGreaterEqual (Arg0, GPP_C0), LLessEqual (Arg0, GPP_H23))) If ((Arg0 >= GPP_C0) && (Arg0 <= GPP_H23))
{ {
Store (PID_GPIOCOM1, Local0) Local0 = PID_GPIOCOM1
Subtract (Arg0, GPP_C0, Local1) Local1 = Arg0 - GPP_C0
} }
/* GPIO Community 03 */ /* GPIO Community 3 */
If (LAnd (LGreaterEqual (Arg0, GPP_I0), LLessEqual (Arg0, GPP_I10))) If ((Arg0 >= GPP_I0) && (Arg0 <= GPP_I10))
{ {
Store (PID_GPIOCOM3, Local0) Local0 = PID_GPIOCOM3
Subtract (Arg0, GPP_I0, Local1) Local1 = Arg0 - GPP_I0
} }
#else #else
/* GPIO Community 0 */ /* GPIO Community 0 */
If (LAnd (LGreaterEqual (Arg0, GPP_A0), LLessEqual (Arg0, GPP_B23))) If ((Arg0 >= GPP_A0) && (Arg0 <= GPP_B23))
{ {
Store (PID_GPIOCOM0, Local0) Local0 = PID_GPIOCOM0
Subtract (Arg0, GPP_A0, Local1) Local1 = Arg0 - GPP_A0
} }
/* GPIO Community 1 */ /* GPIO Community 1 */
If (LAnd (LGreaterEqual (Arg0, GPP_C0), LLessEqual (Arg0, GPP_E23))) If ((Arg0 >= GPP_C0) && (Arg0 <= GPP_E23))
{ {
Store (PID_GPIOCOM1, Local0) Local0 = PID_GPIOCOM1
Subtract (Arg0, GPP_C0, Local1) Local1 = Arg0 - GPP_C0
} }
/* GPIO Community 03*/ /* GPIO Community 3 */
If (LAnd (LGreaterEqual (Arg0, GPP_F0), LLessEqual (Arg0, GPP_G7))) If ((Arg0 >= GPP_F0) && (Arg0 <= GPP_G7))
{ {
Store (PID_GPIOCOM3, Local0) Local0 = PID_GPIOCOM3
Subtract (Arg0, GPP_F0, Local1) Local1 = Arg0 - GPP_F0
} }
#endif /* CONFIG_SKYLAKE_SOC_PCH_H */ #endif /* CONFIG_SKYLAKE_SOC_PCH_H */
Store (PCRB (Local0), Local2)
Add (Local2, PAD_CFG_BASE, Local2) Local2 = PCRB (Local0)
Return (Add (Local2, Multiply (Local1, 8))) Local2 += PAD_CFG_BASE
Return (Local2 + (Local1 * 8))
} }