Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>
Cc:     linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
        Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
Subject: [PATCH] tty: serial: Add RS422 flag to struct serial_rs485
Date:   Mon, 30 Oct 2023 13:36:32 +0800
Message-Id: <20231030053632.5109-1-crescentcy.hsieh@moxa.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FymTmG9mO/BpO29BASCfsQ0Qhn6VWtPFxmgYsTxP8x0LLoWrDWdu1xmk1QJK?=
 =?us-ascii?Q?zaaSWUc6NMa/F+LCYd22MEvXH0NW9vYuk+I0h98joreT7YeHdAk4Ce1kpdTK?=
 =?us-ascii?Q?27NngW9Xoox+fI9z6oh4LPI5hr/K0NPs+N6s9T6Qp5poWfbvsHl4JVKFa8I0?=
 =?us-ascii?Q?o1tDWFxOkzvjY6NQith5h1WfwlAX+W7ME8JbcS8wj6+L8/nd18JPa5baT/rC?=
 =?us-ascii?Q?8rL0zDjKtyknQIKa0bn59jPJAdBe2NHqFqo98iDsNEkxks28zCH4FuU6ETj/?=
 =?us-ascii?Q?nta41Tyq13OjHD1+YaJ6+rcCrc8D+w+gu4d4PejdJGeDzfPO/2wfhBmPWXHe?=
 =?us-ascii?Q?57RjwF74/R8ae/x9Fst3OnNfTxvSSm0nE53sz82kYCWlb3jlFmAwWmyfWUm0?=
 =?us-ascii?Q?PLhNdY1/rvPa6N84Hd9QCpqdfIYXWrAfqFUZ/7E0iJu8ndxvHGYTMdgQxPLi?=
 =?us-ascii?Q?Ordl2VxB7coFM7l/dAgQQpXfIsGV3K107zSGIhprbecAFdgW/BkRWKDJoQrQ?=
 =?us-ascii?Q?YUf7Y2vylSPgzxPc0MBjGQfpLayp4h8VdvBifZMsm2LNmZn5ZJUNTG4BVuBO?=
 =?us-ascii?Q?TMMhYxvcO4nefulK5CkT9rm7dPnKHEdMVGrHssakVVfTfPYi6swjfqPhDq0i?=
 =?us-ascii?Q?kpkaztuinzrS83R8Z5v9rJT2fx+/Ywst8OItIZ57mZn1K345z49mYBqOqDw9?=
 =?us-ascii?Q?fg2GNzmYjhwqxSiCtk3U6KYB8zeQI/Zvbw5bK+VNDgutpvZ0ilMiuqDa8TwF?=
 =?us-ascii?Q?waXqReidmS8kOOGPQLDG/eQ5eubxHPZV39yhdqzLEYEsAhClN+DQ9LHZw9HJ?=
 =?us-ascii?Q?uI+6XUkISxHRFN/jBG2niCjjPzLBXl1DBvI6qOBhd2XDPzhn1n/mAuX9hBq9?=
 =?us-ascii?Q?icLdbzhFr8qvFwA0W634dG5l0scEp4iTjrRaklCq7zsx67eiPAbZUJhNtVcT?=
 =?us-ascii?Q?8HYNy0y4IOvuI6f8HgRcd5h42VML7rSOEs7SabgVwrZ6gKyrR6YR0Mnhy5QM?=
 =?us-ascii?Q?TxQ1P1PjQbyW5eunfATx7q5K9FqQhg92LVB+K7ba8abR3vYTQNYIJE1ztyy+?=
 =?us-ascii?Q?xGObuUENyDwvbVKlnuWGleDbbavecAYpSzk5foVTcvKwn/DpRsbx/ukzZ0Ov?=
 =?us-ascii?Q?IcB1/Vs3WiBl9yLKpIMlYS0tedsAXCBOWkUuoWwPihclr/o0d63zi1ssOPMZ?=
 =?us-ascii?Q?PSXYPWXUFlACISI3ZA4l2+Lah3hDnzrYrao4eGvrxAE0EcblRWyWqg3sOs0g?=
 =?us-ascii?Q?VIjedZ/X1nTa8EWRdnFT9nuuYTcEEf21Flt1P9OxU72bXWA2IzG5X1vQ2ZS1?=
 =?us-ascii?Q?tUqE8m2B7LBERSZSRhyzkDFftslT9oV5S6TO/tI9C72dSWl68GNj9qEVxItz?=
 =?us-ascii?Q?/F6qhKWSAYX/AdboZ1xYVZ1PY971M9Xc5F/b1RobZMUR0+et+ubZY5yCkEb7?=
 =?us-ascii?Q?URGLRt210ffuwUeFLQmdt1UEh6bJr3LvLWCpSkHGxCDRcLC2ibNzjGypMsgs?=
 =?us-ascii?Q?KzsUDm0yMcmC3CxXyccty8Y2jsJblY1j3RTAJiuVYZfB2ULrgrD4/uNSKi6Z?=
 =?us-ascii?Q?JgDnvkhLlzSftvWNcA6LOEB3TSh92EMrlocKFNWoSTfUYrhtmSM0IzcHOBxp?=
 =?us-ascii?Q?jQ=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: defd0686-c721-4797-91a0-08dbd90a3732
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 05:36:50.4201
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Une9uC/yYYx7+K0Sp/iOmBR5zQuoSmTk8CgrWXSOoMJ56HW/LbKkUu016HIY/9BJhLpvTwpmKP7hQcLPZECxUGapbG3VmHCOyghzy78H3ko=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR01MB5211
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 29 Oct 2023 22:38:22 -0700 (PDT)

