| Message ID | 20230413214421.6251-2-afd@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] serial: 8250_exar: Use PCI_DEVICE_DATA macro directly | expand |
On Thu, Apr 13, 2023 at 04:44:21PM -0500, Andrew Davis wrote: > Possibly the last PCI controller-based (i.e. not a soft/winmodem) > dial-up modem one can still buy. > > Looks to have a stock XR17C154 PCI UART chip for communication, but for > some reason when provisioning the PCI IDs they swapped the vendor and > subvendor IDs. Otherwise this card would have worked out of the box. > > Searching online, some folks seem to not have this issue and others do, > so it is possible only some batches of cards have this error. > > Create a new macro to handle the switched IDs and add support here. Yeah, and here you just going to support the schema before your patch 1. For this patch Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
On 4/20/23 6:38 AM, Greg Kroah-Hartman wrote: > On Thu, Apr 13, 2023 at 04:44:21PM -0500, Andrew Davis wrote: >> Possibly the last PCI controller-based (i.e. not a soft/winmodem) >> dial-up modem one can still buy. >> >> Looks to have a stock XR17C154 PCI UART chip for communication, but for >> some reason when provisioning the PCI IDs they swapped the vendor and >> subvendor IDs. Otherwise this card would have worked out of the box. >> >> Searching online, some folks seem to not have this issue and others do, >> so it is possible only some batches of cards have this error. >> >> Create a new macro to handle the switched IDs and add support here. >> >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- >> drivers/tty/serial/8250/8250_exar.c | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) > > Please redo this without patch 1/2 as that would not make sense to > backport anywhere, but adding new device ids are allowed in stable > kernels. Also, as others pointed out, either convert them all or none > :) > Fair enough, posting v2 with only the second patch now. Thanks, Andrew
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 878d87f4202bd..9792db550f8cb 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -40,9 +40,13 @@ #define PCI_DEVICE_ID_COMMTECH_4224PCIE 0x0020 #define PCI_DEVICE_ID_COMMTECH_4228PCIE 0x0021 #define PCI_DEVICE_ID_COMMTECH_4222PCIE 0x0022 + #define PCI_DEVICE_ID_EXAR_XR17V4358 0x4358 #define PCI_DEVICE_ID_EXAR_XR17V8358 0x8358 +#define PCI_SUBDEVICE_ID_USR_2980 0x0128 +#define PCI_SUBDEVICE_ID_USR_2981 0x0129 + #define PCI_DEVICE_ID_SEALEVEL_710xC 0x1001 #define PCI_DEVICE_ID_SEALEVEL_720xC 0x1002 #define PCI_DEVICE_ID_SEALEVEL_740xC 0x1004 @@ -827,6 +831,15 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { (kernel_ulong_t)&bd \ } +#define USR_DEVICE(devid, sdevid, bd) { \ + PCI_DEVICE_SUB( \ + PCI_VENDOR_ID_USR, \ + PCI_DEVICE_ID_EXAR_##devid, \ + PCI_VENDOR_ID_EXAR, \ + PCI_SUBDEVICE_ID_USR_##sdevid), 0, 0, \ + (kernel_ulong_t)&bd \ + } + static const struct pci_device_id exar_pci_tbl[] = { /* ACCES I/O Products */ { PCI_DEVICE_DATA(ACCESSIO, COM_2S, &pbn_exar_XR17C15x) }, @@ -852,6 +865,10 @@ static const struct pci_device_id exar_pci_tbl[] = { IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn), + /* USRobotics USR298x-OEM PCI Modems */ + USR_DEVICE(XR17C152, 2980, pbn_exar_XR17C15x), + USR_DEVICE(XR17C152, 2981, pbn_exar_XR17C15x), + /* Exar Corp. XR17C15[248] Dual/Quad/Octal UART */ { PCI_DEVICE_DATA(EXAR, XR17C152, &pbn_exar_XR17C15x) }, { PCI_DEVICE_DATA(EXAR, XR17C154, &pbn_exar_XR17C15x) },
Possibly the last PCI controller-based (i.e. not a soft/winmodem) dial-up modem one can still buy. Looks to have a stock XR17C154 PCI UART chip for communication, but for some reason when provisioning the PCI IDs they swapped the vendor and subvendor IDs. Otherwise this card would have worked out of the box. Searching online, some folks seem to not have this issue and others do, so it is possible only some batches of cards have this error. Create a new macro to handle the switched IDs and add support here. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/tty/serial/8250/8250_exar.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)