summaryrefslogtreecommitdiff
path: root/common/power_button_x86.c
diff options
context:
space:
mode:
authorEdward Hill <ecgh@chromium.org>2018-10-22 15:04:11 -0600
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-10-23 16:09:17 +0000
commit519b5dfaa3b9b610f28966db9fdf93bd5c64bf0b (patch)
treede80bd2008c74f4ae114d2db74115bd47469c1d6 /common/power_button_x86.c
parent4eaf1868bbe715abd3ecc087ebc2658b33a0e33a (diff)
downloadchrome-ec-519b5dfaa3b9b610f28966db9fdf93bd5c64bf0b.tar.gz
grunt: Increase PWR_BTN_L shutdown delay to 5 seconds
A falling edge on PWR_BTN_L causes the AP to wake back up from S5. Avoid this by increasing the delay before we assert PWR_BTN_L to be longer than the time it takes to reach S5. BUG=b:117676579 BRANCH=grunt TEST=In S0; powerb 12000; S0->S5->G3 Change-Id: Idbfcb8a8d7dc7069a0f61d4b9e8f337ad60db405 Signed-off-by: Edward Hill <ecgh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/1294949 Tested-by: Martin Roth <martinroth@chromium.org> Tested-by: Devin Lu <Devin.Lu@quantatw.com> Reviewed-by: Martin Roth <martinroth@chromium.org>
Diffstat (limited to 'common/power_button_x86.c')
-rw-r--r--common/power_button_x86.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/power_button_x86.c b/common/power_button_x86.c
index 04d43f9b9b..c05b5add50 100644
--- a/common/power_button_x86.c
+++ b/common/power_button_x86.c
@@ -55,7 +55,8 @@
* @S0 make code break code
*/
#define PWRBTN_DELAY_T0 (32 * MSEC) /* 32ms (PCH requires >16ms) */
-#define PWRBTN_DELAY_T1 (4 * SECOND - PWRBTN_DELAY_T0) /* 4 secs - t0 */
+#define PWRBTN_DELAY_T1 (CONFIG_POWER_BUTTON_SHUTDOWN_STRETCH \
+ - PWRBTN_DELAY_T0) /* 4 secs - t0 */
/*
* Length of time to stretch initial power button press to give chipset a
* chance to wake up (~100ms) and react to the press (~16ms). Also used as