Add "SER_RS422_ENABLED" flag within struct serial_rs485, so that serial
port can switching interface into RS422 if supported by using ioctl
command "TIOCSRS485".

In case of interfaces confliction, add checks within
uart_sanitize_serial_rs485() such that only one of RS422/RS485 is set.

Signed-off-by: Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
---
 drivers/tty/serial/serial_core.c | 19 +++++++++++++++++--
 include/uapi/linux/serial.h      |  4 ++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 831d03361..afbffa9dd 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1305,7 +1305,7 @@ static int uart_get_icount(struct tty_struct *tty,
 
 #define SER_RS485_LEGACY_FLAGS	(SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | \
 				 SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \
-				 SER_RS485_TERMINATE_BUS)
+				 SER_RS485_TERMINATE_BUS | SER_RS422_ENABLED)
 
 static int uart_check_rs485_flags(struct uart_port *port, struct serial_rs485 *rs485)
 {
@@ -1371,11 +1371,26 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
 {
 	u32 supported_flags = port->rs485_supported.flags;
 
-	if (!(rs485->flags & SER_RS485_ENABLED)) {
+	if (!(rs485->flags & (SER_RS485_ENABLED | SER_RS422_ENABLED))) {
 		memset(rs485, 0, sizeof(*rs485));
 		return;
 	}
 
+	/* Pick sane setting if the user enables both interfaces */
+	if (rs485->flags & (SER_RS485_ENABLED | SER_RS422_ENABLED)) {
+		dev_warn_ratelimited(port->dev,
+			"%s (%d): Invalid serial interface setting, using RS485 instead\n",
+			port->name, port->line);
+		rs485->flags &= ~SER_RS422_ENABLED;
+	}
+
+	/* Clear other bits and return if RS422 is enabled */
+	if (rs485->flags & SER_RS422_ENABLED) {
+		memset(rs485, 0, sizeof(*rs485));
+		rs485->flags |= SER_RS422_ENABLED;
+		return;
+	}
+
 	/* 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) ==
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
index 53bc1af67..427609fd5 100644
--- a/include/uapi/linux/serial.h
+++ b/include/uapi/linux/serial.h
@@ -137,6 +137,8 @@ struct serial_icounter_struct {
  * * %SER_RS485_ADDRB		- Enable RS485 addressing mode.
  * * %SER_RS485_ADDR_RECV - Receive address filter (enables @addr_recv). Requires %SER_RS485_ADDRB.
  * * %SER_RS485_ADDR_DEST - Destination address (enables @addr_dest). Requires %SER_RS485_ADDRB.
+ *
+ * * %SER_RS422_ENABLED		- RS422 enabled.
  */
 struct serial_rs485 {
 	__u32	flags;
@@ -149,6 +151,8 @@ struct serial_rs485 {
 #define SER_RS485_ADDR_RECV		(1 << 7)
 #define SER_RS485_ADDR_DEST		(1 << 8)
 
+#define SER_RS422_ENABLED		(1 << 9)
+
 	__u32	delay_rts_before_send;
 	__u32	delay_rts_after_send;
 
-- 
2.34.1