Received-SPF: pass (google.com: domain of linux-kernel+bounces-146831-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Parker Newman <parker@finest.io>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jirislaby@kernel.org>,
	linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org
Cc: Parker Newman <pnewman@connecttech.com>
Subject: [PATCH v3 6/8] serial: exar: add CTI cards to exar_get_nr_ports
Date: Tue, 16 Apr 2024 08:55:33 -0400
Message-ID: <4045adb4efcd58805337c66b2e9a37c3fbb8a1e4.1713270624.git.pnewman@connecttech.com>
In-Reply-To: <cover.1713270624.git.pnewman@connecttech.com>
References: <cover.1713270624.git.pnewman@connecttech.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:4aGe6+SarkE=;OQcrbcjZyb3Y7WWdMF3fwcK6slb
 ZrET/fO36iOnVfJRG883oUNZlyIBWra8tnLyRVNDUuHOJYP1bPaWwAmmDtZWI/jYZqhpA190w
 hj9/6PeeQXcW93wUzBIXMzFIBica6yI0Yr4IBwCFfqVDB4qSX1Kzm2f1Ama5BIqoI6fSYRQKa
 XwprR9r3zt2WEBFrMbFKhLZldfZbETVPFqUIRrnbxBl5+6R53AiyHIve895KzXOuOlCoP9r94
 SuCUvzVhfIV5CJATxwwXbZaz8PhU/KcwSp1CR9WUjnTFGKlhI5IJsf8qEuvFvPyZJ/71eKIDH
 Y6vH9q4jXYEH4Lp17569me08LFC75ONHwHySrOtKxy2p/yWPBp/9HrdthFPu4Kby4p2kGpp7r
 qeZ8m+141mi9fAF5xA8BnxUCONex5kb+16cqu8QkbA9UAJ//b4dAKaRgftiGk8jZTLoIlVS42
 qZMdU2LudwzeaV8pFDpPuA1x16QMtC69lLFF/VCM1U9SIZ9z/Vc0k+6F6CRi+ynJtRlB16aQr
 Bg/4F2AxvS1fP4hpBnQVw5XVLedvdjOrsOvm4LzZ6ttqLGuxE+DdjBSDNwIIQjJ1BmpaGda4U
 5v7wV7MyF+0ZbchWGjcI03yhwC9EB4aUkFfuEcHzVAw8iXg9lmmJWCmdFOJ70whgPBVdbdbzH
 hJXyI54NO2LYsG73ElJPmOfskiv6NqnHp/QQ4sABJ6M7yIuU6NbO644iRQtu5zckB+4buoptO
 nQzF2sOo2fdP4gr2Mi5EG8540/3C5O2k0mzupb+/5OPBoPIguwFJPM=

From: Parker Newman <pnewman@connecttech.com>

Add code for getting number of ports of CTI cards to exar_get_nr_ports()

Changes in v3:
- moved to separate patch
- added spaces to single line comments

Signed-off-by: Parker Newman <pnewman@connecttech.com>
=2D--
 drivers/tty/serial/8250/8250_exar.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250=
/8250_exar.c
index 7e47a4145c7b..ada01c6394a3 100644
=2D-- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -710,12 +710,28 @@ static unsigned int exar_get_nr_ports(struct exar825=
0_board *board,
 {
 	unsigned int nr_ports =3D 0;

-	if (pcidev->vendor =3D=3D PCI_VENDOR_ID_ACCESSIO)
+	if (pcidev->vendor =3D=3D PCI_VENDOR_ID_ACCESSIO) {
 		nr_ports =3D BIT(((pcidev->device & 0x38) >> 3) - 1);
-	else if (board->num_ports)
+	} else if (board->num_ports > 0) {
+		// Check if board struct overrides number of ports
 		nr_ports =3D board->num_ports;
-	else
+	} else if (pcidev->vendor =3D=3D PCI_VENDOR_ID_EXAR) {
+		// Exar encodes # ports in last nibble of PCI Device ID ex. 0358
 		nr_ports =3D pcidev->device & 0x0f;
+	} else  if (pcidev->vendor =3D=3D PCI_VENDOR_ID_CONNECT_TECH) {
+		// Handle CTI FPGA cards
+		switch (pcidev->device) {
+		case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_12_XIG00X:
+		case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_12_XIG01X:
+			nr_ports =3D 12;
+			break;
+		case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_16:
+			nr_ports =3D 16;
+			break;
+		default:
+			break;
+		}
+	}

 	return nr_ports;
 }
=2D-
2.43.2