summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2018-04-21 11:06:51 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-05-08 13:17:13 -0700
commit71e966af61f3e4b23e658f42552938c9d6941228 (patch)
treea274871e29466717adee085ba9b02973f88f7333 /power
parent139b84f5b0ed20bc14ce76cb5e2e16a11165b3bd (diff)
downloadchrome-ec-71e966af61f3e4b23e658f42552938c9d6941228.tar.gz
cheza: Enable AP_RST_REQ as a request from AP to reset itself
This makes the EC listen to the AP_RST_REQ GPIO from AP. The rising edge interrupts to trigger a hook to call chipset_reset(). As the hook task will be preempted by the chipset task, it adds a flag bypass_power_lost_trigger to avoid triggering to S5 as the chipset state machines sees power lost during the reset. So far the chipset_reset() implementation is to do a cold reset; will be revised to a warm reset after the PMIC registers are reprogrammed. BRANCH=none BUG=b:74395451 TEST=make buildall -j TEST=Ran 'reboot' on AP console which toggles the GPIO. Change-Id: I946cb029541ce018a8ed1ce25681d38998a7f4b6 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/1023986 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/sdm845.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/power/sdm845.c b/power/sdm845.c
index fb3eb40efc..ded32ee64b 100644
--- a/power/sdm845.c
+++ b/power/sdm845.c
@@ -73,6 +73,14 @@ static char power_button_was_pressed;
/* 1 if lid-open event has been detected */
static char lid_opened;
+/*
+ * 1 if power state is controlled by special functions, like a console command
+ * or an interrupt handler, for bypassing POWER_GOOD lost trigger. It is
+ * because these functions control the PMIC and AP power signals directly and
+ * don't want to get preempted by the chipset state machine.
+ */
+static uint8_t bypass_power_lost_trigger;
+
/* Time where we will power off, if power button still held down */
static timestamp_t power_off_deadline;
@@ -116,6 +124,19 @@ enum power_on_event_t {
POWER_ON_EVENT_COUNT,
};
+/* AP-requested reset GPIO interrupt handlers */
+static void chipset_reset_request_handler(void)
+{
+ CPRINTS("AP wants reset");
+ chipset_reset();
+}
+DECLARE_DEFERRED(chipset_reset_request_handler);
+
+void chipset_reset_request_interrupt(enum gpio_signal signal)
+{
+ hook_call_deferred(&chipset_reset_request_handler_data, 0);
+}
+
static void sdm845_lid_event(void)
{
/* Power task only cares about lid-open events */
@@ -257,6 +278,9 @@ enum power_state power_chipset_init(void)
int init_power_state;
uint32_t reset_flags = system_get_reset_flags();
+ /* Enable reboot control input from AP */
+ gpio_enable_interrupt(GPIO_AP_RST_REQ);
+
/*
* Force the AP shutdown unless we are doing SYSJUMP. Otherwise,
* the AP could stay in strange state.
@@ -444,7 +468,7 @@ static int check_for_power_off_event(void)
power_button_was_pressed = pressed;
/* POWER_GOOD released by AP : shutdown immediately */
- if (!power_has_signals(IN_POWER_GOOD)) {
+ if (!power_has_signals(IN_POWER_GOOD) && !bypass_power_lost_trigger) {
if (power_button_was_pressed)
timer_cancel(TASK_ID_CHIPSET);
@@ -474,7 +498,9 @@ void chipset_reset(void)
* reset pin and zero-latency. We do cold reset instead.
*/
CPRINTS("EC triggered cold reboot");
+ bypass_power_lost_trigger = 1;
power_off();
+ bypass_power_lost_trigger = 0;
/* Issue a request to initiate a power-on sequence */
power_request = POWER_REQ_ON;