From nobody Fri Jan 2 13:50:12 2026 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 6CD2BCDB474 for ; Wed, 11 Oct 2023 18:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346992AbjJKSQh (ORCPT ); Wed, 11 Oct 2023 14:16:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235145AbjJKSQS (ORCPT ); Wed, 11 Oct 2023 14:16:18 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2041.outbound.protection.outlook.com [40.107.6.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15607E5; Wed, 11 Oct 2023 11:16:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TJMh+HfJAapuUDXSiFnJcZ5wZkw/cun9KKwYmltx4LEz1tt368wyq/9Dr8mNL/2iefS2E4/3xsL3CKOhLiAlD+CSa4Cb6MTnrp8zK0gDCR9TisS3RPeRKxKSzh2TdrMOj6xavFkPwSHCu3IvMCG7SD60iQrZa3aXuQGm2EpOUfFqdb9v9cuT9Q5PXVghQ+0RG/Bt5TCn2KgqhzSaQVBNgoQWc6SunvzKnU802eI3nJthL8DImEf5lk/IIDV9CV+fUaanfJesXXdUm130A4FF+dceLWTFINvNRNMemixzmv/5I5MABiaQD9wTUDj7iAomndt+MJIvJx68ca3G0m4hUA== 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=6KQh/iKhf9LXRW6pVMZ1tYdiYaWX6FeHAsXrrGRngEU=; b=m/6m+9dZBljNANWRsZP/JaSMsMGLfFo6cH1xB62lo3+GxoIj+mhnlqG8Z/8R3hcR0/z6hxjGInpY8oa+iFJ5Q0sK36qI0vBerzEkUwWFUKklEdPy0YQg7StbQ7wrY9ZsYk5zWq40/LvVSFO/2skaq2NxRoffDi3BGmVpneTcxk7HtTmRqCFch+GoyTncBnZ0vwA48q4PqGKhTqI+RVMsXp4bH3fzunboeKpZNidURw4IpHg9Y0qLQD480Doosx1g9fmJosZ+27iFqkQ0J2zBHSxsDMBg6JDJLiAgk07n5Sv2oJEZQffIJiT812cvf8GE1O5V35nO27nGY23YJQXJFA== 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=6KQh/iKhf9LXRW6pVMZ1tYdiYaWX6FeHAsXrrGRngEU=; b=m/jUMRZ34/i6WEEHihlwTI/6UyJqy0VzBJcYOaATzUgGmHz8T5Tclm/k81DB2R69EXp41EouNr12/CvdzhQIU1AMAGmGeUpj/OhdhSAj70+74jj50Bqe5o9KXBgnabdvyLRWA8ugo7C6qIMv8hNuYJDzyP3Zg0wlpVhABsPm0I0= 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 DB9P193MB1497.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:26f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.41; Wed, 11 Oct 2023 18:16:10 +0000 Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59]) by VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59%3]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 18:16:10 +0000 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, cniedermaier@dh-electronics.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 v3 1/6] serial: Do not hold the port lock when setting rx-during-tx GPIO Date: Wed, 11 Oct 2023 20:15:39 +0200 Message-Id: <20231011181544.7893-2-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011181544.7893-1-l.sanfilippo@kunbus.com> References: <20231011181544.7893-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0163.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::9) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|DB9P193MB1497:EE_ X-MS-Office365-Filtering-Correlation-Id: c516f870-7ac6-4a98-ed74-08dbca86256e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z1yNtvjSSbYkbCFaHtHQpVy2frvfV17lirdrLjUVA60sjDg/3MPz/4R7jp0sLpXweCv90b5rR8Is/e/Pesgo0eHcWJFcfK83x74L0E2nIBNJCcoVO7NnWiugxdleHHN2mQkZCXLKPHBE2LKyTeFfAAr0uxLpdZwy6c6uEXHvv6yQxmsu8Qfl+DXnVipUPOlZlFB0GYYJv6fNUQ/IKJ7nw4OtxU3A4Cwg5kJPqtBSmgTHvFYHLcuKfQCBk/HVqYp/YcHG7bqwCdqVhol5jSSMXACKNxHV0xIryPfF28fnNxU/nZlj0//bkVLUa1Ok5PViCyCrhIIX5lOnIpTM6IUuIQ480deZV023Z9LuZHqDZRzi/T58tH8A2MbpfgqlDGeLvTMWY/IuVvm+R1UP4gaVzPNG2dJ0tsgheZqOl5TfNnUrCvMQv+n6672cnrwauww4SIvZSBT+lazsturB69Siips3rNswAvB6v4Yi7j4eG15zYYUTB7smIOchOnDVhHfVd7bE67kervLJMnBGva/TSsfs+WSNkUW03UPPDBE5ptLxh/kt5iiN5o4iqhK1pNYt 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)(396003)(39840400004)(376002)(346002)(136003)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(52116002)(6666004)(6506007)(478600001)(6486002)(6512007)(38100700002)(86362001)(36756003)(2906002)(5660300002)(7416002)(83380400001)(1076003)(2616005)(316002)(66946007)(8936002)(4326008)(8676002)(41300700001)(66556008)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NMgxcCyxUTPkjNSD5JJ6kDg1D+pLMjTr8NAgT8XKZINBANxj9/pwBQtIlxdw?= =?us-ascii?Q?cflVPBIEDmdHpBK6sgi5vw/biimnJL1/AyxdF5wBc5XPPpsKTpSl3QCkhxnZ?= =?us-ascii?Q?3K9bXteX2cOMTLFh/8RZPhhmBC0FZYmtnXcAsW3Fjgm/tN6WCwDdrUQjcM/x?= =?us-ascii?Q?ejTeVVwyDjVauX8AX3LK7qv+JR9IDjnUTIsB9iZXMtT+TOlN/o+SIRuNgyF8?= =?us-ascii?Q?ZkEgCSs/3HLOkUtDCqS9qAPq9ragAEt8Mp4LSr/eOcHUpJDbfKOPLYWN9q5z?= =?us-ascii?Q?TSUuRjIf7VNcqIxbd6mj4vh8QwCsGYki2vF6vNdkZzHaG3gLfBlbiWgxK2s+?= =?us-ascii?Q?9GiXVOxVNu9c4NkiSk6aWADzqyu2d5tsHlx5LuxXfdxOp9WgfBV5tU++4TCb?= =?us-ascii?Q?rEjj3+3S+6mfXA3X8M0JPpDTDoI1g9IAUYRu9aZmmY7kfFcfweZfgqJpwo3l?= =?us-ascii?Q?q5vQAWjHV3fqyFc7ZjZbycx8/fL2dVUPDXQLhaF65+NCjPD3r+7KUDT7Hy67?= =?us-ascii?Q?MFfJ9yg9M+TXemK1AJRPRDIU/rYB7f+Yxj6+qM7kQ3RsTAtbIRK3n//NMdvY?= =?us-ascii?Q?pZmduqO5vCGHRbEExFv5H9DF7qeO2V7NV0a1LGOKMagt19zMqci1OI/4EVYc?= =?us-ascii?Q?vHrkX/614EB0WRIrwh9NfOPkXsvU/Ajri8wY/PF5eYbS4PbTcrQZ3Pe4FrUC?= =?us-ascii?Q?icQ1VK9HCQXe79bnABXQ3OLKzsDOZJbNUGv3rvZND7yDTAUk1bV00Uhmuu4U?= =?us-ascii?Q?jPtCVJbBwqQOFvE/LNdLJulsjtg4g9G0GBmObP5JCagiu0s9tljUXZkjw9Km?= =?us-ascii?Q?j1Jr7T0vrBz/XqwDxUoB/o8VGCeWFTvcRk3nlKP727RDWIjZy87+LGHHnoR0?= =?us-ascii?Q?NXtwKgKRmoh3dDBLN+nm5emL+EqCs5fPHIFM706Fk2aAP6jjVyhJbWuRIXOE?= =?us-ascii?Q?5p8VhaDLaYMP1KxcWYQCVl8og8QHug+EkCXV0n/ZIqEQ63kRCKV1RCw2p/nb?= =?us-ascii?Q?ROCRHf3lisg25kMBYDl1jLvqABfr/AQ/Iwjj4pVynSF7jEhTPpZ3sOtJPYv7?= =?us-ascii?Q?1a0XaJneHGRHPVDvBaKrrK8MmLhusKKjKivyvorxmxos4rR3DZum7bROgp0L?= =?us-ascii?Q?lsYqeq2Hh3DtcSVevFo41d0rbvtgmuQ1orf2Za6OSRXsGKfBlj3XZoDXWzuh?= =?us-ascii?Q?5N4evqaHGzTooTkSvoktDSILiaZbmUDx2v5yDTktw29uSuV08CRyxPqLUQ7+?= =?us-ascii?Q?mBZFbvqFSi8c8nbl6x9qkkQMpY0vr6OFCEdmhrswplSq5ONGoM5C3Qkqr7Gy?= =?us-ascii?Q?bRcH8D6wC1OpvYaZO4fADAXd9lSkqQHLaRKVWu5xpR3J49/IfNQvejkMLWew?= =?us-ascii?Q?oVUHcBKDvy3xkPoFD0zigQB3zAWbROw69e8g/SsBNF3VG0i5RK+o0QuL2KOK?= =?us-ascii?Q?9rxmf92l/oL5WkgJ0uJa0ayxK9lfepe3ylWpLmCsk50ASu+0uxCVcCbuyMFW?= =?us-ascii?Q?k68zVEpcwAGZnkjTlB2Fkh9jyrejYNAbppXvthrisLuKBVfiHteccXof7hBA?= =?us-ascii?Q?505YH0FPj2dTOiPd6XfSZLsDiS6AAWYvmkPy4faj6IdhM7w57mPue1B1u+aR?= =?us-ascii?Q?vgt8X/Tp1O7rD7gbmLD3oN0wWSNiv/tDoA0dwgak/Hnn?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: c516f870-7ac6-4a98-ed74-08dbca86256e X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 18:16:10.7169 (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: /PVWPRpN2NsAEQX68DA3vZdpmN7bEKdye0FutcYi9Lz6LxVa2ExQm5cbNYIqYxPyUcEOTC1G0NDkD4to2ZBiLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P193MB1497 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 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(). 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 out= put GPIO") Fixes: ca530cfa968c ("serial: imx: Add support for RS485 RX_DURING_TX outpu= t GPIO") Cc: stable@vger.kernel.org Signed-off-by: Lino Sanfilippo --- 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 *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 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)); } =20 -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; =20 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)); } =20 static int uart_rs485_config(struct uart_port *port) @@ -1407,7 +1409,7 @@ static int uart_rs485_config(struct uart_port *port) int ret; =20 uart_sanitize_serial_rs485(port, rs485); - uart_set_rs485_termination(port, rs485); + uart_set_rs485_gpios(port, rs485); =20 ret =3D port->rs485_config(port, NULL, rs485); if (ret) @@ -1449,7 +1451,7 @@ static int uart_set_rs485_config(struct tty_struct *t= ty, 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); =20 spin_lock_irqsave(&port->lock, 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 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 =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.40.1