Skip to content

Commit 4caae37

Browse files
committed
drivers: serial: nrfx_uarte: Add workaround for FRAMETIMEOUT corner case
When reception is restarted (STARTRX after ENDRX but no STOPRX) it is possible that FRAMETIMEOUT countdown counter will not be started by the first received byte if byte was already being transmitted when STARTRX was called. If that is the only byte then it is expected that timeout will be triggered but since FRAMETIMEOUT counter is not started there is no FRAMETIMEOUT event which has short to STOPRX. This situation will happen in case short buffers are used (< 5 bytes) because then short ENDRX_STARTRX is not used then. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 786cd7f commit 4caae37

File tree

1 file changed

+46
-2
lines changed

1 file changed

+46
-2
lines changed

drivers/serial/uart_nrfx_uarte.c

+46-2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,17 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
9595
#define UARTE_HAS_FRAME_TIMEOUT 1
9696
#endif
9797

98+
/* Frame timeout has a bug that countdown counter may not be triggered in some
99+
* specific condition. It may happen if RX is manually started after ENDRX (STOPRX
100+
* task was not triggered) and there is ongoing reception of a byte. RXDRDY event
101+
* triggered by the reception of that byte may not trigger frame timeout counter.
102+
* If this is the last byte of a transfer then without the workaround there will
103+
* be no expected RX timeout.
104+
*/
105+
#ifdef UARTE_HAS_FRAME_TIMEOUT
106+
#define RX_FRAMETIMEOUT_WORKAROUND 1
107+
#endif
108+
98109
#define INSTANCE_NEEDS_CACHE_MGMT(unused, prefix, i, prop) UARTE_IS_CACHEABLE(prefix##i)
99110

100111
#if UARTE_FOR_EACH_INSTANCE(INSTANCE_NEEDS_CACHE_MGMT, (+), (0), _)
@@ -251,6 +262,9 @@ struct uarte_nrfx_data {
251262
#define UARTE_FLAG_LOW_POWER (UARTE_FLAG_LOW_POWER_TX | UARTE_FLAG_LOW_POWER_RX)
252263
#define UARTE_FLAG_TRIG_RXTO BIT(2)
253264
#define UARTE_FLAG_POLL_OUT BIT(3)
265+
/* Flag indicating that a workaround for not working frame timeout is active. */
266+
#define UARTE_FLAG_FTIMEOUT_WATCH_BIT 4
267+
#define UARTE_FLAG_FTIMEOUT_WATCH BIT(UARTE_FLAG_FTIMEOUT_WATCH_BIT)
254268

255269
/* If enabled then ENDTX is PPI'ed to TXSTOP */
256270
#define UARTE_CFG_FLAG_PPI_ENDTX BIT(0)
@@ -1304,9 +1318,22 @@ static void rx_timeout(struct k_timer *timer)
13041318
NRF_UARTE_Type *uarte = get_uarte_instance(dev);
13051319

13061320
#ifdef UARTE_HAS_FRAME_TIMEOUT
1307-
if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY)) {
1308-
nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
1321+
struct uarte_nrfx_data *data = dev->data;
1322+
struct uarte_async_rx *async_rx = &data->async->rx;
1323+
bool rxdrdy = nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXDRDY);
1324+
1325+
if (IS_ENABLED(RX_FRAMETIMEOUT_WORKAROUND) &&
1326+
atomic_test_and_clear_bit(&data->flags, UARTE_FLAG_FTIMEOUT_WATCH_BIT)) {
1327+
if (rxdrdy) {
1328+
nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXDRDY);
1329+
k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
1330+
}
1331+
} else {
1332+
if (!rxdrdy) {
1333+
nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STOPRX);
1334+
}
13091335
}
1336+
13101337
return;
13111338
#else /* UARTE_HAS_FRAME_TIMEOUT */
13121339
struct uarte_nrfx_data *data = dev->data;
@@ -1532,6 +1559,7 @@ static void endrx_isr(const struct device *dev)
15321559
async_rx->offset = 0;
15331560

15341561
if (async_rx->enabled) {
1562+
bool start_timeout = false;
15351563
/* If there is a next buffer, then STARTRX will have already been
15361564
* invoked by the short (the next buffer will be filling up already)
15371565
* and here we just do the swap of which buffer the driver is following,
@@ -1546,6 +1574,11 @@ static void endrx_isr(const struct device *dev)
15461574
*/
15471575
if (!nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) {
15481576
nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
1577+
nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO);
1578+
if (IS_ENABLED(RX_FRAMETIMEOUT_WORKAROUND)) {
1579+
data->flags |= BIT(UARTE_FLAG_FTIMEOUT_WATCH_BIT);
1580+
start_timeout = true;
1581+
}
15491582
}
15501583
/* Remove the short until the subsequent next buffer is setup */
15511584
nrf_uarte_shorts_disable(uarte, NRF_UARTE_SHORT_ENDRX_STARTRX);
@@ -1554,6 +1587,11 @@ static void endrx_isr(const struct device *dev)
15541587
}
15551588

15561589
irq_unlock(key);
1590+
if (IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT)) {
1591+
if (start_timeout && !K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
1592+
k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
1593+
}
1594+
}
15571595
}
15581596

15591597
#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
@@ -1611,6 +1649,12 @@ static void rxto_isr(const struct device *dev)
16111649
struct uarte_nrfx_data *data = dev->data;
16121650
struct uarte_async_rx *async_rx = &data->async->rx;
16131651

1652+
if (IS_ENABLED(RX_FRAMETIMEOUT_WORKAROUND)) {
1653+
if (atomic_test_and_clear_bit(&data->flags, UARTE_FLAG_FTIMEOUT_WATCH)) {
1654+
k_timer_stop(&async_rx->timer);
1655+
}
1656+
}
1657+
16141658
if (async_rx->buf) {
16151659
#ifdef CONFIG_HAS_NORDIC_DMM
16161660
(void)dmm_buffer_in_release(config->mem_reg, async_rx->usr_buf, 0, async_rx->buf);

0 commit comments

Comments
 (0)