scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-05 14:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chip/npcx/espi: Handle global reset events asserting eSPI_Reset#

Browse Source 
In case there is a sudden power loss to PCH, then there are no eSPI VW
messages sent from the PCH to EC indicating power state transition into
S5. Instead, the eSPI compatibility spec defines such events as global
reset events. For global reset events, eSPI_Reset# signal is asserted
without SLP_SUS# being asserted. This acts as an indication to the EC
that there was a global reset event.

Add a callback chipset_handle_espi_reset_assert that takes any necessary
action whenever eSPI_Reset# pin is asserted. On skylake, it would check
if power button was being pressed and release the button.

BUG=chrome-os-partner:62014
BRANCH=None
TEST=Verified that apshutdown works as expected.

Change-Id: I409afa0d00faca55ae3aa577743cedac58d4d877
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/438935
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh
2017-02-07 17:02:35 -08:00
committed by chrome-bot
parent 11c0c9e86d
commit 4ce529e25a
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chip/npcx/espi.c
View File

@@ -8,6 +8,7 @@
#include "registers.h"
#include "system.h"
#include "task.h"
#include "chipset.h"
#include "console.h"
#include "uart.h"
#include "util.h"
@@ -542,6 +543,7 @@ void espi_interrupt(void)
} /* eSPI reset (from eSPI_rst pin) */
else if (IS_BIT_SET(status, NPCX_ESPISTS_ESPIRST)) {
CPRINTS("eSPI RST");
chipset_handle_espi_reset_assert();
espi_reset_recovery();
}

6
include/chipset.h
View File

@@ -82,6 +82,11 @@ void chipset_reset(int cold_reset);
*/
void power_interrupt(enum gpio_signal signal);
/**
* Handle assert of eSPI_Reset# pin.
*/
void chipset_handle_espi_reset_assert(void);
#else /* !HAS_TASK_CHIPSET */
/*
* Allow other modules to compile if the chipset module is disabled. This is
@@ -98,6 +103,7 @@ static inline void chipset_throttle_cpu(int throttle) { }
static inline void chipset_force_shutdown(void) { }
static inline void chipset_reset(int cold_reset) { }
static inline void power_interrupt(enum gpio_signal signal) { }
static inline void chipset_handle_espi_reset_assert(void) { }
#endif /* !HAS_TASK_CHIPSET */

14
power/skylake.c
View File

@@ -92,6 +92,20 @@ static void handle_slp_sus(enum power_state state)
chipset_set_pmic_slp_sus_l(gpio_get_level(GPIO_PCH_SLP_SUS_L));
}
void chipset_handle_espi_reset_assert(void)
{
/*
* If eSPI_Reset# pin is asserted without SLP_SUS# being asserted, then
* it means that there is an unexpected power loss (global reset
* event). In this case, check if shutdown was being forced by pressing
* power button. If yes, release power button.
*/
if (power_has_signals(IN_PCH_SLP_SUS_DEASSERTED) && forcing_shutdown) {
power_button_pch_release();
forcing_shutdown = 0;
}
}
enum power_state power_handle_state(enum power_state state)
{
enum power_state new_state;