This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 44d1811ebb9e34e17a1ce076684a2c9c639fd054 Author: Jukka Laitinen <[email protected]> AuthorDate: Fri Oct 25 12:40:10 2024 +0300 imx9/serial: Clean up the flow control code - Remove GPIO (SW) based flow control. It didn't work, and pure HW flow control seems to work fine - Remove some unneeded ifdefs and change bit-field flags to booleans to clean up the code Signed-off-by: Jukka Laitinen <[email protected]> --- arch/arm64/src/imx9/imx9_lpuart.c | 301 +++++++++----------------------------- 1 file changed, 70 insertions(+), 231 deletions(-) diff --git a/arch/arm64/src/imx9/imx9_lpuart.c b/arch/arm64/src/imx9/imx9_lpuart.c index a53bef673d..b41bc66cf4 100644 --- a/arch/arm64/src/imx9/imx9_lpuart.c +++ b/arch/arm64/src/imx9/imx9_lpuart.c @@ -294,36 +294,28 @@ struct imx9_uart_s { - struct uart_dev_s dev; /* Generic UART device */ - const uint32_t uartbase; /* Base address of UART registers */ - const int uartnum; /* LPUART number 1-8 */ - uint32_t baud; /* Configured baud */ - uint32_t ie; /* Saved enabled interrupts */ - uint8_t irq; /* IRQ associated with this UART */ - uint8_t parity; /* 0=none, 1=odd, 2=even */ - uint8_t bits; /* Number of bits (7 or 8) */ -#if defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL) - uint8_t inviflow:1; /* Invert RTS sense */ - const uint32_t rts_gpio; /* LPUART RTS GPIO pin configuration */ -#endif -#ifdef CONFIG_SERIAL_OFLOWCONTROL - const uint32_t cts_gpio; /* LPUART CTS GPIO pin configuration */ -#endif - uint8_t stopbits2:1; /* 1: Configure with 2 stop bits vs 1 */ -#ifdef CONFIG_SERIAL_IFLOWCONTROL - uint8_t iflow:1; /* input flow control (RTS) enabled */ -#endif -#ifdef CONFIG_SERIAL_OFLOWCONTROL - uint8_t oflow:1; /* output flow control (CTS) enabled */ -#endif -#ifdef CONFIG_SERIAL_RS485CONTROL - uint8_t rs485mode:1; /* We are in RS485 (RTS on TX) mode */ -#endif + struct uart_dev_s dev; /* Generic UART device */ + + const uint32_t uartbase; /* Base address of UART registers */ + const int uartnum; /* LPUART number 1-8 */ + const bool usects; /* output flow control (CTS) available */ + const bool userts; /* input flow control (RTS) available */ + const bool rs485mode; /* We are in RS485 (RTS on TX) mode */ + const bool inviflow; /* Invert RTS sense */ + uint32_t baud; /* Configured baud */ + uint32_t ie; /* Saved enabled interrupts */ + uint8_t irq; /* IRQ associated with this UART */ + uint8_t parity; /* 0=none, 1=odd, 2=even */ + uint8_t bits; /* Number of bits (7 or 8) */ + bool stopbits2; /* true: Configure with 2 stop bits vs 1 */ + bool oflow; /* output flow control (CTS) enabled */ + bool iflow; /* input flow control (RTS) enabled */ + /* TX DMA state */ #ifdef SERIAL_HAVE_TXDMA - const unsigned int txch; /* DMAMUX source of TX DMA request */ - DMACH_HANDLE txdma; /* currently-open transmit DMA stream */ + const unsigned int txch; /* DMAMUX source of TX DMA request */ + DMACH_HANDLE txdma; /* currently-open transmit DMA stream */ #endif /* RX DMA state */ @@ -369,10 +361,6 @@ static bool imx9_rxavailable(struct uart_dev_s *dev); static void imx9_txint(struct uart_dev_s *dev, bool enable); #endif -#ifdef CONFIG_SERIAL_IFLOWCONTROL -static bool imx9_rxflowcontrol(struct uart_dev_s *dev, - unsigned int nbuffered, bool upper); -#endif static void imx9_send(struct uart_dev_s *dev, int ch); static bool imx9_txready(struct uart_dev_s *dev); @@ -430,7 +418,7 @@ static const struct uart_ops_s g_lpuart_ops = .rxint = imx9_rxint, .rxavailable = imx9_rxavailable, #ifdef CONFIG_SERIAL_IFLOWCONTROL - .rxflowcontrol = imx9_rxflowcontrol, + .rxflowcontrol = NULL, #endif .send = imx9_send, .txint = imx9_txint, @@ -451,7 +439,7 @@ static const struct uart_ops_s g_lpuart_rxtxdma_ops = .rxint = imx9_dma_rxint, .rxavailable = imx9_dma_rxavailable, #ifdef CONFIG_SERIAL_IFLOWCONTROL - .rxflowcontrol = imx9_rxflowcontrol, + .rxflowcontrol = NULL, #endif .send = imx9_send, .txint = imx9_dma_txint, @@ -474,7 +462,7 @@ static const struct uart_ops_s g_lpuart_rxdma_ops = .rxint = imx9_dma_rxint, .rxavailable = imx9_dma_rxavailable, #ifdef CONFIG_SERIAL_IFLOWCONTROL - .rxflowcontrol = imx9_rxflowcontrol, + .rxflowcontrol = NULL, #endif .send = imx9_send, .txint = imx9_txint, @@ -495,7 +483,7 @@ static const struct uart_ops_s g_lpuart_txdma_ops = .rxint = imx9_rxint, .rxavailable = imx9_rxavailable, #ifdef CONFIG_SERIAL_IFLOWCONTROL - .rxflowcontrol = imx9_rxflowcontrol, + .rxflowcontrol = NULL, #endif .send = imx9_send, .txint = imx9_dma_txint, @@ -638,24 +626,19 @@ static struct imx9_uart_s g_lpuart1priv = .bits = CONFIG_LPUART1_BITS, .stopbits2 = CONFIG_LPUART1_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART1_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART1_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART1_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART1_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART1_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART1_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART1_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART1_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART1_TXDMA @@ -663,7 +646,7 @@ static struct imx9_uart_s g_lpuart1priv = # endif # ifdef CONFIG_LPUART1_RXDMA .rxch = DMA_REQUEST_MUXLPUART1RX, - .rxfifo = g_lpuart1rxfifo, + .rxfifo = g_lpuart1rxfifo, # endif }; #endif @@ -702,24 +685,19 @@ static struct imx9_uart_s g_lpuart2priv = .bits = CONFIG_LPUART2_BITS, .stopbits2 = CONFIG_LPUART2_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART2_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART2_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART2_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART2_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART2_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART2_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART2_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART2_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART2_TXDMA @@ -766,24 +744,19 @@ static struct imx9_uart_s g_lpuart3priv = .bits = CONFIG_LPUART3_BITS, .stopbits2 = CONFIG_LPUART3_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART3_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART3_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART3_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART3_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART3_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART3_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART3_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART3_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART3_TXDMA @@ -830,24 +803,19 @@ static struct imx9_uart_s g_lpuart4priv = .bits = CONFIG_LPUART4_BITS, .stopbits2 = CONFIG_LPUART4_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART4_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART4_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART4_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART4_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART4_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART4_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART4_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART4_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART4_TXDMA @@ -894,24 +862,19 @@ static struct imx9_uart_s g_lpuart5priv = .bits = CONFIG_LPUART5_BITS, .stopbits2 = CONFIG_LPUART5_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART5_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART5_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART5_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART5_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART5_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART5_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART5_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART5_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART5_TXDMA @@ -958,24 +921,19 @@ static struct imx9_uart_s g_lpuart6priv = .bits = CONFIG_LPUART6_BITS, .stopbits2 = CONFIG_LPUART6_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART6_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART6_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART6_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART6_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART6_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART6_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART6_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART6_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART6_TXDMA @@ -1022,24 +980,19 @@ static struct imx9_uart_s g_lpuart7priv = .bits = CONFIG_LPUART7_BITS, .stopbits2 = CONFIG_LPUART7_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART7_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART7_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART7_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART7_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART7_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART7_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART7_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART7_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART7_TXDMA @@ -1086,24 +1039,19 @@ static struct imx9_uart_s g_lpuart8priv = .bits = CONFIG_LPUART8_BITS, .stopbits2 = CONFIG_LPUART8_2STOP, # if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_LPUART8_OFLOWCONTROL) - .oflow = 1, - .cts_gpio = GPIO_LPUART8_CTS, + .usects = true, # endif # if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART8_IFLOWCONTROL) - .iflow = 1, -# endif -# if ((defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART8_RS485RTSCONTROL)) || \ - (defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_LPUART8_IFLOWCONTROL))) - .rts_gpio = GPIO_LPUART8_RTS, + .userts = true, # endif # if (defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL)) && \ defined(CONFIG_LPUART8_INVERTIFLOWCONTROL) - .inviflow = 1, + .inviflow = true, # endif # if defined(CONFIG_SERIAL_RS485CONTROL) && defined(CONFIG_LPUART8_RS485RTSCONTROL) - .rs485mode = 1, + .rs485mode = true, # endif # ifdef CONFIG_LPUART8_TXDMA @@ -1358,37 +1306,21 @@ static int imx9_setup(struct uart_dev_s *dev) { struct imx9_uart_s *priv = (struct imx9_uart_s *)dev; #ifndef CONFIG_SUPPRESS_LPUART_CONFIG - struct uart_config_s config = - { - 0 - }; - + struct uart_config_s config; int ret; /* Configure the UART */ + memset(&config, 0, sizeof(config)); config.baud = priv->baud; /* Configured baud */ config.parity = priv->parity; /* 0=none, 1=odd, 2=even */ config.bits = priv->bits; /* Number of bits (5-9) */ config.stopbits2 = priv->stopbits2; /* true: Configure with 2 stop bits instead of 1 */ -#ifdef CONFIG_SERIAL_OFLOWCONTROL - config.usects = priv->oflow; /* Flow control on outbound side */ -#endif -#ifdef CONFIG_SERIAL_IFLOWCONTROL - /* Flow control on outbound side if not GPIO based */ - - if (priv->rts_gpio == 0) - { - config.userts = priv->iflow; - } -#endif -#ifdef CONFIG_SERIAL_RS485CONTROL config.users485 = priv->rs485mode; /* Switch into RS485 mode */ -#endif -#if defined(CONFIG_SERIAL_RS485CONTROL) || defined(CONFIG_SERIAL_IFLOWCONTROL) + config.userts = priv->iflow; config.invrts = priv->inviflow; /* Inversion of outbound flow control */ -#endif + config.usects = priv->oflow; ret = imx9_lpuart_configure(priv->uartbase, priv->uartnum, &config); @@ -1697,20 +1629,21 @@ static int imx9_ioctl(struct file *filep, int cmd, unsigned long arg) /* Return parity */ - termiosp->c_cflag = ((priv->parity != 0) ? PARENB : 0) | - ((priv->parity == 1) ? PARODD : 0); + termiosp->c_cflag = (!priv->parity ? PARENB : 0) | + (priv->parity ? PARODD : 0); /* Return stop bits */ - termiosp->c_cflag |= (priv->stopbits2) ? CSTOPB : 0; + termiosp->c_cflag |= priv->stopbits2 ? CSTOPB : 0; /* Return flow control */ #ifdef CONFIG_SERIAL_OFLOWCONTROL - termiosp->c_cflag |= ((priv->oflow) ? CCTS_OFLOW : 0); + termiosp->c_cflag |= (priv->oflow ? CCTS_OFLOW : 0); + #endif #ifdef CONFIG_SERIAL_IFLOWCONTROL - termiosp->c_cflag |= ((priv->iflow) ? CRTS_IFLOW : 0); + termiosp->c_cflag |= (priv->iflow ? CRTS_IFLOW : 0); #endif /* Return baud */ @@ -1758,12 +1691,12 @@ static int imx9_ioctl(struct file *filep, int cmd, unsigned long arg) if ((!termiosp) #ifdef CONFIG_SERIAL_OFLOWCONTROL - || ((termiosp->c_cflag & CCTS_OFLOW) && (priv->cts_gpio == 0)) + || ((termiosp->c_cflag & CCTS_OFLOW) && !priv->usects) #endif #ifdef CONFIG_SERIAL_IFLOWCONTROL - || ((termiosp->c_cflag & CRTS_IFLOW) && (priv->rts_gpio == 0)) + || ((termiosp->c_cflag & CRTS_IFLOW) && !priv->userts) #endif - ) + ) { ret = -EINVAL; break; @@ -1829,12 +1762,9 @@ static int imx9_ioctl(struct file *filep, int cmd, unsigned long arg) priv->parity = parity; priv->bits = nbits; priv->stopbits2 = stop2; -#ifdef CONFIG_SERIAL_OFLOWCONTROL priv->oflow = (termiosp->c_cflag & CCTS_OFLOW) != 0; -#endif -#ifdef CONFIG_SERIAL_IFLOWCONTROL priv->iflow = (termiosp->c_cflag & CRTS_IFLOW) != 0; -#endif + /* effect the changes immediately - note that we do not * implement TCSADRAIN / TCSAFLUSH */ @@ -2022,97 +1952,6 @@ static bool imx9_rxavailable(struct uart_dev_s *dev) } #endif -/**************************************************************************** - * Name: imx9_rxflowcontrol - * - * Description: - * Called when Rx buffer is full (or exceeds configured watermark levels - * if CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS is defined). - * Return true if UART activated RX flow control to block more incoming - * data - * - * Input Parameters: - * dev - UART device instance - * nbuffered - the number of characters currently buffered - * (if CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS is - * not defined the value will be 0 for an empty buffer or the - * defined buffer size for a full buffer) - * upper - true indicates the upper watermark was crossed where - * false indicates the lower watermark has been crossed - * - * Returned Value: - * true if RX flow control activated. - * - ****************************************************************************/ - -#ifdef CONFIG_SERIAL_IFLOWCONTROL -static bool imx9_rxflowcontrol(struct uart_dev_s *dev, - unsigned int nbuffered, bool upper) -{ - struct imx9_uart_s *priv = (struct imx9_uart_s *)dev; - - if (priv->iflow && (priv->rts_gpio != 0)) - { - /* Assert/de-assert nRTS set it high resume/stop sending */ - - imx9_gpiowrite(priv->rts_gpio, upper); - - if (upper) - { - /* With heavy Rx traffic, RXNE might be set and data pending. - * Returning 'true' in such case would cause RXNE left unhandled - * and causing interrupt storm. Sending end might be also be slow - * to react on nRTS, and returning 'true' here would prevent - * processing that data. - * - * Therefore, return 'false' so input data is still being processed - * until sending end reacts on nRTS signal and stops sending more. - */ - - return false; - } - - return upper; - } - else - { - /* Is the RX buffer full? */ - - if (upper) - { - /* Disable Rx interrupt to prevent more data being from - * peripheral. When hardware RTS is enabled, this will - * prevent more data from coming in. - * - * This function is only called when UART recv buffer is full, - * that is: "dev->recv.head + 1 == dev->recv.tail". - * - * Logic in "uart_read" will automatically toggle Rx interrupts - * when buffer is read empty and thus we do not have to re- - * enable Rx interrupts. - */ - - uart_disablerxint(dev); - return true; - } - - /* No.. The RX buffer is empty */ - - else - { - /* We might leave Rx interrupt disabled if full recv buffer was - * read empty. Enable Rx interrupt to make sure that more input is - * received. - */ - - uart_enablerxint(dev); - } - } - - return false; -} -#endif - /**************************************************************************** * Name: imx9_dma_receive *
