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

soc/intel/cannonlake/acpi: Replace LAnd() with ASL 2.0 syntax 

Replace `LAnd (a, b)` with `a && b`.

Change-Id: I259bd218ac3f786cef6e05386f6dc55ccaf6b911
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60468
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer 2021-12-29 17:03:26 +01:00
parent 5e0fc511fd
commit 53b6c206e5
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/intel/cannonlake/acpi/gpio.asl
View File

@ -61,31 +61,31 @@ Device (GPIO)
Method (GADD, 1, NotSerialized) Method (GADD, 1, NotSerialized)
{ {
/* GPIO Community 0 */ /* GPIO Community 0 */
If (LAnd (LGreaterEqual (Arg0, GPP_A0), LLessEqual (Arg0, SPI0_CLK_LOOPBK))) If (LGreaterEqual (Arg0, GPP_A0) && LLessEqual (Arg0, SPI0_CLK_LOOPBK))
{ {
Store (PID_GPIOCOM0, Local0) Store (PID_GPIOCOM0, Local0)
Subtract (Arg0, GPP_A0, Local1) Subtract (Arg0, GPP_A0, Local1)
} }
/* GPIO Community 1 */ /* GPIO Community 1 */
If (LAnd (LGreaterEqual (Arg0, GPP_D0), LLessEqual (Arg0, vSD3_CD_B))) If (LGreaterEqual (Arg0, GPP_D0) && LLessEqual (Arg0, vSD3_CD_B))
{ {
Store (PID_GPIOCOM1, Local0) Store (PID_GPIOCOM1, Local0)
Subtract (Arg0, GPP_D0, Local1) Subtract (Arg0, GPP_D0, Local1)
} }
/* GPIO Community 2 */ /* GPIO Community 2 */
If (LAnd (LGreaterEqual (Arg0, GPD0), LLessEqual (Arg0, DRAM_RESET_B))) If (LGreaterEqual (Arg0, GPD0) && LLessEqual (Arg0, DRAM_RESET_B))
{ {
Store (PID_GPIOCOM2, Local0) Store (PID_GPIOCOM2, Local0)
Subtract (Arg0, GPD0, Local1) Subtract (Arg0, GPD0, Local1)
} }
/* GPIO Community 3 */ /* GPIO Community 3 */
If (LAnd (LGreaterEqual (Arg0, HDA_BCLK), LLessEqual (Arg0, TRIGGER_OUT))) If (LGreaterEqual (Arg0, HDA_BCLK) && LLessEqual (Arg0, TRIGGER_OUT))
{ {
Store (PID_GPIOCOM3, Local0) Store (PID_GPIOCOM3, Local0)
Subtract (Arg0, HDA_BCLK, Local1) Subtract (Arg0, HDA_BCLK, Local1)
} }
/* GPIO Community 4*/ /* GPIO Community 4*/
If (LAnd (LGreaterEqual (Arg0, GPP_C0), LLessEqual (Arg0, CL_RST_B))) If (LGreaterEqual (Arg0, GPP_C0) && LLessEqual (Arg0, CL_RST_B))
{ {
Store (PID_GPIOCOM4, Local0) Store (PID_GPIOCOM4, Local0)
Subtract (Arg0, GPP_C0, Local1) Subtract (Arg0, GPP_C0, Local1)

8
src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
View File

@ -67,25 +67,25 @@ Device (GPIO)
Method (GADD, 1, NotSerialized) Method (GADD, 1, NotSerialized)
{ {
/* GPIO Community 0 */ /* GPIO Community 0 */
If (LAnd (LGreaterEqual (Arg0, GPP_A0), LLessEqual (Arg0, GSPI1_CLK_LOOPBK))) If (LGreaterEqual (Arg0, GPP_A0) && LLessEqual (Arg0, GSPI1_CLK_LOOPBK))
{ {
Store (PID_GPIOCOM0, Local0) Store (PID_GPIOCOM0, Local0)
Subtract (Arg0, GPP_A0, Local1) Subtract (Arg0, GPP_A0, Local1)
} }
/* GPIO Community 1 */ /* GPIO Community 1 */
If (LAnd (LGreaterEqual (Arg0, GPP_C0), LLessEqual (Arg0, vSSP2_RXD))) If (LGreaterEqual (Arg0, GPP_C0) && LLessEqual (Arg0, vSSP2_RXD))
{ {
Store (PID_GPIOCOM1, Local0) Store (PID_GPIOCOM1, Local0)
Subtract (Arg0, GPP_C0, Local1) Subtract (Arg0, GPP_C0, Local1)
} }
/* GPIO Community 3*/ /* GPIO Community 3*/
If (LAnd (LGreaterEqual (Arg0, GPP_K0), LLessEqual (Arg0, SPI0_CLK_LOOPBK))) If (LGreaterEqual (Arg0, GPP_K0) && LLessEqual (Arg0, SPI0_CLK_LOOPBK))
{ {
Store (PID_GPIOCOM3, Local0) Store (PID_GPIOCOM3, Local0)
Subtract (Arg0, GPP_K0, Local1) Subtract (Arg0, GPP_K0, Local1)
} }
/* GPIO Community 4*/ /* GPIO Community 4*/
If (LAnd (LGreaterEqual (Arg0, HDACPU_SDI), LLessEqual (Arg0, GPP_J11))) If (LGreaterEqual (Arg0, HDACPU_SDI) && LLessEqual (Arg0, GPP_J11))
{ {
Store (PID_GPIOCOM4, Local0) Store (PID_GPIOCOM4, Local0)
Subtract (Arg0, GPP_I0, Local1) Subtract (Arg0, GPP_I0, Local1)

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

@ -36,9 +36,7 @@ Device (HDAS)
* NHLT Query only supported for revision 1 and * NHLT Query only supported for revision 1 and
* if NHLT address and length are set in NVS. * if NHLT address and length are set in NVS.
*/ */
If (LAnd (LEqual (Arg1, One), If (LEqual (Arg1, One) && LNotEqual (NHLA, Zero) && LNotEqual (NHLL, Zero)) {
LAnd (LNotEqual (NHLA, Zero),
LNotEqual (NHLL, Zero)))) {
Return (Buffer (One) { 0x03 }) Return (Buffer (One) { 0x03 })
} Else { } Else {
Return (Buffer (One) { 0x01 }) Return (Buffer (One) { 0x01 })