Commit e0f5241b authored by Krzysztof Chruściński's avatar Krzysztof Chruściński Committed by Benjamin Cabé
Browse files

drivers: serial: nrfx_uarte: Fix use of PM_DEVICE_ISR_SAFE 

PM_DEVICE_ISR_SAFE shall not be used when non-asynchronous API is used
because RX is disabled in suspend action and that takes relatively
long time. In case of PM_DEVICE_ISR_SAFE it is done with interrupts
disabled. RX is not used at all if disable-rx property is set and in
that case PM_DEVICE_ISR_SAFE can be used.

Added macro which determines if ISR safe mode can be used.

Signed-off-by: default avatarKrzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
parent 66daaf6b

drivers/serial/uart_nrfx_uarte.c

+13 −2
Changes for drivers/serial/uart_nrfx_uarte.c: 13 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2512,6 +2512,18 @@ static int uarte_instance_init(const struct device *dev, 
			     : UART_CFG_FLOW_CTRL_NONE,			       \

	}



/* Macro determines if PM actions are interrupt safe. They are in case of

 * asynchronous API (except for instance in fast power domain) and non-asynchronous

 * API if RX is disabled. Macro must resolve to a literal 1 or 0.

 */

#define UARTE_PM_ISR_SAFE(idx)						       \

	COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),		       \

		    (0),						       \

		    (COND_CODE_1(CONFIG_UART_##idx##_ASYNC,		       \

				 (PM_DEVICE_ISR_SAFE),			       \

				 (COND_CODE_1(UARTE_PROP(idx, disable_rx),     \

					      (PM_DEVICE_ISR_SAFE), (0))))))   \



#define UART_NRF_UARTE_DEVICE(idx)					       \

	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(UARTE(idx));		       \

	UARTE_INT_DRIVEN(idx);						       \
@@ -2584,8 +2596,7 @@ static int uarte_instance_init(const struct device *dev, 
	}								       \

									       \

	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \

			    COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),\

				    (0), (PM_DEVICE_ISR_SAFE)));	       \

			    UARTE_PM_ISR_SAFE(idx));			       \

									       \

	DEVICE_DT_DEFINE(UARTE(idx),					       \

		      uarte_##idx##_init,				       \

CRA Git | Maintained and supported by SUSTech CRA and CCSE