8250_pci.c change for fix hanging problem while suspend machine. 8250_pci.c support the same vendor id and device id definition as sunix multi-I/O card driver, when the sunix multi-io borad driver is installed,there are two drivers to support the same sunix multi-io card,it will cause operation error
PATCH 1/1 8250_pci.c change for fix hanging problem while suspend machine. 8250_pci.c support the same vendor id and device id definition as sunix multi-I/O card driver, when the sunix multi-io borad driver is installed,there are two drivers to support the same sunix multi-io card,it will cause operation error
Signed-off-by saumah <[email protected]>
--- 8250_pci.c | 162 +---------------------------------------------------- 1 file changed, 2 insertions(+), 160 deletions(-)
8250_pci.c +2 -160
@@ -519,115 +519,6 @@ static int pci_siig_setup(struct serial_private *priv,return setup_port (priv, port, bar, offset,0 ); } -/* -* Timedia has an explosion of boards, and to avoid the PCI table from -* growing *huge*, we use this function to collapse some 70 entries -* in the PCI table into one, for sanity's and compactness's sake. -*/ -static const unsigned short timedia_single_port[] = { -0x4025 ,0x4027 ,0x4028 ,0x5025 ,0x5027 ,0 -}; - -static const unsigned short timedia_dual_port[] = { -0x0002 ,0x4036 ,0x4037 ,0x4038 ,0x4078 ,0x4079 ,0x4085 , -0x4088 ,0x4089 ,0x5037 ,0x5078 ,0x5079 ,0x5085 ,0x6079 , -0x7079 ,0x8079 ,0x8137 ,0x8138 ,0x8237 ,0x8238 ,0x9079 , -0x9137 ,0x9138 ,0x9237 ,0x9238 ,0xA079 ,0xB079 ,0xC079 , -0xD079 ,0 -}; - -static const unsigned short timedia_quad_port[] = { -0x4055 ,0x4056 ,0x4095 ,0x4096 ,0x5056 ,0x8156 ,0x8157 , -0x8256 ,0x8257 ,0x9056 ,0x9156 ,0x9157 ,0x9158 ,0x9159 , -0x9256 ,0x9257 ,0xA056 ,0xA157 ,0xA158 ,0xA159 ,0xB056 , -0xB157 ,0 -}; - -static const unsigned short timedia_eight_port[] = { -0x4065 ,0x4066 ,0x5065 ,0x5066 ,0x8166 ,0x9066 ,0x9166 , -0x9167 ,0x9168 ,0xA066 ,0xA167 ,0xA168 ,0 -}; - -static const struct timedia_struct { -int num; -const unsigned short *ids; -} timedia_data[] = { - {1 , timedia_single_port }, - {2 , timedia_dual_port }, - {4 , timedia_quad_port }, - {8 , timedia_eight_port } -}; - -/* -* There are nearly 70 different Timedia/SUNIX PCI serial devices. Instead of -* listing them individually, this driver merely grabs them all with -* PCI_ANY_ID. Some of these devices, however, also feature a parallel port, -* and should be left free to be claimed by parport_serial instead. -*/ -static int pci_timedia_probe (struct pci_dev *dev) -{ -/* -* Check the third digit of the subdevice ID -* (0,2,3,5,6: serial only -- 7,8,9: serial + parallel) -*/ -if ((dev->subsystem_device &0x00f0 ) >=0x70 ) { -dev_info (&dev->dev, -"ignoring Timedia subdevice %04x for parport_serial\n" , - dev->subsystem_device); -return -ENODEV ; - } - -return 0 ; -} - -static int pci_timedia_init (struct pci_dev *dev) -{ -const unsigned short *ids; -int i, j; - -for (i =0 ; i <ARRAY_SIZE (timedia_data); i++) { - ids = timedia_data[i].ids; -for (j =0 ; ids[j]; j++) -if (dev->subsystem_device == ids[j]) -return timedia_data[i].num; - } -return 0 ; -} - -/* -* Timedia/SUNIX uses a mixture of BARs and offsets -* Ugh, this is ugly as all hell --- TYT -*/ -static int -pci_timedia_setup (struct serial_private *priv, -const struct pciserial_board *board, -struct uart_8250_port *port,int idx) -{ -unsigned int bar =0 , offset = board->first_offset; - -switch (idx) { -case 0 : - bar =0 ; -break ; -case 1 : - offset = board->uart_offset; - bar =0 ; -break ; -case 2 : - bar =1 ; -break ; -case 3 : - offset = board->uart_offset; -/* FALLTHROUGH */ -case 4 :/* BAR 2 */ -case 5 :/* BAR 3 */ -case 6 :/* BAR 4 */ -case 7 :/* BAR 5 */ - bar = idx -2 ; - } - -return setup_port (priv, port, bar, offset, board->reg_shift); -}/* * Some Titan cards are also a little weird
@@ -2103,42 +1994,8 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { .subdevice = PCI_ANY_ID, .setup = titan_400l_800l_setup, }, -/* -* Timedia cards -*/ - { - .vendor = PCI_VENDOR_ID_TIMEDIA, - .device = PCI_DEVICE_ID_TIMEDIA_1889, - .subvendor = PCI_VENDOR_ID_TIMEDIA, - .subdevice = PCI_ANY_ID, - .probe = pci_timedia_probe, - .init = pci_timedia_init, - .setup = pci_timedia_setup, - }, - { - .vendor = PCI_VENDOR_ID_TIMEDIA, - .device = PCI_ANY_ID, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .setup = pci_timedia_setup, - }, - /* - * SUNIX (Timedia) cards - * Do not "probe" for these cards as there is at least one combination - * card that should be handled by parport_pc that doesn't match the - * rule in pci_timedia_probe. - * It is part number is MIO5079A but its subdevice ID is 0x0102. - * There are some boards with part number SER5037AL that report - * subdevice ID 0x0002. - */ - { - .vendor = PCI_VENDOR_ID_SUNIX, - .device = PCI_DEVICE_ID_SUNIX_1999, - .subvendor = PCI_VENDOR_ID_SUNIX, - .subdevice = PCI_ANY_ID, - .init = pci_timedia_init, - .setup = pci_timedia_setup, - }, + +/* * Xircom cards */
@@ -4375,22 +4232,7 @@ static const struct pci_device_id serial_pci_tbl[] = { {PCI_VENDOR_ID_OXSEMI ,PCI_DEVICE_ID_OXSEMI_16PCI95N ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_oxsemi }, - { PCI_VENDOR_ID_TIMEDIA, PCI_DEVICE_ID_TIMEDIA_1889, -PCI_VENDOR_ID_TIMEDIA ,PCI_ANY_ID ,0 ,0 , - pbn_b0_bt_1_921600 }, -/* -* SUNIX (TIMEDIA) -*/ - { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999, -PCI_VENDOR_ID_SUNIX ,PCI_ANY_ID , -PCI_CLASS_COMMUNICATION_SERIAL <<8 ,0xffff00 , - pbn_b0_bt_1_921600 }, - - { PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999, -PCI_VENDOR_ID_SUNIX ,PCI_ANY_ID , -PCI_CLASS_COMMUNICATION_MULTISERIAL <<8 ,0xffff00 , - pbn_b0_bt_1_921600 },/* * AFAVLAB serial card, from Harald Welte <[email protected]>
--
2.17.1