Commit 22b72e62 authored by Laurentiu Mihalcea's avatar Laurentiu Mihalcea Committed by Anas Nashif
Browse files

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

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: default avatarLaurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
(cherry picked from commit e224a41e)
parent ff720870

drivers/dai/nxp/sai/sai.c

+4 −10
Changes for drivers/dai/nxp/sai/sai.c: 4 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -95,20 +95,14 @@ void sai_isr(const void *parameter) 


	/* check for TX FIFO error */

	if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_TX, data->regmap, kSAI_FIFOErrorFlag)) {

		LOG_ERR("FIFO underrun detected");

		/* TODO: this will crash the program and should be addressed as

		 * mentioned in TODO list's 2).

		 */

		z_irq_spurious(NULL);

		LOG_WRN("FIFO underrun detected");

		SAI_TX_RX_STATUS_CLEAR(DAI_DIR_TX, data->regmap, kSAI_FIFOErrorFlag);

	}



	/* check for RX FIFO error */

	if (SAI_TX_RX_STATUS_IS_SET(DAI_DIR_RX, data->regmap, kSAI_FIFOErrorFlag)) {

		LOG_ERR("FIFO overrun detected");

		/* TODO: this will crash the program and should be addressed as

		 * mentioned in TODO list's 2).

		 */

		z_irq_spurious(NULL);

		LOG_WRN("FIFO overrun detected");

		SAI_TX_RX_STATUS_CLEAR(DAI_DIR_RX, data->regmap, kSAI_FIFOErrorFlag);

	}

}

drivers/dai/nxp/sai/sai.h

+5 −0
Changes for drivers/dai/nxp/sai/sai.h: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ LOG_MODULE_REGISTER(nxp_dai_sai); 
	((dir) == DAI_DIR_RX ? ((UINT_TO_I2S(regmap))->RCSR & (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

 * you have 1 SYNC direction with 1 ASYNC direction.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE