diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2019-06-13 15:17:30 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-06-14 23:41:44 +0000 |
commit | 2dc17781c1a41e3c5d06d6155cac5e17e75f128a (patch) | |
tree | cd75f6f356e5a01668ccc10789507ec3af751b3b | |
parent | 96d36fbe1a838fd9571d32ed680bd0946c2d5f55 (diff) | |
download | chrome-ec-2dc17781c1a41e3c5d06d6155cac5e17e75f128a.tar.gz |
ish: make PMU reset prep isr go thru system_reset
Right now, the power management module will bypass system_reset upon
receiving a reset prep IRQ. This causes persistent data to not be
saved, and also repeated code. Change to use system_reset.
BUG=b:134089952
BRANCH=none
TEST=persistent data seems to be working better (but this is only one
of three cases that will need to be fixed)
Change-Id: If738c4423a54c4349c2d553023c6d0b49227c951
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1659234
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r-- | chip/ish/power_mgt.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chip/ish/power_mgt.c b/chip/ish/power_mgt.c index 984495de87..7d4e901a13 100644 --- a/chip/ish/power_mgt.c +++ b/chip/ish/power_mgt.c @@ -657,19 +657,14 @@ static void reset_prep_isr(void) /* mask reset prep avail interrupt */ PMU_RST_PREP = PMU_RST_PREP_INT_MASK; - /** + /* * Indicate completion of servicing the interrupt to IOAPIC first * then indicate completion of servicing the interrupt to LAPIC */ IOAPIC_EOI_REG = ISH_RESET_PREP_VEC; LAPIC_EOI_REG = 0x0; - if (pm_ctx.aon_valid) { - handle_reset_in_aontask(ISH_PM_STATE_RESET_PREP); - } else { - ish_mia_reset(); - } - + system_reset(0); __builtin_unreachable(); } |