From 4adf85982fac9e6dd5de800aa371817202ad18d5 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 21 Mar 2017 11:20:26 -0700 Subject: [PATCH] UPSTREAM: google/chromeec: Ensure \_SB.LID0 is present before using it Since we want to support devices that do not have a lid but still use EC, we need to conditionally check if referencing \_SB.LID0 is valid. BUG=b:35775024 CQ-DEPEND=CL:459510 Change-Id: I11b9bca59355caa266b27322da90dde2f9aa00a5 Signed-off-by: Patrick Georgi Original-Commit-Id: 219daafa8fc27483b2a652d9428d874bf960a6a1 Original-Change-Id: I92433460ec870fb07f48e67a6dfc61e3c036a129 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://review.coreboot.org/18941 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Duncan Laurie Ignore-CL-Reviewed-on: https://review.coreboot.org/17271 Ignore-CL-Reviewed-on: https://review.coreboot.org/17346 Ignore-CL-Reviewed-on: https://review.coreboot.org/18041 Ignore-CL-Reviewed-on: https://review.coreboot.org/18814 Ignore-CL-Reviewed-on: https://review.coreboot.org/18953 Reviewed-on: https://chromium-review.googlesource.com/458636 --- src/ec/google/chromeec/acpi/ec.asl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index a40d0acbc0..67cee27adf 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -26,6 +26,9 @@ External (\_SB.DPTF.TEVT, MethodObj) External (\_SB.DPTF.TCHG, DeviceObj) #endif External (\_SB.DPTF.TPET, MethodObj) +#ifndef EC_ENABLE_LID_SWITCH +External (\_SB.LID0, DeviceObj) +#endif Device (EC0) { @@ -169,7 +172,9 @@ Device (EC0) #ifdef EC_ENABLE_LID_SWITCH Notify (LID0, 0x80) #else - Notify (\_SB.LID0, 0x80) + If (CondRefOf (\_SB.LID0)) { + Notify (\_SB.LID0, 0x80) + } #endif } @@ -181,7 +186,9 @@ Device (EC0) #ifdef EC_ENABLE_LID_SWITCH Notify (LID0, 0x80) #else - Notify (\_SB.LID0, 0x80) + If (CondRefOf (\_SB.LID0)) { + Notify (\_SB.LID0, 0x80) + } #endif }