Received-SPF: pass (google.com: domain of linux-kernel+bounces-205943-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 1/6] tty: serial: 8250: Fix the amount of ports doesn't match the device
Date: Fri,  7 Jun 2024 19:43:31 +0800
Message-Id: <20240607114336.4496-2-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?oPUe7fpOKwu6TrXWVAs+7QM0IBzLejU0WTJOZ9pWP16ZQC7f7V5LPbDbD4Iq?=
 =?us-ascii?Q?rbfAvwfNKWrYyGDoEtaSfdyHcjPu/NIM2b1iT/kxYbKzfAmS+w1tEEKKOZBR?=
 =?us-ascii?Q?FMQi1yGH4ceHP/F5wQa+LTim5q8b76B6ETX5kUuhr0oxvwTT7Kmh0L1g62ve?=
 =?us-ascii?Q?a3cg8NoZGfkWdqePqJhdV46eeIr4hkxIIBn5K/mMuJ2P9Qs6CY+PqO/5rBXX?=
 =?us-ascii?Q?0+J5PP5AwWl82Tg4Pf6NFT+06f9TevHzGS0QMDgNhl8WSm12K/0FoR0ONoSC?=
 =?us-ascii?Q?xvaDc604lnjOscZpDueFXXyhoG+UfvB/RvsP2Y2Wwf8rRa3R1kTmuLGWelKB?=
 =?us-ascii?Q?lwHN/PdsGyScwf01LmiE89wJuKNz7PaknXXuSGF3YwRk0G+Abssnwquv1t1K?=
 =?us-ascii?Q?/Vt9iGRk+gkaqfFpcKdRa6lxIftDqBcsYfzG7jLc5lc3N6N4OGZAkxXQen1u?=
 =?us-ascii?Q?iIUqpf3Xydd9UA5Sn6XKTLrp6QX9KCa+5+J/cMYpDW86+nv3edtZGEExV+GY?=
 =?us-ascii?Q?JTq390TZTB2H7eoFmtXUWbJg3fdhw+UrNnQat+uf4MoQ0oERcpQqz9pvfeWn?=
 =?us-ascii?Q?mVs141LNoomx1JH7nDVXoqIKGFKv4WmaJUcb21rPWAVCeJXz/P1m5qKSaZlw?=
 =?us-ascii?Q?49JU8xIGDXFxrrRy6gYmWkxw02M/T8srWp5X3XJMAu57JMhEO/IR46QFMmYl?=
 =?us-ascii?Q?iFual0SjbIKi6zCzHOcj9c9CRxI6CJkS2Auata2KnS8YGMqtzl/JWoMnR8nr?=
 =?us-ascii?Q?VrtVbQPTAPXjHD15z5DnLhNIcWPytplqh1aYIulemMJ8Cvba49XbBwI1cej4?=
 =?us-ascii?Q?o/6OzqFfZ4ndLsdpENvFIAVuw0jChSq1wtwr59DVv2LbcQoxTcjzp6FJOQm8?=
 =?us-ascii?Q?hPaHqYEqNlSKRWUuaaklW9ukBTe+V2INDestfxGHujm6GouzuaulT2WPGB/S?=
 =?us-ascii?Q?gNudv4elqpI+UqBwjtXhWLZJwRRdNFCHRkazLodF8s2F8mcQPjw0i9KhJN1N?=
 =?us-ascii?Q?jjLchyRD6sU3sTEiOEsDwprJHIiPOlQfhrKi9M3YP/W1ItjTeyi0Iu3PtY7O?=
 =?us-ascii?Q?TD8Kaag/T1BM2XcXVlVB5Rni2iV/fiSQB9PXyVbjnj4hP2OFY1mcxNgxpYSy?=
 =?us-ascii?Q?Y9D+q1nRe+1mExIu103mDV34x7BWjLQfm3797ltsoqe8vs7jBENwpqO0tdjT?=
 =?us-ascii?Q?p0VBun4j+gb4tP+3Jbds8lKIAUYxWVOBB+6yNMcYHHPTnEwDE9uzTn91CGLi?=
 =?us-ascii?Q?d9msngYqLoX6AL9zsPVp+MV7p5+CPZ3us/HMa3rOZzaLm/lSfmDVsRELh6cU?=
 =?us-ascii?Q?5oRH1EZQgCobH8KL+aJtY2Mo1xvl12iCjsEkvDplyG281vQT97kMXPsHcNuU?=
 =?us-ascii?Q?YrHoYW7BXU88IKVFKhDMdVf9IdPUikXr2y4uF/ijduogR4N7+A+75YSuMakd?=
 =?us-ascii?Q?G6mierGfB8r/kc/ATN+kNBb311RmY5ldeBFr5LoQrFkh6SLbduYsCwuihQxx?=
 =?us-ascii?Q?BPtA6BVuNSIM3rYDTla9pD1hp10EOV/57RKZ8YGJwaLsY+N4t0bIi6SJ8n7h?=
 =?us-ascii?Q?grLBD8U495TDGMdxE0Du656suM36wmvAG59vxpSDCErCKwcHlSwZ2UKv3PrE?=
 =?us-ascii?Q?5w=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 46277a71-6139-4222-dffb-08dc86e7175c
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:46.9729
 (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: wnE0UcKqchKAGyeBKdqronT+miRbOkDP7JROQJ9qYhmRUtftWTtA5yNNiBNUep5DZMWpB2fGx05Z+QVtP0BiXks2e+5pdi6OYGa8fYLVmrM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR01MB5588

Normally, the amount of ports is written at the third digit of device ID
of Moxa PCI boards, for example: `0x1121` indicates a 2 ports device.

However, `CP116E_A_A` and `CP116E_A_B` are two exceptions, which has 8
ports but the third digit of device ID is `6`.

This patch fixes the issue above by adding checks.

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

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 40af74b55933..4e88ee07e548 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -2041,6 +2041,10 @@ static int pci_moxa_init(struct pci_dev *dev)
 	unsigned int num_ports = (device & 0x00F0) >> 4, i;
 	u8 val, init_mode = MOXA_RS232;
 
+	if (device == PCI_DEVICE_ID_MOXA_CP116E_A_A ||
+	    device == PCI_DEVICE_ID_MOXA_CP116E_A_B)
+		num_ports = 8;
+
 	if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232)) {
 		init_mode = MOXA_RS422;
 	}
-- 
2.34.1