summaryrefslogtreecommitdiff
path: root/chip/npcx/espi.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2018-03-26 08:56:39 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-04-05 03:50:18 -0700
commit5873f302c445e82669af43ee6bfcf0b4109d067e (patch)
tree6b827329d24699352d7e65eca368a99c5a6925e8 /chip/npcx/espi.c
parentd1d5dc162a8ddd6db0b71a3e95ede90b2d5e6ae6 (diff)
downloadchrome-ec-5873f302c445e82669af43ee6bfcf0b4109d067e.tar.gz
chip/npcx: Ensure software watchdog has highest priority
Before this change uart_ec_interrupt and software watchdog interrupt handler both had priority 0. Since UART IRQ number is 33, and software watchdog is 44, the UART interrupt handler would have higher prority. Fix this by increasing all interrupt handler priorities, leaving the software watchdog handler alone on priority 0. BRANCH=eve,poppy,fizz BUG=b:76391320 TEST=Cherry-pick CL:979736 (causes a watchdog in UART interrupt handler), check that panicinfo contains a sensible PC in r5 after reset. Change-Id: I97f99af5192a4a9571854a4d3f7c48a4674d605e Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/979738 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'chip/npcx/espi.c')
-rw-r--r--chip/npcx/espi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c
index 6fc3e2b919..21766701a0 100644
--- a/chip/npcx/espi.c
+++ b/chip/npcx/espi.c
@@ -503,7 +503,7 @@ void __espi_wk2a_interrupt(void)
if (IS_BIT_SET(pending_bits, 6))
espi_vw_evt_oobrst();
}
-DECLARE_IRQ(NPCX_IRQ_WKINTA_2, __espi_wk2a_interrupt, 2);
+DECLARE_IRQ(NPCX_IRQ_WKINTA_2, __espi_wk2a_interrupt, 3);
/* Handle eSPI virtual wire interrupt 2 */
void __espi_wk2b_interrupt(void)
@@ -519,7 +519,7 @@ void __espi_wk2b_interrupt(void)
if (IS_BIT_SET(pending_bits, 0))
espi_vw_evt_hostrst_warn();
}
-DECLARE_IRQ(NPCX_IRQ_WKINTB_2, __espi_wk2b_interrupt, 2);
+DECLARE_IRQ(NPCX_IRQ_WKINTB_2, __espi_wk2b_interrupt, 3);
/* Interrupt handler for eSPI status changed */
void espi_interrupt(void)
@@ -595,7 +595,7 @@ void espi_interrupt(void)
status = NPCX_ESPISTS & mask;
}
}
-DECLARE_IRQ(NPCX_IRQ_ESPI, espi_interrupt, 3);
+DECLARE_IRQ(NPCX_IRQ_ESPI, espi_interrupt, 4);
/*****************************************************************************/
/* eSPI Initialization functions */