diff options
| -rw-r--r-- | board/cheza/gpio.inc | 2 | ||||
| -rw-r--r-- | include/chipset.h | 8 | ||||
| -rw-r--r-- | power/sdm845.c | 53 |
3 files changed, 60 insertions, 3 deletions
diff --git a/board/cheza/gpio.inc b/board/cheza/gpio.inc index 85ea7a4a5f..302aff7f95 100644 --- a/board/cheza/gpio.inc +++ b/board/cheza/gpio.inc @@ -15,7 +15,7 @@ GPIO_INT(WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* EC_W GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* LID_OPEN_EC */ GPIO_INT(AP_RST_REQ, PIN(C, 2), GPIO_INT_RISING | GPIO_PULL_DOWN, chipset_reset_request_interrupt) /* Reset request from AP */ /* AP_RST_L is used for PMIC and AP negotiation. Don't change its state. */ -GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH, chipset_power_signal_interrupt) /* * Should always make it low, to prevent AP unexpected up. diff --git a/include/chipset.h b/include/chipset.h index 85d33425f8..66398ea059 100644 --- a/include/chipset.h +++ b/include/chipset.h @@ -129,4 +129,12 @@ void chipset_handle_reboot(void); */ void chipset_reset_request_interrupt(enum gpio_signal signal); +/** + * Chipset-specific power signal interrupt, overrides the default one. + * + * It is used in SDM845, to handle the short-low-pulse during the reset + * sequence which we don't consider it as a power-lost. + */ +void chipset_power_signal_interrupt(enum gpio_signal signal); + #endif /* __CROS_EC_CHIPSET_H */ diff --git a/power/sdm845.c b/power/sdm845.c index ded32ee64b..24429c1f37 100644 --- a/power/sdm845.c +++ b/power/sdm845.c @@ -66,6 +66,9 @@ /* Delay between power-off the system and all things (PMIC/AP) expected off */ #define SYSTEM_POWER_OFF_DELAY (350 * MSEC) +/* Delay to confirm the power lost */ +#define POWER_LOST_CONFIRM_DELAY (350 * MSEC) + /* TODO(crosbug.com/p/25047): move to HOOK_POWER_BUTTON_CHANGE */ /* 1 if the power button was pressed last time we checked */ static char power_button_was_pressed; @@ -81,6 +84,9 @@ static char lid_opened; */ static uint8_t bypass_power_lost_trigger; +/* The timestamp of the latest power lost */ +static timestamp_t latest_power_lost_time; + /* Time where we will power off, if power button still held down */ static timestamp_t power_off_deadline; @@ -137,6 +143,49 @@ void chipset_reset_request_interrupt(enum gpio_signal signal) hook_call_deferred(&chipset_reset_request_handler_data, 0); } +/* Confirm power lost if the POWER_GOOD signal keeps low for a while */ +static uint32_t chipset_is_power_lost(void) +{ + /* + * Current POWER_GOOD signal is lost and the latest power lost trigger + * happened before the confirmation delay. + */ + return (get_time().val - latest_power_lost_time.val >= + POWER_LOST_CONFIRM_DELAY) && !power_has_signals(IN_POWER_GOOD); +} + +/* The deferred handler to save the power signal */ +static void deferred_power_signal_handler(void) +{ + /* Wake the chipset task to check the power lost duration */ + task_wake(TASK_ID_CHIPSET); +} +DECLARE_DEFERRED(deferred_power_signal_handler); + +/** + * Power signal interrupt, overrides the default one. + * + * It handles the short-low-pulse during the reset sequence which we don't + * consider it as a power-lost. + */ +void chipset_power_signal_interrupt(enum gpio_signal signal) +{ + /* Call the default power signal interrupt */ + power_signal_interrupt(signal); + + /* + * It is the start of the low pulse, save the timestamp, wake the + * chipset task after POWER_LOST_CONFIRM_DELAY in order to check if it + * is a power-lost or a reset (short low-pulse). + */ + if (!(power_get_signals() & IN_POWER_GOOD)) { + /* Keep the timestamp just at the low pulse happens. */ + latest_power_lost_time = get_time(); + hook_call_deferred(&deferred_power_signal_handler_data, + POWER_LOST_CONFIRM_DELAY); + } +} + static void sdm845_lid_event(void) { /* Power task only cares about lid-open events */ @@ -467,8 +516,8 @@ 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) && !bypass_power_lost_trigger) { + /* Power lost: shutdown immediately */ + if (chipset_is_power_lost() && !bypass_power_lost_trigger) { if (power_button_was_pressed) timer_cancel(TASK_ID_CHIPSET); |