[Backport v3.7.99-ncs1-branch] drivers: serial: nrfx_uarte: Legacy shim rework to support nrf54x and runtime device PM

boards/native/nrf_bsim/CMakeLists.txt

@@ -56,6 +56,7 @@ zephyr_include_directories(
   common
   common/cmsis
   ${NSI_DIR}/common/src/include
+  ${ZEPHYR_BASE}/soc/nordic/common
 )
 
 zephyr_library_include_directories(

doc/releases/release-notes-4.0.rst

@@ -228,6 +228,8 @@ Drivers and Sensors
 * Serial
 
   * LiteX: Renamed the ``compatible`` from ``litex,uart0`` to :dtcompatible:`litex,uart`.
+  * Nordic: Removed ``CONFIG_UART_n_GPIO_MANAGEMENT`` Kconfig options (where n is an instance
+    index) which had no use after pinctrl driver was introduced.
 
 * SPI
 

drivers/serial/Kconfig.nrfx

@@ -31,12 +31,20 @@ config UART_NRFX_UARTE
 config UART_NRFX_UARTE_LEGACY_SHIM
 	bool "Legacy UARTE shim"
 	depends on UART_NRFX_UARTE
-	depends on !SOC_SERIES_NRF54LX
-	depends on !SOC_SERIES_NRF54HX || RISCV
-	depends on !SOC_SERIES_NRF92X || RISCV
-	# New shim takes more ROM. Until it is fixed use legacy shim.
 	default y
 
+config UART_NRFX_UARTE_ENHANCED_RX
+	bool "Enhanced RX handling"
+	depends on UART_ASYNC_API
+	depends on UART_NRFX_UARTE_LEGACY_SHIM
+	default y if !(UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC)
+	help
+	  Enable RX handling mode which is switching buffers on timeout. This is an
+	  enhancement compared to other two modes (default and hardware assisted).
+	  Default mode could miscount bytes when interrupt was not handled on time
+	  and hardware assisted required TIMER peripheral instance and PPI channel
+	  for accurate byte counting.
+
 config UART_ASYNC_TX_CACHE_SIZE
 	int "TX cache buffer size"
 	depends on UART_ASYNC_API

drivers/serial/Kconfig.nrfx_uart_instance

@@ -68,10 +68,14 @@ config UART_$(nrfx_uart_num)_NRF_ASYNC_LOW_POWER
 	depends on HAS_HW_NRF_UARTE$(nrfx_uart_num)
 	depends on UART_ASYNC_API
 	depends on UART_NRFX_UARTE_LEGACY_SHIM
+	default y if !PM_DEVICE
 	help
 	  When enabled, UARTE is enabled before each TX or RX usage and disabled
 	  when not used. Disabling UARTE while in idle allows to achieve lowest
 	  power consumption. It is only feasible if receiver is not always on.
+	  This option is irrelevant when device power management (PM) is enabled
+	  because then device state is controlled by the PM actions.
+
 
 config UART_$(nrfx_uart_num)_NRF_HW_ASYNC_TIMER
 	int "Timer instance"
@@ -119,12 +123,3 @@ config UART_$(nrfx_uart_num)_A2I_RX_BUF_COUNT
 	default 0
 	help
 	  Number of chunks into RX space is divided.
-
-config UART_$(nrfx_uart_num)_GPIO_MANAGEMENT
-	bool "GPIO management on port $(nrfx_uart_num)"
-	depends on PM_DEVICE
-	default y
-	help
-	  If enabled, the driver will configure the GPIOs used by the uart to
-	  their default configuration when device is powered down. The GPIOs
-	  will be configured back to correct state when UART is powered up.

drivers/serial/uart_nrfx_uart.c

@@ -1087,12 +1087,9 @@ static int uart_nrfx_pm_action(const struct device *dev,
 
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
-		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
-			ret = pinctrl_apply_state(config->pcfg,
-						  PINCTRL_STATE_DEFAULT);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
 		}
 
 		nrf_uart_enable(uart0_addr);
@@ -1103,13 +1100,9 @@ static int uart_nrfx_pm_action(const struct device *dev,
 		break;
 	case PM_DEVICE_ACTION_SUSPEND:
 		nrf_uart_disable(uart0_addr);
-
-		if (IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) {
-			ret = pinctrl_apply_state(config->pcfg,
-						  PINCTRL_STATE_SLEEP);
-			if (ret < 0) {
-				return ret;
-			}
+		ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
 		}
 		break;
 	default: