bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: input: npcx: init semaphore before interrupt enable

Browse Source 
A kernel panic was observed on a platform when k_sem_give() was called
in npcx_kbd_ksi_isr(). From the panic information, it appears that
the semaphore was used before it was initialized. This commit prevents
the potential issue by enabling the interrupt only after
the input_kbd_matrix_common_init() function is called
(where the semaphore is initialized).

Signed-off-by: Jun Lin <CHLin56@nuvoton.com>
This commit is contained in:
Jun Lin 2025-07-17 13:10:04 +08:00 committed by Anas Nashif
parent 69acc016eb
commit f1f7ca459b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/input/input_npcx_kbd.c
View File

@ -187,13 +187,6 @@ static int npcx_kbd_init(const struct device *dev)
return -EINVAL;
}
/* Configure wake-up input and callback for keyboard input signal */
for (int i = 0; i < common->row_size; i++) {
npcx_kbd_init_ksi_wui_callback(
dev, &data->ksi_callback[i], &config->wui_maps[i],
npcx_kbd_ksi_isr);
}
/* Configure pin-mux for keyboard scan device */
ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0) {
@ -201,7 +194,20 @@ static int npcx_kbd_init(const struct device *dev)
return ret;
}
return input_kbd_matrix_common_init(dev);
ret = input_kbd_matrix_common_init(dev);
if (ret < 0) {
LOG_ERR("keyboard scan common init failed (%d)", ret);
return ret;
}
/* Configure wake-up input and callback for keyboard input signal */
for (int i = 0; i < common->row_size; i++) {
npcx_kbd_init_ksi_wui_callback(
dev, &data->ksi_callback[i], &config->wui_maps[i],
npcx_kbd_ksi_isr);
}
return 0;
}
PINCTRL_DT_INST_DEFINE(0);