diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-09-23 13:11:46 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-23 21:09:34 -0700 |
| commit | 5fa727805ca3222e9268755c54c15bbf87c5b2bd (patch) | |
| tree | ebbbcb27e0d7842a98c12a1c9210c3d0a4aac94b | |
| parent | a87663f6dc431e8154b77c49ad7eaa8eb0e7bc4e (diff) | |
| download | chrome-ec-5fa727805ca3222e9268755c54c15bbf87c5b2bd.tar.gz | |
npcx: gpio: Remove DEBUG_GPIO to make gpio_interrupt reentrant
GPIO interrupt priority levels can vary (notably, SHI CS interrupt is
higher) so gpio_interrupt must be reentrant.
BUG=chrome-os-partner:57434
BRANCH=Kevin
TEST=Stress test on kevin 'pd 1 reset' with OEM charger attached, verify
pdcmd task never gets wedged with TCPC ALERT stuck low.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: If853b80ebcef622480389a7cc94e851de0f8bb20
Reviewed-on: https://chromium-review.googlesource.com/388745
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
(cherry picked from commit 011da7eb51c10a8e108bae0e489ff3ddc848ee33)
Reviewed-on: https://chromium-review.googlesource.com/388749
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | chip/npcx/gpio.c | 4 | ||||
| -rw-r--r-- | chip/npcx/registers.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c index 8327a22c08..f0beddbfc0 100644 --- a/chip/npcx/gpio.c +++ b/chip/npcx/gpio.c @@ -744,11 +744,7 @@ DECLARE_HOOK(HOOK_INIT, gpio_init, HOOK_PRIO_DEFAULT); static void gpio_interrupt(int int_no) { -#if DEBUG_GPIO - static uint8_t i, j, pin, wui_mask; -#else uint8_t i, j, pin, wui_mask; -#endif for (i = 0; i < ARRAY_SIZE(gpio_wui_table); i++) { for (j = 0; j < ARRAY_SIZE(gpio_wui_table[0]); j++) { diff --git a/chip/npcx/registers.h b/chip/npcx/registers.h index 34188f58e9..50b36227b3 100644 --- a/chip/npcx/registers.h +++ b/chip/npcx/registers.h @@ -54,7 +54,6 @@ #define DEBUG_I2C 0 #define DEBUG_TMR 0 #define DEBUG_WDG 0 -#define DEBUG_GPIO 1 #define DEBUG_FAN 0 #define DEBUG_PWM 0 #define DEBUG_SPI 0 |