From nobody Fri Jan 2 11:58:40 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 A403ACDB470 for ; Wed, 11 Oct 2023 17:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232457AbjJKRjR (ORCPT ); Wed, 11 Oct 2023 13:39:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbjJKRjM (ORCPT ); Wed, 11 Oct 2023 13:39:12 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE0EF8F; Wed, 11 Oct 2023 10:39:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=klwwR+6mfGr75TVyoV7h8z9micylMuyiaZQZ8n1PCXEoOacW5oYAIDf6juYJz7wyiSze955lSyCBSyj2bLksypvZF2ZV5EpOM4JGayxLCK1y/gy8elOjOrKOoMWoRCsWG7aqKkMfHryJXGdpDiJK1uJ9BVBWu0dT3wWeVf5hgmD9V0bF2cI8MPoDgBR9q5mOxLqKk77p6OwKcPkQx9HVPLRriePHXNsAxfh8mjdGX59iFxdsJrEBW+2sNcEi2awoNMBSnkjH0oKmU3HZCZSVWFyZDgRY0jcYG/70AKZxBWTI+pKKAgfglPRmbCZQQqwQwTU6puK8Xd3P4n3E40VTjA== 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=AUz3U2fU/BT4VNr5sXIo3f5tdyEclvTEcCcz4TpXXqbslp9rvbZHZVXGQhq7/eBzlrPQY9E4nd66K7jsCNDz03gsJ6sZLJCdDVjg6vt03g1ZmLM/2vI9M7tF/BzQ52vi9ETUMjgB53XKGbciiusNmi3sTumGcBgLG8dF6dMLBAopnJ8I9QfI+RCtxwPx8ttZZ0BaAxrDSt2Ix7Q/PeoC0HhFkYpX0UzNSMymfJUcb8sfr/thjQIbxa0cNXhTFeOrI0zzFwG3y1rvJ3OzyGh3BhchQeMkyb5J9lLTG4/wZo2Y/V4s3Nq1bMSGsI5flO514iqIN7QeG28qNj0y/zCFfQ== 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=na+PDpR1mbteH6+kkcXBGL+92Wdded29TmdqZ0oqp8SO4L1B+VLuAeZRdNcAldvlalZkct87JkPWNcjjSEHIaWVuBEhHwSuaA5c89+WdygkvRmKvOEKUMwz8jLU0+iomderGUygye+XYLOVZhi5N/g9nDFui9DISmY9Yp9l3bTY= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:05 +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 17:39:05 +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 v2 1/7] serial: Do not hold the port lock when setting rx-during-tx GPIO Date: Wed, 11 Oct 2023 19:38:23 +0200 Message-Id: <20231011173829.10508-2-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: 783012d7-e28b-400d-331c-08dbca80f6d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tGRCJjbeSdmcDRTtJiWANZpXMn+re3GcZBJHlcf/hsmZ7D+RudCRbEOpBcZouBoAjPDaWTTnUdgLKJGL3yIQvCV3Zf3GokTLAJR6d+uLyIGAcN3/M/ESQHazdtzrHsrwTV3PejFAYUcIch6q5pO9UR9gRs45ckY1CksWarlvJ19L5o+MRxoBcXUuitR02eMc9J0CPIqZ9FznT5vgpUTTrBNOdTvYNdznISQ1TunYs8VLL3qWNySJflFxrV7VjiDu74isH63E5zZNPusY6iN/gQsNMUw2mqFsU5YhQwSyDQuZWmBbau6sqw+USLJ/wE1XBgb+cDUfSlydjlviV+edAqK751uOlQnDY343uUPs6LdELXdIL31ldfofVMMcY3z6HEMUT55j1yyA3NXhNsoOG7A5l6TSfuacvCb3q71WY1JdmToVs8Mty3/qAze9oGdqDndPIg4UCd0mzQyG5T6I/dzj5vMWmpTGdWQG4b54T/GvuWQYUiQfxLP0IPtTmbYzFYZjcwxUBqfnau6dv9huMhlCveWj4VaVyKZAWnLMve5qpKtBhcLjbxiuiWDsFzjb 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hrjWRu5dgBrm2wayejrE3KsI4QEYzrpebvOGLMFrW1Sge+v9auE70OjU/At6?= =?us-ascii?Q?xY+8GFBTDZn71GiQnBT7XlMk6ZU+r5qIpJXbCz4WTfTbvDkvEg/nNL24Naak?= =?us-ascii?Q?1hW1BSijtPHAVgaza4awWXVkJixOIW+qeLrBOFE+pSxKsHCg/8EXsZ5W5lZt?= =?us-ascii?Q?zheKgYjAFOX6iuHKD/t5HK+NvMBLZqRgzi6EURCE71xEbTblkdfO9yiDANeb?= =?us-ascii?Q?hSZLEmtYaqEP+83EREGnJ4i14APGGR1n1nBE082+EklQS3pFYgWsPBVg95Tk?= =?us-ascii?Q?t4nIyixy9By01d3gJwsyRYvJApC1rKcPiuanFCnhSZtN71ce3xR9b5aPvK6P?= =?us-ascii?Q?GUdzK0Q1Cs9i5nn94Vc4Ymkh6XC7RwSTBOP/YIQtNyCjKpkY+X68AewfTbGd?= =?us-ascii?Q?pLfVEj5f+hEKXegCCKh9klh/27TDLsIRFRLfF/C4KfsVQjtrjns0rgDKHLSm?= =?us-ascii?Q?sbgFqdPlBhAsb3pOjUyERQ0sjlwXvM6F1apzW4tEanVoq6/YUMmr1eyRa0bN?= =?us-ascii?Q?WCJY6e3O0gOlQshnSRQbkPJdJ5IjuHMDC1eFVsropiNv5w0uG2cYl3xO6XUL?= =?us-ascii?Q?vzY7W1MqG3gmr6Kf1Yc32D2zH02HF378rGAIoCcZ1/LjAqPvbHgP6068j+8h?= =?us-ascii?Q?yssDUqOqhe6ECtqtpDttsfv5rX481wWGTFWbjkYH8PHW6CsksVkWn1OwDqR9?= =?us-ascii?Q?eEhf2K8/6/QUgrVkrWweKPDAptRdKQpqhE5JTQWvePl9+El1B9IivRy6ZyBZ?= =?us-ascii?Q?cWt1F6wpyO2Efa5/Tjno9cNnYY8EhBPpvZNgNeRhxG2zMEs9uDYbrUcY7tkf?= =?us-ascii?Q?N0SEEzc0QPwQjwFRnCO4y8mBvOzS1+SPWiliaWk4W35QvQdsOGD8TEMqYHTF?= =?us-ascii?Q?NHVVRwpYX6tc5jFvg1LPwEMXz0VB5F+ACe5jw7iW8KX4YUfBEnD4dT2dsjfA?= =?us-ascii?Q?eg7JfXc9bwgVFAH1Bg1FYA/XmTdrN+1Mc6g3Xp/Hgfe9pYwOJcdKCptgBvMa?= =?us-ascii?Q?V25Cbf2VL5uUjXqnJFPwN1XaKyiNRYsd36mNSjYf8JFJNm+5ik3WNjk7E75a?= =?us-ascii?Q?loIOpk6YO/DGjqVsHLhjOyUQfeucdsG5cDGSyHT1jGpoGWRCjo2yYHR9ld4z?= =?us-ascii?Q?F0Dyftv9CB+j+aui2/MkXe9Qldqk3aoivhLBETCiLMwg/84JayeOP9Jl6un4?= =?us-ascii?Q?TLKdRhuCdpdRU0zfHugJk5RbnuiNeZ5PFGK5H53DsnKA8lreHIJiZlAOHmch?= =?us-ascii?Q?qR6zewD2cr/cWqOdoqREmtV2/1tWvWtAjgkRZZ4yOH3znHYxS9hkXj7f99Ef?= =?us-ascii?Q?ib3uVijoiFbu90mcausMZdtQWjI8xpvweos41GcPpkLbt7WRL5k+xFSJ3y4l?= =?us-ascii?Q?mscG9Fa2yhCPjRsxKslgaOwabT+ioLkgxjV4SW6E+m70PMNpNWOEW4r2lSeF?= =?us-ascii?Q?3VfSog8cqoHIbf8DiK4tIqnRpsyhe3fTWNYxm1JW/1YerCCGEHqrm5o2nQjy?= =?us-ascii?Q?EZry1SMqpiIkiKm07QQhk9V3B9M2blmZibSdI9mAigIjK+/rVTxzf/kx2y53?= =?us-ascii?Q?Q66zazXGgBvTncqx0JU83Dek+Gvf+XZcq6D0RMVJsmLN9l37NFAcKukEEwKF?= =?us-ascii?Q?zxgkcaeFhWXv5WlklTWT/eiyNexmNZ3GZhUBjl+Xu0LU?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: 783012d7-e28b-400d-331c-08dbca80f6d4 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:05.0610 (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: Snc63m0C3MogJcDZ/TOJFOnkcz7rUAIvNmIXBirTZkHZ8ZX9NGgdCcFJF2ogsv2Q8u/kV9TbUD2Euo8ykP63tA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 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 From nobody Fri Jan 2 11:58:40 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 11A22CDB471 for ; Wed, 11 Oct 2023 17:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232973AbjJKRjU (ORCPT ); Wed, 11 Oct 2023 13:39:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbjJKRjO (ORCPT ); Wed, 11 Oct 2023 13:39:14 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E7D98; Wed, 11 Oct 2023 10:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnZ7gbPricR2ACpOXheK35H30OSlirJ0sRNbq2BNUfprgmFlHc5svTR/vhVwz/oMUzNFf2SBvMYTVv0/hLDqXQaE4LU6IB3cgv2NenhNH0TUV7Md/vdcFYonDchSbNXvJfemsErOLod7M4N/EIRpzkQTMH+yRF/o1yQJ9v4QVHZ79MhVL/JD46C4N29JIWJQAhA9E6d5TJdWfV8UA0qi2elJD6d8b6vWpCP3QPcXDSYqWK4oIuGPuY4nOGW0oS5LoyDQVB284vkLuaCK16zb1lX/l8gYbz2AQGbz6eGuxTnGyZ19TFXUwJAWEL5YFklTSwmEui+ZhRbzNzJoh9Y3eQ== 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=4GdkgcY/GaYzPupCbixjzBwTpe3yNotCFgwLRCoSCFU=; b=Hc0wO1p8od/ZkpnVeH7OPDF00CHci20/YQCmtTkncw/PeMnydGLK+14VbL2Wphol2WGL6NOvw/gYLqybZk7kaU2Go55Mm70lJymAuWTr7COWD1dM59QZ0wRS3DUx/vQ3tTeCxIPrNJsCeMI02MIOfwwXhWo020h+OfwsmDPClTf7MylxcaXlogb/Qm0EjGrzDTvQUiaO2uCpkpF8NLcYOD7lceaG2f270psOyKaXzRVzKfI/7ZJBntcPzRxveQ5simEK+O60neNaYCeTr6tFyRA67J0hVsoLUbk8k+pCKYYby5kP1/ep82lMA6PEmRQf++eJnyv+WrZ/OsHfgJDUHQ== 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=4GdkgcY/GaYzPupCbixjzBwTpe3yNotCFgwLRCoSCFU=; b=MJxAlVUKboAjc3pnWKf5Qx6lgDT0aXgANdEfYhea3qRmKVX1/GNlL6RX41RZohYRzbvHNf9khEqd94g9qhsHs4QwA3uAV0hAvDUFZOA4ERQLEWTXm6s9oNqRbp0WS0zqR0MACmPPvIMOrJMYJ6h5EALzxJ/p6863t7nPjp/eKyM= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:05 +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 17:39:05 +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 Subject: [PATCH v2 2/7] serial: amba-pl011: get rid of useless wrapper pl011_get_rs485_mode() Date: Wed, 11 Oct 2023 19:38:24 +0200 Message-Id: <20231011173829.10508-3-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: cea16201-84a7-4859-cad4-08dbca80f72e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TRs833aB0CzXkuyGa32oC1obW3+IQ/WEMrvnuVu6mheOfUuAve45hx2o5X08kbVf9QzDyh29KLK1MkCA911bjBO0GxfSuM/0ShiUgC06Dy7wJTD0NuEHqMJ1gDcBTFubtoduNMgAhaPVzkFiM7WmSIy2YFMZys5tJtvCNogtUaHbk7DTD8pCNDb1DOtHCZ9XotZL0128ZCmcG+0xCHIPyL24oaHOYzugkkpx5nD+pNN12H/RIjohBYFvCwy0CLEXOYf3dzBPqMr17diq8csXGlus2tEk/+HPNXootosn89MGbW1rcvSlEwG3Xl/1CgIBO9RF3hlqyVP77PwQXcOdOQHJer7GsgS6Ub1zD0QKMhamhvGk2UHUD38iGTYIGRJIqvD+EBcfLIjBPXPCtKpWaECbJxsVS8n0MUXnxnxep21BbMb0m9FGNIajDVXjZskVrk/PSlHYd1TPaYnRiDTLTJnrUw+AnTl44J92ygzEz2vulsBRXhbwgUmIS0kdKLSWn2BeeudQMqbxPPgo8a+KQRC+ACB1qrxcAlmKFafOuYRT2ZdeDfc0wHVgi3I+mBCd0NN0KCT9ukea+nZVAGkfYwRZABzNbWWl9XsZt2O4xiI= 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(107886003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002)(26583001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zcsL/23QVWB3aLyfKslCBBRVJue6luKUKao4dSgfWqnRx1T4Y0KfquhU9XI5?= =?us-ascii?Q?SnW1Vsvi+mxhIcugYOwGR3uzZ++JWX22S2r94PXe6zSxzXFkr/HDTFecIsa0?= =?us-ascii?Q?m5u+0mFW7opetsk9wTh8e4vaNlEBPByWeLvJRdTf+RxidIjm7Pe3uY40l9KO?= =?us-ascii?Q?wOyjobmtbBicOW1SvM9hugIkugbTyh4RYjzK/fYt/wMqwljyfwlKE2Hi6tZP?= =?us-ascii?Q?sNLNnzCi/1wCL0WEnT8nAHSVpMPDJMKDFP70kEtx/1R1UCAAnjiGB6LgU3Lc?= =?us-ascii?Q?jQj4HnOrCbGbD+zhCR5UXVSIG1+eZWhe+M6MW23kdDsgFMmi8/GE28oyUz5a?= =?us-ascii?Q?X7Ujo5wp84dwI4oSkXltuJ6Wxmd5RfZiOy2+lPBBZ2c8UpodJzh89WMSyIzs?= =?us-ascii?Q?qnib8rlflufo5EWIRn/lVD5qvqoOCD4QDct/GZa9APiMJEu9qlujzOS8e6Gb?= =?us-ascii?Q?oU6QiT3DV1v9qR2ffsanSZ739wE2mEP0K2A8L1DdR3bLURhTeeq0E1Dm1rPQ?= =?us-ascii?Q?0I5uH9ztPUBdJE02BxZDmiRYKjs+fjV0Vw/cxAhsem0+Nac3Pf7OEPfJ6Lhw?= =?us-ascii?Q?CYyGG4blG9QWSdPoZqGyt97PkjxWtFJJlEjgyJT+cHljovy9PRlBx5DI4OK8?= =?us-ascii?Q?XLLIWZ9oqMCfRdlHN6BgFJzMNhltyS6jOcp1I1Bb982sQpcZ5PQaQ+1rsHJM?= =?us-ascii?Q?3P9GguoTry/x5FHGmI0GPFw6mm5oP7CQUAcehB2qckvqB9dzQi6urlBcyCTn?= =?us-ascii?Q?1Qq8o8ZcD+Z7hC/R1aSZUEqh2JxSlQft+AtW8Xl0icOwxiF6SFYsYZkVJ9kW?= =?us-ascii?Q?5GUsSsDTVrrgIBqPnzyRRNRhY+VyL/UFrrs9SzJeQEXQ25J5YzBVmebLE10N?= =?us-ascii?Q?NOUvt9UjMvJhBS8lvrMcDgXBfZOd7QygIV52xTxecY282ph3EAKERVyBHE8b?= =?us-ascii?Q?OsaMxOGRQHD+UQFEB71A1mB5MAuOnnr2y2kJI5jiee111Xa/b0qClrR6Gr4k?= =?us-ascii?Q?Ie5Vox64ozsqTOO97q+Y29rvzVHizqDTxrzhzALW4jwxCRVIdwYCatEWbMMA?= =?us-ascii?Q?Ndr+DeooYGDwJQg31+Zcf9OEAxFfm39D5lnDURWRsnWnPMOtcTX8w/OF3AUJ?= =?us-ascii?Q?dFN+032H8pXNxnb0EeusiWxjZ9jnBI0SdLSNGlXPsmaypHwlYUNyy3YqAcef?= =?us-ascii?Q?pgbnxXSGIHsevaDTK1f0GrRVj2VxvN5qWzVeUF2JWLkUss+s7khwJi4LlmZW?= =?us-ascii?Q?56AfAFlm6+GbsqUJxX7e0ihhdGMNkFKGk8jqIV81L5+ibZi0hqfeQGqpRj4j?= =?us-ascii?Q?ZP8IX0uoSI9GkXnFxOsPx/txhPoZ56QWkOSP6Z/6gV6caf1PM8Ggr4I20awr?= =?us-ascii?Q?uW589HQvUVoYbEi8qEp8P2F8DcT9Ibet1l7PeWG1J5pGEEAkBMIxfyisSHpl?= =?us-ascii?Q?wlfzOZbQGhbMGLFlAW9ZJ9SymojFG8hi5tZHhrZOZo2DoJfb9ekbicrd7EU2?= =?us-ascii?Q?9mR7Q03aCLeJCPlrR97Ef18xmZrOxydBpL72WXRpgfavxphERduVQFqSlEvq?= =?us-ascii?Q?UQQwqrMkT8mgDa7nypEKDp1dF/dE8RgmpDpOGpoPIQv01Cil3sucaJ71mAav?= =?us-ascii?Q?oBwyeY1yu+NYyNFFHEGDccbxpREEvanmDq1cDU2zrh4J?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: cea16201-84a7-4859-cad4-08dbca80f72e X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:05.7071 (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: QqKcf8aIXkPvFHHLJr5O8xrqz3WCbhdSGh6CROWO06UVsrv5qxNHuWewcD9k4AqsGusLnzSKB9a75bBiLL44fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Due to earlier code changes function pl011_get_rs485_mode() is now merely a wrapper for uart_get_rs485_mode() which does not add any further functionality. So remove it and instead call uart_get_rs485_mode() directly. Reviewed-by: Lukas Wunner Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/amba-pl011.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl01= 1.c index 3dc9b0fcab1c..70b44f3e9eb7 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2716,18 +2716,6 @@ static int pl011_find_free_port(void) return -EBUSY; } =20 -static int pl011_get_rs485_mode(struct uart_amba_port *uap) -{ - struct uart_port *port =3D &uap->port; - int ret; - - ret =3D uart_get_rs485_mode(port); - if (ret) - return ret; - - return 0; -} - static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, struct resource *mmiobase, int index) { @@ -2748,7 +2736,7 @@ static int pl011_setup_port(struct device *dev, struc= t uart_amba_port *uap, uap->port.flags =3D UPF_BOOT_AUTOCONF; uap->port.line =3D index; =20 - ret =3D pl011_get_rs485_mode(uap); + ret =3D uart_get_rs485_mode(&uap->port); if (ret) return ret; =20 --=20 2.40.1 From nobody Fri Jan 2 11:58:40 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 A6104CDB470 for ; Wed, 11 Oct 2023 17:39:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233008AbjJKRjX (ORCPT ); Wed, 11 Oct 2023 13:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232655AbjJKRjP (ORCPT ); Wed, 11 Oct 2023 13:39:15 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3CA6A9; Wed, 11 Oct 2023 10:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RHq9G8iW5Y/QKfhvI7TrnEm9OYr+Hr6JTly/F1TrZQpjJs+HcIMxfqAUf6yYfKrpOd9kHDYPNIL6kvs8y3Lrl4kV0sLDtNWYQumDmi2fjC1NXz1sqslUvRr1jG0OEd3ephyUd13vsL8bnvUS2n3tcD+gfVEhTrDuCwpc5iWHwk984wtzuydI5YPT4JF+xkG/bR0NwSJLvS2E7sRvL3HhKhpdgRE2oVOY9YM4sLR5FigSUlq3KZYRIKRacNHW+0a1zN2CjMbRLMd9fF34BTG7PG4Ey0Q3DHZlLh4l2B94W+35tgYKZEErB+iqsLHRCpBF7da3lVPerooYmaW9XryFvA== 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=qfr9CVtu2RhfuGF5Ku22UhpbfvaQTz9uuOjeoqXvcnk=; b=WFkQRrsaM7bh7KSZO7IVb3S5uydf/O9itgmU94qj8eWsHo3QNT0x4U9QhIFVfna/elMQfqyQaSPR+ij+XypQ1cdrAPLLpwi6xsMK7EDvUjk/OF2FGj9YQWuNYKpo/Y0d8fuO275ARID03sBr8kRzOuS0LMfN3r+lWkCaZyqQ3k179XuJz3Wst6K0pFVrHvX5ftGYVyBnNvuBCy0xqSc73KOJ1JRF8AcatDtj/Vx4eymuI8ZK49DG5CUAWOW/gYSndMCcwOv2mJg5g9k93OoRLSSOdG/EEcEjEBmOKeFZSZeqb0JDxPC8sqLDiNaClPX6+ts1r/JcpMj6h6QL26F3aQ== 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=qfr9CVtu2RhfuGF5Ku22UhpbfvaQTz9uuOjeoqXvcnk=; b=r4AiKIoJQJzvgW+IXJ1Dz/LXsF89G5OSVbEyxXYyLTCCow4214Vb0uzPoF32O7d4prv7Na5Mv374wrz1/AdtrxoyqKi1PmOJj9U2D4YGTnexhv0Eu/w2CKep/lMSK24MKumJFYZM6iq/3e3q6pFTXYrCm1KEX06GB9Ck8ESGRfo= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:06 +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 17:39:06 +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 v2 3/7] serial: core: set missing supported flag for RX during TX GPIO Date: Wed, 11 Oct 2023 19:38:25 +0200 Message-Id: <20231011173829.10508-4-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: eb6f5678-c754-462b-7505-08dbca80f79c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dt655zRSC6lwo33MtuKDB+fCz5OkI7nVASqYi+4jVDJbofUdmeIVLfKjcrJhKQCDcIEHG/Nk/lYVmQeR0W9/SZ5+jdqDno9ehW3DzoEj7diDgpAkJZ/8+7zIgynnF0cpBU/gnth1udeEZJDxYb9lFGqv5bRbovIpcPoBZrAd0kKHfebH8kbKFuD20Nf4yIqamEwh4vNfE2D4zk4kjAzAp7eEaD520EMwnyv5OCdd64l2ZSCx0EFiqVOdLrID4wPWYXfBZ1HbXIkLLvrA2/CVhT49uWCCkOq5iop1Ntpqce+EwYKMZKtw/RGRarKnnNa9xkCSVxUKY/7+nIOKzToAjI2gD4ok1hf4apfZTsO5tz6m1Ow+UAQsn4NCaW+tDgtaRO8jBQ2gVIevqRhbW6xAZXyi8jfbYKwouSNZab1rJw8LIR0K8y7eIfgNBayKhP6btimQ5GdCdTLWp7KFuvikDLM+n2B4HPrRsFpSx8lZa/qWLU7a2VSgTOqAVWsHoEIJmdrIBLVkS1L59juLdEGlUdutGsQCnAd/1Q4pcLSrmCes2z00Q0etxDXfn8TxfVpn 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tdn6qAuQaOm0auhL9rQ3o+E+l1jrSnmoH7vmAf1DmWUybKeYdMie8IP24VbE?= =?us-ascii?Q?WypzUD4Kkx10y5IFYhaqDVHqTZe1lcssS0ambQZMyPwAtNH5Q982kWH9LNGD?= =?us-ascii?Q?25ypUzcfxA5QwRCaol04MD7xHvjUeT0xrEj4tYwD9sLCo1lU91WKGtsmRq/i?= =?us-ascii?Q?Gz6AfD1zptPKzyu+ABf1wCPQpRMcVm7Bq37T3ndy4jRScMXiX3e1gYEj+w0I?= =?us-ascii?Q?VYBtutObB180pGEdvgCoZo4f6HGZpW4p1/RfD7l2g9OL1Bz0LsIN5qx/o9q4?= =?us-ascii?Q?4AdIIhiKjfXGXNkiYcscGUA74Do/ui5fq7zVK/v6+NAohM1HGXRYuDDrQnDu?= =?us-ascii?Q?hCSnf6gJyXhpq4UgJJPAKC1X0qXe5CpMP/OatLxvp2YDLXImDcKGx+yvYHW5?= =?us-ascii?Q?LKRGeawb6A7mN7XbaZn+fsH1IFewQZLOyqscboAz3AlqzJ9Oi6Gjlzt4SWWW?= =?us-ascii?Q?+4iKnr9Q7WN6IlWTrHWnVM941NvpQDZwp95AC+I6NB/mAk4vSEnT7+FxCtXs?= =?us-ascii?Q?4mJyK/c3dLJcJPXYGscNuINX0lgVx4tDlI4TzhJrH5JZWf5n05od5yMNCC/A?= =?us-ascii?Q?a/Rf9VTolJ1xwk7jEbn3IFgyB5jWzpe+jpy7dDXvrGKmYR8EZMWeG1X1cxUY?= =?us-ascii?Q?NDlOXXqdCIp/KjkyhQ0gtdPBQjVY76HUyV9CeYOSLEuAKSzqD0IbpsN9BPhf?= =?us-ascii?Q?JjvsFafP+GGPjPCjOge2ASBTCAbv5lQdqRiJVyEnTZ8vlhGDdDNGGdAjud1e?= =?us-ascii?Q?BCS9lx9O1oByE8xVnBPe7nfNwvVDXPWaZcI0o88yexCywb5tYeNrPCaqJNoZ?= =?us-ascii?Q?mhptkKBkxmhfltVOW/wXdyroDGwVpHme5O3fyt+fout3AHNyISwvdMuiwOI+?= =?us-ascii?Q?lW+AALlKTGbc78jpDcOW1sDieCaw75zWuTlZobA0YI3XzIPJ4CbMWKCbDmER?= =?us-ascii?Q?PGFmYDGigSPL5TvtGGidkyEz1952DbzKyQgsU9WSEIK+BMdSaCz2oTKCnD/2?= =?us-ascii?Q?j9arHJah3JrfPnf58zqZoYqjqjjvN3/C7JtABAR070NYH97xltt/N+KYLWdm?= =?us-ascii?Q?1tYqxGnTEaf+HZ8FDU9mBgLE28yZXvNKR/bY6dRPyHhdQV9DLQrzkwGEFUVG?= =?us-ascii?Q?KJQlGmEftDqa0Riaslm1Ey9W7dDvNYn5slUC1UC8JJCJb53vjBelwGruMU50?= =?us-ascii?Q?JLDTBT9Hg7G9lhqXchDxjzq/L5jYfSFz/TgGtRCcI1Lp5go0Qn+PKEz7dQf7?= =?us-ascii?Q?8M3NNY05K4pfVGTuMeFOitkI+1tA9nBptU/4IFRN1Lz94Ibkyv6M7V26XN3c?= =?us-ascii?Q?KQIEHRGaFQjJ1OOODVtmhn2qfSpvdKKMQqqLHIAoSwQdkIRGNJbfLpdXh6cE?= =?us-ascii?Q?Zj+kUJS2Rs2WzQsLycvx3DjK4P0XiBBDNISsZ7pHztzfvhhOMgnwELa2gPVM?= =?us-ascii?Q?Y9i5m+6z8PkTr1gIEXF0Ub1EgHF7wlswyV9aO0eKW/laU62OzuH9Uj0OCuRY?= =?us-ascii?Q?qWm9DMJ7TxR3CxcwmtvkwpHlmmaXoKyaQOwm4lGa5egxkc+x0sBQlg16uI9S?= =?us-ascii?Q?YSKYxXNDfp1iB+KZ5/XtDh5zTvQfwXGfnQk3+oTBaD2UZu5Wwzfvc+X6ziO7?= =?us-ascii?Q?y8TNYrTc+4N3UpMwhV4hJrFVDAy3K+KpCG12m6ktUbJM?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb6f5678-c754-462b-7505-08dbca80f79c X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:06.3396 (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: hLoPjhgH/Wrv5Zdngp8WkiPi3dtCS3CkcUmRMgLg0NAZpE+TbiEnxMCSWymYRFoRVGvFiNVf501etWzdSOPgcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If the RS485 feature RX-during-TX is supported by means of a GPIO set the according supported flag. Otherwise setting this feature from userspace may not be possible, since in uart_sanitize_serial_rs485() the passed RS485 configuration is matched against the supported features and unsupported settings are thereby removed and thus take no effect. Cc: stable@vger.kernel.org Fixes: 163f080eb717 ("serial: core: Add option to output RS485 RX_DURING_TX= state via GPIO") Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/serial_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index ef0500be3553..697c36dc7ec8 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3622,6 +3622,8 @@ int uart_get_rs485_mode(struct uart_port *port) port->rs485_rx_during_tx_gpio =3D NULL; return dev_err_probe(dev, ret, "Cannot get rs485-rx-during-tx-gpios\n"); } + if (port->rs485_rx_during_tx_gpio) + port->rs485_supported.flags |=3D SER_RS485_RX_DURING_TX; =20 return 0; } --=20 2.40.1 From nobody Fri Jan 2 11:58:40 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 5FC0BCDB470 for ; Wed, 11 Oct 2023 17:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233037AbjJKRj1 (ORCPT ); Wed, 11 Oct 2023 13:39:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232848AbjJKRjR (ORCPT ); Wed, 11 Oct 2023 13:39:17 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7187E98; Wed, 11 Oct 2023 10:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRuXSixgPJs38mZPzNP6C3nsOavSxOGX7lo1/WGijZnlDlRQ8eWrxxxf1W5s4wgsX+daCazjDoNk0OfHsJzU5zHmwJv59nuV1Irt3sqSpAzTt6XOUI14gX4vxqqKFz0DRVxQ92W8xdnKI+3wReLTqeXzcrJsbAb2MurBHUq5v+GDT8d1ObwPgT78MRufFnn6e+VTWTaeFZyRR4iMXaR4MdoTSt8NaHGrnXKN8droefuyWzWrPa/X2EBSK5n/f0/KGUgXgk9Nemg4WkpziIbimHzdJ74Si8SZwA2kNISu53wqk0WSoKQ3P2hnQNvLCIGB+4ujk7jcNRG4Q8g0PrDGtg== 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=oK48PGvsIKhBF+d21ldU+Id6JckShcS/hsDClCbGVHo=; b=OT74+xrYWxE5LGaSillEvi+mLxhaZtkyCcWGYjfWMFCUdR7f/FkIFke2SpWEjp7IAOUU9CIGUzWk3s4FH1GtZcdPTv7dpepdlNYRA6IJh+cOju2UhDv3EHe1iCQMQQDWvaTtDWlGcXXb8dNVqDdI2JsrV+M0FQSgvNcWVabDo+J27fa4vZ4dV1S4OGG9880eh/18gZ/tKu38kkGM/ubCpWY/cV9tdRAs03pg1mtdIDl4InnSu0PH2Sqhuf6EkjZFnnEHctOai0ffUDm0I63BzltP9DW3uDDQKRp8/fv7C99WAUSPV4F5oW/COXndoYngLuuOqEyQS1rrU08ENJ0UJg== 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=oK48PGvsIKhBF+d21ldU+Id6JckShcS/hsDClCbGVHo=; b=0TSnZkBH9ERhP96Zj9iw3FCyjuI4u8zhWICab8u/G7kBmSaPMRW2f97ngrPpPgUoszJPWWS9F+ZTJeUSwfNCOWV7acV4WScw6KsVT9UfeVl7DTyeGNycu6Vsl2R6KnL6XS+MA1zdDe6AiJHi4849dzzkpBITpQIVWRHhyiiPg5Y= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:06 +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 17:39:06 +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 v2 4/7] serial: core: fix sanitizing check for RTS settings Date: Wed, 11 Oct 2023 19:38:26 +0200 Message-Id: <20231011173829.10508-5-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: e6788358-77d6-4af2-aa7e-08dbca80f7f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nbRLNG4Hp5hrGIXlig/UQx2qtT2mYfMPwchd1VWf1a1z5+eAsHTwnk4Iy1CUE90jo9TV4un2CXIEUJrix47SHMoHplkwxEJr1ruL5aCJSdlhvEFnR+DckRMDleUYxs/WeU4k+8CvUXWvnGXB6ZLDA/Ctod54VDqg3CiJR8BrS91vFFK6hOBm/rlCuozxLl+Az6IRMb18RZ7HtM8NNx30G9DSAe5rmqioNG4mfoD/QcGVKA8xt+GjolbnjPBeZhjFOFq5a0BjqNUEGbO2ksCyD/gBrmZeOfDTGAmYCgT7pqg8fSyqcPekLnQ4dUR5XPNe5EAeiT+cSFGlvfFz9wjXkWXfXfJ4Rm6UPHQh9+9UD09zirbFGAhjMmGAvfHtZfidfkeUZQ1Uihi91DHW6ZSPp9Ij8GFU8u/V+rNwWUF6R2CYLaMBTZ9BA9XURhjZOhBPqmePSQ0h4xhzVWbElJt/04w7yxijKbUPvbwuRI7Vxpio1EIJ7vJE101yfLaj15ii0Pf5qBMHTUhSpiPMl/qpVWjhIjSQiof6i7rRpmXGFAgwKfz66eyStLKq55hjz8ob 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?heBXJxpCyGJj/bqZnix+xga6zMxVHMayjk9sHXCAlKiBqySPMbeQCqJohOCe?= =?us-ascii?Q?3AJ1j9Dcfa4ZXsBrbkwO/7AbGWmPMsmKXlAirgdm3PmrZsXnNdjTn11eUMZf?= =?us-ascii?Q?EI9zu7IgpKoqrq4wrHN4Dah4rjuu3V7K6DAFP/4M8yM3yVISz2jIpkGK1O8Q?= =?us-ascii?Q?Pz5UJUdXPD0JW6jc0vw4eVHV4Y2ti4LchO9pkCUG3XoCBGnUyxfk8PipLGc6?= =?us-ascii?Q?BzeZven5CCY/GSQrVdgUoBrK4rhV8mTHcRG8051bWREcyK9RczTLhJP4CZUH?= =?us-ascii?Q?w0E21LN2NPGMz2PzjyGWn7esFuBaBXsK/X1VbIwwAo+ZS0+lzBkrRImJKxHO?= =?us-ascii?Q?e3eO3KdfB029fE+cd0g5n0+cef0Wcfr6FUcXnezQ0elZKDlhsZ91hJo4Vf75?= =?us-ascii?Q?XALH967+qP6iYHB2fkrZzU91R+w3bDfEr7sC0ocdW5/iN4T4l0ZmQKrbPGDh?= =?us-ascii?Q?2iFrelgZCqUXRzwPt9sQVOo45hThZGU1PMsKkcwTceHAA1d40efSdTkCjuXn?= =?us-ascii?Q?3GbvAv3JNOyW7wwOMJyVti3uZBgsHWcBGkGj90vIfhOUPm1ciaEPDTtLthMq?= =?us-ascii?Q?s2ks0eM7UxHWqTSsO0Ov7Pv123R3JNeRAt4IGMaEWTsfz778gRfZ9ZI5kb+H?= =?us-ascii?Q?65m37gi0O2n74FJVdKMuSx38MLA1rDUFPuenLrWmB/4G2xU15nWekrRzRpF/?= =?us-ascii?Q?iErbaelEa5Qe/0mmJHW7zS5qlaVvJcbpzwXmPJiBJMBzzF5GcdARZd8yapAK?= =?us-ascii?Q?gyuT8PVg0uBIZFUIl9LnqGTNsosh9xwJqHPTdr3gvnEViyy08LBIKQjynY40?= =?us-ascii?Q?1ga+JEuZtSfQPzVPxB6AIYe8TswljmUdeZ/VUYkZ0GdautUIkldX3Q0tR0C9?= =?us-ascii?Q?AE4S7knKc2iVtZ3mC60F/aaX3AgT7iRQO4pmNR6jaZ2Qke6lIDqLgKNwoAnm?= =?us-ascii?Q?QagDls+7V5QMvfMISVY3A1dsLc7zEHyyPqEIwzCDjdG0YQxXIexVI1e52QHy?= =?us-ascii?Q?hPMK7CrLesmOLF/7gv/9oxXG+SGfx4WAYzj8J3lCqbQHrQatLcyGW70Xoo7+?= =?us-ascii?Q?DcGRu6+aGkRHucxWQBCZxUSQZ9Hg3L1q/hCH08siTn2aQ/FJHzvRqgHRyms+?= =?us-ascii?Q?EVVmGrg0FYBL860GrZ5BfHYvHUQrxUASNwdyAujVpdF4dlxpGkr0x6QpPa14?= =?us-ascii?Q?5BN/Zm+QrRrStDbAPOlKtcUdS72Q0JwwfV1JwFsY2VBnRuiuUBeN3oD4VWsY?= =?us-ascii?Q?24ti+zI6YYaWlKjNyoLQFanxxA9FLwnsxyGLbEu3ZX6CfOKfo/l/7ZS0nGjD?= =?us-ascii?Q?pSdR/DqCFTZB4JhKjuAYqWoGXyB5h7j29zClBuEdXDQHg8mWw875Ue71G5QD?= =?us-ascii?Q?riEoN+P7kVcEaLCoL3tPQ9V7M6lsLn0a1NtU6ur43GIEQ4voOgTFTy3uMNPZ?= =?us-ascii?Q?mvfijBKrlxoGXASAe6q0bKUdjEQv8ifWqp9J9D9Mjg4TpOsLTUIkt1s2ScBW?= =?us-ascii?Q?C4W6T5ZGROehPIq0XQNYKoFh+Jc59TGzyT+2Vaw+lStHXLUzIpoQ09S3c/MP?= =?us-ascii?Q?Un9G1owUuyxgPq2ZUUfW+PSxVj5u6Xsd/WK/NTYtKfSniodYtSd/G5kBs7dI?= =?us-ascii?Q?1Qwocmi7aUdCyOTvIZfn57J4yXVZoxKIDjtBogvjDBIs?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6788358-77d6-4af2-aa7e-08dbca80f7f4 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:06.8742 (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: nwcIsKvEWDJB60NZDevImlIlIArjzwRAk2TI0VUJm+jC7T4F9YtwmyERbmVAlrBwdx/VfE2IHzrPSCtJZvYaZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Among other things uart_sanitize_serial_rs485() tests the sanity of the RTS settings in a RS485 configuration that has been passed by userspace. If RTS-on-send and RTS-after-send are both set or unset the configuration is adjusted and RTS-after-send is disabled and RTS-on-send enabled. This however makes only sense if both RTS modes are actually supported by the driver. With commit be2e2cb1d281 ("serial: Sanitize rs485_struct") the code does take the driver support into account but only checks if one of both RTS modes are supported. This may lead to the errorneous result of RTS-on-send being set even if only RTS-after-send is supported. Fix this by changing the implemented logic: First clear all unsupported flags in the RS485 configuration, then adjust an invalid RTS setting by taking into account which RTS mode is supported. Cc: stable@vger.kernel.org Fixes: be2e2cb1d281 ("serial: Sanitize rs485_struct") Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/serial_core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index 697c36dc7ec8..f4feebf8200f 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1370,19 +1370,27 @@ static void uart_sanitize_serial_rs485(struct uart_= port *port, struct serial_rs4 return; } =20 + rs485->flags &=3D supported_flags; + /* Pick sane settings if the user hasn't */ - if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) = && - !(rs485->flags & SER_RS485_RTS_ON_SEND) =3D=3D + if (!(rs485->flags & SER_RS485_RTS_ON_SEND) =3D=3D !(rs485->flags & SER_RS485_RTS_AFTER_SEND)) { - dev_warn_ratelimited(port->dev, - "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", - port->name, port->line); - rs485->flags |=3D SER_RS485_RTS_ON_SEND; - rs485->flags &=3D ~SER_RS485_RTS_AFTER_SEND; - supported_flags |=3D SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND; - } + if (supported_flags & SER_RS485_RTS_ON_SEND) { + rs485->flags |=3D SER_RS485_RTS_ON_SEND; + rs485->flags &=3D ~SER_RS485_RTS_AFTER_SEND; =20 - rs485->flags &=3D supported_flags; + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", + port->name, port->line); + } else { + rs485->flags |=3D SER_RS485_RTS_AFTER_SEND; + rs485->flags &=3D ~SER_RS485_RTS_ON_SEND; + + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_AFTER_SEND instead\n", + port->name, port->line); + } + } =20 uart_sanitize_serial_rs485_delays(port, rs485); =20 --=20 2.40.1 From nobody Fri Jan 2 11:58:40 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 26C95CDB472 for ; Wed, 11 Oct 2023 17:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234757AbjJKRjb (ORCPT ); Wed, 11 Oct 2023 13:39:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbjJKRjS (ORCPT ); Wed, 11 Oct 2023 13:39:18 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1D97C4; Wed, 11 Oct 2023 10:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QuSh1NXj8JHoy9LCLL+f2xorFck/5FWwXmfw09vLYL2thIoaym/KpRVy39Hg7OS9fqb8fzsFTTDB57YVj2wipshkmW8KFEnEHK8nwPt5sNPGYzmrd94ZClTofC2e10VX9wdc5/iyACpBPv11hnYdGD2ZhZem2DhjQtkGIVdu+UD+OJZz9/0+p5ZmNQ74TGyVvFByqN/av6GmEvYAMXt8WiIJJNazSmdAakyt58hasXcTOaTzK9PoTOQR1CSBcEt8Wlw1roGt6UofjMS5I4fP+ltQ9KVryhhXPWILsaMteLfEYVn8zJfy94uWHiDwXt89wg+4QFBRFuRsgyQTU7H4zA== 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=TJ5/eJP8FSTSE85vf+YgYI2YYEXaQjMZKL7yA99JX58=; b=UZZTUqNXgsZgu/466tYIm+Ix/uqnDGn/YDRUhle54azedumTc5ETSmx72cpHpS3tm3TorNpd0ruvJKMcX3RgX679cP8QJ/ZvJS5kzfbH2eHw7p8JR9BR+BcPZiRsoS/1NfU/mxhOvl6grpwb3ZuvL+W5qlhx5h7037jIEQVns0fNcoFnS0yri4kQD5GdGphsC55a4RuDpLrXFm0tVSxW1rm3mHK4MWsoHU8BqjS72RDKsvyHeGRmP0CElXW1dKrDLgHrXqioNlRYD/JLSP4kYCH63W3QJw9AtKPsmOFXZ3AuRmgY1j5bhXy0ZfZf2UV7QPtXrgVjyyfskTCgRwQeHg== 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=TJ5/eJP8FSTSE85vf+YgYI2YYEXaQjMZKL7yA99JX58=; b=DbVAj2hhxlbE474a4rpPOhEOesiUrQaeAadFkRnHHiruO56n/owYU8kaO+I+eKAlF0LMGL22UYDN77HNRac3HkvfBEmA6eD7ndDqOn9HRSKGIGlmxu/jD8myX0k+mToWNnfwsO5DCQpUxCg9iYw2LGb29er1iI+wWKesh07E1Ac= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:07 +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 17:39:07 +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 v2 5/7] serial: core: make sure RS485 cannot be enabled when it is not supported Date: Wed, 11 Oct 2023 19:38:27 +0200 Message-Id: <20231011173829.10508-6-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: eac9b7c1-c153-473b-7d9b-08dbca80f84a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MhzVGNtm64uw4rKQgbL0d0zQXFs3Mw2rITxyAFESodnZquKHFt1tTsZcnHK5Bj505w8NMp1LeOsv8pqxwtbyEL6PZ3w3eRm+1L4FGiij6His1Lp78BUw5H/9kPoZ6587d83o1vambc6kjK1CeUwZIzc5wD6/Lpn/4hWKB110C5pdkmZdbrk5NDiTlDqOG5VddyqQu0kMNsGugqGlD3QIA/VrPbG4DagCwCeFrg46IvC7Wh8jGLuA8tbwP38hFxJEKoWN29XxXhiv1V9NJst5RUTdQt+VY0tRD/EZAHwzJLb9tWzbrBokk6Wl8luoG7JwLLMImZtU5C2AE9lhaHI3a5IHGdHcz1M1YdKPDb6VghaFJRkGrQn14ku338WN0kJHskaLeKnkO4MnAov/uw15e932jXDy5UYXbCG94fXWYW81ojzLXy1bSjBrlhu3+L+fWE7KmhKIWD6vlXCoDPYUn5bc5ZzyAi73hcv9XI5gm6vtS2n1SCLxG2U+34wSua4w2dQmTQXMXcGuhC3wirP8AJs2hEhVCX+dV6RXGHwH05UYd/epY0XmBqxQSagZsJIT 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p62od7rs+/j5jbADP20rHQ7RBWos/B04yXkWO7fPgRJ0Bv2DyZhOA0KAeaGT?= =?us-ascii?Q?kWo3Q5J2fqHgC7H55sw2DXF1s72O8QfImWT7tbreJhwtE93t8L5W+8XVNfwb?= =?us-ascii?Q?2sct+3C86LHDo+wQSwE0fVKz+nVju+vcMzvVlbuLsb1vqvb8OttSerLiSWV9?= =?us-ascii?Q?bQwSGKGAKFEngOJqXqBYWp2DoWkaRbCOpxshGSaXnxrDeW4Vpb7IQWj6WcrX?= =?us-ascii?Q?7Og67dZ5E+Sjnc5E1Y3195iMfnIU3pkjBa7vnk05J4l479dyBl26Ak8Yje72?= =?us-ascii?Q?quya5X6/+au7daG3FOgfPqKzAli39G17wn17NbOhAgMI1TGixjl58NSV2KZ/?= =?us-ascii?Q?jzPFMzr0/LpwZ/2O7kge9/2u+3l6VyrkwBUv+Vt/2FLb88Ymato/XbG3TsWY?= =?us-ascii?Q?hwwm2EN1MS2pfyW41BPRLmnE1/yNa7FcHGdzXTKUL/CdQy4arbAdVkt7xHgO?= =?us-ascii?Q?fJCm9mYizbsZLT7B9cvW4KEnD6KCApzhbK3Oiz5sK5pm68+9bqHwbwpYTmyI?= =?us-ascii?Q?AYvmbgksfd4fwBXA+I2KHI2dgabb1mxf6hJBDWjGKiPormrD/SKa+EK1nDgW?= =?us-ascii?Q?SbeZcORXZjCH9gHGyMFnZZkgMCGTOjGeEXuPLXcRHmYVe87hy2mT7hEaVHMI?= =?us-ascii?Q?XpEa9rXHCJiJc4F5jGfso+LaQKQ0q0oFwFr4oGXDy/TmzxybfUcv0KAe3Ahm?= =?us-ascii?Q?RFh2ZS+DXmlG1QdikVfPtyGswRIIdjsSi/OA5lIK+aKRn33+xGuR7SAaUhKQ?= =?us-ascii?Q?weXzTZn+SWcmuOa3grwDXiwcCsFZsPbbIxVvQoKNn9RrRFX+m0iBfHhCye3o?= =?us-ascii?Q?u2sZ/tipIAjSlb2L/dKe46lYU/1EVLcMznGSQkZThEWLNJ3f/zpq7Opze2vP?= =?us-ascii?Q?X89xMWf5MHcdQqK4yedA5zBLCqeu3ZPUE6vXGhd75ZDHbAOvPFgHBC+ugjDh?= =?us-ascii?Q?tgG1mP7tK9OPI84QTTSWTinGupZLcms1TKkkKhRlJSOjP0RE73rJqY3065IA?= =?us-ascii?Q?QGDBQtCP52Hm7/NFcfS+bPYV8YXaonJf6/wxhMUIGx7xZEZq8jG47jw76Np0?= =?us-ascii?Q?lV+Xbt3ACc3dYJk7wYbs6xMal025atICXLk1q3e7tc6W6JBhSgkQ8h0NTdK6?= =?us-ascii?Q?c3f1JCer5Sc1Tc0LP0sgPFsu+2k0mz5d54t4btxc5VV9GhrXM28xD1R8vc8V?= =?us-ascii?Q?kyOzO/HW5DCaCxgZvmO/qsiZVymt6MKcj1nZxfgq8o/7t5g75+jlm2//z0KQ?= =?us-ascii?Q?SCwCEX1xzP+mfiZMEZYf1qTm6f0H78NdKS+37qltBGr0ILJ0t5b23Ojg8IGl?= =?us-ascii?Q?37vb/Aywpyu3lmvU+1/A2W4Nv4ADn7tAitwsXI29atep1jARTIpQ6/CnHkRy?= =?us-ascii?Q?uDhPVDSdtsOrHD6yZ76gc5BszjC3I/TbpGQOY+ScYbgWty5mczWdngkzEaQr?= =?us-ascii?Q?G+B3cLRPiXPuMfPXdobHVVP4PIa8qEOvVKaH+Y5mc5vtqxaOFA79VciYSZmP?= =?us-ascii?Q?9WjdjMZ1akaV5xH3WM1m5uMXcFi8HqPY0Tv8Ut+kCDPhGyBjCWsuV1jUoo2z?= =?us-ascii?Q?cLLQZ+9TjmjVBKpQgLp4xz03WEP+0BVecDWA2VJ9h8uguEnL+wKOeB0UsNMa?= =?us-ascii?Q?PGabdP7fyC6pblDCYYCWWUg/9i9uTFLhaf87OKiSAy7d?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: eac9b7c1-c153-473b-7d9b-08dbca80f84a X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:07.4494 (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: y44YvyJicRxX4989Fx82MRVRea2sNpcn/Q43LyqVHgJevGG9nz1epqiK+sHkvJhOjg55efNVBIFVqU8+cN281w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some uart drivers specify a rs485_config() function and then decide later to disable RS485 support for some reason (e.g. imx and ar933). In these cases userspace may be able to activate RS485 via TIOCSRS485 nevertheless, since in uart_set_rs485_config() an existing rs485_config() function indicates that RS485 is supported. Make sure that this is not longer possible by checking the uarts rs485_supported.flags instead and bailing out if SER_RS485_ENABLED is not set. Furthermore instead of returning an empty structure return -ENOTTY if the RS485 configuration is requested via TIOCGRS485 but RS485 is not supported. This has a small impact on userspace visibility but it is consistent with the -ENOTTY error for TIOCGRS485. Fixes: e849145e1fdd ("serial: ar933x: Fill in rs485_supported") Fixes: 55e18c6b6d42 ("serial: imx: Remove serial_rs485 sanitization") Cc: stable@vger.kernel.org Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/serial_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index f4feebf8200f..dca09877fabc 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1432,6 +1432,9 @@ static int uart_get_rs485_config(struct uart_port *po= rt, unsigned long flags; struct serial_rs485 aux; =20 + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return -ENOTTY; + spin_lock_irqsave(&port->lock, flags); aux =3D port->rs485; spin_unlock_irqrestore(&port->lock, flags); @@ -1449,7 +1452,7 @@ static int uart_set_rs485_config(struct tty_struct *t= ty, struct uart_port *port, int ret; unsigned long flags; =20 - if (!port->rs485_config) + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) return -ENOTTY; =20 if (copy_from_user(&rs485, rs485_user, sizeof(*rs485_user))) --=20 2.40.1 From nobody Fri Jan 2 11:58:40 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 7779BCDB470 for ; Wed, 11 Oct 2023 17:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232996AbjJKRjj (ORCPT ); Wed, 11 Oct 2023 13:39:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233183AbjJKRj0 (ORCPT ); Wed, 11 Oct 2023 13:39:26 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82388CC; Wed, 11 Oct 2023 10:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAh2drSLMhIDGnpgmbeR5QxKNfoLgrTmzxZj3wqU08yayWnBU4t3w03PaPJG/8GPpIhBSSSjtzrVAZIhlsGd1y1qzYbyJU/XEvj90rbrQyZSGhqq5e/X5PaYYIq96gyZYd2zCeC3Obxh1wk4O7fxfGv/UAs5XKrZ1Qu3SKZHRXj0B25LpNvRhgCPJa2b/bPqrA8gh0yRU2UfCOJts7ifoVqT24T3ROAqIFGT2oU4txiwI3HcuenRiaFr+RheOEWhtwlMl1IbLhCJiUkrY4sGj/nXB4sqWawIF5Swf9t49O9SnNESAt+n6j/Pbk1qS3NA7Vkg3ytrWuTFxBmjQ6rwTA== 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=g9VNnrRh+93b9tiZ7+fqQ29BWG2jfMJ+okhxSduWaaw=; b=bBeAblgk4q/AM/hZYIdL5SHKWSx35276mQ/idQ9keKNchocVM+RCfsW4IH8pAeb1U9nxV9CTA3Xy+jG9kH19mGjSjpoVNO1bq8oORQM/VxgZCceBR8+2t0Jz51jlXMvZkNqmvWxcGXyDIK3Ls0dp1KSGd196U+F+soorjGPJeDOvyMT8e3W9ESyw/lHF17hAZHw0ZSVWVBrxhzx7vHyYUeujv6cvmzNNKBMCyiXtO06vbmC103NAfpm38e/bmr2GXsu2EE2rgTL3GQ4WCssnDqTEKThE0T9s4gWXeA+dofGXBUjBNoUI94FfI8vtpJ5hFJdBDjSTXwrhAT/4toGgpg== 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=g9VNnrRh+93b9tiZ7+fqQ29BWG2jfMJ+okhxSduWaaw=; b=aAO/cdrvJeQ7KrAch7thEVyxuqGaSN5jU0IxrAIquJXnO8kRwSMYGd7C6IAOGlWthsjeQjg4CaLu066BgAS94rUJV6pf3jb+0BBp9vmkc0lAeWoP5zeu0RG8nlJ0Hbvj4GWsdubrWf1HrcEW41rfoYNxzKwY2nfCpixV+2vM9KM= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:08 +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 17:39:08 +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, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH v2 6/7] serial: core, imx: do not set RS485 enabled if it is not supported Date: Wed, 11 Oct 2023 19:38:28 +0200 Message-Id: <20231011173829.10508-7-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: 7563fd0f-131b-4ca1-b310-08dbca80f8a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 58WR2e9qytcd68wapZlInQB0RgQtzyhh+s/A+CUeJqJIyQS5PDGb8QgP/UiSxn1AEwkKSBVfKkCRiuOPoMuGKL/ImF+7QakoAuPjZQ6Tqxh2h3DB3CsmMIzfPJ3kzFv8YIHmt6gBwyOZOy0HZSGXCzKDtJpYMvMhVdeV9br2L1j2ZO5XI44Sg15Dy3i/tTkvtt6MhGirONesdrUfTQMF6dh5HIPMD/uRuRjZS7rwCwWYaYmr4L9TKrLJ505rcp7tS/66/h6CiEKc9o1hNumk13Y6MJQ0RUR51cjqxwIJSHXWYJGOOy2oR7iJPg7zHWrSKWNxSSH5bTdYSk5a4yugE2Cy8R+5Aoigufm258uoiFFZx+vG7of2XhQiLj4vvgLoVyossx52PvcLWjbxhzOAaL6s8qNEo0c9fRyQ4cZz5fciwv1IEmQDSUqMB5+FjiNoMjTKCtZmbiSkaJDoOj9HnVdPqXzHDgu6f1tnvGU6CXTLIctzDZOBhUojrKTBWiubJjfXYZSg4kciB1fb3rVz/ELrYeymehic3t+gi8k9JOnMizht/BHHp9uCgPNYLTHQ 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(54906003)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M1hMSmg0aXRGaW5sdWVUdWRqQ0p4VjJOd0F3dVcrOXVubnJrN04wK005Mks1?= =?utf-8?B?cGtoT0dUbHRyT0dEOEtMZENjUDVNOGQrNnNRNHRkMmZjaXhsSGZJSjBlWVpx?= =?utf-8?B?QlRGSlpQdmVodC9lZkk2U0V4M0psZkI5NTJNVU9ZUldnSzZQejZRdlRYMkNS?= =?utf-8?B?YTJ5NTV0TDlsa2ViVmY2QnJIcXVyKy80UHoxQWlOTHlCVGova0xRdm9IYVpx?= =?utf-8?B?QlhUajVtUG85c2crT0k5YTlydTNUL3JzR2lqM25FQ0w4K1hTQ0xjQ3NMaTNG?= =?utf-8?B?aEtleTAwQXRJMDZxOVBEcThaZDEvdmJrcTY2cndGT0dTd3B4eEx2ejhZc1Aw?= =?utf-8?B?SXRvRFV3S251dTg1ZDJ5NDVkeDhqK1FBMFpISlpSckFsNC9yUHRGNUVTRU4x?= =?utf-8?B?TXhHMFV5b0FqUGNwdS9mZ2NXK1RDL0lhQk5LNnBwUDJidnVXRXpyM016TUVX?= =?utf-8?B?NTNWYk50OGxPOUNXeC8rTC9xNXY1TnJQRDkrcGlvU2crNlVZa0kzRzRDTUdR?= =?utf-8?B?S1ZSUUtkVUVHSTBoV01maFlqVWhlVHYyT1o1Ui9IK3lYWFlsWWFXanlmNFFH?= =?utf-8?B?cjFUNFpmN3RkdHN1TmNvamV2WmxleHdOeDV5OGJZcUxXaEN0ZkJQTU5ZdVc3?= =?utf-8?B?WVJCcUQ4Z1ZaQ1BRQXRjS2JXSFNwOGNKZ3dBZzBUUHBVOTV1RXpHUytQMUhF?= =?utf-8?B?b2hkUFM1dS9TOVFtYVloR0I3MndZOEg5S2xDenYrQ0p2YVBsb2pIYmF2M0hK?= =?utf-8?B?eXJuckI2T0gzenpJUGtxSFBHNitjaHVmQUxxVElpdUhBQWZMTUFDSzlVZm1Y?= =?utf-8?B?R0llSG1WYTRaSWRuanhmOEhOaXRTV3o2US9ObXhWNEdiTCsrNTZDR2pIM1I0?= =?utf-8?B?YmlzaExHYllKZG4wOTZ0ZnJCU0pIOEUvNzNPMjJJTUF1YXBzUlpXZjJlZGJG?= =?utf-8?B?YU91YmFaa0VnOUsxeGlkUmZnWlRPdGJ2dWZwTEFaWGptQnIyajJDcWhpcDRy?= =?utf-8?B?SkRybFF5b0Zvay9XbituV24zVVFUUGh4bUEzUEpQdFZrTEdPd0NFOEVwR3ZB?= =?utf-8?B?NVp6ZmJVMk9FSzl0Nk9CSllDdVRnMkVMemZPVXJ5U3F2SXBMbXdyaFp5V0Nr?= =?utf-8?B?OU00aTA5VlFybFF2blJmUDlkdnVoTkg3Rjl3a1JnN0FxeEpNalFzK1R2dnIr?= =?utf-8?B?ZFVlNjJISWNUSmpraVRTak1xUVd1cmZSMFYwZGdpck92dUdkaW10TFY0MlRY?= =?utf-8?B?cGFjV2lNWHdMRGVCMzEyclZFb0xYS2hvZm9oMWF1SHVyRFRYYkRDMnNNN0t6?= =?utf-8?B?MFZFRytmcDFmYlAwenlQVHc3VlYzOWx5TWRXeUFUTENZK2k2UVlMdmtqcEl1?= =?utf-8?B?bFNrMjZqNGJGL2lwYng0UXQ2anhMeXRNZjY2TSt4NFNpbDM2OU5rT2owWXRX?= =?utf-8?B?OFFWWjZiUU5Zb2NxeFlVcEpTd1lLTFZkYjJKMExoOXFwMmJRcDJONVMwSWFi?= =?utf-8?B?ZmZFS2MxTHZVa0dxcThWcDZIdDE5S0RWdERIcDRBcERPUkZNbGloN25QOWI5?= =?utf-8?B?L3RWR1RiMTBxT2RoRng5MWcxVWFNMTRyWkNHWXVvd0JqVlFvZkkwOExSbnZC?= =?utf-8?B?L3lNdVRiTWgvd2dGNHp5bXN2KzI4L3F4L05ENTZ6eGpoZUVFZEhxdUp5a0t0?= =?utf-8?B?Ulk2UFJ1YTN5Vm9MN2hObjV1NUc5V0hUUElsWXZmOTdBams1SlZyTG1tSGRZ?= =?utf-8?B?UGM4c21xSitHbWtZTEpJNDFEVm5lY2Vsa1dzakJWem5QTWJjY3E5UUd0ZU14?= =?utf-8?B?eVN6blphbGNreU8vVWtGKysrakVNSlRQWHJLd000WWN5WWVPMGlKeDlHczV1?= =?utf-8?B?VStJdnhnRjRKdjZ4L3NrL0FnOVRBb1VHbE9xbDJKcGdCeC90TkRraUtRMFB2?= =?utf-8?B?cFBaUVVML0RDK2lpWEJPZ0dxMjhVUkQvWXJmdEJYMXFOcjJWUmZkcXUvZkNY?= =?utf-8?B?ZHZNS1k2bGNHVHNqZ2N3K3g0cExwVnlDemxlbmJLUm1pQUhFLytYcExscDRH?= =?utf-8?B?N284Vi9aeEdGNEhIdU9QdmVXMTlTZk5ld0lORFB4bm8vYVJRZGtuc2N3eThu?= =?utf-8?B?VWV6dXdlZDFDOFVpVUpPcjQvWkJkajlVSkpKUE9ORXlOQktLNnRZM2NPZ1FE?= =?utf-8?Q?caBeGvRCazl5t2cme45FSmvfuLvBaj9OlxOvaoQ1p8Gf?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7563fd0f-131b-4ca1-b310-08dbca80f8a2 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:08.0536 (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: 3G/BcBG+MR0SKgB0v9OH9fWXUk4Z96ezoa242iKnjMLz/idaDYLIuT7767KHxp4W8c/vim2rxhhbVa9f0eLhMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If the imx driver cannot support RS485 it sets the ports rs485_supported structure to NULL. But it still calls uart_get_rs485_mode() which may set the RS485_ENABLED flag nevertheless. This may lead to an attempt to configure RS485 even if it is not supported when the flag is evaluated in uart_configure_port() at port startup. Avoid this by bailing out of uart_get_rs485_mode() if the RS485_ENABLED flag is not supported by the caller. With this fix a check for RTS availability is now obsolete in the imx driver, since it can not evaluate to true any more. Remove this check, too. Fixes: 00d7a00e2a6f ("serial: imx: Fill in rs485_supported") Cc: stable@vger.kernel.org Suggested-by: Uwe Kleine-K=C3=B6nig Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/imx.c | 4 ---- drivers/tty/serial/serial_core.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index edb2ec6a5567..c8c19bf8585d 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2332,10 +2332,6 @@ static int imx_uart_probe(struct platform_device *pd= ev) return ret; } =20 - if (sport->port.rs485.flags & SER_RS485_ENABLED && - (!sport->have_rtscts && !sport->have_rtsgpio)) - dev_err(&pdev->dev, "no RTS control, disabling rs485\n"); - /* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B) * signal cannot be set low during transmission in case the diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index dca09877fabc..95cec2343b35 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3576,6 +3576,9 @@ int uart_get_rs485_mode(struct uart_port *port) int ret; int rx_during_tx_gpio_flag; =20 + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return 0; + ret =3D device_property_read_u32_array(dev, "rs485-rts-delay", rs485_delay, 2); if (!ret) { --=20 2.40.1 From nobody Fri Jan 2 11:58:40 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 E130BCDB470 for ; Wed, 11 Oct 2023 17:39:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345543AbjJKRjp (ORCPT ); Wed, 11 Oct 2023 13:39:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233207AbjJKRj0 (ORCPT ); Wed, 11 Oct 2023 13:39:26 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 125EEDA; Wed, 11 Oct 2023 10:39:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aaeNd8w7b/VaFp07oj7NVehXLCwApFzAWz2mF0f5sAiCJvMWyqR1yXBgick8lvQFf9YNnsoBynXnenZAk5WgC/znJ+rJD17hSuNP0NYF2CDWoykSbE7CV7+VNg4mvNMr8HMzdkB++zcpHHQ9QBjSmDDiE0B/lt6adAYqHlFBSac11xHhpOHebVi17EJZIg41j51p9aYtmf/LLbZ2W6m/gHVLpOKTF4QfTdC3XC0CHMM90Czs0CJ2JOZ9E2YnwKoyV+t9PdPmENEOh+Wo0WVGzkCp+TzHGsdG25QjxQzmIT3EsjnxT397QvLbRJoXROLPVTWBbVekzSpvT1ybwUEU5A== 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=7/vH9Q9jKs2GzlPx8DEoi1T0SBAlJ5DZXJzhZrsbsp4=; b=MNCAcbQyL53gUiPvy1ONeCfRogQZ7UKe/s+wSBGImS7MMJcwerLSgRgz/rS0S2AJL6qN0RPP8ydqaxpiQrv9qThH5r1wj6JSDgaytxZXDkexT1qDQJI/PXofYAEBroDyNXnFIablT8/VKbSOCX/2iLQ7/CFrAOUFtqmGiB02jJAKuFbtfmIBDmi3jRi/B1YbFt6mcCWv5kk3VAiLj1xPhaLBIUTbdHRa5a/LXt3gkExuzRFoT+MPyxnElPNppE3mMytJC1wXu+p/MjGcGvdMndSm2LJh50B8w6oaMgv7z4BpJlkN8dA6lMyFidD1cR5tWAusrRZTk3RLYk/cWVyBnw== 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=7/vH9Q9jKs2GzlPx8DEoi1T0SBAlJ5DZXJzhZrsbsp4=; b=Ypvbg2b3hkZzQpttoBDg6IuUk/URlnlfgLufILYixdGAVIeJ9/rma8GCibCn62jpn+l+Ke+3sKLctCvFr1axNPq1tXQ77DH81oJ0jMps3nrNODJj36N8G/5P7E/OI82Y4/AjNzPJuQz1qkube8jp1nEfI3VAYga8T3u6QcXv1rY= 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 AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) 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 17:39:08 +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 17:39:08 +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 v2 7/7] serial: omap: do not override settings for RS485 support Date: Wed, 11 Oct 2023 19:38:29 +0200 Message-Id: <20231011173829.10508-8-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: ea8cbbba-faa9-478b-3656-08dbca80f909 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3p6sozCcn2HL4jncWnuqlu4SCPtJqF5u6K8RLNRH3WWuGN/Ao19nMb8OlzF9sIefGXHfqfD9NC3JS2cfWzdbddcaIJ9+PRKXNPNe1xS+yaZ48B4y6MZ1+8m+6/YDu+fGBwLzA2j9uSbBYN8TjJGc5NAPGXggsdv8io9YjFrcxO6sXIepaZZGXfyOwUGiMfhJ8ligqFVUsiegqGmZlEqI6fJlm0OYzpcmJHxwdFOAXcYqkrCZ8bKe1sySPJ4Oaq9S1honTWynz+inu8nVzcgbQvdTKOj5iwaTwMBxGIp3XKCiDAh++ET+rrzcOhvcSX2rRMWtKel05Q4ypMQ7mVwr0SYpCwbADYZuL3LQ7JVnV83r+SuZSWSLPa5yvqBbeQtGPzeE3vuQabr415pHavg6cr25DfZFGlWVbTeDJ39zIQmL78nx8pcBZXqqOMVqF5TwoWvbpCpWI+ByGRvvOcg2O5YpMt/VHG8JyPmw4itcdMY1/42NvWlX29exSBo1qk00mCuTzdcugsj1OaTM1rSPQZX3rTITLx+4LHzUjh1g6FerIBZZ8Fw4LC1JIH0Evm86 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)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XeB9TZPG8Xe9zzSsxjCWo2zvsNf63NHcuuE/dXdm01KnFFB+rZuO9Q28U4OY?= =?us-ascii?Q?23SsDRsof4p4XdbVKnjhyvW5iH8etN9Fx01QFN8WKX6sn01KB9LMnn2UTFhP?= =?us-ascii?Q?iaedLAZtFapGfumpWPapBKR6xNhqv1pgWd/M/MIEIq0PagAZYLhqxE5NJIrM?= =?us-ascii?Q?1cVW7Ve/girqFRPcI+3Lch1gV89KhVZWJLGwLCSEB7WvmrMmlaXmrOhrd+lm?= =?us-ascii?Q?ns1MdowXa5AVDQEwLq5fHfbxHgopC7UuLEB8DgGJQbJaX+Rhv8VVB/u2sptI?= =?us-ascii?Q?Fedy7n/8kodqjgvjYFqTcHVLA9vs+fftztamwEY9w7CGpDmBr/j9FPl06yOk?= =?us-ascii?Q?Cjvbt/w6YAGlbWMfP5CyiPtbKVYMKQ25dMpuhlfK65uoQ07iUpm1LRDYXYva?= =?us-ascii?Q?VtbgbR7q7gVqFa5vu2+2/OibToYbKx+6XHd7GEAVj1oZnv58JKeYwI7IKXfd?= =?us-ascii?Q?6IOJNtonnCo5H+nhAnqjqO6xiHug6WDrLlRJEAHQwc7KCc2itjQFOZvvMnk7?= =?us-ascii?Q?UezIK52Hp3YfWxn+L3pP8GH81ye07aYyo61OnEKfcOucigY+ROXsEmdfXlht?= =?us-ascii?Q?lc3T4JVnp0jO0cWhc9hFqCJAcg0nMGCgE/q0PmqBdvOqgxxh5uzvmg1o1KxV?= =?us-ascii?Q?tMbzhj96KlyzCFTQAGtHMxckPMQQR1lO/C5zDcOHSujdLvYM5Hiuush+U1kZ?= =?us-ascii?Q?M9CgN7kPk6o9GqZGvohc2/+TdnYmqpSeweHlFIelleNC5ZbNyoF5eQuTgG8i?= =?us-ascii?Q?4iMfoSorGETMFxeKOqI9V8sW7V/uFRzE3urjvVlcPjisMUqQ56WxNAVJBiL+?= =?us-ascii?Q?lvv4JsUrVSPDG7pUl8trhUEnx1DtL09CW0XNbkftWzTZ+A18goxiMFEQqCSi?= =?us-ascii?Q?pCXRltf37hRPopgHDGQfzvGhO9w1w8QvvzKIRu7Kh24eEy/WKuyYC2onZqhc?= =?us-ascii?Q?fOq38hoV0lbs4ulWIQwwM2e4ty1hyB6Zn1Xa5zrAscuapfCE/aUNwEdSHP6T?= =?us-ascii?Q?HclWEoL1LVHIM1XPplzMzk0KLKePOIe+a3GpHQxOV/aAXcTlRQtGaCdSU88Y?= =?us-ascii?Q?eA/blBIk/zes1MBpKMuEc74eeTY2WIue/2gzRjzr7UTWbilyPfnlknQXYxYc?= =?us-ascii?Q?pEB4eFYmsrVQ5StK2mvvvaq53K917GZ5F4mGMUTM/T0TgQ5FT6Qgj/QfX87k?= =?us-ascii?Q?iBhs8sUmZhHuMm/d0pr6fgMgwDkZzsSy6XGx2tMCgTENzt8u0glNogLIVnSA?= =?us-ascii?Q?Ljsom63RmDijIpywShpuj53/QHHGA/qQClyKzvpjsn5pjKNbnAFnL4RHmvVa?= =?us-ascii?Q?oCO2OqOPrtRmvdeqXdLwfT7rm36nzT4FVr7jgFuXK8IjVtWUvamMT5f4nu/b?= =?us-ascii?Q?+18ImcjK3CLJh8H5F9sLKP869LLaUByAyc/fVPvofCeap36deogIGKfmLm0Q?= =?us-ascii?Q?8h+1wkCZV5JR9zyoBRRwOxdeJQvciey2feRpau9WSshc1FdfJVHaKnC6hIHZ?= =?us-ascii?Q?3Z9LVpirJBbmTwvOgbVtKYGRu+qOT5DoQMpl/Vguxo2zXlFSw78xBg//TfXS?= =?us-ascii?Q?a2F6MPoJjVKvnGTZUqgjOgHXztFIZLM0sTw48HqKZEVcDvFZVxdtHh4JjGmY?= =?us-ascii?Q?ecdF1EcCzXYfh1NyGPr+JLR/7cUfCSww0YLpH+YBK2vT?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea8cbbba-faa9-478b-3656-08dbca80f909 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:08.7136 (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: Y5j5NN90xeg3vpV0d5w8i6PHB2HhszRDvIpLQi84uiDUjSKFqYTqwpEFUSw/KT31EXHNIvZMgQFTcHQiI44UoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In serial_omap_rs485() RS485 support may be deactivated due to a missing RTS GPIO. This is done by nullifying the ports rs485_supported struct. After that however the serial_omap_rs485_supported struct is assigned to the same structure unconditionally, which results in an unintended reactivation of RS485 support. Fix this by callling serial_omap_rs485() after the assignment of rs485_supported. Fixes: e2752ae3cfc9 ("serial: omap: Disallow RS-485 if rts-gpio is not spec= ified") Cc: stable@vger.kernel.org Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/omap-serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-ser= ial.c index 0ead88c5a19a..4f7ee4392034 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1604,10 +1604,6 @@ static int serial_omap_probe(struct platform_device = *pdev) dev_info(up->port.dev, "no wakeirq for uart%d\n", up->port.line); =20 - ret =3D serial_omap_probe_rs485(up, &pdev->dev); - if (ret < 0) - goto err_rs485; - sprintf(up->name, "OMAP UART%d", up->port.line); up->port.mapbase =3D mem->start; up->port.membase =3D base; @@ -1622,6 +1618,10 @@ static int serial_omap_probe(struct platform_device = *pdev) DEFAULT_CLK_SPEED); } =20 + ret =3D serial_omap_probe_rs485(up, &pdev->dev); + if (ret < 0) + goto err_rs485; + up->latency =3D PM_QOS_CPU_LATENCY_DEFAULT_VALUE; up->calc_latency =3D PM_QOS_CPU_LATENCY_DEFAULT_VALUE; cpu_latency_qos_add_request(&up->pm_qos_request, up->latency); --=20 2.40.1