From nobody Fri Dec 19 13:10:49 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A7F8C10F07 for ; Sat, 9 Dec 2023 12:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230168AbjLIM7S (ORCPT ); Sat, 9 Dec 2023 07:59:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbjLIM7P (ORCPT ); Sat, 9 Dec 2023 07:59:15 -0500 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2043.outbound.protection.outlook.com [40.107.7.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E87F010D8; Sat, 9 Dec 2023 04:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j3nuZnDB1sbK/8slOWy24jbK1DynajwdiRaYGh1gzS/DRBJn1xTJs5yteHRfhMnN0O4qVBcJ+9Do9g6dcOMWnO5MXZTEJSn1xOZMRHtaPi3hxEZ7GfMb2dNFg8KAFk6OV0REAJI0bRM+Zlkz+0W02Pb3i8qAGDAq97a0dXU/ZZKi5IVpxBkdJcXIQWf8DDDJEYGpGe6xGxq5C8wI4DqQfwI1L/PDbA1gZsN4kLJ+o/k5WOZkqNwmJBF9vT3lvuhdFetJ3BXfoq8LbQOVJv53Vx6asdbWdYOZF7ZbltSPrpCzwugd2ZJIM8Bd+6IqZqaBE7eb2zssEoTMzDqlJZS4Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ui9KCTXid1xQ6I8QFDMz29kSlbNm7B3mfuhdJjPmypQ=; b=a1KpvBvo7wiqdirTWw3HoSCuFvEz+WFIQjDj3adVjGHFA5xXb3hrxZ8o6KQdweABRGTGL7u50GahQtBEz9RIuGeZsfmgiCN115I8iGbqitcnfI0qq6rJY8Yk2qOYSs1xdwAi9Rb2POTEQ6B8us1UQcBKxOPoWF3UEa6g1E0Un2Vwnch+y1Lt/wV76B/iwhjdArlRb6WNnXEU+jRkFdHQweK/3Ngi9yrymWk1tux6BJzmFoQ6iRVrkGN2hGjsQmPav0xBFMMcuc1saxET71fVW1yaim43zCipyW4rGotoal2xHwjEf+K32WqXQz1wtpaghXRHf9wOOXZzxcr1zBqsMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kunbus.com; dmarc=pass action=none header.from=kunbus.com; dkim=pass header.d=kunbus.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kunbus.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ui9KCTXid1xQ6I8QFDMz29kSlbNm7B3mfuhdJjPmypQ=; b=MfhZWO3FWbkxNtBrKbntGgThLZLgvtlBdJ3LsmIZgksnj0r3GG/s76PlMLB5eukAkAn2dyQ62qKGBWR+RvScdI3DQbqgOztYTAyOj6I1QRcoBEXhkDc43LfY159pUlSfxuVGR1ZXo7th/xM72DZBDB0CVNjQ/q4pKBFHIlyRmU4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kunbus.com; Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) by PR3P193MB0555.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:31::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.29; Sat, 9 Dec 2023 12:59:17 +0000 Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::653f:d0f3:e7f6:8c06]) by VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::653f:d0f3:e7f6:8c06%5]) with mapi id 15.20.7068.029; Sat, 9 Dec 2023 12:59:17 +0000 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: 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, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com, Lino Sanfilippo , stable@vger.kernel.org Subject: [PATCH v5 1/7] serial: Do not hold the port lock when setting rx-during-tx GPIO Date: Sat, 9 Dec 2023 13:58:30 +0100 Message-ID: <20231209125836.16294-2-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231209125836.16294-1-l.sanfilippo@kunbus.com> References: <20231209125836.16294-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0070.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::22) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|PR3P193MB0555:EE_ X-MS-Office365-Filtering-Correlation-Id: f07165ad-c521-41c0-72c8-08dbf8b6a69e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fy7yyyM2iBJ81/YY1YEVoIB6yAqEAXTHB9SqJiN+zWrOmlRYTjsKGCDIMnTO7qlwNbngoeHUggAI7WrdFM9sJsyrw+EzZkDdcHsyuLZjniR5aekdCdVw+/osoCALTRBq+7I4sF7MKYE48hEIQL80BUFiNqNtyomAmqwUKq6m3LfUay8Dwe6GkP823kJuFNK67MpVrrwjQfmhzzhS6mbNpThvDvFFE9aVm2CKqiuY6UhWlEM05iUSbcg84GCn7XcG72awYZpwu7rfZLvqUXj9N+4Z7T9zt1PrIzZfA7KDPywUjY3p3QcsiXu2nlFxvgGGA0KdWKffGf084qpwRiGvUoDJxBMJw2NmOrr8celxwJvcmIB5CpgdplCJRP9IavcElkb2CtVcukQvhv9K2w6i4IPpzu4kBEnGtIO7EnDcYkc4aemJkuvX2VXelw6cM0fFjmD49KaOqYERtU/NCWphvvQIVPRcXrj1hyYWmahdb3Ay79KrV/fZ4WtzrxJdQOf1voEakuVZVcSI+kt9dInHesS8esTtf8tdqV/7cG+tqidAY764K35iGmiDcN4aLd0A X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1P193MB0413.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(39830400003)(366004)(376002)(396003)(346002)(136003)(230922051799003)(186009)(1800799012)(64100799003)(451199024)(2616005)(1076003)(478600001)(6506007)(6666004)(52116002)(6512007)(41300700001)(83380400001)(5660300002)(2906002)(4326008)(8676002)(8936002)(7416002)(6486002)(66946007)(316002)(66476007)(66556008)(38100700002)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QC3nGixn46mXECUwVXiCF0FJUfsIYc7NyQL4CvxsYwaa44V+ptxqWe4zTyTO?= =?us-ascii?Q?Ia86Tq0svO9IEelF2GHMjagNHafr+Hav9hC5b9YPcx9W2KVgyJ6BjDitna1+?= =?us-ascii?Q?zaN3WG3RtkerA3IG5fVxHl42V/By7C7bUDFNfWTRapmxxeweDai0nzu0/hMq?= =?us-ascii?Q?K6O8SPQDZMZVrWWPkjLx+jgpBAwaomDM4Cca62j872xt8B9tPfLB/GRmgHVN?= =?us-ascii?Q?I1z9KtJLccDQYvG7gWlTVNAZ9WKRQ7OoTWJ/TGFooM5GmurbFmYBiARE6OJI?= =?us-ascii?Q?jr0Dq00IaFr4ELy51oaL9b1Fm83NekBwn3hgNGRxVk5xy8zKT3cErAyjOyFU?= =?us-ascii?Q?K91JOiUFalFJ7gu0Pi7hvV8jZTeADtuNGvL8vMBPVPeyJHKCKocZBJRVxLyl?= =?us-ascii?Q?i8d5fee+1aXGwSlY4IiEB/JfkPD9/ghKybSWTmKubOM5cjk2qQAYMSZddVUx?= =?us-ascii?Q?CaqFwy2p5mcI6oOVnd+N7akAYub8XUTadsx/+mPxlaV1S3Li7HuHtxChR4OZ?= =?us-ascii?Q?bDIEBICWQav+1eWO90QLPMMoh+XTHupCvsBZYRM6VLffI73A5/PdtLtvnCqA?= =?us-ascii?Q?Uh6S3Wd/8XXunA8si2/LPEE1kiKLtL20rhwU2mK7TvQUrwXPoqC5dkHLeTtI?= =?us-ascii?Q?q9IQTOITZsdbqxz4E6CYbSkaXMrOguMiXCtF/MtWlQ1Gb2cdH2YI2Zo3zO+4?= =?us-ascii?Q?voYgGjMv+To7daQgRhtlrSGfDSAqd3OTgLnsvW0eTO7yuYtEIGJFsbLd3LhF?= =?us-ascii?Q?WtANL2ymdIF1jwCulcovEM2pT0eD498Z4lIFFzVtyM9rzP6Wjnc7N58q52fb?= =?us-ascii?Q?CL7ydFz6c2tpcdeLZcWzRurpxOnfKNXg0nJ7+0z7RuoyHXG3XzfWIwdL5Stz?= =?us-ascii?Q?86VxoRiF/hZ9tKD6i2dBXxmgdK5h1aS7G+dAYcx6CA7jQs7IuGjab5s1CzT3?= =?us-ascii?Q?hsw/Be8A937lkOAxkjzF4iGfWA83K0aWaVbueYEdq08a7v++o5AJV0HP4xow?= =?us-ascii?Q?FgPJVJE4IP1r6itLlXnZOb279KApv2rw+LXkOOADbg6zFMp3iX5H0WHhd+0V?= =?us-ascii?Q?oo9aa6TBtI2vtSduvR/xiqnxjV/sdMS515RQtPgxWSoY+5miZ7NLGrAagELl?= =?us-ascii?Q?2qo56rEB7zcCoDGtgXA7dHLgtDZrjWOS1HGzy5i4HCMxMeiQHrqzf6yIe9p4?= =?us-ascii?Q?vyDVrFCo1G2xzNKxvnqvB//yyque2kfCSjRhOiBN2SEN1uTKjyV1n+oXS1/k?= =?us-ascii?Q?UEEbr5NbdTNdJNRj4slR1IQuFFHS9O44+LZ+7tpvjWkYYzm+KYlMM+cMmhOG?= =?us-ascii?Q?wgtAR1Wx50vZEBAuFRUkF98df7zMHPmyp7eR++e2fHPRIOK92+RRz4JKF0q9?= =?us-ascii?Q?UICm3Vv91P+AoC5NZYQc2ZuOAu9ctaQwaFKNqA3a9GlrOD7tmqw5yRWtIclK?= =?us-ascii?Q?UQxGtD+TjCAayfs62RFNrh2g8TVquX+LloMYmUDUzJTF74tVDucnAPHOFuGY?= =?us-ascii?Q?03s0jnH32mIT9BIww1RXEUD+pC2/oKhwZA6p9Jt4jCjjv/tDN6zfX5pHOLKp?= =?us-ascii?Q?yRkXAWpT8uBLhwNRnOI/0BgElmuTv18lNwYOWoXSOUPTtw8AiK22hV6kR5xf?= =?us-ascii?Q?7WsNRQFw7R92Kb9Zie7Vzyl2VCNVdiaE6fEPpv34n84n?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: f07165ad-c521-41c0-72c8-08dbf8b6a69e X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2023 12:59:16.7942 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aaa4d814-e659-4b0a-9698-1c671f11520b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /J16/FjfSkP2LSYuYnSYrW1IIbPsaqP9Qp1Bvv6OOpx2m9OTxJKUB+Gf5t2L/K/qMdyZo7SREo09Lw2wbU0K4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P193MB0555 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 out= put GPIO") Fixes: ca530cfa968c ("serial: imx: Add support for RS485 RX_DURING_TX outpu= t GPIO") Cc: Shawn Guo Cc: Sascha Hauer Cc: stable@vger.kernel.org Signed-off-by: Lino Sanfilippo Reviewed-by: Hugo Villeneuve Reviewed-by: Ilpo J=C3=A4rvinen --- 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 *p= ort, struct ktermios *termio rs485conf->flags & SER_RS485_RX_DURING_TX) imx_uart_start_rx(port); =20 - 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; } =20 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.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_p= ort *port, !!(rs485->flags & SER_RS485_TERMINATE_BUS)); } =20 +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 =3D &port->rs485; @@ -1413,6 +1423,7 @@ static int uart_rs485_config(struct uart_port *port) =20 uart_sanitize_serial_rs485(port, rs485); uart_set_rs485_termination(port, rs485); + uart_set_rs485_rx_during_tx(port, rs485); =20 uart_port_lock_irqsave(port, &flags); ret =3D port->rs485_config(port, NULL, rs485); @@ -1457,6 +1468,7 @@ static int uart_set_rs485_config(struct tty_struct *t= ty, 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); =20 uart_port_lock_irqsave(port, &flags); ret =3D port->rs485_config(port, &tty->termios, &rs485); diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-us= art.c index 3048620315d6..ec9a72a5bea9 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 =20 stm32_usart_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); =20 - 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 |=3D SER_RS485_RX_DURING_TX; =20 if (rs485conf->flags & SER_RS485_ENABLED) { --=20 2.42.0