| Message ID | 20231011181544.7893-1-l.sanfilippo@kunbus.com |
|---|---|
| Headers | show |
| Series | Fixes and improvements for RS485 | expand |
Hi, On 12.10.23 00:36, Hugo Villeneuve wrote: . > > > On Wed, 11 Oct 2023 20:15:39 +0200 > Lino Sanfilippo <l.sanfilippo@kunbus.com> wrote: > >> Both the imx and stm32 driver set the rx-during-tx GPIO in the >> rs485_config() function by means of gpiod_set_value(). Since rs485_config() >> is called with the port lock held, this can be an problem in case that >> setting the GPIO line can sleep (e.g. if a GPIO expander is used which is >> connected via SPI or I2C). >> >> Avoid this issue by setting the GPIO outside of the port lock in the serial >> core and by using gpiod_set_value_cansleep() instead of gpiod_set_value(). > > Hi Lino, > it seems to me that both drivers were already using > gpiod_set_value_cansleep()? Maybe update your commit > message if this is the case. > Right, I will fix this, thanks! >> >> Since now both the term and the rx-during-tx GPIO are set within the serial >> core use a common function uart_set_rs485_gpios() to set both. >> >> With moving it into the serial core setting the rx-during-tx GPIO is now >> automatically done for all drivers that support such a GPIO. >> >> Fixes: c54d48543689 ("serial: stm32: Add support for rs485 RX_DURING_TX output GPIO") >> Fixes: ca530cfa968c ("serial: imx: Add support for RS485 RX_DURING_TX output GPIO") >> Cc: stable@vger.kernel.org >> Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com> >> --- >> drivers/tty/serial/imx.c | 4 ---- >> drivers/tty/serial/serial_core.c | 10 ++++++---- >> drivers/tty/serial/stm32-usart.c | 5 +---- >> 3 files changed, 7 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c >> index 13cb78340709..edb2ec6a5567 100644 >> --- a/drivers/tty/serial/imx.c >> +++ b/drivers/tty/serial/imx.c >> @@ -1947,10 +1947,6 @@ static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termio >> rs485conf->flags & SER_RS485_RX_DURING_TX) >> imx_uart_start_rx(port); >> >> - if (port->rs485_rx_during_tx_gpio) >> - gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, >> - !!(rs485conf->flags & SER_RS485_RX_DURING_TX)); >> - >> return 0; >> } >> >> diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c >> index 7bdc21d5e13b..ef0500be3553 100644 >> --- a/drivers/tty/serial/serial_core.c >> +++ b/drivers/tty/serial/serial_core.c >> @@ -1391,14 +1391,16 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4 >> memset(rs485->padding1, 0, sizeof(rs485->padding1)); >> } >> >> -static void uart_set_rs485_termination(struct uart_port *port, >> - const struct serial_rs485 *rs485) >> +static void uart_set_rs485_gpios(struct uart_port *port, >> + const struct serial_rs485 *rs485) >> { >> if (!(rs485->flags & SER_RS485_ENABLED)) >> return; >> >> gpiod_set_value_cansleep(port->rs485_term_gpio, >> !!(rs485->flags & SER_RS485_TERMINATE_BUS)); >> + gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, >> + !!(rs485->flags & SER_RS485_RX_DURING_TX)); >> } >> >> static int uart_rs485_config(struct uart_port *port) >> @@ -1407,7 +1409,7 @@ static int uart_rs485_config(struct uart_port *port) >> int ret; >> >> uart_sanitize_serial_rs485(port, rs485); >> - uart_set_rs485_termination(port, rs485); >> + uart_set_rs485_gpios(port, rs485); > > Suggestion: define a new function to handle rx_during_tx, to keep > uart_set_rs485_termination(), which is more self-documenting than > uart_set_rs485_gpios(). > > ex: > uart_set_rs485_termination(port, rs485); > + uart_set_rs485_rx_during_tx(port, rs485); > I admit that I do not like the function name uart_set_rs485_gpios() very much. As you said it is less descriptive than e.g. uart_set_rs485_termination(). On the other hand the two functions you suggested would always be called together, which reduces the benefit of having two separate functions. Plus they are nothing more than wrappers around gpiod_set_value_cansleep() with the same additional check for SER_RS485_ENABLED. Let me think about a better name first. Anyway, thanks a lot for the review! Regards, Lino > Hugo. > > >> >> ret = port->rs485_config(port, NULL, rs485); >> if (ret) >> @@ -1449,7 +1451,7 @@ static int uart_set_rs485_config(struct tty_struct *tty, struct uart_port *port, >> if (ret) >> return ret; >> uart_sanitize_serial_rs485(port, &rs485); >> - uart_set_rs485_termination(port, &rs485); >> + uart_set_rs485_gpios(port, &rs485); >> >> spin_lock_irqsave(&port->lock, flags); >> ret = port->rs485_config(port, &tty->termios, &rs485); >> diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c >> index 5e9cf0c48813..8eb13bf055f2 100644 >> --- a/drivers/tty/serial/stm32-usart.c >> +++ b/drivers/tty/serial/stm32-usart.c >> @@ -226,10 +226,7 @@ static int stm32_usart_config_rs485(struct uart_port *port, struct ktermios *ter >> >> stm32_usart_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); >> >> - if (port->rs485_rx_during_tx_gpio) >> - gpiod_set_value_cansleep(port->rs485_rx_during_tx_gpio, >> - !!(rs485conf->flags & SER_RS485_RX_DURING_TX)); >> - else >> + if (!port->rs485_rx_during_tx_gpio) >> rs485conf->flags |= SER_RS485_RX_DURING_TX; >> >> if (rs485conf->flags & SER_RS485_ENABLED) { >> -- >> 2.40.1 >>
The following series includes some fixes and improvements around RS485 in the serial core and UART drivers: Patch 1: Do not hold the port lock when setting rx-during-tx GPIO Patch 2: Get rid of useless wrapper pl011_get_rs485_mode() Patch 3: set missing supported flag for RX during TX GPIO Patch 4: fix sanitizing check for RTS settings Patch 5: make sure RS485 is cannot be enabled when it is not supported Patch 6: imx: do not set RS485 enabled if it is not supported Patch 7: omap: do not override settings for rs485 support Changes in v2: - add missing 'Fixes' tags as requested by Greg - corrected a typo as pointed out by Hugo - fix issue in imx driver in the serial core as suggested by Uwe - partly rephrase some commit messages - add patch 7 Changes in v3 - Drop patch "Get rid of useless wrapper pl011_get_rs485_mode()" as requested by Greg Lino Sanfilippo (6): serial: Do not hold the port lock when setting rx-during-tx GPIO serial: core: set missing supported flag for RX during TX GPIO serial: core: fix sanitizing check for RTS settings serial: core: make sure RS485 cannot be enabled when it is not supported serial: core, imx: do not set RS485 enabled if it is not supported serial: omap: do not override settings for RS485 support drivers/tty/serial/imx.c | 8 ------ drivers/tty/serial/omap-serial.c | 8 +++--- drivers/tty/serial/serial_core.c | 48 ++++++++++++++++++++++---------- drivers/tty/serial/stm32-usart.c | 5 +--- 4 files changed, 38 insertions(+), 31 deletions(-) base-commit: 94f6f0550c625fab1f373bb86a6669b45e9748b3