michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: dai: sai: don't crash on underrun/overrun

Browse source 
TX/RX FIFO underrun shouldn't crash the RTOS when it occurs.
Also, since this can also happen under "normal" conditions
(i.e: DMA doesn't copy data fast enough from/to SAI's FIFOs)
the software should be able to recover from it.

As such:
	1) Remove `z_irq_spurious()` call.
	2) Clear error flag
	3) De-escalate error message to warning message

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
This commit is contained in:
Laurentiu Mihalcea 2024-08-14 15:05:25 +03:00 • committed by Anas Nashif
commit e224a41ec8
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/dai/nxp/sai/sai.c
View file

@ -95,20 +95,14 @@ void sai_isr(const void *parameter)
/* check for TX FIFO error */ /* check for TX FIFO error */
if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_TX, data->regmap, kSAI_FIFOErrorFlag)) { if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_TX, data->regmap, kSAI_FIFOErrorFlag)) {
LOG_ERR("FIFO underrun detected"); LOG_WRN("FIFO underrun detected");
/* TODO: this will crash the program and should be addressed as SAI_TX_RX_STATUS_CLEAR(DAI_DIR_TX, data->regmap, kSAI_FIFOErrorFlag);
* mentioned in TODO list's 2).
*/
z_irq_spurious(NULL);
} }
/* check for RX FIFO error */ /* check for RX FIFO error */
if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_RX, data->regmap, kSAI_FIFOErrorFlag)) { if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_RX, data->regmap, kSAI_FIFOErrorFlag)) {
LOG_ERR("FIFO overrun detected"); LOG_WRN("FIFO overrun detected");
/* TODO: this will crash the program and should be addressed as SAI_TX_RX_STATUS_CLEAR(DAI_DIR_RX, data->regmap, kSAI_FIFOErrorFlag);
* mentioned in TODO list's 2).
*/
z_irq_spurious(NULL);
} }
} }

5
drivers/dai/nxp/sai/sai.h
View file

@ -210,6 +210,11 @@ LOG_MODULE_REGISTER(nxp_dai_sai);
((dir) == DAI_DIR_RX ? ((UINT_TO_I2S(regmap))->RCSR & (which)) : \ ((dir) == DAI_DIR_RX ? ((UINT_TO_I2S(regmap))->RCSR & (which)) : \
((UINT_TO_I2S(regmap))->TCSR & (which))) ((UINT_TO_I2S(regmap))->TCSR & (which)))
/* used to clear status flags */
#define SAI_TX_RX_STATUS_CLEAR(dir, regmap, which) \
((dir) == DAI_DIR_RX ? SAI_RxClearStatusFlags(UINT_TO_I2S(regmap), which) \
: SAI_TxClearStatusFlags(UINT_TO_I2S(regmap), which))
/* used to retrieve the SYNC direction. Use this macro when you know for sure /* used to retrieve the SYNC direction. Use this macro when you know for sure
* you have 1 SYNC direction with 1 ASYNC direction. * you have 1 SYNC direction with 1 ASYNC direction.
*/ */