Revert "drivers: serial: nrfx_uarte: Deprecate CONFIG_UART_x_NRF_HW_ASYNC"

nordic-krch · nordic-krch · commit e12bbc87287c · 2025-06-30T08:26:11.000+02:00
This reverts commit 384e940. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
@@ -60,6 +60,7 @@ config UART_NRFX_UARTE_ENHANCED_RX
 	bool "Enhanced RX handling"
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
+	depends on !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
 	default y
 	help
 	  Enable RX handling mode which is switching buffers on timeout. This is an
diff --git a/drivers/serial/Kconfig.nrfx_uart_instance b/drivers/serial/Kconfig.nrfx_uart_instance
@@ -49,23 +49,18 @@ config UART_$(nrfx_uart_num)_NRF_TX_BUFFER_SIZE
 	  particular SoC.
 
 config UART_$(nrfx_uart_num)_NRF_HW_ASYNC
-	bool "[DEPRECATED] Use hardware RX byte counting"
+	bool "Use hardware RX byte counting"
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
-	depends on !UART_NRFX_UARTE_ENHANCED_RX
 	depends on HAS_HW_NRF_PPI || HAS_HW_NRF_DPPIC
 	select NRFX_GPPI
-	select DEPRECATED
 	help
 	  If default driver uses interrupts to count incoming bytes, it is possible
 	  that with higher speeds and/or high cpu load some data can be lost.
 	  It is recommended to use hardware byte counting in such scenarios.
 	  Hardware RX byte counting requires timer instance and one PPI channel.
 
-	  This options is deprecated. Use UART_NRFX_UARTE_ENHANCED_RX which supports
-	  reliable byte counting without additional HW resources (TIMER and (D)PPI).
-
 config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	bool "Low power mode"
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
@@ -1611,11 +1611,11 @@ static void endrx_isr(const struct device *dev)
 		}
 
 		irq_unlock(key);
-		if (IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT)) {
-			if (start_timeout && !K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
-				k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
-			}
+#ifdef UARTE_HAS_FRAME_TIMEOUT
+		if (start_timeout && !K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {
+			k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);
 		}
+#endif
 	}
 
 #if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
@@ -1,6 +1,9 @@
 CONFIG_UART_ASYNC_API=y
 CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
+# Enable HW RX byte counting. This especially matters at higher baud rates.
+CONFIG_UART_1_NRF_HW_ASYNC=y
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
 
 # Align with the Serial LTE Modem (SLM) application.
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
@@ -1,6 +1,9 @@
 CONFIG_UART_ASYNC_API=y
 CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
+# Enable HW RX byte counting. This especially matters at higher baud rates.
+CONFIG_UART_1_NRF_HW_ASYNC=y
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
 
 # Align with the Serial LTE Modem (SLM) application.
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
+CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -1 +1,3 @@
 CONFIG_VAR_LENGTH_BUFFER_TEST_BUADRATE_LIMIT=57600
+CONFIG_UART_1_NRF_HW_ASYNC=y
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.conf b/tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.conf
@@ -1,2 +1,4 @@
 CONFIG_ARM_MPU=n
 CONFIG_VAR_LENGTH_BUFFER_TEST_BUADRATE_LIMIT=57600
+CONFIG_UART_1_NRF_HW_ASYNC=y
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2
diff --git a/tests/drivers/uart/uart_errors/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_errors/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,2 @@
+CONFIG_UART_1_NRF_HW_ASYNC=y
+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -77,6 +77,9 @@ tests:
       - CONFIG_UART_0_INTERRUPT_DRIVEN=n
       - CONFIG_UART_0_ASYNC=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
+      - CONFIG_UART_0_NRF_HW_ASYNC=y
+      - CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
+      - CONFIG_NRFX_TIMER2=y
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -78,13 +78,19 @@ tests:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
+      - CONFIG_UART_0_NRF_HW_ASYNC=y
+      - CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
+      - CONFIG_NRFX_TIMER2=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
 
   drivers.uart.pm.async.enhanced_poll:
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=n
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_0_ASYNC=y
+      - CONFIG_UART_0_NRF_HW_ASYNC=y
+      - CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
+      - CONFIG_NRFX_TIMER2=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
     platform_exclude:
       - nrf54l09pdk/nrf54l09/cpuapp

Original file line number	Diff line number	Diff line change
`@@ -1611,11 +1611,11 @@ static void endrx_isr(const struct device *dev)`
`1611`	`1611`	`}`
`1612`	`1612`
`1613`	`1613`	`irq_unlock(key);`
`1614`		`- if (IS_ENABLED(UARTE_HAS_FRAME_TIMEOUT)) {`
`1615`		`- if (start_timeout && !K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {`
`1616`		`- k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);`
`1617`		`- }`
	`1614`	`+#ifdef UARTE_HAS_FRAME_TIMEOUT`
	`1615`	`+ if (start_timeout && !K_TIMEOUT_EQ(async_rx->timeout, K_NO_WAIT)) {`
	`1616`	`+ k_timer_start(&async_rx->timer, async_rx->timeout, K_NO_WAIT);`
`1618`	`1617`	`}`
	`1618`	`+#endif`
`1619`	`1619`	`}`
`1620`	`1620`
`1621`	`1621`	`#if !defined(CONFIG_UART_NRFX_UARTE_ENHANCED_RX)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1`
	`2`	`+CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`CONFIG_VAR_LENGTH_BUFFER_TEST_BUADRATE_LIMIT=57600`
	`2`	`+CONFIG_UART_1_NRF_HW_ASYNC=y`
	`3`	`+CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1`