Add blacklisting capability to serial_pci to avoid misdetection of serial ports
PATCH 1/1 Add blacklisting capability to serial_pci to avoid misdetection of serial ports
[Resend, originally sent to the lkml]
The serial_pci driver tries to guess serial ports on unknown devices based on the PCI class (modem or serial). On certain softmodems (AC'97 modems) this can lead to the recognition of non-existing serial ports like this:
0000:00:08.0: ttyS1 at I/O 0x8828 (irq = 3) is a 8250 0000:00:08.0: ttyS2 at I/O 0x8840 (irq = 3) is a 8250 0000:00:08.0: ttyS3 at I/O 0x8850 (irq = 3) is a 8250 0000:00:08.0: ttyS4 at I/O 0x8860 (irq = 3) is a 8250 0000:00:08.0: ttyS5 at I/O 0x8870 (irq = 3) is a 8250
This actually disables the use of the hsfmodem 3rd party driver if 8250 is compiled into the kernel e.g. to provide a boot-time serial console.
This patch adds a blacklist of PCI IDs that are to be ignored by the driver.
The patch applies against both 2.6.21.5 and 2.6.22-rc7.
drivers/serial/8250_pci.c +16 -0
@@ -1513,6 +1513,11 @@ }, }; +static const struct pci_device_id softmodem_blacklist[] = { + {PCI_VDEVICE (AL ,0x5457 ), },/* ALi Corporation M5457 AC'97 Modem */ + { } +}; +/* * Given a complete unknown PCI device, try to use some heuristics to * guess what the configuration might be, based on the pitiful PCI
@@ -1521,6 +1526,7 @@static int __devinit serial_pci_guess_board (struct pci_dev *dev,struct pciserial_board *board) { +const struct pci_device_id * blacklist;int num_iomem, num_port, first_port =-1 , i;/*
@@ -1535,6 +1541,16 @@ (dev->class & 0xff) > 6)return -ENODEV ; +/* +* Do not access blacklisted devices that are known not to +* feature serial ports. +*/ +for (blacklist = softmodem_blacklist; blacklist->vendor; blacklist++) { +if ((dev->vendor == blacklist->vendor) && + (dev->device == blacklist->device)) +return -ENODEV ; + } + num_iomem = num_port =0 ;for (i =0 ; i <PCI_NUM_BAR_RESOURCES ; i++) {if (pci_resource_flags (dev, i) &IORESOURCE_IO ) {