serial: 8250_pci: unbreak last serial ports on NetMos 9865 cards
PATCH 1/1 serial: 8250_pci: unbreak last serial ports on NetMos 9865 cards
Aparently 9865 uses standard BAR encoding scheme (unlike 99xx cards). Current pci_netmos_9900_setup() uses wrong BAR indices for the 9865 PCI device, function 2. Using standard BAR indices makes all 6 ports work for me. Thus disable the NetMos 9900 quirk for NetMos 9865 pci device.
For the reference, here is the relevant part of lspci for my device:
02:07.0 Serial controller: MosChip Semiconductor Technology Ltd. PCI 9865 Multi-I/O Controller (prog-if 02 [16550])
Subsystem: Device a000:1000 Flags: bus master, medium devsel, latency 32, IRQ 17 I/O ports at ac00 [size=8] Memory at fcfff000 (32-bit, non-prefetchable) [size=4K] Memory at fcffe000 (32-bit, non-prefetchable) [size=4K] Capabilities: [48] Power Management version 2 Kernel driver in use: serial
02:07.1 Serial controller: MosChip Semiconductor Technology Ltd. PCI 9865 Multi-I/O Controller (prog-if 02 [16550])
Subsystem: Device a000:1000 Flags: bus master, medium devsel, latency 32, IRQ 18 I/O ports at a800 [size=8] Memory at fcffd000 (32-bit, non-prefetchable) [size=4K] Memory at fcffc000 (32-bit, non-prefetchable) [size=4K] Capabilities: [48] Power Management version 2 Kernel driver in use: serial
02:07.2 Communication controller: MosChip Semiconductor Technology Ltd. PCI 9865 Multi-I/O Controller
Subsystem: Device a000:3004 Flags: bus master, medium devsel, latency 32, IRQ 19 I/O ports at a400 [size=8] I/O ports at a000 [size=8] I/O ports at 9c00 [size=8] I/O ports at 9800 [size=8] Memory at fcffb000 (32-bit, non-prefetchable) [size=4K] Capabilities: [48] Power Management version 2 Kernel driver in use: serial
--- drivers/tty/serial/8250/8250_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_pci.c +2 -1
@@ -784,7 +784,8 @@ static int pci_netmos_9900_setup(struct serial_private *priv, {unsigned int bar; -if ((priv->dev->subsystem_device &0xff00 ) ==0x3000 ) { +if ((priv->dev->device !=PCI_DEVICE_ID_NETMOS_9865 ) && + (priv->dev->subsystem_device &0xff00 ) ==0x3000 ) {/* netmos apparently orders BARs by datasheet layout, so serial * ports get BARs 0 and 3 (or 1 and 4 for memmapped) */
Signature · 1 line
1.8.5.2
Hello,
Quoted 4 lines · Dmitry Eremin-Solenikov
Aparently 9865 uses standard BAR encoding scheme (unlike 99xx cards). Current
pci_netmos_9900_setup()uses wrong BAR indices for the 9865 PCI device, function 2. Using standard BAR indices makes all 6 ports work for me. Thus disable the NetMos 9900 quirk for NetMos 9865 pci device.
Do you need any additional details for the patch?
[skipped lspci]
Quoted 23 lines
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- drivers/tty/serial/8250/8250_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/tty/serial/8250/8250_pci.c +2
-2@@ -784,7 +784,8 @@ static int pci_netmos_9900_setup(struct serial_private *priv, {unsigned int bar; -if ((priv->dev->subsystem_device &0xff00 ) ==0x3000 ) { +if ((priv->dev->device !=PCI_DEVICE_ID_NETMOS_9865 ) && + (priv->dev->subsystem_device &0xff00 ) ==0x3000 ) {/* netmos apparently orders BARs by datasheet layout, so serial * ports get BARs 0 and 3 (or 1 and 4 for memmapped) */ --1.8.5.2
Signature · 2 lines
With best wishes Dmitry
Quoted 10 lines · Dmitry Eremin-Solenikov
Hello,
Quoted 4 lines · Dmitry Eremin-Solenikov
Aparently 9865 uses standard BAR encoding scheme (unlike 99xx cards). Current
pci_netmos_9900_setup()uses wrong BAR indices for the 9865 PCI device, function 2. Using standard BAR indices makes all 6 ports work for me. Thus disable the NetMos 9900 quirk for NetMos 9865 pci device.Do you need any additional details for the patch?
Sorry for the noise, I missed that you have it in -fixes. Please excuse me.
Signature · 2 lines
With best wishes Dmitry