michaelh/zephyr
1
0
Fork 0
Code Releases Activity

driver: uart_npcx: do not check for irq enable in irq ready functions

Browse source 
Current implementation of uart_npcx_irq_{tx,rx}_ready always returns
false if the respective interrupt enable bit is not set, which means
that the api cannot be used if the interrupts are temporarily disabled
for whatever reasons, breaking patterns such as [1].

Other uart drivers also seems to not have this check, this patch removes
it from the NPCX driver too.

[1] https://github.com/zephyrproject-rtos/zephyr/blob/master/drivers/console/uart_console.c#L549

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2021-02-19 17:51:55 +00:00 • committed by Anas Nashif
commit 951c99c61a
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/serial/uart_npcx.c
View file

@ -182,11 +182,7 @@ static void uart_npcx_irq_tx_disable(const struct device *dev)
static int uart_npcx_irq_tx_ready(const struct device *dev) static int uart_npcx_irq_tx_ready(const struct device *dev)
{ {
struct uart_reg *const inst = HAL_INSTANCE(dev); return uart_npcx_tx_fifo_ready(dev);
/* Tx interrupt is enable and its FIFO is ready to send (not full) */
return (IS_BIT_SET(inst->UFTCTL, NPCX_UFTCTL_TEMPTY_EN) &&
uart_npcx_tx_fifo_ready(dev));
} }
static int uart_npcx_irq_tx_complete(const struct device *dev) static int uart_npcx_irq_tx_complete(const struct device *dev)
@ -213,11 +209,7 @@ static void uart_npcx_irq_rx_disable(const struct device *dev)
static int uart_npcx_irq_rx_ready(const struct device *dev) static int uart_npcx_irq_rx_ready(const struct device *dev)
{ {
struct uart_reg *const inst = HAL_INSTANCE(dev); return uart_npcx_rx_fifo_available(dev);
/* Rx interrupt is enable and at least one byte is in its FIFO */
return (IS_BIT_SET(inst->UFRCTL, NPCX_UFRCTL_RNEMPTY_EN) &&
uart_npcx_rx_fifo_available(dev));
} }
static void uart_npcx_irq_err_enable(const struct device *dev) static void uart_npcx_irq_err_enable(const struct device *dev)