Add support for additional revisions/IDs of the Brainboxes UC
range of serial cards.
Add: Additional UC-235/UC-246, UC-302, UC-313, UC-346, UC-357 card IDs
Add: UC-253/UC-734 , UC-607, UC-836 cards
Fix: UC-431 variant note removed as it is a 3-port card, and there is
no generic 3-port configuration available.
Fix: UC-257 moved to parport_serial as it is a serial/LPT card.
Signed-off-by: Cameron Williams <[email protected]>
---
v2 - v3:
Re-submit patch series using git send-email to make threading work.
v1 - v2:
This is a resubmission series for the patch series below. That series
was lots of changes sent to lots of maintainers, this series is just for
the tty/serial/8250 subsystem.
[1] https://lore.kernel.org/all/DU0PR02MB789950E64D808DB57E9D7312C4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
[2] https://lore.kernel.org/all/DU0PR02MB7899DE53DFC900EFB50E53F2C4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
[3] https://lore.kernel.org/all/DU0PR02MB7899033E7E81EAF3694BC20AC4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
[4] https://lore.kernel.org/all/DU0PR02MB7899EABA8C3DCAC94DCC79D4C4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
drivers/tty/serial/8250/8250_pci.c | 56 ++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index ecb4e9acc70d..a6527545363a 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4940,10 +4940,14 @@ static const struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
pbn_b2_1_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0AA2,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_1_115200 },
/*
- * Brainboxes UC-257
+ * Brainboxes UC-253/UC-734
*/
- { PCI_VENDOR_ID_INTASHIELD, 0x0861,
+ { PCI_VENDOR_ID_INTASHIELD, 0x0CA1,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
pbn_b2_2_115200 },
@@ -4979,6 +4983,14 @@ static const struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x08E2,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x08E3,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
/*
* Brainboxes UC-310
*/
@@ -4989,6 +5001,14 @@ static const struct pci_device_id serial_pci_tbl[] = {
/*
* Brainboxes UC-313
*/
+ { PCI_VENDOR_ID_INTASHIELD, 0x08A1,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x08A2,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
{ PCI_VENDOR_ID_INTASHIELD, 0x08A3,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
@@ -5003,6 +5023,10 @@ static const struct pci_device_id serial_pci_tbl[] = {
/*
* Brainboxes UC-346
*/
+ { PCI_VENDOR_ID_INTASHIELD, 0x0B01,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_4_115200 },
{ PCI_VENDOR_ID_INTASHIELD, 0x0B02,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
@@ -5014,6 +5038,10 @@ static const struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0A82,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
{ PCI_VENDOR_ID_INTASHIELD, 0x0A83,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
@@ -5026,12 +5054,34 @@ static const struct pci_device_id serial_pci_tbl[] = {
0, 0,
pbn_b2_4_115200 },
/*
- * Brainboxes UC-420/431
+ * Brainboxes UC-420
*/
{ PCI_VENDOR_ID_INTASHIELD, 0x0921,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
pbn_b2_4_115200 },
+ /*
+ * Brainboxes UC-607
+ */
+ { PCI_VENDOR_ID_INTASHIELD, 0x09A1,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x09A2,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x09A3,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_2_115200 },
+ /*
+ * Brainboxes UC-836
+ */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0D41,
+ PCI_ANY_ID, PCI_ANY_ID,
+ 0, 0,
+ pbn_b2_4_115200 },
/*
* Brainboxes PX-101
*/
--
2.42.0
On 15. 10. 23, 19:10, Cameron Williams wrote:
> Add support for additional revisions/IDs of the Brainboxes UC
> range of serial cards.
>
> Add: Additional UC-235/UC-246, UC-302, UC-313, UC-346, UC-357 card IDs
> Add: UC-253/UC-734 , UC-607, UC-836 cards
> Fix: UC-431 variant note removed as it is a 3-port card, and there is
> no generic 3-port configuration available.
So can it be fixed instead of removed?
> Fix: UC-257 moved to parport_serial as it is a serial/LPT card.
So this patch deserves a Fixes tag and should go to stable as well?
Anyway, could you split this into fixes and additions (ie. 2 patches)?
thanks,
--
js
suse labs
On Mon, Oct 16, 2023 at 07:40:03AM +0200, Jiri Slaby wrote:
> On 15. 10. 23, 19:10, Cameron Williams wrote:
> > Add support for additional revisions/IDs of the Brainboxes UC
> > range of serial cards.
> >
> > Add: Additional UC-235/UC-246, UC-302, UC-313, UC-346, UC-357 card IDs
> > Add: UC-253/UC-734 , UC-607, UC-836 cards
> > Fix: UC-431 variant note removed as it is a 3-port card, and there is
> > no generic 3-port configuration available.
>
> So can it be fixed instead of removed?
>
By fixed, do you mean implement a generic 3-port configuration?
I could look into it, it would be nice to have all of the cards in the
range supported, but I wanted to avoid adding a specific configuration
only used by one niche card.
If you mean fixed as in change the wording a little bit and add a Fixes:
tag, then I can do that too.
> > Fix: UC-257 moved to parport_serial as it is a serial/LPT card.
>
> So this patch deserves a Fixes tag and should go to stable as well?
>
> Anyway, could you split this into fixes and additions (ie. 2 patches)?
>
Noted.
> thanks,
> --
> js
> suse labs
>