From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Lino Sanfilippo <l.sanfilippo@kunbus.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>,
u.kleine-koenig@pengutronix.de, shawnguo@kernel.org,
s.hauer@pengutronix.de, mcoquelin.stm32@gmail.com,
alexandre.torgue@foss.st.com, cniedermaier@dh-electronics.com,
hugo@hugovil.com, LKML <linux-kernel@vger.kernel.org>,
linux-serial <linux-serial@vger.kernel.org>,
LinoSanfilippo@gmx.de, Lukas Wunner <lukas@wunner.de>,
p.rosenberger@kunbus.com, stable@vger.kernel.org
Subject: Re: [PATCH v5 1/7] serial: Do not hold the port lock when setting rx-during-tx GPIO
Date: Mon, 11 Dec 2023 12:35:36 +0200 (EET) [thread overview]
Message-ID: <e65d73ed-9d7f-8037-78c9-48c817ea3492@linux.intel.com> (raw)
In-Reply-To: <20231209125836.16294-2-l.sanfilippo@kunbus.com>
[-- Attachment #1: Type: text/plain, Size: 3528 bytes --]
On Sat, 9 Dec 2023, Lino Sanfilippo wrote:
> Both the imx and stm32 driver set the rx-during-tx GPIO in rs485_config().
> Since this function 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 moving the GPIO setting outside of the port lock into
> the serial core and thus making it a generic feature.
>
> 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: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> 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 | 12 ++++++++++++
> drivers/tty/serial/stm32-usart.c | 5 +----
> 3 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index 708b9852a575..9cffeb23112b 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -1943,10 +1943,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 f1348a509552..a0290a5fe8b3 100644
> --- a/drivers/tty/serial/serial_core.c
> +++ b/drivers/tty/serial/serial_core.c
> @@ -1402,6 +1402,16 @@ static void uart_set_rs485_termination(struct uart_port *port,
> !!(rs485->flags & SER_RS485_TERMINATE_BUS));
> }
>
> +static void uart_set_rs485_rx_during_tx(struct uart_port *port,
> + const struct serial_rs485 *rs485)
> +{
> + if (!(rs485->flags & SER_RS485_ENABLED))
> + return;
> +
> + 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)
> {
> struct serial_rs485 *rs485 = &port->rs485;
> @@ -1413,6 +1423,7 @@ static int uart_rs485_config(struct uart_port *port)
>
> uart_sanitize_serial_rs485(port, rs485);
> uart_set_rs485_termination(port, rs485);
> + uart_set_rs485_rx_during_tx(port, rs485);
>
> uart_port_lock_irqsave(port, &flags);
> ret = port->rs485_config(port, NULL, rs485);
> @@ -1457,6 +1468,7 @@ static int uart_set_rs485_config(struct tty_struct *tty, struct uart_port *port,
> return ret;
> uart_sanitize_serial_rs485(port, &rs485);
> uart_set_rs485_termination(port, &rs485);
> + uart_set_rs485_rx_during_tx(port, &rs485);
>
> uart_port_lock_irqsave(port, &flags);
> ret = port->rs485_config(port, &tty->termios, &rs485);
Also a nice simplification of driver-side code.
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Just noting since this is now in core that if ->rs485_config() fails,
I suppose it's just normal to not rollback gpiod_set_value_cansleep()
(skimming through existing users in tree, it looks it's practically
never touched on the error rollback paths so I guess it's the normal
practice)?
Anyway, since neither of the users currently don't fail in their
->rs485_config() so it doesn't seem a critical issue.
--
i.
next prev parent reply other threads:[~2023-12-11 10:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 12:58 [PATCH v5 0/7] Fixes and improvements for RS485 Lino Sanfilippo
2023-12-09 12:58 ` [PATCH v5 1/7] serial: Do not hold the port lock when setting rx-during-tx GPIO Lino Sanfilippo
2023-12-11 10:35 ` Ilpo Järvinen [this message]
2023-12-13 22:14 ` Lino Sanfilippo
2023-12-11 14:49 ` Hugo Villeneuve
2023-12-09 12:58 ` [PATCH v5 2/7] serial: core: set missing supported flag for RX during TX GPIO Lino Sanfilippo
2023-12-11 10:36 ` Ilpo Järvinen
2023-12-09 12:58 ` [PATCH v5 3/7] serial: core: fix sanitizing check for RTS settings Lino Sanfilippo
2023-12-11 10:40 ` Ilpo Järvinen
2023-12-09 12:58 ` [PATCH v5 4/7] serial: core: make sure RS485 cannot be enabled when it is not supported Lino Sanfilippo
2023-12-11 10:53 ` Ilpo Järvinen
2023-12-13 22:23 ` Lino Sanfilippo
2023-12-09 12:58 ` [PATCH v5 5/7] serial: core, imx: do not set RS485 enabled if " Lino Sanfilippo
2023-12-11 11:00 ` Ilpo Järvinen
2023-12-13 22:31 ` Lino Sanfilippo
2023-12-14 9:27 ` Ilpo Järvinen
2023-12-09 12:58 ` [PATCH v5 6/7] serial: omap: do not override settings for RS485 support Lino Sanfilippo
2023-12-13 10:26 ` Ilpo Järvinen
2023-12-13 22:55 ` Lino Sanfilippo
2023-12-09 12:58 ` [PATCH v5 7/7] serial: 8250_exar: Set missing rs485_supported flag Lino Sanfilippo
2023-12-13 10:18 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e65d73ed-9d7f-8037-78c9-48c817ea3492@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=LinoSanfilippo@gmx.de \
--cc=alexandre.torgue@foss.st.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=cniedermaier@dh-electronics.com \
--cc=gregkh@linuxfoundation.org \
--cc=hugo@hugovil.com \
--cc=jirislaby@kernel.org \
--cc=l.sanfilippo@kunbus.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=p.rosenberger@kunbus.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox