Received-SPF: pass (google.com: domain of linux-kernel+bounces-214603-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Crescent Hsieh <crescentcy.hsieh@moxa.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jirislaby@kernel.org>,
	Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org,
	Crescent Hsieh <crescentcy.hsieh@moxa.com>
Subject: [PATCH] tty: serial: 8250: Fixes: Fix port count mismatch with the device
Date: Fri, 14 Jun 2024 17:03:22 +0800
Message-Id: <20240614090322.2303-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?KBGIIaNJGIZV+HwAlW71VnccvNm1zBtqMsjr/4zDR+AGjDe2uDw+YQax3QnQ?=
 =?us-ascii?Q?zXMRFjHpeQKcXtfYFaI+ciOxhJmBqWng4wqMwbKT2UfyExXoEqIEVS9ZOjjT?=
 =?us-ascii?Q?8soiJupGSZ8XlRCcVrF6PPmdpwBxh/DYypiIYQa7LKFMfbPUsGdUuTlbSigx?=
 =?us-ascii?Q?xODEhPwZvGMHCCcxBHJwTS482NBuUPLo5aCumPUcjvw+hW4RIx7AnSY5lvme?=
 =?us-ascii?Q?+eJMcKt06VXxfrusdJPoFFDZBF4CywE7g0xcz9Bz6gtrglldXpLtll1sZk+A?=
 =?us-ascii?Q?8GL8SagvQDC7TxrIB67w+mO28N5NNqLgiXtangV1sw3yR94L5bcVlCmm1lQL?=
 =?us-ascii?Q?t/KnQD5TchKfdHJS0FUfgy/spREdwfaVZfmDOYYblQmFOINTZ5JGL1HPVKMU?=
 =?us-ascii?Q?fNavDsrBIuJfWROKim2KVIqbZ2FtEcWH9YgZyEj7lG1dGa4GA4tgRciO8Btj?=
 =?us-ascii?Q?50qWNEYUrePEQw8a9om8NcQfODEOWk8p9/KnKKKklFGxNj3BNdOQ+S9JKNiN?=
 =?us-ascii?Q?w+K/LyoxZTiSk3fgkU7+zixrZyy3LhiOoPj3wX7fuw1wjH+TDzR3NW42zu5v?=
 =?us-ascii?Q?+fGqvVkIxLJblxKwxYIiFlAAFgLgQ2FISztN0cs09hJfE4vcgWHXBlQ67B3z?=
 =?us-ascii?Q?413Yej25KU2AvErMR9sgmp506kDWhN4ml6tfe6FUFNlHeaz8WUMm+1dQvMa+?=
 =?us-ascii?Q?oLRzQ5V37Jk1bvpmYYciU/qEKIJ7WmjsSWELxeUrQRyfN5McepdnJgE+E8Xs?=
 =?us-ascii?Q?4o5gdRVpT7pj2nTTzplt5VR+NXpXxDxvD1f8ACFZsxNlwPd2hLmg4IavDMbU?=
 =?us-ascii?Q?SzTCyF9GHCWybVJJ6wBUdWOTdTV03I1Tivjby1oC/YAstuhJmmyt4CMNtvnI?=
 =?us-ascii?Q?ciBVm9oAM1XzFXNY5XBJMsDB9H/Jl4CHWEdkZESFALoEEHWbQONxOZxft/Nf?=
 =?us-ascii?Q?8DTcuJkGciiO9shuuwYhigplrcoAT5GSiA259EECXzW/P3z4mh22M3ul/ZaE?=
 =?us-ascii?Q?Zgon2han4HCJwsbC5M8hW+/fGvD3Bqp5durCRxoWbqldOXDTBb3fgDHXZf83?=
 =?us-ascii?Q?3tn/vzDpwlca1OHnT4zUNYWfVZhFKfzglrdmip/pavhiCVveGGscPF4looDS?=
 =?us-ascii?Q?EHOdVyOkhc7sQA1WsQZbHe82WOEtf0AN0TP3fKaeAMPTAKiJQ2Lm6buXMX9x?=
 =?us-ascii?Q?twHbPVsSKI4y1zFgJ5dCoOQW2D8zgO83Xo8y+0UUC5a9nxgdqwBwLXKSPg0y?=
 =?us-ascii?Q?JUQArn9QaczxL30g0l3EadqKNj9gP5XjGJSLcj1rxaD3AQMUOzP+EaqOcJv6?=
 =?us-ascii?Q?kU5vnJ9NcNc/GOknr4X5W15Pz/it/BGcWR69LLQCxuFoOwDMNiErGIjdO/B2?=
 =?us-ascii?Q?B7tjku6+6FR0qjiNlIhiURKukKLQM8mOxYM5G7nxKy8oFEcV+jhsS4yA8Jrr?=
 =?us-ascii?Q?RZ0aRZzeEPdCUUg8yhZjxPaQlshCtcbrl+wU/YIgsWSfmJfkxnrAMFxuY6oo?=
 =?us-ascii?Q?b44+jF0SzOZY9ftp86phyCNSQ8mNP0IEy8qyKt+SZ+ESyI9Yn/KEMxdtbLSZ?=
 =?us-ascii?Q?Id803eiXcIi1dbOj6w2CQd5c5R4ud2o+Z6l71C+etxVsbQTH/Tep0pDi3CYO?=
 =?us-ascii?Q?Xw=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9daa763b-8278-4e6a-a11b-08dc8c50e032
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:03:36.8282
 (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: gOzkTxPnzQ0+vCSH9njCmckg30pRN3mmTxTfP8LoyAWKoPMMtyVPwkllgCnK9+wkixqaE7NYOtLN16eLhjvvOJJV/WDZ8f8DxGc74FeUwOU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR0101MB4820

Normally, the number of ports is indicated by the third digit of the
device ID on Moxa PCI serial boards. For example, `0x1121` indicates a
device with 2 ports.

However, `CP116E_A_A` and `CP116E_A_B` are exceptions; they have 8
ports, but the third digit of the device ID is `6`.

This patch introduces a function to retrieve the number of ports on Moxa
PCI serial boards, addressing the issue described above.

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

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 40af74b55933..e1d7aa2fa347 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1985,6 +1985,17 @@ enum {
 	MOXA_SUPP_RS485 = BIT(2),
 };
 
+static unsigned short moxa_get_nports(unsigned short device)
+{
+	switch (device) {
+	case PCI_DEVICE_ID_MOXA_CP116E_A_A:
+	case PCI_DEVICE_ID_MOXA_CP116E_A_B:
+		return 8;
+	}
+
+	return FIELD_GET(0x00F0, device);
+}
+
 static bool pci_moxa_is_mini_pcie(unsigned short device)
 {
 	if (device == PCI_DEVICE_ID_MOXA_CP102N	||
@@ -2038,7 +2049,7 @@ static int pci_moxa_init(struct pci_dev *dev)
 {
 	unsigned short device = dev->device;
 	resource_size_t iobar_addr = pci_resource_start(dev, 2);
-	unsigned int num_ports = (device & 0x00F0) >> 4, i;
+	unsigned int i, num_ports = moxa_get_nports(device);
 	u8 val, init_mode = MOXA_RS232;
 
 	if (!(pci_moxa_supported_rs(dev) & MOXA_SUPP_RS232)) {
-- 
2.34.1