Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
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 2/2] tty: serial: 8250: Add support for MOXA PCIe boards to switch interface
Date:   Fri, 27 Oct 2023 14:24:40 +0800
Message-Id: <20231027062440.7749-3-crescentcy.hsieh@moxa.com>
In-Reply-To: <20231027062440.7749-1-crescentcy.hsieh@moxa.com>
References: <20231027062440.7749-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?Jpncsyrj59C9Tn6OO88EsS1vgjt2A5Wabp3FikyB7xZyU6/0d/kpHmvrBhVK?=
 =?us-ascii?Q?sfo/0tf8FIUYgL9i5EL1nPUeWzx1yNW7yCWGwwxUA/ri8QTBum6GV5sVgnzn?=
 =?us-ascii?Q?C1DITQllkT6/ScLNQi3E7t19BUKzhPFfMYO2WOLNJ7P1ZW/netUyHOGZZ8Yq?=
 =?us-ascii?Q?T6iKz677cFk1/84cexc0YtJ0natXpQZiFcHijz/EJQFT23YlTVXjFGs42Xp7?=
 =?us-ascii?Q?4r5W3QK0V9dZaLG4YalN6OuwjZxyjMh26KOA9FrbyMeAGXU2VrOzI/I/oBno?=
 =?us-ascii?Q?k53jdq5ps1/OVnWEHDSOAbsMDUYOpcYEHC2gHhPH9P/F8MObdiLkYhMiN17Y?=
 =?us-ascii?Q?RPTlgsHQ1aksfHbGmMR4ljA16CtE4DiKjrtyIJnr4ldv5CG+Vl7aqMG6EJzc?=
 =?us-ascii?Q?c336ippUkjMHzTMjRkjH/QcMcm28zRcGTgBkXCtmb/LOEp1zhFqGqQxSHCGA?=
 =?us-ascii?Q?aQL78PM2oHAnOJDm2cNZJdHTX1yiskbQiyo6MjkXGbBRdcgoF2r8+nZPlZcH?=
 =?us-ascii?Q?eRxl8RF5XD3hVIjl9bEsgbhPHhaQbslLyVPgh+v3a+r6hGfDZ3uWwcmJtHhS?=
 =?us-ascii?Q?JV/kDiXgZEs7Ye3Gw36QT6JBZwOyAxZrm6jDxQQBQY50S5o+SgUk+660rQvX?=
 =?us-ascii?Q?6zLssdgL/45hAfusrbX0Y3y4akAJxRdmwgL0vj6+Qa7Wr9esWXVvVGEndVGm?=
 =?us-ascii?Q?5pPNdCKNp28hj6bLR5hSAyukAngkMpj1x1IrjsWG8GOsPyBiojuSutzWJ81p?=
 =?us-ascii?Q?YP1ftWwQSxaWONZEHkU2xHzzlGmtGE4QA5bVATkVyeWf2ZZNDaOeAbGoiTKY?=
 =?us-ascii?Q?EjsklhYfkyxb+5VqZfFi34lTUAp+M0pQ5uSt+eKckZilVMo+ZUm9n3+Hn8GQ?=
 =?us-ascii?Q?+wOx4fZaAubzza3qbKLjcoDv3gE81nWUPpGwOl69g7gfaV0sOYRuHoj7Cv9N?=
 =?us-ascii?Q?E8W2sN06OSLOwIKHoQ+CWPlMzyZrH8EQ9Q8eVvNfM6+FZWIDXLfA4pHzpftt?=
 =?us-ascii?Q?yvRPstOVIPedBCWQGXsb/WhSh+QlRFR5+xFC9wZAQijQGI9cXUEZ6HZgiDr3?=
 =?us-ascii?Q?OPEjAIoNNVTkgmRhbOjQdNvwtKVAoZbi3l1auJWiFoSk/J/M3tDrf9ZZT+Nm?=
 =?us-ascii?Q?kXvmFKkPS/5QdNXYIS/UL9LRGiAE5fA5ugfVoRn9FXhocuU0G5O4KtPFg4N3?=
 =?us-ascii?Q?miCg4MxF2RyVRc6GEzaZFFnVZ/XN7muuBGDu0ANSIBrOjQEiAOquJ988db3w?=
 =?us-ascii?Q?OtK7Vbk0TkyQaaxYOuI93EygJGmZzkFz8v7SMh9eF2ATE7/Awg4IPH/S8jsX?=
 =?us-ascii?Q?t7qIYA0tv8/GcifTCBDvcF2Co51w9bc7RQztBtTzJngwys9jAaS9VTJiaQaC?=
 =?us-ascii?Q?JRjbMTBn8kBufO3BZSfjqnyifOBqteNAAyI509/grcQsmzdthc3r/0o15Fd2?=
 =?us-ascii?Q?6JNdgDryGggMWW1zQajjU3tmlI2oGooWunzSyCWhh4bHHzth0zcBuKDuV79A?=
 =?us-ascii?Q?D6s21mkhrcMhzevFKYAqo6waYe1kJgx8zyxeDsNINcs9dgk4ppgKZrzWhNZS?=
 =?us-ascii?Q?p04dQbHbs9kGkGNGNNbgQn8j2bMwUIB0nNOi9dHC2SX6rCnahiNYMQykqQUP?=
 =?us-ascii?Q?9w=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e3b4dd18-f1d7-46b4-8a52-08dbd6b59835
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 06:26:03.6145
 (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: 4mA9LG0GyX6E9YVWU4IBbVCJNC4bPGsCQCjZcGPj8d+ZPSbCPaBHlfewfSD3szf2McENJE26mNxB2RKjUxnE5qA0Nh4XKbUNIojHn/0Y+BI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR0101MB3696
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,URIBL_BLOCKED autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Thu, 26 Oct 2023 23:26:37 -0700 (PDT)

MOXA PCIe boards have 4 serial interfaces and don't require additional
stuff to switch between interfaces:

- RS232
- RS422
- RS485_2W (half-duplex)
- RS485_4W (full-duplex)

By using ioctl command "TIOCRS485", it can switch between default
interface and RS485 if supported.

That means, for RS422/RS485 board, it can switch between RS422 and
RS485 by setting the flags within struct serial_rs485.

However, for the RS232/RS422/RS485 board, it can only switch between
RS232 and RS485, there's no flag for switching interface into RS422.

This patch adds a flag call "SER_RS422_ENALBED" in serial.h and modifies
serial_core.c to make it possible to switch interface between RS232,
RS422 and RS485.

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

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 66a2450da..6eabf6bf5 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1983,6 +1983,10 @@ enum {
 	MOXA_SUPP_RS485 = BIT(2),
 };
 
+static const struct serial_rs485 pci_moxa_rs485_supported = {
+	.flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RX_DURING_TX | SER_RS422_ENABLED,
+};
+
 static bool pci_moxa_is_mini_pcie(unsigned short device)
 {
 	if (device == PCI_DEVICE_ID_MOXA_CP102N	||
@@ -2032,6 +2036,37 @@ static int pci_moxa_set_interface(const struct pci_dev *dev,
 	return 0;
 }
 
+/*
+ * MOXA PCIe boards support switching the serial interface using the ioctl
+ * command "TIOCSRS485".
+ *
+ *	RS232			= (no flags are set)
+ *	RS422			= SER_RS422_ENABLED
+ *	RS485_2W (half-duplex)	= SER_RS485_ENABLED
+ *	RS485_4W (full-duplex)	= SER_RS485_ENABLED | SER_RS485_RX_DURING_TX
+ */
+static int pci_moxa_rs485_config(struct uart_port *port,
+				 struct ktermios *termios,
+				 struct serial_rs485 *rs485)
+{
+	struct pci_dev *dev = to_pci_dev(port->dev);
+	u8 mode = MOXA_RS232;
+
+	if (rs485->flags & SER_RS485_ENABLED) {
+		if (rs485->flags & SER_RS485_RX_DURING_TX)
+			mode = MOXA_RS485_4W;
+		else
+			mode = MOXA_RS485_2W;
+	} else if (rs485->flags & SER_RS422_ENABLED) {
+		mode = MOXA_RS422;
+	} else {
+		if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232))
+			return -ENODEV;
+	}
+
+	return pci_moxa_set_interface(dev, port->port_id, mode);
+}
+
 static int pci_moxa_init(struct pci_dev *dev)
 {
 	unsigned short device = dev->device;
@@ -2067,9 +2102,18 @@ pci_moxa_setup(struct serial_private *priv,
 		const struct pciserial_board *board,
 		struct uart_8250_port *port, int idx)
 {
+	struct pci_dev *dev = priv->dev;
 	unsigned int bar = FL_GET_BASE(board->flags);
 	int offset;
 
+	if (pci_moxa_supported_rs(dev) & MOXA_SUPP_RS485) {
+		port->port.rs485_config = pci_moxa_rs485_config;
+		port->port.rs485_supported = pci_moxa_rs485_supported;
+
+		if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232))
+			port->port.rs485.flags = SER_RS422_ENABLED;
+	}
+
 	if (board->num_ports == 4 && idx == 3)
 		offset = 7 * board->uart_offset;
 	else
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 831d03361..e4ea0e428 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) && !(rs485->flags & SER_RS422_ENABLED)) {
 		memset(rs485, 0, sizeof(*rs485));
 		return;
 	}
 
+	/* Pick sane setting if the user enables both interfaces */
+	if (rs485->flags & SER_RS485_ENABLED && rs485->flags & 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 enable RS422 */
+	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) ==
@@ -1400,7 +1415,7 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
 static void uart_set_rs485_termination(struct uart_port *port,
 				       const struct serial_rs485 *rs485)
 {
-	if (!(rs485->flags & SER_RS485_ENABLED))
+	if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENABLED))
 		return;
 
 	gpiod_set_value_cansleep(port->rs485_term_gpio,
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