From 30bd74b23314f6cd75e1153e3e7be5e19252537f Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 20 Apr 2017 14:48:21 +0000 Subject: Revert "system: Shutdown AP before entering hibernate mode" This reverts commit 20c439be209a9cc0bb949ad21f289c453126395f. Reason for revert: This breaks hibernate on skylake boards and needs to be tested on more than just kevin before submitting. BUG=chromium:702451 BRANCH=none TEST=power down and successfully hibernate on Eve Original change's description: > system: Shutdown AP before entering hibernate mode > > BUG=chromium:702451 > BRANCH=none > TEST=manually test on gru: confirm > 'Alt+VolUp+h' puts gru in hibernate mode and > AC plug-in wakes it up. > > Change-Id: I3e1134b866dea5d3cc61f9b3dad31c3ff0bd9096 > Reviewed-on: https://chromium-review.googlesource.com/470787 > Commit-Ready: Philip Chen > Tested-by: Philip Chen > Reviewed-by: Aseda Aboagye > TBR=rspangler@chromium.org,aaboagye@chromium.org,philipchen@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. BUG=chromium:702451 Change-Id: Ie847a5e3efb28256b00ddc6534d8ae6bbbba7121 Reviewed-on: https://chromium-review.googlesource.com/482989 Commit-Ready: Duncan Laurie Tested-by: Duncan Laurie Reviewed-by: Philip Chen Reviewed-by: Duncan Laurie --- common/system.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'common') diff --git a/common/system.c b/common/system.c index 73a23ccee6..b9e444c71c 100644 --- a/common/system.c +++ b/common/system.c @@ -4,7 +4,6 @@ */ /* System module for Chrome EC : common functions */ -#include "chipset.h" #include "clock.h" #include "common.h" #include "console.h" @@ -409,23 +408,6 @@ const char *system_image_copy_t_to_string(enum system_image_copy_t copy) return image_names[copy < ARRAY_SIZE(image_names) ? copy : 0]; } -test_mockable void system_hibernate(uint32_t seconds, uint32_t microseconds) -{ -#ifdef HAS_TASK_CHIPSET - /* Wait up to a second for chipset to shut down */ - int retries = 100; - - chipset_force_shutdown(); - while (--retries) { - if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) - break; - msleep(10); - } - if (!retries) - CPRINTS("Hibernate before chipset shutdown"); -#endif - chip_hibernate(seconds, microseconds); -} /** * Jump to what we hope is the init address of an image. * -- cgit v1.2.1