summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2017-04-20 14:48:21 +0000
committerchrome-bot <chrome-bot@chromium.org>2017-04-21 06:03:57 -0700
commit30bd74b23314f6cd75e1153e3e7be5e19252537f (patch)
tree24413368ad48e937edbaa5c005249e8a2553896a
parent60d1bc789121fc3be998b48e8e93cafe8ec84069 (diff)
downloadchrome-ec-30bd74b23314f6cd75e1153e3e7be5e19252537f.tar.gz
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 <philipchen@chromium.org> > Tested-by: Philip Chen <philipchen@chromium.org> > Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> > 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 <dlaurie@chromium.org> Tested-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat
-rw-r--r--chip/host/system.c2
-rw-r--r--chip/ish/system.c2
-rw-r--r--chip/it83xx/system.c2
-rw-r--r--chip/lm4/system.c2
-rw-r--r--chip/mec1322/system.c2
-rw-r--r--chip/npcx/system.c2
-rw-r--r--chip/nrf51/system.c2
-rw-r--r--chip/stm32/system.c2
-rw-r--r--common/system.c18
-rw-r--r--include/system.h6
10 files changed, 8 insertions, 32 deletions
diff --git a/chip/host/system.c b/chip/host/system.c
index 4acb19a2cd..3820048fad 100644
--- a/chip/host/system.c
+++ b/chip/host/system.c
@@ -150,7 +150,7 @@ test_mockable void system_reset(int flags)
emulator_reboot();
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+test_mockable void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
uint32_t i;
diff --git a/chip/ish/system.c b/chip/ish/system.c
index 7fe3860d9a..7110e85645 100644
--- a/chip/ish/system.c
+++ b/chip/ish/system.c
@@ -96,7 +96,7 @@ uint32_t system_get_scratchpad(void)
return 0;
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
}
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index bdae81daba..0ad1be657b 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -18,7 +18,7 @@
#include "version.h"
#include "watchdog.h"
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
#ifdef CONFIG_HOSTCMD_PD
/* Inform the PD MCU that we are going to hibernate. */
diff --git a/chip/lm4/system.c b/chip/lm4/system.c
index 4ddfef4e35..684b520dae 100644
--- a/chip/lm4/system.c
+++ b/chip/lm4/system.c
@@ -381,7 +381,7 @@ static void hibernate(uint32_t seconds, uint32_t microseconds, uint32_t flags)
__enter_hibernate(hibctl | LM4_HIBCTL_HIBREQ);
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index ba4b574b06..4b2738e969 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -215,7 +215,7 @@ uint32_t system_get_scratchpad(void)
return MEC1322_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD);
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
int i;
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index 4a8b5e65f4..be7f47135c 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -596,7 +596,7 @@ void system_enable_hib_interrupt(void)
task_enable_irq(NPCX_IRQ_MTC_WKINTAD_0);
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/nrf51/system.c b/chip/nrf51/system.c
index e2891831a0..61bd2311a8 100644
--- a/chip/nrf51/system.c
+++ b/chip/nrf51/system.c
@@ -31,7 +31,7 @@ const char *system_get_chip_revision(void)
return "";
}
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
/* Flush console before hibernating */
cflush();
diff --git a/chip/stm32/system.c b/chip/stm32/system.c
index 43461579d7..b81dc0055c 100644
--- a/chip/stm32/system.c
+++ b/chip/stm32/system.c
@@ -103,7 +103,7 @@ void __no_hibernate(uint32_t seconds, uint32_t microseconds)
void __enter_hibernate(uint32_t seconds, uint32_t microseconds)
__attribute__((weak, alias("__no_hibernate")));
-void chip_hibernate(uint32_t seconds, uint32_t microseconds)
+void system_hibernate(uint32_t seconds, uint32_t microseconds)
{
#ifdef CONFIG_HOSTCMD_PD
/* Inform the PD MCU that we are going to hibernate. */
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.
*
diff --git a/include/system.h b/include/system.h
index 48af1c332a..26a57d9d61 100644
--- a/include/system.h
+++ b/include/system.h
@@ -322,12 +322,6 @@ int system_set_bbram(enum system_bbram_idx idx, uint8_t value);
void system_hibernate(uint32_t seconds, uint32_t microseconds);
/**
- * Chip-level callback functions called in system_hibernate() after we force
- * to shutdown the chipset and get ready to enter hibernate mode.
- */
-void chip_hibernate(uint32_t seconds, uint32_t microseconds);
-
-/**
* Optional board-level callback functions called before and after initiating
* chip-level hibernate sequence. These function may or may not return,
* depending if the board implements an alternate hibernate method. The _late
View Lorry Controller Status