diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2018-04-03 05:44:52 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-03 18:47:12 -0700 |
| commit | a9c7d6b0d73eaf0c48438124b40fc054183701aa (patch) | |
| tree | f921024e21f5e6efd707f0b49a8ad75c7a3bc0ee /common | |
| parent | 228dc8d1193d2b4c26f60a9da779803bd41fe172 (diff) | |
| download | chrome-ec-a9c7d6b0d73eaf0c48438124b40fc054183701aa.tar.gz | |
Code cleanup: Remove cold reset logic
Majority of the chipsets do not have a dedicated GPIO to trigger
AP cold reset. Current code either ignores cold reset or does a warm
reset instead or have a work around to put AP in S5 and then bring
back to S0. In order to avoid the confusion, removed the cold reset
logic and only apreset is used hence forth.
BUG=b:72426192
BRANCH=none
TEST=make buildall -j
Manually tested on GLKRVP, apreset EC command can reset AP.
Change-Id: Ie32d34f2f327ff1b61b32a4d874250dce024cf35
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/991052
Commit-Ready: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/ap_hang_detect.c | 2 | ||||
| -rw-r--r-- | common/button.c | 4 | ||||
| -rw-r--r-- | common/chipset.c | 13 | ||||
| -rw-r--r-- | common/keyboard_8042.c | 2 | ||||
| -rw-r--r-- | common/keyboard_scan.c | 2 |
5 files changed, 8 insertions, 15 deletions
diff --git a/common/ap_hang_detect.c b/common/ap_hang_detect.c index b5098e15b2..45e735e526 100644 --- a/common/ap_hang_detect.c +++ b/common/ap_hang_detect.c @@ -41,7 +41,7 @@ static void hang_detect_deferred(void) if (timeout_will_reboot) { CPRINTS("hang detect triggering warm reboot"); host_set_single_event(EC_HOST_EVENT_HANG_REBOOT); - chipset_reset(0); + chipset_reset(); active = 0; return; } diff --git a/common/button.c b/common/button.c index 5a48c8842e..6190f414bb 100644 --- a/common/button.c +++ b/common/button.c @@ -416,7 +416,7 @@ static void debug_mode_handle(void) host_send_sysrq('x'); CPRINTS("DEBUG MODE: sysrq-x sent"); } else { - chipset_reset(0); + chipset_reset(); CPRINTS("DEBUG MODE: Warm reset triggered"); } recovery_button_pressed = 0; @@ -531,7 +531,7 @@ static void debug_mode_transition(enum debug_state next_state) break; case STATE_WARM_RESET_EXEC: /* Warm reset the host and transition to STATE_NONE. */ - chipset_reset(0); + chipset_reset(); CPRINTS("DEBUG MODE: Warm reset triggered"); curr_debug_state = STATE_DEBUG_NONE; break; diff --git a/common/chipset.c b/common/chipset.c index 1d236fdc14..7a2101624a 100644 --- a/common/chipset.c +++ b/common/chipset.c @@ -20,20 +20,13 @@ #ifdef CONFIG_CMD_POWER_AP static int command_apreset(int argc, char **argv) { - int is_cold = 1; - - if (argc > 1 && !strcasecmp(argv[1], "cold")) - is_cold = 1; - else if (argc > 1 && !strcasecmp(argv[1], "warm")) - is_cold = 0; - /* Force the chipset to reset */ - ccprintf("Issuing AP %s reset...\n", is_cold ? "cold" : "warm"); - chipset_reset(is_cold); + ccprintf("Issuing AP reset...\n"); + chipset_reset(); return EC_SUCCESS; } DECLARE_CONSOLE_COMMAND(apreset, command_apreset, - "[warm | cold]", + NULL, "Issue AP reset"); static int command_apshutdown(int argc, char **argv) diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 3e1836a518..b18be07649 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -729,7 +729,7 @@ static int handle_keyboard_command(uint8_t command, uint8_t *output) break; case I8042_SYSTEM_RESET: - chipset_reset(0); + chipset_reset(); break; default: diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 34474917b3..e63c164100 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -358,7 +358,7 @@ static int check_runtime_keys(const uint8_t *state) /* R = reboot */ CPRINTS("KB warm reboot"); keyboard_clear_buffer(); - chipset_reset(0); + chipset_reset(); return 1; } else if (state[KEYBOARD_COL_KEY_H] == KEYBOARD_MASK_KEY_H) { /* H = hibernate */ |