Received-SPF: pass (google.com: domain of linux-kernel+bounces-205947-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Crescent Hsieh <crescentcy.hsieh@moxa.com>
To: Jiri Slaby <jirislaby@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org,
	Crescent Hsieh <crescentcy.hsieh@moxa.com>
Subject: [PATCH 4/6] tty: serial: 8250: Add check for setting default serial interface
Date: Fri,  7 Jun 2024 19:43:34 +0800
Message-Id: <20240607114336.4496-5-crescentcy.hsieh@moxa.com>
In-Reply-To: <20240607114336.4496-1-crescentcy.hsieh@moxa.com>
References: <20240607114336.4496-1-crescentcy.hsieh@moxa.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?trMLAPY7W+wi9J84fINDMLiN8HgZaZv9Z3knYsfmlIXw7ZV7JdjkPUF1m9IA?=
 =?us-ascii?Q?6m+DFepUdmskJ0C/VIwrt1zqjAJfUXVtVkVSAbBzXHMwgFjwmKp3WAGN9w3I?=
 =?us-ascii?Q?q4h9JnAZjNM+NOs9Xln55LmO6TdjHAR9pHIobeX3xzJLDv45xxhBoEwLfXvW?=
 =?us-ascii?Q?z6FGgoDiWHE0xJpAUQgz5VIcz7qt++BpvXIselt9xQHHZwSLtaw8vl7pwY8U?=
 =?us-ascii?Q?28fjXZzXJGYuLLw+rqgnnaupnCzKuaabHir6DH9uiwhIS2AVkhhWzIsT+4tR?=
 =?us-ascii?Q?ji6kL0xf9ydBWO06iQhgPKkpCRmvLTilx8pxepVYjdaLQSCuwPJ8Rb1CY96D?=
 =?us-ascii?Q?oA4qh9t2QT+IdKFwB52tuoInnp8HJxMpYTlPsq5aSDW6CeoGJOeFZDyRLHfW?=
 =?us-ascii?Q?OM40I7iJSsQ30AFozrQIoEWd8fCXJ4jSKrpiaIL4c41jKkWq0ciO2/v+xT1X?=
 =?us-ascii?Q?NUX5cQG1ll8golsrzEPkRQrEZjeIYy9XAN+aX6YMALjS27MBUo9YDred0CeD?=
 =?us-ascii?Q?6ujMA5BcFsLMHambmh7xVaCzbel0zY0hgqFBoEDvPliJS9p2TTKhe7TnJkmi?=
 =?us-ascii?Q?xtZyqhVgeVsYTDw+6q50LvguGMvIoFSWWYpoh2Ow6oK9TQeKAA0nnDly9VIp?=
 =?us-ascii?Q?h7JpAj+QTals0VpLGzv0ok5f16U4U0iEE+9RmG0jORZKGV5LF7CBfBegIHc0?=
 =?us-ascii?Q?nCxMEwcvPWtIPkYewpLdHFy1Lt6m9oRI25FIZzkBUiQTPmS92LoeAkFFKJxR?=
 =?us-ascii?Q?dqxC86v18JLdOiv89D0apiyncaciooCFZZtmW9acKppNQ19pa97lN1r6UKOI?=
 =?us-ascii?Q?1cDF4Vik/cs23FV/WRONKsS8mmjtxx0XrjPn3XX7JcwskEcN1N6VqPFFvxOp?=
 =?us-ascii?Q?I9qPugP+mr3sfujvOgl5uplv8t099g6yStIvy9E2UarJSdK71s9KhvjOMQgo?=
 =?us-ascii?Q?sUv7NgDOVOBteNFyiVTWcaiuMEOOS3kl+Erj/HLCqIB4QhQlh9Mtxoq0dCfb?=
 =?us-ascii?Q?c0ufAO8Y8W6b94N+MDZsbbBAZzG3hfMuJidq2ydis26TLP/pTXPLdmMbfJsd?=
 =?us-ascii?Q?1ndrJXdGDGAT2IyWo5T9CiHKOK1XVPFMBrgItS8A7AXxT/sOM1xISpmNQSFR?=
 =?us-ascii?Q?eRupqIJcZ42n5BTnjkKwZPEhKfh7XjzbfErsF2Bqida97b8mwKM74zhnoRzX?=
 =?us-ascii?Q?t4GChJQ6NkYmG8IY9MNZoOce6E7kemXrXhsA4Ko7FBiA01P+huMCOA8GlOtz?=
 =?us-ascii?Q?cG8tjsNL38IPJX9Cv8tOUeSHYFj1d7aMJylJ2zCEi42FLjsjzvDiH6fg1iYH?=
 =?us-ascii?Q?gcTyloDJe9KXAIg91bqpJgkhqD2Z1ZIBz3d9If4MZZN0EqvHUa48yrd3X+xi?=
 =?us-ascii?Q?cQEUswvMTli8j9XE8k9vf6K/hlv5lkB8XKolm7TaPdY0F7Vd1rKMM2Ez8oQx?=
 =?us-ascii?Q?XCpiDtfqT4vwTQhZR6t+nojAlQJ100u+UnG5nfNpyOMTyet3oFpbMUpn8apc?=
 =?us-ascii?Q?+nSlNjSubkX43Hj2qPjxkN0J0QJiCbfITIOfxDiLo35NYFKfS6/N0NBWwqLe?=
 =?us-ascii?Q?mk+tcmL0AlMnVORKikuyjFy+elHedEJXX1ngQbplMi26UsDgPyIo21g9AyYQ?=
 =?us-ascii?Q?ZA=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 864cbfe8-b50f-43b2-fb11-08dc86e718cf
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2024 11:43:49.2763
 (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: FO9ebqjOLcPFbDsRC8qsWo6tnvAQkpA2exeaGLJp1se2OY0P2zA0f6AionNaXSvtti1FSfvPiXXfFpoG19H6LWEO9ZNtTPMngn2rFwgk8oI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR01MB5588

Moxa PCIe and Mini-PCIe boards are capable of switching the serial
interface through software control, while other PCI boards switch the
serial interface through hardware DIP switches.

This patch adds a check while setting the default serial interface.

Signed-off-by: Crescent Hsieh <crescentcy.hsieh@moxa.com>
---
 drivers/tty/serial/8250/8250_pci.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index e5bdabcce720..e4e6493a5497 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -2010,6 +2010,25 @@ enum {
 	MOXA_SUPP_RS485 = BIT(2),
 };
 
+static bool pci_moxa_is_pcie(unsigned short device)
+{
+	if (device == PCI_DEVICE_ID_MOXA_CP102E     ||
+	    device == PCI_DEVICE_ID_MOXA_CP102EL    ||
+	    device == PCI_DEVICE_ID_MOXA_CP104EL_A  ||
+	    device == PCI_DEVICE_ID_MOXA_CP114EL    ||
+	    device == PCI_DEVICE_ID_MOXA_CP116E_A_A ||
+	    device == PCI_DEVICE_ID_MOXA_CP116E_A_B ||
+	    device == PCI_DEVICE_ID_MOXA_CP118EL_A  ||
+	    device == PCI_DEVICE_ID_MOXA_CP118E_A_I ||
+	    device == PCI_DEVICE_ID_MOXA_CP132EL    ||
+	    device == PCI_DEVICE_ID_MOXA_CP134EL_A  ||
+	    device == PCI_DEVICE_ID_MOXA_CP138E_A   ||
+	    device == PCI_DEVICE_ID_MOXA_CP168EL_A)
+		return true;
+
+	return false;
+}
+
 static bool pci_moxa_is_mini_pcie(unsigned short device)
 {
 	if (device == PCI_DEVICE_ID_MOXA_CP102N	||
@@ -2070,11 +2089,13 @@ static int pci_moxa_init(struct pci_dev *dev)
 	    device == PCI_DEVICE_ID_MOXA_CP116E_A_B)
 		num_ports = 8;
 
-	if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232)) {
-		init_mode = MOXA_RS422;
+	if (pci_moxa_is_pcie(device) || pci_moxa_is_mini_pcie(device)) {
+		if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232))
+			init_mode = MOXA_RS422;
+
+		for (i = 0; i < num_ports; ++i)
+			pci_moxa_set_interface(dev, i, init_mode);
 	}
-	for (i = 0; i < num_ports; ++i)
-		pci_moxa_set_interface(dev, i, init_mode);
 
 	/*
 	 * Enable hardware buffer to prevent break signal output when system boots up.
-- 
2.34.1