This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e9b7dee55a arch/arm/imxrt: Serial add RXDMA support for singlewire mode
e9b7dee55a is described below
commit e9b7dee55a421689f48c1fa3d15d6e112134b801
Author: Peter van der Perk <peter.vanderp...@nxp.com>
AuthorDate: Tue Jun 3 17:16:15 2025 +0200
arch/arm/imxrt: Serial add RXDMA support for singlewire mode
In singlewire mode the ops were only for non-dma usecases. But if rxdma is
enabled we can use that.
For TXDMA it's not possible because we've to change pin direction
immediately after transmission is done.
---
arch/arm/src/imxrt/imxrt_serial.c | 48 +++++++++++++++++++++++++++++++++++++--
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/imxrt/imxrt_serial.c
b/arch/arm/src/imxrt/imxrt_serial.c
index c7fc297b2b..68b868290a 100644
--- a/arch/arm/src/imxrt/imxrt_serial.c
+++ b/arch/arm/src/imxrt/imxrt_serial.c
@@ -884,6 +884,28 @@ static const struct uart_ops_s g_lpuart_singlewire_ops =
.txready = imxrt_txready,
.txempty = imxrt_txempty,
};
+
+#ifdef SERIAL_HAVE_RXDMA
+static const struct uart_ops_s g_lpuart_singlewire_rxdma_ops =
+{
+ .setup = imxrt_dma_setup,
+ .shutdown = imxrt_dma_shutdown,
+ .attach = imxrt_attach,
+ .detach = imxrt_detach,
+ .ioctl = imxrt_ioctl,
+ .receive = imxrt_dma_receive,
+ .rxint = imxrt_dma_rxint,
+ .rxavailable = imxrt_dma_rxavailable,
+#ifdef CONFIG_SERIAL_IFLOWCONTROL
+ .rxflowcontrol = imxrt_rxflowcontrol,
+#endif
+ .send = imxrt_singlewire_send,
+ .txint = imxrt_singlewire_txint,
+ .txready = imxrt_txready,
+ .txempty = imxrt_txempty,
+};
+#endif
+
#endif
#if !defined(SERIAL_HAVE_ONLY_TXDMA) && !defined(SERIAL_HAVE_ONLY_RXDMA)
@@ -1166,6 +1188,7 @@ static struct imxrt_uart_s g_lpuart1priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART1_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
@@ -1236,6 +1259,7 @@ static struct imxrt_uart_s g_lpuart2priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART2_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART2_INVERTIFLOWCONTROL))
@@ -1303,6 +1327,7 @@ static struct imxrt_uart_s g_lpuart3priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART3_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART3_INVERTIFLOWCONTROL))
@@ -1370,6 +1395,7 @@ static struct imxrt_uart_s g_lpuart4priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART4_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART4_INVERTIFLOWCONTROL))
@@ -1437,6 +1463,7 @@ static struct imxrt_uart_s g_lpuart5priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART5_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART5_INVERTIFLOWCONTROL))
@@ -1504,6 +1531,7 @@ static struct imxrt_uart_s g_lpuart6priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART6_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART6_INVERTIFLOWCONTROL))
@@ -1571,6 +1599,7 @@ static struct imxrt_uart_s g_lpuart7priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART7_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART7_INVERTIFLOWCONTROL))
@@ -1638,6 +1667,7 @@ static struct imxrt_uart_s g_lpuart8priv =
# endif
# ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART8_TX,
+ .prev_ops = 0,
# endif
# if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART8_INVERTIFLOWCONTROL))
@@ -1705,6 +1735,7 @@ static struct imxrt_uart_s g_lpuart9priv =
#endif
#ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART9_TX,
+ .prev_ops = 0,
#endif
#if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART9_INVERTIFLOWCONTROL))
@@ -1772,6 +1803,7 @@ static struct imxrt_uart_s g_lpuart10priv =
#endif
#ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART10_TX,
+ .prev_ops = 0,
#endif
#if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART10_INVERTIFLOWCONTROL))
@@ -1839,6 +1871,7 @@ static struct imxrt_uart_s g_lpuart11priv =
#endif
#ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART11_TX,
+ .prev_ops = 0,
#endif
#if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART11_INVERTIFLOWCONTROL))
@@ -1906,6 +1939,7 @@ static struct imxrt_uart_s g_lpuart12priv =
#endif
#ifdef CONFIG_IMXRT_LPUART_SINGLEWIRE
.tx_gpio = GPIO_LPUART12_TX,
+ .prev_ops = 0,
#endif
#if (((defined(CONFIG_SERIAL_RS485CONTROL) ||
defined(CONFIG_SERIAL_IFLOWCONTROL))) \
&& defined(CONFIG_LPUART12_INVERTIFLOWCONTROL))
@@ -2687,7 +2721,16 @@ static int imxrt_ioctl(struct file *filep, int cmd,
unsigned long arg)
~(IOMUX_PULL_MASK | IOMUX_OPENDRAIN)) | gpio_val);
regval |= LPUART_CTRL_LOOPS | LPUART_CTRL_RSRC;
priv->prev_ops = priv->dev.ops;
- priv->dev.ops = &g_lpuart_singlewire_ops;
+#ifdef SERIAL_HAVE_RXDMA
+ if (priv->dev.ops->receive == imxrt_dma_receive)
+ {
+ priv->dev.ops = &g_lpuart_singlewire_rxdma_ops;
+ }
+ else
+#endif
+ {
+ priv->dev.ops = &g_lpuart_singlewire_ops;
+ }
}
else
{
@@ -2695,9 +2738,10 @@ static int imxrt_ioctl(struct file *filep, int cmd,
unsigned long arg)
IOMUX_OPENDRAIN)) |
IOMUX_PULL_NONE);
regval &= ~(LPUART_CTRL_LOOPS | LPUART_CTRL_RSRC);
- if (priv->dev.ops == &g_lpuart_singlewire_ops)
+ if (priv->prev_ops)
{
priv->dev.ops = priv->prev_ops;
+ priv->prev_ops = 0;
}
}
