Received-SPF: pass (google.com: domain of linux-kernel+bounces-149189-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 v4 5/7] serial: exar: add CTI cards to exar_get_nr_ports
Date: Wed, 17 Apr 2024 16:31:27 -0400
Message-ID: <0c64bdf852f39aec966b38696695d951e485d7e6.1713382717.git.pnewman@connecttech.com>
In-Reply-To: <cover.1713382717.git.pnewman@connecttech.com>
References: <cover.1713382717.git.pnewman@connecttech.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:DI5yBrAfF6U=;+j/LC8KMH+9uKL2BSQzqZtK6Na5
 as9KKNuuRhL+VhZeRV4RA4Pq5mXw1BwaNV0ZzFRgzQvNbe97y/7GobbMqiv0QzKiwp+0KfP93
 0KVtBx8uag81gDfVBFMLrjC8BZuvqtHY1o7Weoy7OclPrhznb3E6+XuPMAbR+NJAX7MiDkZfn
 hYohJmFJeT2FzvlM+qSlyhpCDdVUUX49HG5kNy3Re8fDRnr3fLAUsObXnz1mHRDRt4qyrZcGH
 1wIIkepI2bqeGtUfZG4IuaErV+B49ut7+/hWHXrEl9HA2KtVXsGSBXn0Z95mqqEmVJB8HKgpI
 cONdbwaYr3SNeBNniU4zBJ4otUhp+oYQkcq/0X72mBtXXJJiAk2FKfSLUHT1Wjw5Kqmdn4JpJ
 RM7WHpmrwC4489Wgohs5W407YOZyVDXPlOzZAfJU6fJ2C+EiVduq/Xa26Xpf4EL81/NndF7CG
 mojJn+IYsToQsHLDkZR6/B+iM16OybqMrRMy3Q8kXo5UwCm+DlEhk0/IvQ7WWDstjkkhRkV+B
 l4Cc/N2VJHDIIu5R/iZdDB72tlbHSKwiijoN0uFvgPeoJhgEzYqaySGIl199lFHp0QzNEdTM1
 9hBmT2czIAWyvBu+AZGruF+aDTwJ2ik/hrtJGcyvaU6XoyYZozTOrtpviZchmoPo/MQgVgZrO
 vvlwpMEEsZhkjlN99MmhGs7/3PPZ/8rUHi8YESfrRaIj76ZtcuyGyOVEkMw88TVEV0hg9tD9b
 FfU4z/ofL7zbRwoVs43tuW3wciwZ1LDCNqXTv7EWKZNWT1fl33YQ9s=

From: Parker Newman <pnewman@connecttech.com>

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

Signed-off-by: Parker Newman <pnewman@connecttech.com>
=2D--
Changes in v3:
- moved to separate patch
- added spaces to single line comments

 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 e68029a59122..197f45e306ff 100644
=2D-- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -711,12 +711,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