* Request: Netmos support in parport_serial for 2.4.27
@ 2004-06-13 11:19 Ryan Underwood
2004-06-13 12:39 ` Marcelo Tosatti
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Ryan Underwood @ 2004-06-13 11:19 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
Hi,
There's been a patch floating around for a while now to add Netmos
support to parport_serial. It has been submitted numerous times but it
seems that nobody notices it. :)
Can it be reviewed for inclusion before 2.4.27? I have a few systems
with these cards and it would be very nice to have them up to snuff.
The patch against 2.4.20 can be found here:
http://winterwolf.co.uk/linuxsw
--
Ryan Underwood, <nemesis@icequake.net>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 11:19 Request: Netmos support in parport_serial for 2.4.27 Ryan Underwood @ 2004-06-13 12:39 ` Marcelo Tosatti 2004-06-13 20:30 ` Jesper Juhl 2004-06-13 13:05 ` Pavel Janík 2004-06-13 14:25 ` Willy Tarreau 2 siblings, 1 reply; 19+ messages in thread From: Marcelo Tosatti @ 2004-06-13 12:39 UTC (permalink / raw) To: linux-kernel, Ryan Underwood n Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > Hi, > > There's been a patch floating around for a while now to add Netmos > support to parport_serial. It has been submitted numerous times but it > seems that nobody notices it. :) > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > with these cards and it would be very nice to have them up to snuff. > > The patch against 2.4.20 can be found here: > http://winterwolf.co.uk/linuxsw Hi Ryan, Care to submit the patch inlined in another email message? What about v2.6 kernels? Thanks! ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 12:39 ` Marcelo Tosatti @ 2004-06-13 20:30 ` Jesper Juhl 2004-06-13 21:04 ` Marcelo Tosatti 2004-06-13 22:07 ` Marcelo Tosatti 0 siblings, 2 replies; 19+ messages in thread From: Jesper Juhl @ 2004-06-13 20:30 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel, Ryan Underwood, Willy Tarreau On Sun, 13 Jun 2004, Marcelo Tosatti wrote: > n Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > > > Hi, > > > > There's been a patch floating around for a while now to add Netmos > > support to parport_serial. It has been submitted numerous times but it > > seems that nobody notices it. :) > > > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > > with these cards and it would be very nice to have them up to snuff. > > > > The patch against 2.4.20 can be found here: > > http://winterwolf.co.uk/linuxsw > > Hi Ryan, > > Care to submit the patch inlined in another email message? > Here are the original patches from http://winterwolf.co.uk/linuxsw An attempt of mine to update them for 2.4.27-pre5 can be found elsewhere in this thread. Kind regards, Jesper Juhl <juhl-lkml@dif.dk> 00_parport_serial.patch : diff -urN orig/linux-2.4.20-pre9/drivers/char/ChangeLog linux-2.4.20-pre9/drivers/char/ChangeLog --- orig/linux-2.4.20-pre9/drivers/char/ChangeLog Tue Aug 14 01:37:33 2001 +++ linux-2.4.20-pre9/drivers/char/ChangeLog Sat Oct 5 17:58:35 2002 @@ -1,3 +1,8 @@ +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> + + * parport_serial.c: Move from ../parport/ here, must be initialised + after serial.c for register_serial to work. + 2001-08-11 Tim Waugh <twaugh@redhat.com> * serial.c (get_pci_port): Deal with awkward Titan cards. diff -urN orig/linux-2.4.20-pre9/drivers/char/Makefile linux-2.4.20-pre9/drivers/char/Makefile --- orig/linux-2.4.20-pre9/drivers/char/Makefile Sat Oct 5 17:43:27 2002 +++ linux-2.4.20-pre9/drivers/char/Makefile Sat Oct 5 17:58:35 2002 @@ -153,6 +153,7 @@ obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o obj-$(CONFIG_SERIAL) += $(SERIAL) +obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o obj-$(CONFIG_SERIAL_21285) += serial_21285.o obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o diff -urN orig/linux-2.4.20-pre9/drivers/char/parport_serial.c linux-2.4.20-pre9/drivers/char/parport_serial.c --- orig/linux-2.4.20-pre9/drivers/char/parport_serial.c Thu Jan 1 01:00:00 1970 +++ linux-2.4.20-pre9/drivers/char/parport_serial.c Sat Oct 5 17:58:35 2002 @@ -0,0 +1,426 @@ +/* + * Support for common PCI multi-I/O cards (which is most of them) + * + * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * + * Multi-function PCI cards are supposed to present separate logical + * devices on the bus. A common thing to do seems to be to just use + * one logical device with lots of base address registers for both + * parallel ports and serial ports. This driver is for dealing with + * that. + * + */ + +#include <linux/types.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/pci.h> +#include <linux/parport.h> +#include <linux/parport_pc.h> +#include <linux/serial.h> +#include <linux/serialP.h> +#include <linux/list.h> + +#include <asm/serial.h> + +enum parport_pc_pci_cards { + titan_110l = 0, + titan_210l, + avlab_1s1p, + avlab_1s1p_650, + avlab_1s1p_850, + avlab_1s2p, + avlab_1s2p_650, + avlab_1s2p_850, + avlab_2s1p, + avlab_2s1p_650, + avlab_2s1p_850, + siig_1s1p_10x, + siig_2s1p_10x, + siig_2p1s_20x, + siig_1s1p_20x, + siig_2s1p_20x, +}; + + +/* each element directly indexed from enum list, above */ +static struct parport_pc_pci { + int numports; + struct { /* BAR (base address registers) numbers in the config + space header */ + int lo; + int hi; /* -1 if not there, >6 for offset-method (max + BAR is 6) */ + } addr[4]; + + /* If set, this is called immediately after pci_enable_device. + * If it returns non-zero, no probing will take place and the + * ports will not be used. */ + int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); + + /* If set, this is called after probing for ports. If 'failed' + * is non-zero we couldn't use any of the ports. */ + void (*postinit_hook) (struct pci_dev *pdev, int failed); +} cards[] __devinitdata = { + /* titan_110l */ { 1, { { 3, -1 }, } }, + /* titan_210l */ { 1, { { 3, -1 }, } }, + /* avlab_1s1p */ { 1, { { 1, 2}, } }, + /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, + /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, + /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_2s1p */ { 1, { { 2, 3}, } }, + /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, + /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, + /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, + /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, + /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, + /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, + /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, +}; + +static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { + /* PCI cards */ + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, + /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ + { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, + { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, + { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, + { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, + { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, + { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, + { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, + { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, + { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + + { 0, } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); + +struct pci_board_no_ids { + int flags; + int num_ports; + int base_baud; + int uart_offset; + int reg_shift; + int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, + int enable); + int first_uart_offset; +}; + +static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) +{ + return pci_siig10x_fn(dev, NULL, enable); +} + +static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) +{ + return pci_siig20x_fn(dev, NULL, enable); +} + +static struct pci_board_no_ids pci_boards[] __devinitdata = { + /* + * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, + * Offset to get to next UART's registers, + * Register shift to use for memory-mapped I/O, + * Initialization function, first UART offset + */ + +// Cards not tested are marked n/t +// If you have one of these cards and it works for you, please tell me.. + +/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, +/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, +/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, +/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, +/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +}; + +struct parport_serial_private { + int num_ser; + int line[20]; + struct pci_board_no_ids ser; + int num_par; + struct parport *port[PARPORT_MAX]; +}; + +static int __devinit get_pci_port (struct pci_dev *dev, + struct pci_board_no_ids *board, + struct serial_struct *req, + int idx) +{ + unsigned long port; + int base_idx; + int max_port; + int offset; + + base_idx = SPCI_FL_GET_BASE(board->flags); + if (board->flags & SPCI_FL_BASE_TABLE) + base_idx += idx; + + if (board->flags & SPCI_FL_REGION_SZ_CAP) { + max_port = pci_resource_len(dev, base_idx) / 8; + if (idx >= max_port) + return 1; + } + + offset = board->first_uart_offset; + + /* Timedia/SUNIX uses a mixture of BARs and offsets */ + /* Ugh, this is ugly as all hell --- TYT */ + if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ + switch(idx) { + case 0: base_idx=0; + break; + case 1: base_idx=0; offset=8; + break; + case 2: base_idx=1; + break; + case 3: base_idx=1; offset=8; + break; + case 4: /* BAR 2*/ + case 5: /* BAR 3 */ + case 6: /* BAR 4*/ + case 7: base_idx=idx-2; /* BAR 5*/ + } + + port = pci_resource_start(dev, base_idx) + offset; + + if ((board->flags & SPCI_FL_BASE_TABLE) == 0) + port += idx * (board->uart_offset ? board->uart_offset : 8); + + if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { + int high_bits_offset = ((sizeof(long)-sizeof(int))*8); + req->port = port; + if (high_bits_offset) + req->port_high = port >> high_bits_offset; + else + req->port_high = 0; + return 0; + } + req->io_type = SERIAL_IO_MEM; + req->iomem_base = ioremap(port, board->uart_offset); + req->iomem_reg_shift = board->reg_shift; + req->port = 0; + return req->iomem_base ? 0 : 1; +} + +/* Register the serial port(s) of a PCI card. */ +static int __devinit serial_register (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct pci_board_no_ids *board = &pci_boards[id->driver_data]; + struct parport_serial_private *priv = pci_get_drvdata (dev); + struct serial_struct serial_req; + int base_baud; + int k; + int success = 0; + + priv->ser = *board; + if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) + return 1; + + base_baud = board->base_baud; + if (!base_baud) + base_baud = BASE_BAUD; + memset (&serial_req, 0, sizeof (serial_req)); + + for (k = 0; k < board->num_ports; k++) { + int line; + serial_req.irq = dev->irq; + if (get_pci_port (dev, board, &serial_req, k)) + break; + serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; + serial_req.baud_base = base_baud; + line = register_serial (&serial_req); + if (line < 0) { + printk (KERN_DEBUG + "parport_serial: register_serial failed\n"); + continue; + } + priv->line[priv->num_ser++] = line; + success = 1; + } + + return success ? 0 : 1; +} + +/* Register the parallel port(s) of a PCI card. */ +static int __devinit parport_register (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct parport_serial_private *priv = pci_get_drvdata (dev); + int i = id->driver_data, n; + int success = 0; + + if (cards[i].preinit_hook && + cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) + return -ENODEV; + + for (n = 0; n < cards[i].numports; n++) { + struct parport *port; + int lo = cards[i].addr[n].lo; + int hi = cards[i].addr[n].hi; + unsigned long io_lo, io_hi; + io_lo = pci_resource_start (dev, lo); + io_hi = 0; + if ((hi >= 0) && (hi <= 6)) + io_hi = pci_resource_start (dev, hi); + else if (hi > 6) + io_lo += hi; /* Reinterpret the meaning of + "hi" as an offset (see SYBA + def.) */ + /* TODO: test if sharing interrupts works */ + printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " + "I/O at %#lx(%#lx)\n", + parport_serial_pci_tbl[i].vendor, + parport_serial_pci_tbl[i].device, io_lo, io_hi); + port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, + PARPORT_DMA_NONE, dev); + if (port) { + priv->port[priv->num_par++] = port; + success = 1; + } + } + + if (cards[i].postinit_hook) + cards[i].postinit_hook (dev, !success); + + return success ? 0 : 1; +} + +static int __devinit parport_serial_pci_probe (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct parport_serial_private *priv; + int err; + + priv = kmalloc (sizeof *priv, GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->num_ser = priv->num_par = 0; + pci_set_drvdata (dev, priv); + + err = pci_enable_device (dev); + if (err) { + pci_set_drvdata (dev, NULL); + kfree (priv); + return err; + } + + if (parport_register (dev, id)) { + pci_set_drvdata (dev, NULL); + kfree (priv); + return -ENODEV; + } + + if (serial_register (dev, id)) { + int i; + for (i = 0; i < priv->num_par; i++) + parport_pc_unregister_port (priv->port[i]); + pci_set_drvdata (dev, NULL); + kfree (priv); + return -ENODEV; + } + + return 0; +} + +static void __devexit parport_serial_pci_remove (struct pci_dev *dev) +{ + struct parport_serial_private *priv = pci_get_drvdata (dev); + int i; + + // Serial ports + for (i = 0; i < priv->num_ser; i++) { + unregister_serial (priv->line[i]); + + if (priv->ser.init_fn) + (priv->ser.init_fn) (dev, &priv->ser, 0); + } + pci_set_drvdata (dev, NULL); + + // Parallel ports + for (i = 0; i < priv->num_par; i++) + parport_pc_unregister_port (priv->port[i]); + + kfree (priv); + return; +} + +static struct pci_driver parport_serial_pci_driver = { + name: "parport_serial", + id_table: parport_serial_pci_tbl, + probe: parport_serial_pci_probe, + remove: __devexit_p(parport_serial_pci_remove), +}; + + +static int __init parport_serial_init (void) +{ + return pci_module_init (&parport_serial_pci_driver); +} + +static void __exit parport_serial_exit (void) +{ + pci_unregister_driver (&parport_serial_pci_driver); + return; +} + +MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); +MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); +MODULE_LICENSE("GPL"); + +module_init(parport_serial_init); +module_exit(parport_serial_exit); diff -urN orig/linux-2.4.20-pre9/drivers/parport/ChangeLog linux-2.4.20-pre9/drivers/parport/ChangeLog --- orig/linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Aug 3 02:39:44 2002 +++ linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Oct 5 17:58:35 2002 @@ -1,3 +1,8 @@ +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> + + * parport_serial.c: Move from here to ../char/, must be initialised + after serial.c for register_serial to work. + 2002-04-25 Tim Waugh <twaugh@redhat.com> * parport_serial.c, parport_pc.c: Move some SIIG cards around. diff -urN orig/linux-2.4.20-pre9/drivers/parport/Makefile linux-2.4.20-pre9/drivers/parport/Makefile --- orig/linux-2.4.20-pre9/drivers/parport/Makefile Fri Sep 14 01:04:43 2001 +++ linux-2.4.20-pre9/drivers/parport/Makefile Sat Oct 5 17:58:35 2002 @@ -22,7 +22,6 @@ obj-$(CONFIG_PARPORT) += parport.o obj-$(CONFIG_PARPORT_PC) += parport_pc.o -obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o obj-$(CONFIG_PARPORT_PC_PCMCIA)+= parport_cs.o obj-$(CONFIG_PARPORT_AMIGA) += parport_amiga.o obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o diff -urN orig/linux-2.4.20-pre9/drivers/parport/parport_serial.c linux-2.4.20-pre9/drivers/parport/parport_serial.c --- orig/linux-2.4.20-pre9/drivers/parport/parport_serial.c Sat Aug 3 02:39:44 2002 +++ linux-2.4.20-pre9/drivers/parport/parport_serial.c Thu Jan 1 01:00:00 1970 @@ -1,426 +0,0 @@ -/* - * Support for common PCI multi-I/O cards (which is most of them) - * - * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * - * Multi-function PCI cards are supposed to present separate logical - * devices on the bus. A common thing to do seems to be to just use - * one logical device with lots of base address registers for both - * parallel ports and serial ports. This driver is for dealing with - * that. - * - */ - -#include <linux/types.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/parport.h> -#include <linux/parport_pc.h> -#include <linux/serial.h> -#include <linux/serialP.h> -#include <linux/list.h> - -#include <asm/serial.h> - -enum parport_pc_pci_cards { - titan_110l = 0, - titan_210l, - avlab_1s1p, - avlab_1s1p_650, - avlab_1s1p_850, - avlab_1s2p, - avlab_1s2p_650, - avlab_1s2p_850, - avlab_2s1p, - avlab_2s1p_650, - avlab_2s1p_850, - siig_1s1p_10x, - siig_2s1p_10x, - siig_2p1s_20x, - siig_1s1p_20x, - siig_2s1p_20x, -}; - - -/* each element directly indexed from enum list, above */ -static struct parport_pc_pci { - int numports; - struct { /* BAR (base address registers) numbers in the config - space header */ - int lo; - int hi; /* -1 if not there, >6 for offset-method (max - BAR is 6) */ - } addr[4]; - - /* If set, this is called immediately after pci_enable_device. - * If it returns non-zero, no probing will take place and the - * ports will not be used. */ - int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); - - /* If set, this is called after probing for ports. If 'failed' - * is non-zero we couldn't use any of the ports. */ - void (*postinit_hook) (struct pci_dev *pdev, int failed); -} cards[] __devinitdata = { - /* titan_110l */ { 1, { { 3, -1 }, } }, - /* titan_210l */ { 1, { { 3, -1 }, } }, - /* avlab_1s1p */ { 1, { { 1, 2}, } }, - /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, - /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, - /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_2s1p */ { 1, { { 2, 3}, } }, - /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, - /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, - /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, - /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, - /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, - /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, - /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, -}; - -static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { - /* PCI cards */ - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, - /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ - { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, - { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, - { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, - { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, - { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, - { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, - { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, - { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, - { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - - { 0, } /* terminate list */ -}; -MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); - -struct pci_board_no_ids { - int flags; - int num_ports; - int base_baud; - int uart_offset; - int reg_shift; - int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, - int enable); - int first_uart_offset; -}; - -static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) -{ - return pci_siig10x_fn(dev, NULL, enable); -} - -static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) -{ - return pci_siig20x_fn(dev, NULL, enable); -} - -static struct pci_board_no_ids pci_boards[] __devinitdata = { - /* - * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, - * Offset to get to next UART's registers, - * Register shift to use for memory-mapped I/O, - * Initialization function, first UART offset - */ - -// Cards not tested are marked n/t -// If you have one of these cards and it works for you, please tell me.. - -/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, -/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, -/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, -/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, -/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -}; - -struct parport_serial_private { - int num_ser; - int line[20]; - struct pci_board_no_ids ser; - int num_par; - struct parport *port[PARPORT_MAX]; -}; - -static int __devinit get_pci_port (struct pci_dev *dev, - struct pci_board_no_ids *board, - struct serial_struct *req, - int idx) -{ - unsigned long port; - int base_idx; - int max_port; - int offset; - - base_idx = SPCI_FL_GET_BASE(board->flags); - if (board->flags & SPCI_FL_BASE_TABLE) - base_idx += idx; - - if (board->flags & SPCI_FL_REGION_SZ_CAP) { - max_port = pci_resource_len(dev, base_idx) / 8; - if (idx >= max_port) - return 1; - } - - offset = board->first_uart_offset; - - /* Timedia/SUNIX uses a mixture of BARs and offsets */ - /* Ugh, this is ugly as all hell --- TYT */ - if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ - switch(idx) { - case 0: base_idx=0; - break; - case 1: base_idx=0; offset=8; - break; - case 2: base_idx=1; - break; - case 3: base_idx=1; offset=8; - break; - case 4: /* BAR 2*/ - case 5: /* BAR 3 */ - case 6: /* BAR 4*/ - case 7: base_idx=idx-2; /* BAR 5*/ - } - - port = pci_resource_start(dev, base_idx) + offset; - - if ((board->flags & SPCI_FL_BASE_TABLE) == 0) - port += idx * (board->uart_offset ? board->uart_offset : 8); - - if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { - int high_bits_offset = ((sizeof(long)-sizeof(int))*8); - req->port = port; - if (high_bits_offset) - req->port_high = port >> high_bits_offset; - else - req->port_high = 0; - return 0; - } - req->io_type = SERIAL_IO_MEM; - req->iomem_base = ioremap(port, board->uart_offset); - req->iomem_reg_shift = board->reg_shift; - req->port = 0; - return req->iomem_base ? 0 : 1; -} - -/* Register the serial port(s) of a PCI card. */ -static int __devinit serial_register (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct pci_board_no_ids *board = &pci_boards[id->driver_data]; - struct parport_serial_private *priv = pci_get_drvdata (dev); - struct serial_struct serial_req; - int base_baud; - int k; - int success = 0; - - priv->ser = *board; - if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) - return 1; - - base_baud = board->base_baud; - if (!base_baud) - base_baud = BASE_BAUD; - memset (&serial_req, 0, sizeof (serial_req)); - - for (k = 0; k < board->num_ports; k++) { - int line; - serial_req.irq = dev->irq; - if (get_pci_port (dev, board, &serial_req, k)) - break; - serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; - serial_req.baud_base = base_baud; - line = register_serial (&serial_req); - if (line < 0) { - printk (KERN_DEBUG - "parport_serial: register_serial failed\n"); - continue; - } - priv->line[priv->num_ser++] = line; - success = 1; - } - - return success ? 0 : 1; -} - -/* Register the parallel port(s) of a PCI card. */ -static int __devinit parport_register (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct parport_serial_private *priv = pci_get_drvdata (dev); - int i = id->driver_data, n; - int success = 0; - - if (cards[i].preinit_hook && - cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) - return -ENODEV; - - for (n = 0; n < cards[i].numports; n++) { - struct parport *port; - int lo = cards[i].addr[n].lo; - int hi = cards[i].addr[n].hi; - unsigned long io_lo, io_hi; - io_lo = pci_resource_start (dev, lo); - io_hi = 0; - if ((hi >= 0) && (hi <= 6)) - io_hi = pci_resource_start (dev, hi); - else if (hi > 6) - io_lo += hi; /* Reinterpret the meaning of - "hi" as an offset (see SYBA - def.) */ - /* TODO: test if sharing interrupts works */ - printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " - "I/O at %#lx(%#lx)\n", - parport_serial_pci_tbl[i].vendor, - parport_serial_pci_tbl[i].device, io_lo, io_hi); - port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, - PARPORT_DMA_NONE, dev); - if (port) { - priv->port[priv->num_par++] = port; - success = 1; - } - } - - if (cards[i].postinit_hook) - cards[i].postinit_hook (dev, !success); - - return success ? 0 : 1; -} - -static int __devinit parport_serial_pci_probe (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct parport_serial_private *priv; - int err; - - priv = kmalloc (sizeof *priv, GFP_KERNEL); - if (!priv) - return -ENOMEM; - priv->num_ser = priv->num_par = 0; - pci_set_drvdata (dev, priv); - - err = pci_enable_device (dev); - if (err) { - pci_set_drvdata (dev, NULL); - kfree (priv); - return err; - } - - if (parport_register (dev, id)) { - pci_set_drvdata (dev, NULL); - kfree (priv); - return -ENODEV; - } - - if (serial_register (dev, id)) { - int i; - for (i = 0; i < priv->num_par; i++) - parport_pc_unregister_port (priv->port[i]); - pci_set_drvdata (dev, NULL); - kfree (priv); - return -ENODEV; - } - - return 0; -} - -static void __devexit parport_serial_pci_remove (struct pci_dev *dev) -{ - struct parport_serial_private *priv = pci_get_drvdata (dev); - int i; - - // Serial ports - for (i = 0; i < priv->num_ser; i++) { - unregister_serial (priv->line[i]); - - if (priv->ser.init_fn) - (priv->ser.init_fn) (dev, &priv->ser, 0); - } - pci_set_drvdata (dev, NULL); - - // Parallel ports - for (i = 0; i < priv->num_par; i++) - parport_pc_unregister_port (priv->port[i]); - - kfree (priv); - return; -} - -static struct pci_driver parport_serial_pci_driver = { - name: "parport_serial", - id_table: parport_serial_pci_tbl, - probe: parport_serial_pci_probe, - remove: __devexit_p(parport_serial_pci_remove), -}; - - -static int __init parport_serial_init (void) -{ - return pci_module_init (&parport_serial_pci_driver); -} - -static void __exit parport_serial_exit (void) -{ - pci_unregister_driver (&parport_serial_pci_driver); - return; -} - -MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); -MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); -MODULE_LICENSE("GPL"); - -module_init(parport_serial_init); -module_exit(parport_serial_exit); 01_netmos.patch : diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/char/parport_serial.c linux-2.4.20-pre9/drivers/char/parport_serial.c --- linux-2.4.20-pre9-00_parport_serial/drivers/char/parport_serial.c Sat Oct 5 17:58:35 2002 +++ linux-2.4.20-pre9/drivers/char/parport_serial.c Sat Oct 5 18:15:14 2002 @@ -32,6 +32,8 @@ enum parport_pc_pci_cards { titan_110l = 0, titan_210l, + netmos_9735, + netmos_9835, avlab_1s1p, avlab_1s1p_650, avlab_1s1p_850, @@ -70,6 +72,8 @@ } cards[] __devinitdata = { /* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } }, + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, + /* netmos_9835 */ { 1, { { 2, -1 }, } }, /* avlab_1s1p */ { 1, { { 1, 2}, } }, /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, @@ -92,6 +96,10 @@ PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, @@ -171,6 +179,8 @@ /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* netmos_9835 */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/parport/ChangeLog linux-2.4.20-pre9/drivers/parport/ChangeLog --- linux-2.4.20-pre9-00_parport_serial/drivers/parport/ChangeLog Sat Oct 5 17:58:35 2002 +++ linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Oct 5 18:23:05 2002 @@ -3,6 +3,10 @@ * parport_serial.c: Move from here to ../char/, must be initialised after serial.c for register_serial to work. + 2001-10-11 Tim Waugh <twaugh@redhat.com> + * parport_pc.c, parport_serial.c: Support for NetMos cards. + Patch originally from Michael Reinelt <reinelt@eunet.at>. + 2002-04-25 Tim Waugh <twaugh@redhat.com> * parport_serial.c, parport_pc.c: Move some SIIG cards around. diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/parport/parport_pc.c linux-2.4.20-pre9/drivers/parport/parport_pc.c --- linux-2.4.20-pre9-00_parport_serial/drivers/parport/parport_pc.c Sat Oct 5 17:43:32 2002 +++ linux-2.4.20-pre9/drivers/parport/parport_pc.c Sat Oct 5 18:12:20 2002 @@ -2699,6 +2699,10 @@ oxsemi_840, aks_0100, mobility_pp, + netmos_9705, + netmos_9805, + netmos_9815, + netmos_9855, }; @@ -2768,6 +2772,10 @@ /* oxsemi_840 */ { 1, { { 0, -1 }, } }, /* aks_0100 */ { 1, { { 0, 1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } }, + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ }; static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { @@ -2836,6 +2844,15 @@ PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, + /* NetMos communication controllers */ + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, { 0, } /* terminate list */ }; MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); diff -urN linux-2.4.20-pre9-00_parport_serial/include/linux/pci_ids.h linux-2.4.20-pre9/include/linux/pci_ids.h --- linux-2.4.20-pre9-00_parport_serial/include/linux/pci_ids.h Sat Oct 5 17:43:41 2002 +++ linux-2.4.20-pre9/include/linux/pci_ids.h Sat Oct 5 18:09:44 2002 @@ -1791,8 +1791,12 @@ #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 #define PCI_VENDOR_ID_NETMOS 0x9710 +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 #define PCI_DEVICE_ID_NETMOS_9735 0x9735 +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 #define PCI_DEVICE_ID_NETMOS_9835 0x9835 +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 -- Jesper Juhl <juhl-lkml@dif.dk> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 20:30 ` Jesper Juhl @ 2004-06-13 21:04 ` Marcelo Tosatti 2004-06-13 22:07 ` Marcelo Tosatti 1 sibling, 0 replies; 19+ messages in thread From: Marcelo Tosatti @ 2004-06-13 21:04 UTC (permalink / raw) To: Jesper Juhl; +Cc: linux-kernel, Ryan Underwood, Willy Tarreau On Sun, Jun 13, 2004 at 10:30:35PM +0200, Jesper Juhl wrote: > On Sun, 13 Jun 2004, Marcelo Tosatti wrote: > > > n Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > > > > > Hi, > > > > > > There's been a patch floating around for a while now to add Netmos > > > support to parport_serial. It has been submitted numerous times but it > > > seems that nobody notices it. :) > > > > > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > > > with these cards and it would be very nice to have them up to snuff. > > > > > > The patch against 2.4.20 can be found here: > > > http://winterwolf.co.uk/linuxsw > > > > Hi Ryan, > > > > Care to submit the patch inlined in another email message? > > > > Here are the original patches from http://winterwolf.co.uk/linuxsw > An attempt of mine to update them for 2.4.27-pre5 can be found elsewhere > in this thread. Ok, someone sent me this patch already but did not I merge it, for no good reason. Even Tim ACked. I'll apply it, thanks. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 20:30 ` Jesper Juhl 2004-06-13 21:04 ` Marcelo Tosatti @ 2004-06-13 22:07 ` Marcelo Tosatti 2004-06-14 4:10 ` Willy Tarreau ` (2 more replies) 1 sibling, 3 replies; 19+ messages in thread From: Marcelo Tosatti @ 2004-06-13 22:07 UTC (permalink / raw) To: Jesper Juhl; +Cc: linux-kernel, Ryan Underwood, Willy Tarreau, twaugh Jesper, Two more things. It seems v2.6 also lacks support for this boards: grep PCI_DEVICE_ID_NETMOS_ * pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9735 0x9735 pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9835 0x9835 [marcelo@localhost linux]$ Care to prepare a v2.6 version? And two, do we really need to move parport_serial.c to drivers/char in v2.4 ? Thanks again On Sun, Jun 13, 2004 at 10:30:35PM +0200, Jesper Juhl wrote: > On Sun, 13 Jun 2004, Marcelo Tosatti wrote: > > > n Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > > > > > Hi, > > > > > > There's been a patch floating around for a while now to add Netmos > > > support to parport_serial. It has been submitted numerous times but it > > > seems that nobody notices it. :) > > > > > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > > > with these cards and it would be very nice to have them up to snuff. > > > > > > The patch against 2.4.20 can be found here: > > > http://winterwolf.co.uk/linuxsw > > > > Hi Ryan, > > > > Care to submit the patch inlined in another email message? > > > > Here are the original patches from http://winterwolf.co.uk/linuxsw > An attempt of mine to update them for 2.4.27-pre5 can be found elsewhere > in this thread. > > > Kind regards, > Jesper Juhl <juhl-lkml@dif.dk> > > > 00_parport_serial.patch : > > diff -urN orig/linux-2.4.20-pre9/drivers/char/ChangeLog linux-2.4.20-pre9/drivers/char/ChangeLog > --- orig/linux-2.4.20-pre9/drivers/char/ChangeLog Tue Aug 14 01:37:33 2001 > +++ linux-2.4.20-pre9/drivers/char/ChangeLog Sat Oct 5 17:58:35 2002 > @@ -1,3 +1,8 @@ > +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> > + > + * parport_serial.c: Move from ../parport/ here, must be initialised > + after serial.c for register_serial to work. > + > 2001-08-11 Tim Waugh <twaugh@redhat.com> > > * serial.c (get_pci_port): Deal with awkward Titan cards. > diff -urN orig/linux-2.4.20-pre9/drivers/char/Makefile linux-2.4.20-pre9/drivers/char/Makefile > --- orig/linux-2.4.20-pre9/drivers/char/Makefile Sat Oct 5 17:43:27 2002 > +++ linux-2.4.20-pre9/drivers/char/Makefile Sat Oct 5 17:58:35 2002 > @@ -153,6 +153,7 @@ > > obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o > obj-$(CONFIG_SERIAL) += $(SERIAL) > +obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o > obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o > obj-$(CONFIG_SERIAL_21285) += serial_21285.o > obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o > diff -urN orig/linux-2.4.20-pre9/drivers/char/parport_serial.c linux-2.4.20-pre9/drivers/char/parport_serial.c > --- orig/linux-2.4.20-pre9/drivers/char/parport_serial.c Thu Jan 1 01:00:00 1970 > +++ linux-2.4.20-pre9/drivers/char/parport_serial.c Sat Oct 5 17:58:35 2002 > @@ -0,0 +1,426 @@ > +/* > + * Support for common PCI multi-I/O cards (which is most of them) > + * > + * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version > + * 2 of the License, or (at your option) any later version. > + * > + * > + * Multi-function PCI cards are supposed to present separate logical > + * devices on the bus. A common thing to do seems to be to just use > + * one logical device with lots of base address registers for both > + * parallel ports and serial ports. This driver is for dealing with > + * that. > + * > + */ > + > +#include <linux/types.h> > +#include <linux/module.h> > +#include <linux/init.h> > +#include <linux/pci.h> > +#include <linux/parport.h> > +#include <linux/parport_pc.h> > +#include <linux/serial.h> > +#include <linux/serialP.h> > +#include <linux/list.h> > + > +#include <asm/serial.h> > + > +enum parport_pc_pci_cards { > + titan_110l = 0, > + titan_210l, > + avlab_1s1p, > + avlab_1s1p_650, > + avlab_1s1p_850, > + avlab_1s2p, > + avlab_1s2p_650, > + avlab_1s2p_850, > + avlab_2s1p, > + avlab_2s1p_650, > + avlab_2s1p_850, > + siig_1s1p_10x, > + siig_2s1p_10x, > + siig_2p1s_20x, > + siig_1s1p_20x, > + siig_2s1p_20x, > +}; > + > + > +/* each element directly indexed from enum list, above */ > +static struct parport_pc_pci { > + int numports; > + struct { /* BAR (base address registers) numbers in the config > + space header */ > + int lo; > + int hi; /* -1 if not there, >6 for offset-method (max > + BAR is 6) */ > + } addr[4]; > + > + /* If set, this is called immediately after pci_enable_device. > + * If it returns non-zero, no probing will take place and the > + * ports will not be used. */ > + int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); > + > + /* If set, this is called after probing for ports. If 'failed' > + * is non-zero we couldn't use any of the ports. */ > + void (*postinit_hook) (struct pci_dev *pdev, int failed); > +} cards[] __devinitdata = { > + /* titan_110l */ { 1, { { 3, -1 }, } }, > + /* titan_210l */ { 1, { { 3, -1 }, } }, > + /* avlab_1s1p */ { 1, { { 1, 2}, } }, > + /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > + /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > + /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_2s1p */ { 1, { { 2, 3}, } }, > + /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, > + /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, > + /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, > + /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, > + /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, > + /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, > + /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, > +}; > + > +static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { > + /* PCI cards */ > + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > + /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > + { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > + { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > + { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, > + { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, > + { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, > + { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, > + { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, > + { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, > + { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + > + { 0, } /* terminate list */ > +}; > +MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); > + > +struct pci_board_no_ids { > + int flags; > + int num_ports; > + int base_baud; > + int uart_offset; > + int reg_shift; > + int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, > + int enable); > + int first_uart_offset; > +}; > + > +static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > +{ > + return pci_siig10x_fn(dev, NULL, enable); > +} > + > +static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > +{ > + return pci_siig20x_fn(dev, NULL, enable); > +} > + > +static struct pci_board_no_ids pci_boards[] __devinitdata = { > + /* > + * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, > + * Offset to get to next UART's registers, > + * Register shift to use for memory-mapped I/O, > + * Initialization function, first UART offset > + */ > + > +// Cards not tested are marked n/t > +// If you have one of these cards and it works for you, please tell me.. > + > +/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > +/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > +/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, > +/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, > +/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +}; > + > +struct parport_serial_private { > + int num_ser; > + int line[20]; > + struct pci_board_no_ids ser; > + int num_par; > + struct parport *port[PARPORT_MAX]; > +}; > + > +static int __devinit get_pci_port (struct pci_dev *dev, > + struct pci_board_no_ids *board, > + struct serial_struct *req, > + int idx) > +{ > + unsigned long port; > + int base_idx; > + int max_port; > + int offset; > + > + base_idx = SPCI_FL_GET_BASE(board->flags); > + if (board->flags & SPCI_FL_BASE_TABLE) > + base_idx += idx; > + > + if (board->flags & SPCI_FL_REGION_SZ_CAP) { > + max_port = pci_resource_len(dev, base_idx) / 8; > + if (idx >= max_port) > + return 1; > + } > + > + offset = board->first_uart_offset; > + > + /* Timedia/SUNIX uses a mixture of BARs and offsets */ > + /* Ugh, this is ugly as all hell --- TYT */ > + if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ > + switch(idx) { > + case 0: base_idx=0; > + break; > + case 1: base_idx=0; offset=8; > + break; > + case 2: base_idx=1; > + break; > + case 3: base_idx=1; offset=8; > + break; > + case 4: /* BAR 2*/ > + case 5: /* BAR 3 */ > + case 6: /* BAR 4*/ > + case 7: base_idx=idx-2; /* BAR 5*/ > + } > + > + port = pci_resource_start(dev, base_idx) + offset; > + > + if ((board->flags & SPCI_FL_BASE_TABLE) == 0) > + port += idx * (board->uart_offset ? board->uart_offset : 8); > + > + if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { > + int high_bits_offset = ((sizeof(long)-sizeof(int))*8); > + req->port = port; > + if (high_bits_offset) > + req->port_high = port >> high_bits_offset; > + else > + req->port_high = 0; > + return 0; > + } > + req->io_type = SERIAL_IO_MEM; > + req->iomem_base = ioremap(port, board->uart_offset); > + req->iomem_reg_shift = board->reg_shift; > + req->port = 0; > + return req->iomem_base ? 0 : 1; > +} > + > +/* Register the serial port(s) of a PCI card. */ > +static int __devinit serial_register (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct pci_board_no_ids *board = &pci_boards[id->driver_data]; > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + struct serial_struct serial_req; > + int base_baud; > + int k; > + int success = 0; > + > + priv->ser = *board; > + if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) > + return 1; > + > + base_baud = board->base_baud; > + if (!base_baud) > + base_baud = BASE_BAUD; > + memset (&serial_req, 0, sizeof (serial_req)); > + > + for (k = 0; k < board->num_ports; k++) { > + int line; > + serial_req.irq = dev->irq; > + if (get_pci_port (dev, board, &serial_req, k)) > + break; > + serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; > + serial_req.baud_base = base_baud; > + line = register_serial (&serial_req); > + if (line < 0) { > + printk (KERN_DEBUG > + "parport_serial: register_serial failed\n"); > + continue; > + } > + priv->line[priv->num_ser++] = line; > + success = 1; > + } > + > + return success ? 0 : 1; > +} > + > +/* Register the parallel port(s) of a PCI card. */ > +static int __devinit parport_register (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + int i = id->driver_data, n; > + int success = 0; > + > + if (cards[i].preinit_hook && > + cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) > + return -ENODEV; > + > + for (n = 0; n < cards[i].numports; n++) { > + struct parport *port; > + int lo = cards[i].addr[n].lo; > + int hi = cards[i].addr[n].hi; > + unsigned long io_lo, io_hi; > + io_lo = pci_resource_start (dev, lo); > + io_hi = 0; > + if ((hi >= 0) && (hi <= 6)) > + io_hi = pci_resource_start (dev, hi); > + else if (hi > 6) > + io_lo += hi; /* Reinterpret the meaning of > + "hi" as an offset (see SYBA > + def.) */ > + /* TODO: test if sharing interrupts works */ > + printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " > + "I/O at %#lx(%#lx)\n", > + parport_serial_pci_tbl[i].vendor, > + parport_serial_pci_tbl[i].device, io_lo, io_hi); > + port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, > + PARPORT_DMA_NONE, dev); > + if (port) { > + priv->port[priv->num_par++] = port; > + success = 1; > + } > + } > + > + if (cards[i].postinit_hook) > + cards[i].postinit_hook (dev, !success); > + > + return success ? 0 : 1; > +} > + > +static int __devinit parport_serial_pci_probe (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct parport_serial_private *priv; > + int err; > + > + priv = kmalloc (sizeof *priv, GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + priv->num_ser = priv->num_par = 0; > + pci_set_drvdata (dev, priv); > + > + err = pci_enable_device (dev); > + if (err) { > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return err; > + } > + > + if (parport_register (dev, id)) { > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return -ENODEV; > + } > + > + if (serial_register (dev, id)) { > + int i; > + for (i = 0; i < priv->num_par; i++) > + parport_pc_unregister_port (priv->port[i]); > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return -ENODEV; > + } > + > + return 0; > +} > + > +static void __devexit parport_serial_pci_remove (struct pci_dev *dev) > +{ > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + int i; > + > + // Serial ports > + for (i = 0; i < priv->num_ser; i++) { > + unregister_serial (priv->line[i]); > + > + if (priv->ser.init_fn) > + (priv->ser.init_fn) (dev, &priv->ser, 0); > + } > + pci_set_drvdata (dev, NULL); > + > + // Parallel ports > + for (i = 0; i < priv->num_par; i++) > + parport_pc_unregister_port (priv->port[i]); > + > + kfree (priv); > + return; > +} > + > +static struct pci_driver parport_serial_pci_driver = { > + name: "parport_serial", > + id_table: parport_serial_pci_tbl, > + probe: parport_serial_pci_probe, > + remove: __devexit_p(parport_serial_pci_remove), > +}; > + > + > +static int __init parport_serial_init (void) > +{ > + return pci_module_init (&parport_serial_pci_driver); > +} > + > +static void __exit parport_serial_exit (void) > +{ > + pci_unregister_driver (&parport_serial_pci_driver); > + return; > +} > + > +MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); > +MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); > +MODULE_LICENSE("GPL"); > + > +module_init(parport_serial_init); > +module_exit(parport_serial_exit); > diff -urN orig/linux-2.4.20-pre9/drivers/parport/ChangeLog linux-2.4.20-pre9/drivers/parport/ChangeLog > --- orig/linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Aug 3 02:39:44 2002 > +++ linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Oct 5 17:58:35 2002 > @@ -1,3 +1,8 @@ > +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> > + > + * parport_serial.c: Move from here to ../char/, must be initialised > + after serial.c for register_serial to work. > + > 2002-04-25 Tim Waugh <twaugh@redhat.com> > > * parport_serial.c, parport_pc.c: Move some SIIG cards around. > diff -urN orig/linux-2.4.20-pre9/drivers/parport/Makefile linux-2.4.20-pre9/drivers/parport/Makefile > --- orig/linux-2.4.20-pre9/drivers/parport/Makefile Fri Sep 14 01:04:43 2001 > +++ linux-2.4.20-pre9/drivers/parport/Makefile Sat Oct 5 17:58:35 2002 > @@ -22,7 +22,6 @@ > > obj-$(CONFIG_PARPORT) += parport.o > obj-$(CONFIG_PARPORT_PC) += parport_pc.o > -obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o > obj-$(CONFIG_PARPORT_PC_PCMCIA)+= parport_cs.o > obj-$(CONFIG_PARPORT_AMIGA) += parport_amiga.o > obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o > diff -urN orig/linux-2.4.20-pre9/drivers/parport/parport_serial.c linux-2.4.20-pre9/drivers/parport/parport_serial.c > --- orig/linux-2.4.20-pre9/drivers/parport/parport_serial.c Sat Aug 3 02:39:44 2002 > +++ linux-2.4.20-pre9/drivers/parport/parport_serial.c Thu Jan 1 01:00:00 1970 > @@ -1,426 +0,0 @@ > -/* > - * Support for common PCI multi-I/O cards (which is most of them) > - * > - * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > - * > - * > - * Multi-function PCI cards are supposed to present separate logical > - * devices on the bus. A common thing to do seems to be to just use > - * one logical device with lots of base address registers for both > - * parallel ports and serial ports. This driver is for dealing with > - * that. > - * > - */ > - > -#include <linux/types.h> > -#include <linux/module.h> > -#include <linux/init.h> > -#include <linux/pci.h> > -#include <linux/parport.h> > -#include <linux/parport_pc.h> > -#include <linux/serial.h> > -#include <linux/serialP.h> > -#include <linux/list.h> > - > -#include <asm/serial.h> > - > -enum parport_pc_pci_cards { > - titan_110l = 0, > - titan_210l, > - avlab_1s1p, > - avlab_1s1p_650, > - avlab_1s1p_850, > - avlab_1s2p, > - avlab_1s2p_650, > - avlab_1s2p_850, > - avlab_2s1p, > - avlab_2s1p_650, > - avlab_2s1p_850, > - siig_1s1p_10x, > - siig_2s1p_10x, > - siig_2p1s_20x, > - siig_1s1p_20x, > - siig_2s1p_20x, > -}; > - > - > -/* each element directly indexed from enum list, above */ > -static struct parport_pc_pci { > - int numports; > - struct { /* BAR (base address registers) numbers in the config > - space header */ > - int lo; > - int hi; /* -1 if not there, >6 for offset-method (max > - BAR is 6) */ > - } addr[4]; > - > - /* If set, this is called immediately after pci_enable_device. > - * If it returns non-zero, no probing will take place and the > - * ports will not be used. */ > - int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); > - > - /* If set, this is called after probing for ports. If 'failed' > - * is non-zero we couldn't use any of the ports. */ > - void (*postinit_hook) (struct pci_dev *pdev, int failed); > -} cards[] __devinitdata = { > - /* titan_110l */ { 1, { { 3, -1 }, } }, > - /* titan_210l */ { 1, { { 3, -1 }, } }, > - /* avlab_1s1p */ { 1, { { 1, 2}, } }, > - /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > - /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > - /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_2s1p */ { 1, { { 2, 3}, } }, > - /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, > - /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, > - /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, > - /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, > - /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, > - /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, > - /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, > -}; > - > -static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { > - /* PCI cards */ > - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > - /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > - { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > - { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > - { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, > - { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, > - { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, > - { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, > - { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, > - { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, > - { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - > - { 0, } /* terminate list */ > -}; > -MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); > - > -struct pci_board_no_ids { > - int flags; > - int num_ports; > - int base_baud; > - int uart_offset; > - int reg_shift; > - int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, > - int enable); > - int first_uart_offset; > -}; > - > -static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > -{ > - return pci_siig10x_fn(dev, NULL, enable); > -} > - > -static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > -{ > - return pci_siig20x_fn(dev, NULL, enable); > -} > - > -static struct pci_board_no_ids pci_boards[] __devinitdata = { > - /* > - * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, > - * Offset to get to next UART's registers, > - * Register shift to use for memory-mapped I/O, > - * Initialization function, first UART offset > - */ > - > -// Cards not tested are marked n/t > -// If you have one of these cards and it works for you, please tell me.. > - > -/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > -/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > -/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, > -/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, > -/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -}; > - > -struct parport_serial_private { > - int num_ser; > - int line[20]; > - struct pci_board_no_ids ser; > - int num_par; > - struct parport *port[PARPORT_MAX]; > -}; > - > -static int __devinit get_pci_port (struct pci_dev *dev, > - struct pci_board_no_ids *board, > - struct serial_struct *req, > - int idx) > -{ > - unsigned long port; > - int base_idx; > - int max_port; > - int offset; > - > - base_idx = SPCI_FL_GET_BASE(board->flags); > - if (board->flags & SPCI_FL_BASE_TABLE) > - base_idx += idx; > - > - if (board->flags & SPCI_FL_REGION_SZ_CAP) { > - max_port = pci_resource_len(dev, base_idx) / 8; > - if (idx >= max_port) > - return 1; > - } > - > - offset = board->first_uart_offset; > - > - /* Timedia/SUNIX uses a mixture of BARs and offsets */ > - /* Ugh, this is ugly as all hell --- TYT */ > - if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ > - switch(idx) { > - case 0: base_idx=0; > - break; > - case 1: base_idx=0; offset=8; > - break; > - case 2: base_idx=1; > - break; > - case 3: base_idx=1; offset=8; > - break; > - case 4: /* BAR 2*/ > - case 5: /* BAR 3 */ > - case 6: /* BAR 4*/ > - case 7: base_idx=idx-2; /* BAR 5*/ > - } > - > - port = pci_resource_start(dev, base_idx) + offset; > - > - if ((board->flags & SPCI_FL_BASE_TABLE) == 0) > - port += idx * (board->uart_offset ? board->uart_offset : 8); > - > - if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { > - int high_bits_offset = ((sizeof(long)-sizeof(int))*8); > - req->port = port; > - if (high_bits_offset) > - req->port_high = port >> high_bits_offset; > - else > - req->port_high = 0; > - return 0; > - } > - req->io_type = SERIAL_IO_MEM; > - req->iomem_base = ioremap(port, board->uart_offset); > - req->iomem_reg_shift = board->reg_shift; > - req->port = 0; > - return req->iomem_base ? 0 : 1; > -} > - > -/* Register the serial port(s) of a PCI card. */ > -static int __devinit serial_register (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct pci_board_no_ids *board = &pci_boards[id->driver_data]; > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - struct serial_struct serial_req; > - int base_baud; > - int k; > - int success = 0; > - > - priv->ser = *board; > - if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) > - return 1; > - > - base_baud = board->base_baud; > - if (!base_baud) > - base_baud = BASE_BAUD; > - memset (&serial_req, 0, sizeof (serial_req)); > - > - for (k = 0; k < board->num_ports; k++) { > - int line; > - serial_req.irq = dev->irq; > - if (get_pci_port (dev, board, &serial_req, k)) > - break; > - serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; > - serial_req.baud_base = base_baud; > - line = register_serial (&serial_req); > - if (line < 0) { > - printk (KERN_DEBUG > - "parport_serial: register_serial failed\n"); > - continue; > - } > - priv->line[priv->num_ser++] = line; > - success = 1; > - } > - > - return success ? 0 : 1; > -} > - > -/* Register the parallel port(s) of a PCI card. */ > -static int __devinit parport_register (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - int i = id->driver_data, n; > - int success = 0; > - > - if (cards[i].preinit_hook && > - cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) > - return -ENODEV; > - > - for (n = 0; n < cards[i].numports; n++) { > - struct parport *port; > - int lo = cards[i].addr[n].lo; > - int hi = cards[i].addr[n].hi; > - unsigned long io_lo, io_hi; > - io_lo = pci_resource_start (dev, lo); > - io_hi = 0; > - if ((hi >= 0) && (hi <= 6)) > - io_hi = pci_resource_start (dev, hi); > - else if (hi > 6) > - io_lo += hi; /* Reinterpret the meaning of > - "hi" as an offset (see SYBA > - def.) */ > - /* TODO: test if sharing interrupts works */ > - printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " > - "I/O at %#lx(%#lx)\n", > - parport_serial_pci_tbl[i].vendor, > - parport_serial_pci_tbl[i].device, io_lo, io_hi); > - port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, > - PARPORT_DMA_NONE, dev); > - if (port) { > - priv->port[priv->num_par++] = port; > - success = 1; > - } > - } > - > - if (cards[i].postinit_hook) > - cards[i].postinit_hook (dev, !success); > - > - return success ? 0 : 1; > -} > - > -static int __devinit parport_serial_pci_probe (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct parport_serial_private *priv; > - int err; > - > - priv = kmalloc (sizeof *priv, GFP_KERNEL); > - if (!priv) > - return -ENOMEM; > - priv->num_ser = priv->num_par = 0; > - pci_set_drvdata (dev, priv); > - > - err = pci_enable_device (dev); > - if (err) { > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return err; > - } > - > - if (parport_register (dev, id)) { > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return -ENODEV; > - } > - > - if (serial_register (dev, id)) { > - int i; > - for (i = 0; i < priv->num_par; i++) > - parport_pc_unregister_port (priv->port[i]); > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit parport_serial_pci_remove (struct pci_dev *dev) > -{ > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - int i; > - > - // Serial ports > - for (i = 0; i < priv->num_ser; i++) { > - unregister_serial (priv->line[i]); > - > - if (priv->ser.init_fn) > - (priv->ser.init_fn) (dev, &priv->ser, 0); > - } > - pci_set_drvdata (dev, NULL); > - > - // Parallel ports > - for (i = 0; i < priv->num_par; i++) > - parport_pc_unregister_port (priv->port[i]); > - > - kfree (priv); > - return; > -} > - > -static struct pci_driver parport_serial_pci_driver = { > - name: "parport_serial", > - id_table: parport_serial_pci_tbl, > - probe: parport_serial_pci_probe, > - remove: __devexit_p(parport_serial_pci_remove), > -}; > - > - > -static int __init parport_serial_init (void) > -{ > - return pci_module_init (&parport_serial_pci_driver); > -} > - > -static void __exit parport_serial_exit (void) > -{ > - pci_unregister_driver (&parport_serial_pci_driver); > - return; > -} > - > -MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); > -MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); > -MODULE_LICENSE("GPL"); > - > -module_init(parport_serial_init); > -module_exit(parport_serial_exit); > > > 01_netmos.patch : > > diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/char/parport_serial.c linux-2.4.20-pre9/drivers/char/parport_serial.c > --- linux-2.4.20-pre9-00_parport_serial/drivers/char/parport_serial.c Sat Oct 5 17:58:35 2002 > +++ linux-2.4.20-pre9/drivers/char/parport_serial.c Sat Oct 5 18:15:14 2002 > @@ -32,6 +32,8 @@ > enum parport_pc_pci_cards { > titan_110l = 0, > titan_210l, > + netmos_9735, > + netmos_9835, > avlab_1s1p, > avlab_1s1p_650, > avlab_1s1p_850, > @@ -70,6 +72,8 @@ > } cards[] __devinitdata = { > /* titan_110l */ { 1, { { 3, -1 }, } }, > /* titan_210l */ { 1, { { 3, -1 }, } }, > + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, > + /* netmos_9835 */ { 1, { { 2, -1 }, } }, > /* avlab_1s1p */ { 1, { { 1, 2}, } }, > /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > @@ -92,6 +96,10 @@ > PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, > /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > @@ -171,6 +179,8 @@ > > /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* netmos_9835 */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/parport/ChangeLog linux-2.4.20-pre9/drivers/parport/ChangeLog > --- linux-2.4.20-pre9-00_parport_serial/drivers/parport/ChangeLog Sat Oct 5 17:58:35 2002 > +++ linux-2.4.20-pre9/drivers/parport/ChangeLog Sat Oct 5 18:23:05 2002 > @@ -3,6 +3,10 @@ > * parport_serial.c: Move from here to ../char/, must be initialised > after serial.c for register_serial to work. > > + 2001-10-11 Tim Waugh <twaugh@redhat.com> > + * parport_pc.c, parport_serial.c: Support for NetMos cards. > + Patch originally from Michael Reinelt <reinelt@eunet.at>. > + > 2002-04-25 Tim Waugh <twaugh@redhat.com> > > * parport_serial.c, parport_pc.c: Move some SIIG cards around. > diff -urN linux-2.4.20-pre9-00_parport_serial/drivers/parport/parport_pc.c linux-2.4.20-pre9/drivers/parport/parport_pc.c > --- linux-2.4.20-pre9-00_parport_serial/drivers/parport/parport_pc.c Sat Oct 5 17:43:32 2002 > +++ linux-2.4.20-pre9/drivers/parport/parport_pc.c Sat Oct 5 18:12:20 2002 > @@ -2699,6 +2699,10 @@ > oxsemi_840, > aks_0100, > mobility_pp, > + netmos_9705, > + netmos_9805, > + netmos_9815, > + netmos_9855, > }; > > > @@ -2768,6 +2772,10 @@ > /* oxsemi_840 */ { 1, { { 0, -1 }, } }, > /* aks_0100 */ { 1, { { 0, 1 }, } }, > /* mobility_pp */ { 1, { { 0, 1 }, } }, > + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ > + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ > + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ > + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ > }; > > static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { > @@ -2836,6 +2844,15 @@ > PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, > { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, > PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, > + /* NetMos communication controllers */ > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, > { 0, } /* terminate list */ > }; > MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); > diff -urN linux-2.4.20-pre9-00_parport_serial/include/linux/pci_ids.h linux-2.4.20-pre9/include/linux/pci_ids.h > --- linux-2.4.20-pre9-00_parport_serial/include/linux/pci_ids.h Sat Oct 5 17:43:41 2002 > +++ linux-2.4.20-pre9/include/linux/pci_ids.h Sat Oct 5 18:09:44 2002 > @@ -1791,8 +1791,12 @@ > #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 > > #define PCI_VENDOR_ID_NETMOS 0x9710 > +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 > #define PCI_DEVICE_ID_NETMOS_9735 0x9735 > +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 > +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 > #define PCI_DEVICE_ID_NETMOS_9835 0x9835 > +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 > > #define PCI_SUBVENDOR_ID_EXSYS 0xd84d > #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 > > > -- > Jesper Juhl <juhl-lkml@dif.dk> > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 22:07 ` Marcelo Tosatti @ 2004-06-14 4:10 ` Willy Tarreau 2004-06-14 4:51 ` Ryan Underwood 2004-06-14 8:20 ` Jesper Juhl 2 siblings, 0 replies; 19+ messages in thread From: Willy Tarreau @ 2004-06-14 4:10 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: Jesper Juhl, linux-kernel, Ryan Underwood, twaugh Hi Marcelo, On Sun, Jun 13, 2004 at 07:07:27PM -0300, Marcelo Tosatti wrote: > And two, do we really need to move parport_serial.c to drivers/char in v2.4 ? I believe that moving a file in the stable kernel is a bad thing when it implies moving the module, especially for people in the embedded world, because we can imagine some of them may have a particular update mechanism or a pre-configured modules.dep or anything like that which will need to be changed again for this update, while it seems there is no particular reason. But if 2.6 has it in the same directory, this could be the occasion to move it definitely. Just my opinion anyway ;-) Cheers, Willy ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 22:07 ` Marcelo Tosatti 2004-06-14 4:10 ` Willy Tarreau @ 2004-06-14 4:51 ` Ryan Underwood 2004-06-14 14:59 ` Jesper Juhl 2004-06-21 1:49 ` Netmos 9835 in 2.6.x was " Marcelo Tosatti 2004-06-14 8:20 ` Jesper Juhl 2 siblings, 2 replies; 19+ messages in thread From: Ryan Underwood @ 2004-06-14 4:51 UTC (permalink / raw) To: Marcelo Tosatti Cc: Jesper Juhl, linux-kernel, Ryan Underwood, Willy Tarreau, twaugh [-- Attachment #1: Type: text/plain, Size: 579 bytes --] On Sun, Jun 13, 2004 at 07:07:27PM -0300, Marcelo Tosatti wrote: > > Jesper, > > Two more things. > > It seems v2.6 also lacks support for this boards: > > grep PCI_DEVICE_ID_NETMOS_ * > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9735 0x9735 > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9835 0x9835 > [marcelo@localhost linux]$ > > Care to prepare a v2.6 version? Seems like someone already did, but I guess it did not get applied for some reasons: http://seclists.org/lists/linux-kernel/2003/Dec/0654.html -- Ryan Underwood, <nemesis@icequake.net> [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-14 4:51 ` Ryan Underwood @ 2004-06-14 14:59 ` Jesper Juhl 2004-06-21 1:49 ` Netmos 9835 in 2.6.x was " Marcelo Tosatti 1 sibling, 0 replies; 19+ messages in thread From: Jesper Juhl @ 2004-06-14 14:59 UTC (permalink / raw) To: Ryan Underwood Cc: Marcelo Tosatti, Jesper Juhl, linux-kernel, Willy Tarreau, twaugh On Mon, 14 Jun 2004, Ryan Underwood wrote: > On Sun, Jun 13, 2004 at 07:07:27PM -0300, Marcelo Tosatti wrote: > > > > Jesper, > > > > Two more things. > > > > It seems v2.6 also lacks support for this boards: > > > > grep PCI_DEVICE_ID_NETMOS_ * > > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9735 0x9735 > > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9835 0x9835 > > [marcelo@localhost linux]$ > > > > Care to prepare a v2.6 version? > Seems like someone already did, but I guess it did not get applied for > some reasons: > http://seclists.org/lists/linux-kernel/2003/Dec/0654.html Seems I won't have to try and create a 2.6 version then... I guess I'll just try and update it to apply cleanly against 2.6.7-rc3 - that is, unless someone more qualified wants to step in and do it? -- Jesper Juhl <juhl-lkml@dif.dk> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Netmos 9835 in 2.6.x was Request: Netmos support in parport_serial for 2.4.27 2004-06-14 4:51 ` Ryan Underwood 2004-06-14 14:59 ` Jesper Juhl @ 2004-06-21 1:49 ` Marcelo Tosatti 2004-06-21 2:08 ` Andrew Morton 1 sibling, 1 reply; 19+ messages in thread From: Marcelo Tosatti @ 2004-06-21 1:49 UTC (permalink / raw) To: Jesper Juhl, linux-kernel, Ryan Underwood, Willy Tarreau, twaugh, akpm On Sun, Jun 13, 2004 at 11:51:04PM -0500, Ryan Underwood wrote: > On Sun, Jun 13, 2004 at 07:07:27PM -0300, Marcelo Tosatti wrote: > > > > Jesper, > > > > Two more things. > > > > It seems v2.6 also lacks support for this boards: > > > > grep PCI_DEVICE_ID_NETMOS_ * > > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9735 0x9735 > > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9835 0x9835 > > [marcelo@localhost linux]$ > > > > Care to prepare a v2.6 version? > > Seems like someone already did, but I guess it did not get applied for > some reasons: > http://seclists.org/lists/linux-kernel/2003/Dec/0654.html Andrew, the patch in the URL looks fine to me, it adds support for Netmos 9835 based cards. Tim Waugh ACKed the 2.4 version of the patch. Christopher Lameter updated the patch for v2.6, and it looks alright to me. Please check the URL. Quoting him: "Attached a patch to support a variety of PCI based serial and parallel port I/O ports (typically labeled 222N-2 or 9835). The patch was I just fixed it up and made it work for 2.6.0-test10/10. I think this should go into 2.6.0 since it has been out there for a long time and is just some additional driver support that somehow fell through the cracks in 2.4.X. Tim Waugh submitted it in the 2.4.X series." I'm sure the fellows in this thread who posses the cards can give it a test. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Netmos 9835 in 2.6.x was Request: Netmos support in parport_serial for 2.4.27 2004-06-21 1:49 ` Netmos 9835 in 2.6.x was " Marcelo Tosatti @ 2004-06-21 2:08 ` Andrew Morton 0 siblings, 0 replies; 19+ messages in thread From: Andrew Morton @ 2004-06-21 2:08 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: juhl-lkml, linux-kernel, nemesis-lists, willy, twaugh Marcelo Tosatti <marcelo.tosatti@cyclades.com> wrote: > > > http://seclists.org/lists/linux-kernel/2003/Dec/0654.html > > Andrew, the patch in the URL looks fine to me, it adds support for > Netmos 9835 based cards. Tim Waugh ACKed the 2.4 version of the patch. OK, thanks. I queued the below patch. From: Christoph Lameter <christoph@graphe.net> Attached a patch to support a variety of PCI based serial and parallel port I/O ports (typically labeled 222N-2 or 9835). I think this should go into 2.6.0 since it has been out there for a long time and is just some additional driver support that somehow fell through the cracks in 2.4.X. Tim Waugh submitted it in the 2.4.X series. See also http://winterwolf.co.uk/pciio Signed-off-by: Andrew Morton <akpm@osdl.org> --- 25-akpm/drivers/parport/ChangeLog | 4 ++++ 25-akpm/drivers/parport/parport_pc.c | 17 +++++++++++++++++ 25-akpm/drivers/parport/parport_serial.c | 10 ++++++++++ 25-akpm/include/linux/pci_ids.h | 4 ++++ 4 files changed, 35 insertions(+) diff -puN drivers/parport/ChangeLog~for-netmos-based-pci-cards-providing-serial-and-parallel-ports drivers/parport/ChangeLog --- 25/drivers/parport/ChangeLog~for-netmos-based-pci-cards-providing-serial-and-parallel-ports 2004-06-20 19:07:08.187268320 -0700 +++ 25-akpm/drivers/parport/ChangeLog 2004-06-20 19:07:08.196266952 -0700 @@ -1,3 +1,7 @@ +2001-10-11 Tim Waugh <twaugh@redhat.com> + * parport_pc.c, parport_serial.c: Support for NetMos cards. + + Patch originally from Michael Reinelt <reinelt@eunet.at>. + 2002-04-25 Tim Waugh <twaugh@redhat.com> * parport_serial.c, parport_pc.c: Move some SIIG cards around. diff -puN drivers/parport/parport_pc.c~for-netmos-based-pci-cards-providing-serial-and-parallel-ports drivers/parport/parport_pc.c --- 25/drivers/parport/parport_pc.c~for-netmos-based-pci-cards-providing-serial-and-parallel-ports 2004-06-20 19:07:08.189268016 -0700 +++ 25-akpm/drivers/parport/parport_pc.c 2004-06-20 19:07:08.198266648 -0700 @@ -2632,6 +2632,10 @@ enum parport_pc_pci_cards { oxsemi_840, aks_0100, mobility_pp, + netmos_9705, + netmos_9805, + netmos_9815, + netmos_9855, }; @@ -2701,6 +2705,10 @@ static struct parport_pc_pci { /* oxsemi_840 */ { 1, { { 0, -1 }, } }, /* aks_0100 */ { 1, { { 0, -1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } }, + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ }; static struct pci_device_id parport_pc_pci_tbl[] = { @@ -2769,6 +2777,15 @@ static struct pci_device_id parport_pc_p PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, + /* NetMos communication controllers */ + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, { 0, } /* terminate list */ }; MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); diff -puN drivers/parport/parport_serial.c~for-netmos-based-pci-cards-providing-serial-and-parallel-ports drivers/parport/parport_serial.c --- 25/drivers/parport/parport_serial.c~for-netmos-based-pci-cards-providing-serial-and-parallel-ports 2004-06-20 19:07:08.190267864 -0700 +++ 25-akpm/drivers/parport/parport_serial.c 2004-06-20 19:07:08.199266496 -0700 @@ -33,6 +33,8 @@ enum parport_pc_pci_cards { titan_110l = 0, titan_210l, + netmos_9735, + netmos_9835, avlab_1s1p, avlab_1s1p_650, avlab_1s1p_850, @@ -71,6 +73,8 @@ static struct parport_pc_pci { } cards[] __devinitdata = { /* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } }, + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, + /* netmos_9835 */ { 1, { { 2, -1 }, } }, /* avlab_1s1p */ { 1, { { 1, 2}, } }, /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, @@ -93,6 +97,10 @@ static struct pci_device_id parport_seri PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, @@ -172,6 +180,8 @@ static struct pci_board_no_ids pci_board /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* netmos_9835 */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, diff -puN include/linux/pci_ids.h~for-netmos-based-pci-cards-providing-serial-and-parallel-ports include/linux/pci_ids.h --- 25/include/linux/pci_ids.h~for-netmos-based-pci-cards-providing-serial-and-parallel-ports 2004-06-20 19:07:08.192267560 -0700 +++ 25-akpm/include/linux/pci_ids.h 2004-06-20 19:07:08.201266192 -0700 @@ -2254,8 +2254,12 @@ #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 #define PCI_VENDOR_ID_NETMOS 0x9710 +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 #define PCI_DEVICE_ID_NETMOS_9735 0x9735 +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 #define PCI_DEVICE_ID_NETMOS_9835 0x9835 +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 _ ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 22:07 ` Marcelo Tosatti 2004-06-14 4:10 ` Willy Tarreau 2004-06-14 4:51 ` Ryan Underwood @ 2004-06-14 8:20 ` Jesper Juhl 2 siblings, 0 replies; 19+ messages in thread From: Jesper Juhl @ 2004-06-14 8:20 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel, Ryan Underwood, Willy Tarreau, twaugh On Sun, 13 Jun 2004, Marcelo Tosatti wrote: > > Jesper, > > Two more things. > > It seems v2.6 also lacks support for this boards: > > grep PCI_DEVICE_ID_NETMOS_ * > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9735 0x9735 > pci_ids.h:#define PCI_DEVICE_ID_NETMOS_9835 0x9835 > [marcelo@localhost linux]$ > > Care to prepare a v2.6 version? > I don't mind giving it a try, but as I said in my original reply I'm way out of my league here. First of all I'm not the author of the original patch, all I did was to try and update it to apply cleanly against 2.4.27-pre5. Secondly I don't have the hardware, so the only testing I can do is check that it compiles cleanly and then test boot a kernel to see if it blows up. But sure, I'll see if I can get it worked into 2.6, that'll be a nice challenge, but I'll probably be needing some help along the way. > And two, do we really need to move parport_serial.c to drivers/char in v2.4 ? > To be honest, I have no idea. -- Jesper Juhl <juhl-lkml@dif.dk> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 11:19 Request: Netmos support in parport_serial for 2.4.27 Ryan Underwood 2004-06-13 12:39 ` Marcelo Tosatti @ 2004-06-13 13:05 ` Pavel Janík 2004-06-13 14:25 ` Willy Tarreau 2 siblings, 0 replies; 19+ messages in thread From: Pavel Janík @ 2004-06-13 13:05 UTC (permalink / raw) To: linux-kernel From: Ryan Underwood <nemesis-lists@icequake.net> Date: Sun, 13 Jun 2004 06:19:49 -0500 > Can it be reviewed for inclusion before 2.4.27? I have a few systems > with these cards and it would be very nice to have them up to snuff. I too have several (several hundreds) systems with it. Please include it in the next 2.4 version. -- Pavel Janík Avoid unnecessary branches. -- The Elements of Programming Style (Kernighan & Plaugher) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 11:19 Request: Netmos support in parport_serial for 2.4.27 Ryan Underwood 2004-06-13 12:39 ` Marcelo Tosatti 2004-06-13 13:05 ` Pavel Janík @ 2004-06-13 14:25 ` Willy Tarreau 2004-06-13 19:15 ` Jesper Juhl 2 siblings, 1 reply; 19+ messages in thread From: Willy Tarreau @ 2004-06-13 14:25 UTC (permalink / raw) To: linux-kernel Hi, I bet you won't have any luck to see it included in anywhere if you expect kernel maintainers to launch a web browser, find it on your site, and possibly merge it by hand. You could make things easier to them by updating the patch to 2.4.27-bk and post it right here. Cheers, Willy On Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > Hi, > > There's been a patch floating around for a while now to add Netmos > support to parport_serial. It has been submitted numerous times but it > seems that nobody notices it. :) > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > with these cards and it would be very nice to have them up to snuff. > > The patch against 2.4.20 can be found here: > http://winterwolf.co.uk/linuxsw > > -- > Ryan Underwood, <nemesis@icequake.net> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 14:25 ` Willy Tarreau @ 2004-06-13 19:15 ` Jesper Juhl 2004-06-13 19:24 ` Jesper Juhl 0 siblings, 1 reply; 19+ messages in thread From: Jesper Juhl @ 2004-06-13 19:15 UTC (permalink / raw) To: Willy Tarreau; +Cc: Ryan Underwood, linux-kernel On Sun, 13 Jun 2004, Willy Tarreau wrote: > Hi, > > I bet you won't have any luck to see it included in anywhere if you > expect kernel maintainers to launch a web browser, find it on your > site, and possibly merge it by hand. You could make things easier to > them by updating the patch to 2.4.27-bk and post it right here. > > Cheers, > Willy > > On Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > > > Hi, > > > > There's been a patch floating around for a while now to add Netmos > > support to parport_serial. It has been submitted numerous times but it > > seems that nobody notices it. :) > > > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > > with these cards and it would be very nice to have them up to snuff. > > > > The patch against 2.4.20 can be found here: > > http://winterwolf.co.uk/linuxsw > > > > -- > > Ryan Underwood, <nemesis@icequake.net> > Just to see if I could do it I downloaded the two patches in question from here: http://winterwolf.co.uk/software/linux/netmos/00_parport_serial.patch http://winterwolf.co.uk/software/linux/netmos/01_netmos.patch and then attempted to update them to apply cleanly against 2.4.27-pre5. You can find the result of my efforts below. Please note that I do not have the hardware, so the only testing I've done is check that they still compile. My knowledge of this code is also extremely limited (did this mainly as a learning experience to find out how to deal with patch reject files and such) so please someone review what I've done and be very suspicious of any changes since I'm way out of my league here... I modified one of the changelog entries to current date, not sure if that's right or if it should just be left at the original date (I thought current date since now is the time the updated patch is made) Anyway, just trying to help here, so I hope this is of use to somebody and that I didn't make too much of a mess of things :) Kind regards, Jesper Juhl <juhl-lkml@dif.dk> Updated version of the 00_parport_serial.patch : diff -urpN linux-2.4.27-pre5-orig/drivers/char/ChangeLog linux-2.4.27-pre5/drivers/char/ChangeLog --- linux-2.4.27-pre5-orig/drivers/char/ChangeLog 2002-11-29 00:53:12.000000000 +0100 +++ linux-2.4.27-pre5/drivers/char/ChangeLog 2004-06-13 20:33:53.000000000 +0200 @@ -1,3 +1,8 @@ +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> + + * parport_serial.c: Move from ../parport/ here, must be initialised + after serial.c for register_serial to work. + 2001-08-11 Tim Waugh <twaugh@redhat.com> * serial.c (get_pci_port): Deal with awkward Titan cards. diff -urpN linux-2.4.27-pre5-orig/drivers/char/Makefile linux-2.4.27-pre5/drivers/char/Makefile --- linux-2.4.27-pre5-orig/drivers/char/Makefile 2004-02-18 14:36:31.000000000 +0100 +++ linux-2.4.27-pre5/drivers/char/Makefile 2004-06-13 20:33:53.000000000 +0200 @@ -171,6 +171,7 @@ endif obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o obj-$(CONFIG_SERIAL) += $(SERIAL) +obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o obj-$(CONFIG_SERIAL_21285) += serial_21285.o obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o diff -urpN linux-2.4.27-pre5-orig/drivers/char/parport_serial.c linux-2.4.27-pre5/drivers/char/parport_serial.c --- linux-2.4.27-pre5-orig/drivers/char/parport_serial.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.4.27-pre5/drivers/char/parport_serial.c 2004-06-13 20:33:53.000000000 +0200 @@ -0,0 +1,426 @@ +/* + * Support for common PCI multi-I/O cards (which is most of them) + * + * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * + * Multi-function PCI cards are supposed to present separate logical + * devices on the bus. A common thing to do seems to be to just use + * one logical device with lots of base address registers for both + * parallel ports and serial ports. This driver is for dealing with + * that. + * + */ + +#include <linux/types.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/pci.h> +#include <linux/parport.h> +#include <linux/parport_pc.h> +#include <linux/serial.h> +#include <linux/serialP.h> +#include <linux/list.h> + +#include <asm/serial.h> + +enum parport_pc_pci_cards { + titan_110l = 0, + titan_210l, + avlab_1s1p, + avlab_1s1p_650, + avlab_1s1p_850, + avlab_1s2p, + avlab_1s2p_650, + avlab_1s2p_850, + avlab_2s1p, + avlab_2s1p_650, + avlab_2s1p_850, + siig_1s1p_10x, + siig_2s1p_10x, + siig_2p1s_20x, + siig_1s1p_20x, + siig_2s1p_20x, +}; + + +/* each element directly indexed from enum list, above */ +static struct parport_pc_pci { + int numports; + struct { /* BAR (base address registers) numbers in the config + space header */ + int lo; + int hi; /* -1 if not there, >6 for offset-method (max + BAR is 6) */ + } addr[4]; + + /* If set, this is called immediately after pci_enable_device. + * If it returns non-zero, no probing will take place and the + * ports will not be used. */ + int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); + + /* If set, this is called after probing for ports. If 'failed' + * is non-zero we couldn't use any of the ports. */ + void (*postinit_hook) (struct pci_dev *pdev, int failed); +} cards[] __devinitdata = { + /* titan_110l */ { 1, { { 3, -1 }, } }, + /* titan_210l */ { 1, { { 3, -1 }, } }, + /* avlab_1s1p */ { 1, { { 1, 2}, } }, + /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, + /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, + /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, + /* avlab_2s1p */ { 1, { { 2, 3}, } }, + /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, + /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, + /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, + /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, + /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, + /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, + /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, +}; + +static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { + /* PCI cards */ + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, + /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ + { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, + { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, + { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, + { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, + { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, + { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, + { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, + { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, + { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, + + { 0, } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); + +struct pci_board_no_ids { + int flags; + int num_ports; + int base_baud; + int uart_offset; + int reg_shift; + int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, + int enable); + int first_uart_offset; +}; + +static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) +{ + return pci_siig10x_fn(dev, NULL, enable); +} + +static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) +{ + return pci_siig20x_fn(dev, NULL, enable); +} + +static struct pci_board_no_ids pci_boards[] __devinitdata = { + /* + * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, + * Offset to get to next UART's registers, + * Register shift to use for memory-mapped I/O, + * Initialization function, first UART offset + */ + +// Cards not tested are marked n/t +// If you have one of these cards and it works for you, please tell me.. + +/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, +/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, +/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, +/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, +/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, +/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, +}; + +struct parport_serial_private { + int num_ser; + int line[20]; + struct pci_board_no_ids ser; + int num_par; + struct parport *port[PARPORT_MAX]; +}; + +static int __devinit get_pci_port (struct pci_dev *dev, + struct pci_board_no_ids *board, + struct serial_struct *req, + int idx) +{ + unsigned long port; + int base_idx; + int max_port; + int offset; + + base_idx = SPCI_FL_GET_BASE(board->flags); + if (board->flags & SPCI_FL_BASE_TABLE) + base_idx += idx; + + if (board->flags & SPCI_FL_REGION_SZ_CAP) { + max_port = pci_resource_len(dev, base_idx) / 8; + if (idx >= max_port) + return 1; + } + + offset = board->first_uart_offset; + + /* Timedia/SUNIX uses a mixture of BARs and offsets */ + /* Ugh, this is ugly as all hell --- TYT */ + if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ + switch(idx) { + case 0: base_idx=0; + break; + case 1: base_idx=0; offset=8; + break; + case 2: base_idx=1; + break; + case 3: base_idx=1; offset=8; + break; + case 4: /* BAR 2*/ + case 5: /* BAR 3 */ + case 6: /* BAR 4*/ + case 7: base_idx=idx-2; /* BAR 5*/ + } + + port = pci_resource_start(dev, base_idx) + offset; + + if ((board->flags & SPCI_FL_BASE_TABLE) == 0) + port += idx * (board->uart_offset ? board->uart_offset : 8); + + if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { + int high_bits_offset = ((sizeof(long)-sizeof(int))*8); + req->port = port; + if (high_bits_offset) + req->port_high = port >> high_bits_offset; + else + req->port_high = 0; + return 0; + } + req->io_type = SERIAL_IO_MEM; + req->iomem_base = ioremap(port, board->uart_offset); + req->iomem_reg_shift = board->reg_shift; + req->port = 0; + return req->iomem_base ? 0 : 1; +} + +/* Register the serial port(s) of a PCI card. */ +static int __devinit serial_register (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct pci_board_no_ids *board = &pci_boards[id->driver_data]; + struct parport_serial_private *priv = pci_get_drvdata (dev); + struct serial_struct serial_req; + int base_baud; + int k; + int success = 0; + + priv->ser = *board; + if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) + return 1; + + base_baud = board->base_baud; + if (!base_baud) + base_baud = BASE_BAUD; + memset (&serial_req, 0, sizeof (serial_req)); + + for (k = 0; k < board->num_ports; k++) { + int line; + serial_req.irq = dev->irq; + if (get_pci_port (dev, board, &serial_req, k)) + break; + serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; + serial_req.baud_base = base_baud; + line = register_serial (&serial_req); + if (line < 0) { + printk (KERN_DEBUG + "parport_serial: register_serial failed\n"); + continue; + } + priv->line[priv->num_ser++] = line; + success = 1; + } + + return success ? 0 : 1; +} + +/* Register the parallel port(s) of a PCI card. */ +static int __devinit parport_register (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct parport_serial_private *priv = pci_get_drvdata (dev); + int i = id->driver_data, n; + int success = 0; + + if (cards[i].preinit_hook && + cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) + return -ENODEV; + + for (n = 0; n < cards[i].numports; n++) { + struct parport *port; + int lo = cards[i].addr[n].lo; + int hi = cards[i].addr[n].hi; + unsigned long io_lo, io_hi; + io_lo = pci_resource_start (dev, lo); + io_hi = 0; + if ((hi >= 0) && (hi <= 6)) + io_hi = pci_resource_start (dev, hi); + else if (hi > 6) + io_lo += hi; /* Reinterpret the meaning of + "hi" as an offset (see SYBA + def.) */ + /* TODO: test if sharing interrupts works */ + printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " + "I/O at %#lx(%#lx)\n", + parport_serial_pci_tbl[i].vendor, + parport_serial_pci_tbl[i].device, io_lo, io_hi); + port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, + PARPORT_DMA_NONE, dev); + if (port) { + priv->port[priv->num_par++] = port; + success = 1; + } + } + + if (cards[i].postinit_hook) + cards[i].postinit_hook (dev, !success); + + return success ? 0 : 1; +} + +static int __devinit parport_serial_pci_probe (struct pci_dev *dev, + const struct pci_device_id *id) +{ + struct parport_serial_private *priv; + int err; + + priv = kmalloc (sizeof *priv, GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->num_ser = priv->num_par = 0; + pci_set_drvdata (dev, priv); + + err = pci_enable_device (dev); + if (err) { + pci_set_drvdata (dev, NULL); + kfree (priv); + return err; + } + + if (parport_register (dev, id)) { + pci_set_drvdata (dev, NULL); + kfree (priv); + return -ENODEV; + } + + if (serial_register (dev, id)) { + int i; + for (i = 0; i < priv->num_par; i++) + parport_pc_unregister_port (priv->port[i]); + pci_set_drvdata (dev, NULL); + kfree (priv); + return -ENODEV; + } + + return 0; +} + +static void __devexit parport_serial_pci_remove (struct pci_dev *dev) +{ + struct parport_serial_private *priv = pci_get_drvdata (dev); + int i; + + // Serial ports + for (i = 0; i < priv->num_ser; i++) { + unregister_serial (priv->line[i]); + + if (priv->ser.init_fn) + (priv->ser.init_fn) (dev, &priv->ser, 0); + } + pci_set_drvdata (dev, NULL); + + // Parallel ports + for (i = 0; i < priv->num_par; i++) + parport_pc_unregister_port (priv->port[i]); + + kfree (priv); + return; +} + +static struct pci_driver parport_serial_pci_driver = { + name: "parport_serial", + id_table: parport_serial_pci_tbl, + probe: parport_serial_pci_probe, + remove: __devexit_p(parport_serial_pci_remove), +}; + + +static int __init parport_serial_init (void) +{ + return pci_module_init (&parport_serial_pci_driver); +} + +static void __exit parport_serial_exit (void) +{ + pci_unregister_driver (&parport_serial_pci_driver); + return; +} + +MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); +MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); +MODULE_LICENSE("GPL"); + +module_init(parport_serial_init); +module_exit(parport_serial_exit); diff -urpN linux-2.4.27-pre5-orig/drivers/parport/ChangeLog linux-2.4.27-pre5/drivers/parport/ChangeLog --- linux-2.4.27-pre5-orig/drivers/parport/ChangeLog 2003-06-13 16:51:35.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/ChangeLog 2004-06-13 20:42:02.000000000 +0200 @@ -1,3 +1,8 @@ +2004-06-13 Marek Michalkiewicz <marekm@amelek.gda.pl> + + * parport_serial.c: Move from here to ../char/, must be initialised + after serial.c for register_serial to work. + 2002-11-29 Tim Waugh <twaugh@redhat.com> * parport_pc.c: Fix ECP hang on Aladdin card. diff -urpN linux-2.4.27-pre5-orig/drivers/parport/Makefile linux-2.4.27-pre5/drivers/parport/Makefile --- linux-2.4.27-pre5-orig/drivers/parport/Makefile 2004-02-18 14:36:31.000000000 +0100 +++ linux-2.4.27-pre5/drivers/parport/Makefile 2004-06-13 20:43:13.000000000 +0200 @@ -22,7 +22,6 @@ endif obj-$(CONFIG_PARPORT) += parport.o obj-$(CONFIG_PARPORT_PC) += parport_pc.o -obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o obj-$(CONFIG_PARPORT_PC_PCMCIA) += parport_cs.o obj-$(CONFIG_PARPORT_AMIGA) += parport_amiga.o obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o diff -urpN linux-2.4.27-pre5-orig/drivers/parport/parport_serial.c linux-2.4.27-pre5/drivers/parport/parport_serial.c --- linux-2.4.27-pre5-orig/drivers/parport/parport_serial.c 2002-08-03 02:39:44.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/parport_serial.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,426 +0,0 @@ -/* - * Support for common PCI multi-I/O cards (which is most of them) - * - * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * - * Multi-function PCI cards are supposed to present separate logical - * devices on the bus. A common thing to do seems to be to just use - * one logical device with lots of base address registers for both - * parallel ports and serial ports. This driver is for dealing with - * that. - * - */ - -#include <linux/types.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/parport.h> -#include <linux/parport_pc.h> -#include <linux/serial.h> -#include <linux/serialP.h> -#include <linux/list.h> - -#include <asm/serial.h> - -enum parport_pc_pci_cards { - titan_110l = 0, - titan_210l, - avlab_1s1p, - avlab_1s1p_650, - avlab_1s1p_850, - avlab_1s2p, - avlab_1s2p_650, - avlab_1s2p_850, - avlab_2s1p, - avlab_2s1p_650, - avlab_2s1p_850, - siig_1s1p_10x, - siig_2s1p_10x, - siig_2p1s_20x, - siig_1s1p_20x, - siig_2s1p_20x, -}; - - -/* each element directly indexed from enum list, above */ -static struct parport_pc_pci { - int numports; - struct { /* BAR (base address registers) numbers in the config - space header */ - int lo; - int hi; /* -1 if not there, >6 for offset-method (max - BAR is 6) */ - } addr[4]; - - /* If set, this is called immediately after pci_enable_device. - * If it returns non-zero, no probing will take place and the - * ports will not be used. */ - int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); - - /* If set, this is called after probing for ports. If 'failed' - * is non-zero we couldn't use any of the ports. */ - void (*postinit_hook) (struct pci_dev *pdev, int failed); -} cards[] __devinitdata = { - /* titan_110l */ { 1, { { 3, -1 }, } }, - /* titan_210l */ { 1, { { 3, -1 }, } }, - /* avlab_1s1p */ { 1, { { 1, 2}, } }, - /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, - /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, - /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, - /* avlab_2s1p */ { 1, { { 2, 3}, } }, - /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, - /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, - /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, - /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, - /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, - /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, - /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, -}; - -static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { - /* PCI cards */ - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, - /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ - { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, - { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, - { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, - { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, - { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, - { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, - { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, - { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, - { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, - - { 0, } /* terminate list */ -}; -MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); - -struct pci_board_no_ids { - int flags; - int num_ports; - int base_baud; - int uart_offset; - int reg_shift; - int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, - int enable); - int first_uart_offset; -}; - -static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) -{ - return pci_siig10x_fn(dev, NULL, enable); -} - -static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) -{ - return pci_siig20x_fn(dev, NULL, enable); -} - -static struct pci_board_no_ids pci_boards[] __devinitdata = { - /* - * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, - * Offset to get to next UART's registers, - * Register shift to use for memory-mapped I/O, - * Initialization function, first UART offset - */ - -// Cards not tested are marked n/t -// If you have one of these cards and it works for you, please tell me.. - -/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, -/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, -/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, -/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, -/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, -/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, -/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, -}; - -struct parport_serial_private { - int num_ser; - int line[20]; - struct pci_board_no_ids ser; - int num_par; - struct parport *port[PARPORT_MAX]; -}; - -static int __devinit get_pci_port (struct pci_dev *dev, - struct pci_board_no_ids *board, - struct serial_struct *req, - int idx) -{ - unsigned long port; - int base_idx; - int max_port; - int offset; - - base_idx = SPCI_FL_GET_BASE(board->flags); - if (board->flags & SPCI_FL_BASE_TABLE) - base_idx += idx; - - if (board->flags & SPCI_FL_REGION_SZ_CAP) { - max_port = pci_resource_len(dev, base_idx) / 8; - if (idx >= max_port) - return 1; - } - - offset = board->first_uart_offset; - - /* Timedia/SUNIX uses a mixture of BARs and offsets */ - /* Ugh, this is ugly as all hell --- TYT */ - if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ - switch(idx) { - case 0: base_idx=0; - break; - case 1: base_idx=0; offset=8; - break; - case 2: base_idx=1; - break; - case 3: base_idx=1; offset=8; - break; - case 4: /* BAR 2*/ - case 5: /* BAR 3 */ - case 6: /* BAR 4*/ - case 7: base_idx=idx-2; /* BAR 5*/ - } - - port = pci_resource_start(dev, base_idx) + offset; - - if ((board->flags & SPCI_FL_BASE_TABLE) == 0) - port += idx * (board->uart_offset ? board->uart_offset : 8); - - if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { - int high_bits_offset = ((sizeof(long)-sizeof(int))*8); - req->port = port; - if (high_bits_offset) - req->port_high = port >> high_bits_offset; - else - req->port_high = 0; - return 0; - } - req->io_type = SERIAL_IO_MEM; - req->iomem_base = ioremap(port, board->uart_offset); - req->iomem_reg_shift = board->reg_shift; - req->port = 0; - return req->iomem_base ? 0 : 1; -} - -/* Register the serial port(s) of a PCI card. */ -static int __devinit serial_register (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct pci_board_no_ids *board = &pci_boards[id->driver_data]; - struct parport_serial_private *priv = pci_get_drvdata (dev); - struct serial_struct serial_req; - int base_baud; - int k; - int success = 0; - - priv->ser = *board; - if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) - return 1; - - base_baud = board->base_baud; - if (!base_baud) - base_baud = BASE_BAUD; - memset (&serial_req, 0, sizeof (serial_req)); - - for (k = 0; k < board->num_ports; k++) { - int line; - serial_req.irq = dev->irq; - if (get_pci_port (dev, board, &serial_req, k)) - break; - serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; - serial_req.baud_base = base_baud; - line = register_serial (&serial_req); - if (line < 0) { - printk (KERN_DEBUG - "parport_serial: register_serial failed\n"); - continue; - } - priv->line[priv->num_ser++] = line; - success = 1; - } - - return success ? 0 : 1; -} - -/* Register the parallel port(s) of a PCI card. */ -static int __devinit parport_register (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct parport_serial_private *priv = pci_get_drvdata (dev); - int i = id->driver_data, n; - int success = 0; - - if (cards[i].preinit_hook && - cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) - return -ENODEV; - - for (n = 0; n < cards[i].numports; n++) { - struct parport *port; - int lo = cards[i].addr[n].lo; - int hi = cards[i].addr[n].hi; - unsigned long io_lo, io_hi; - io_lo = pci_resource_start (dev, lo); - io_hi = 0; - if ((hi >= 0) && (hi <= 6)) - io_hi = pci_resource_start (dev, hi); - else if (hi > 6) - io_lo += hi; /* Reinterpret the meaning of - "hi" as an offset (see SYBA - def.) */ - /* TODO: test if sharing interrupts works */ - printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " - "I/O at %#lx(%#lx)\n", - parport_serial_pci_tbl[i].vendor, - parport_serial_pci_tbl[i].device, io_lo, io_hi); - port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, - PARPORT_DMA_NONE, dev); - if (port) { - priv->port[priv->num_par++] = port; - success = 1; - } - } - - if (cards[i].postinit_hook) - cards[i].postinit_hook (dev, !success); - - return success ? 0 : 1; -} - -static int __devinit parport_serial_pci_probe (struct pci_dev *dev, - const struct pci_device_id *id) -{ - struct parport_serial_private *priv; - int err; - - priv = kmalloc (sizeof *priv, GFP_KERNEL); - if (!priv) - return -ENOMEM; - priv->num_ser = priv->num_par = 0; - pci_set_drvdata (dev, priv); - - err = pci_enable_device (dev); - if (err) { - pci_set_drvdata (dev, NULL); - kfree (priv); - return err; - } - - if (parport_register (dev, id)) { - pci_set_drvdata (dev, NULL); - kfree (priv); - return -ENODEV; - } - - if (serial_register (dev, id)) { - int i; - for (i = 0; i < priv->num_par; i++) - parport_pc_unregister_port (priv->port[i]); - pci_set_drvdata (dev, NULL); - kfree (priv); - return -ENODEV; - } - - return 0; -} - -static void __devexit parport_serial_pci_remove (struct pci_dev *dev) -{ - struct parport_serial_private *priv = pci_get_drvdata (dev); - int i; - - // Serial ports - for (i = 0; i < priv->num_ser; i++) { - unregister_serial (priv->line[i]); - - if (priv->ser.init_fn) - (priv->ser.init_fn) (dev, &priv->ser, 0); - } - pci_set_drvdata (dev, NULL); - - // Parallel ports - for (i = 0; i < priv->num_par; i++) - parport_pc_unregister_port (priv->port[i]); - - kfree (priv); - return; -} - -static struct pci_driver parport_serial_pci_driver = { - name: "parport_serial", - id_table: parport_serial_pci_tbl, - probe: parport_serial_pci_probe, - remove: __devexit_p(parport_serial_pci_remove), -}; - - -static int __init parport_serial_init (void) -{ - return pci_module_init (&parport_serial_pci_driver); -} - -static void __exit parport_serial_exit (void) -{ - pci_unregister_driver (&parport_serial_pci_driver); - return; -} - -MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); -MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); -MODULE_LICENSE("GPL"); - -module_init(parport_serial_init); -module_exit(parport_serial_exit); Updated version of the 01_netmos.patch : diff -urpN linux-2.4.27-pre5+parport_serial/drivers/char/parport_serial.c linux-2.4.27-pre5/drivers/char/parport_serial.c --- linux-2.4.27-pre5+parport_serial/drivers/char/parport_serial.c 2004-06-13 20:53:59.000000000 +0200 +++ linux-2.4.27-pre5/drivers/char/parport_serial.c 2004-06-13 20:55:57.000000000 +0200 @@ -32,6 +32,8 @@ enum parport_pc_pci_cards { titan_110l = 0, titan_210l, + netmos_9735, + netmos_9835, avlab_1s1p, avlab_1s1p_650, avlab_1s1p_850, @@ -70,6 +72,8 @@ static struct parport_pc_pci { } cards[] __devinitdata = { /* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } }, + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, + /* netmos_9835 */ { 1, { { 2, -1 }, } }, /* avlab_1s1p */ { 1, { { 1, 2}, } }, /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, @@ -92,6 +96,10 @@ static struct pci_device_id parport_seri PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, @@ -171,6 +179,8 @@ static struct pci_board_no_ids pci_board /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, +/* netmos_9835 */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog linux-2.4.27-pre5/drivers/parport/ChangeLog --- linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog 2004-06-13 20:53:59.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/ChangeLog 2004-06-13 20:55:57.000000000 +0200 @@ -7,6 +7,10 @@ * parport_pc.c: Fix ECP hang on Aladdin card. + 2001-10-11 Tim Waugh <twaugh@redhat.com> + * parport_pc.c, parport_serial.c: Support for NetMos cards. + Patch originally from Michael Reinelt <reinelt@eunet.at>. + 2002-04-25 Tim Waugh <twaugh@redhat.com> * parport_serial.c, parport_pc.c: Move some SIIG cards around. diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog~ linux-2.4.27-pre5/drivers/parport/ChangeLog~ --- linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog~ 2004-06-13 20:51:24.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/ChangeLog~ 2004-06-13 20:53:59.000000000 +0200 @@ -7,10 +7,6 @@ * parport_pc.c: Fix ECP hang on Aladdin card. - 2001-10-11 Tim Waugh <twaugh@redhat.com> - * parport_pc.c, parport_serial.c: Support for NetMos cards. - Patch originally from Michael Reinelt <reinelt@eunet.at>. - 2002-04-25 Tim Waugh <twaugh@redhat.com> * parport_serial.c, parport_pc.c: Move some SIIG cards around. diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c linux-2.4.27-pre5/drivers/parport/parport_pc.c --- linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c 2004-06-13 20:53:59.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/parport_pc.c 2004-06-13 20:55:57.000000000 +0200 @@ -2699,6 +2699,10 @@ enum parport_pc_pci_cards { oxsemi_840, aks_0100, mobility_pp, + netmos_9705, + netmos_9805, + netmos_9815, + netmos_9855, }; @@ -2768,6 +2772,10 @@ static struct parport_pc_pci { /* oxsemi_840 */ { 1, { { 0, -1 }, } }, /* aks_0100 */ { 1, { { 0, -1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } }, + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ }; static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { @@ -2836,6 +2844,15 @@ static struct pci_device_id parport_pc_p PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, + /* NetMos communication controllers */ + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, { 0, } /* terminate list */ }; MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c~ linux-2.4.27-pre5/drivers/parport/parport_pc.c~ --- linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c~ 2004-06-13 20:51:24.000000000 +0200 +++ linux-2.4.27-pre5/drivers/parport/parport_pc.c~ 2004-06-13 20:53:59.000000000 +0200 @@ -2699,10 +2699,6 @@ enum parport_pc_pci_cards { oxsemi_840, aks_0100, mobility_pp, - netmos_9705, - netmos_9805, - netmos_9815, - netmos_9855, }; @@ -2772,10 +2768,6 @@ static struct parport_pc_pci { /* oxsemi_840 */ { 1, { { 0, -1 }, } }, /* aks_0100 */ { 1, { { 0, -1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } }, - /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ - /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ - /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ - /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ }; static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { @@ -2844,15 +2836,6 @@ static struct pci_device_id parport_pc_p PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, - /* NetMos communication controllers */ - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, { 0, } /* terminate list */ }; MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); diff -urpN linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h linux-2.4.27-pre5/include/linux/pci_ids.h --- linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h 2004-06-13 20:53:59.000000000 +0200 +++ linux-2.4.27-pre5/include/linux/pci_ids.h 2004-06-13 20:55:57.000000000 +0200 @@ -1996,8 +1996,12 @@ #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 #define PCI_VENDOR_ID_NETMOS 0x9710 +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 #define PCI_DEVICE_ID_NETMOS_9735 0x9735 +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 #define PCI_DEVICE_ID_NETMOS_9835 0x9835 +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 diff -urpN linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h~ linux-2.4.27-pre5/include/linux/pci_ids.h~ --- linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h~ 2004-06-13 20:51:24.000000000 +0200 +++ linux-2.4.27-pre5/include/linux/pci_ids.h~ 2004-06-13 20:53:59.000000000 +0200 @@ -1996,12 +1996,8 @@ #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 #define PCI_VENDOR_ID_NETMOS 0x9710 -#define PCI_DEVICE_ID_NETMOS_9705 0x9705 #define PCI_DEVICE_ID_NETMOS_9735 0x9735 -#define PCI_DEVICE_ID_NETMOS_9805 0x9805 -#define PCI_DEVICE_ID_NETMOS_9815 0x9815 #define PCI_DEVICE_ID_NETMOS_9835 0x9835 -#define PCI_DEVICE_ID_NETMOS_9855 0x9855 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 -- Jesper Juhl <juhl-lkml@dif.dk> ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-13 19:15 ` Jesper Juhl @ 2004-06-13 19:24 ` Jesper Juhl 0 siblings, 0 replies; 19+ messages in thread From: Jesper Juhl @ 2004-06-13 19:24 UTC (permalink / raw) To: linux-kernel; +Cc: Willy Tarreau, Ryan Underwood, Tim Waugh, dh Whoops, seems I left a backup a few backup files in there before I did the diff - very sory about that. Please disregard all parts of the patches relating to "anyfilename~" Embaressing :-( I've removed the bits in the quote below. On Sun, 13 Jun 2004, Jesper Juhl wrote: > On Sun, 13 Jun 2004, Willy Tarreau wrote: > > > Hi, > > > > I bet you won't have any luck to see it included in anywhere if you > > expect kernel maintainers to launch a web browser, find it on your > > site, and possibly merge it by hand. You could make things easier to > > them by updating the patch to 2.4.27-bk and post it right here. > > > > Cheers, > > Willy > > > > On Sun, Jun 13, 2004 at 06:19:49AM -0500, Ryan Underwood wrote: > > > > > > Hi, > > > > > > There's been a patch floating around for a while now to add Netmos > > > support to parport_serial. It has been submitted numerous times but it > > > seems that nobody notices it. :) > > > > > > Can it be reviewed for inclusion before 2.4.27? I have a few systems > > > with these cards and it would be very nice to have them up to snuff. > > > > > > The patch against 2.4.20 can be found here: > > > http://winterwolf.co.uk/linuxsw > > > > > > -- > > > Ryan Underwood, <nemesis@icequake.net> > > > > Just to see if I could do it I downloaded the two patches in question from > here: > http://winterwolf.co.uk/software/linux/netmos/00_parport_serial.patch > http://winterwolf.co.uk/software/linux/netmos/01_netmos.patch > and then attempted to update them to apply cleanly against 2.4.27-pre5. > You can find the result of my efforts below. > Please note that I do not have the hardware, so the only testing I've done > is check that they still compile. My knowledge of this code is also > extremely limited (did this mainly as a learning experience to find out > how to deal with patch reject files and such) so please someone review what > I've done and be very suspicious of any changes since I'm way out of my > league here... I modified one of the changelog entries to current date, > not sure if that's right or if it should just be left at the original date > (I thought current date since now is the time the updated patch is made) > > Anyway, just trying to help here, so I hope this is of use to somebody and > that I didn't make too much of a mess of things :) > > > Kind regards, > Jesper Juhl <juhl-lkml@dif.dk> > > > Updated version of the 00_parport_serial.patch : > > diff -urpN linux-2.4.27-pre5-orig/drivers/char/ChangeLog linux-2.4.27-pre5/drivers/char/ChangeLog > --- linux-2.4.27-pre5-orig/drivers/char/ChangeLog 2002-11-29 00:53:12.000000000 +0100 > +++ linux-2.4.27-pre5/drivers/char/ChangeLog 2004-06-13 20:33:53.000000000 +0200 > @@ -1,3 +1,8 @@ > +2002-09-21 Marek Michalkiewicz <marekm@amelek.gda.pl> > + > + * parport_serial.c: Move from ../parport/ here, must be initialised > + after serial.c for register_serial to work. > + > 2001-08-11 Tim Waugh <twaugh@redhat.com> > > * serial.c (get_pci_port): Deal with awkward Titan cards. > diff -urpN linux-2.4.27-pre5-orig/drivers/char/Makefile > linux-2.4.27-pre5/drivers/char/Makefile > --- linux-2.4.27-pre5-orig/drivers/char/Makefile 2004-02-18 14:36:31.000000000 +0100 > +++ linux-2.4.27-pre5/drivers/char/Makefile 2004-06-13 20:33:53.000000000 +0200 > @@ -171,6 +171,7 @@ endif > > obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o > obj-$(CONFIG_SERIAL) += $(SERIAL) > +obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o > obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o > obj-$(CONFIG_SERIAL_21285) += serial_21285.o > obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o > diff -urpN linux-2.4.27-pre5-orig/drivers/char/parport_serial.c linux-2.4.27-pre5/drivers/char/parport_serial.c > --- linux-2.4.27-pre5-orig/drivers/char/parport_serial.c 1970-01-01 01:00:00.000000000 +0100 > +++ linux-2.4.27-pre5/drivers/char/parport_serial.c 2004-06-13 20:33:53.000000000 +0200 > @@ -0,0 +1,426 @@ > +/* > + * Support for common PCI multi-I/O cards (which is most of them) > + * > + * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version > + * 2 of the License, or (at your option) any later version. > + * > + * > + * Multi-function PCI cards are supposed to present separate logical > + * devices on the bus. A common thing to do seems to be to just use > + * one logical device with lots of base address registers for both > + * parallel ports and serial ports. This driver is for dealing with > + * that. > + * > + */ > + > +#include <linux/types.h> > +#include <linux/module.h> > +#include <linux/init.h> > +#include <linux/pci.h> > +#include <linux/parport.h> > +#include <linux/parport_pc.h> > +#include <linux/serial.h> > +#include <linux/serialP.h> > +#include <linux/list.h> > + > +#include <asm/serial.h> > + > +enum parport_pc_pci_cards { > + titan_110l = 0, > + titan_210l, > + avlab_1s1p, > + avlab_1s1p_650, > + avlab_1s1p_850, > + avlab_1s2p, > + avlab_1s2p_650, > + avlab_1s2p_850, > + avlab_2s1p, > + avlab_2s1p_650, > + avlab_2s1p_850, > + siig_1s1p_10x, > + siig_2s1p_10x, > + siig_2p1s_20x, > + siig_1s1p_20x, > + siig_2s1p_20x, > +}; > + > + > +/* each element directly indexed from enum list, above */ > +static struct parport_pc_pci { > + int numports; > + struct { /* BAR (base address registers) numbers in the config > + space header */ > + int lo; > + int hi; /* -1 if not there, >6 for offset-method (max > + BAR is 6) */ > + } addr[4]; > + > + /* If set, this is called immediately after pci_enable_device. > + * If it returns non-zero, no probing will take place and the > + * ports will not be used. */ > + int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); > + > + /* If set, this is called after probing for ports. If 'failed' > + * is non-zero we couldn't use any of the ports. */ > + void (*postinit_hook) (struct pci_dev *pdev, int failed); > +} cards[] __devinitdata = { > + /* titan_110l */ { 1, { { 3, -1 }, } }, > + /* titan_210l */ { 1, { { 3, -1 }, } }, > + /* avlab_1s1p */ { 1, { { 1, 2}, } }, > + /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > + /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > + /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, > + /* avlab_2s1p */ { 1, { { 2, 3}, } }, > + /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, > + /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, > + /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, > + /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, > + /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, > + /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, > + /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, > +}; > + > +static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { > + /* PCI cards */ > + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > + { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > + /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > + { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > + { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > + { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, > + { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, > + { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, > + { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, > + { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, > + { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, > + { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > + > + { 0, } /* terminate list */ > +}; > +MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); > + > +struct pci_board_no_ids { > + int flags; > + int num_ports; > + int base_baud; > + int uart_offset; > + int reg_shift; > + int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, > + int enable); > + int first_uart_offset; > +}; > + > +static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > +{ > + return pci_siig10x_fn(dev, NULL, enable); > +} > + > +static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > +{ > + return pci_siig20x_fn(dev, NULL, enable); > +} > + > +static struct pci_board_no_ids pci_boards[] __devinitdata = { > + /* > + * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, > + * Offset to get to next UART's registers, > + * Register shift to use for memory-mapped I/O, > + * Initialization function, first UART offset > + */ > + > +// Cards not tested are marked n/t > +// If you have one of these cards and it works for you, please tell me.. > + > +/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > +/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > +/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > +/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, > +/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, > +/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > +}; > + > +struct parport_serial_private { > + int num_ser; > + int line[20]; > + struct pci_board_no_ids ser; > + int num_par; > + struct parport *port[PARPORT_MAX]; > +}; > + > +static int __devinit get_pci_port (struct pci_dev *dev, > + struct pci_board_no_ids *board, > + struct serial_struct *req, > + int idx) > +{ > + unsigned long port; > + int base_idx; > + int max_port; > + int offset; > + > + base_idx = SPCI_FL_GET_BASE(board->flags); > + if (board->flags & SPCI_FL_BASE_TABLE) > + base_idx += idx; > + > + if (board->flags & SPCI_FL_REGION_SZ_CAP) { > + max_port = pci_resource_len(dev, base_idx) / 8; > + if (idx >= max_port) > + return 1; > + } > + > + offset = board->first_uart_offset; > + > + /* Timedia/SUNIX uses a mixture of BARs and offsets */ > + /* Ugh, this is ugly as all hell --- TYT */ > + if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ > + switch(idx) { > + case 0: base_idx=0; > + break; > + case 1: base_idx=0; offset=8; > + break; > + case 2: base_idx=1; > + break; > + case 3: base_idx=1; offset=8; > + break; > + case 4: /* BAR 2*/ > + case 5: /* BAR 3 */ > + case 6: /* BAR 4*/ > + case 7: base_idx=idx-2; /* BAR 5*/ > + } > + > + port = pci_resource_start(dev, base_idx) + offset; > + > + if ((board->flags & SPCI_FL_BASE_TABLE) == 0) > + port += idx * (board->uart_offset ? board->uart_offset : 8); > + > + if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { > + int high_bits_offset = ((sizeof(long)-sizeof(int))*8); > + req->port = port; > + if (high_bits_offset) > + req->port_high = port >> high_bits_offset; > + else > + req->port_high = 0; > + return 0; > + } > + req->io_type = SERIAL_IO_MEM; > + req->iomem_base = ioremap(port, board->uart_offset); > + req->iomem_reg_shift = board->reg_shift; > + req->port = 0; > + return req->iomem_base ? 0 : 1; > +} > + > +/* Register the serial port(s) of a PCI card. */ > +static int __devinit serial_register (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct pci_board_no_ids *board = &pci_boards[id->driver_data]; > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + struct serial_struct serial_req; > + int base_baud; > + int k; > + int success = 0; > + > + priv->ser = *board; > + if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) > + return 1; > + > + base_baud = board->base_baud; > + if (!base_baud) > + base_baud = BASE_BAUD; > + memset (&serial_req, 0, sizeof (serial_req)); > + > + for (k = 0; k < board->num_ports; k++) { > + int line; > + serial_req.irq = dev->irq; > + if (get_pci_port (dev, board, &serial_req, k)) > + break; > + serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; > + serial_req.baud_base = base_baud; > + line = register_serial (&serial_req); > + if (line < 0) { > + printk (KERN_DEBUG > + "parport_serial: register_serial failed\n"); > + continue; > + } > + priv->line[priv->num_ser++] = line; > + success = 1; > + } > + > + return success ? 0 : 1; > +} > + > +/* Register the parallel port(s) of a PCI card. */ > +static int __devinit parport_register (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + int i = id->driver_data, n; > + int success = 0; > + > + if (cards[i].preinit_hook && > + cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) > + return -ENODEV; > + > + for (n = 0; n < cards[i].numports; n++) { > + struct parport *port; > + int lo = cards[i].addr[n].lo; > + int hi = cards[i].addr[n].hi; > + unsigned long io_lo, io_hi; > + io_lo = pci_resource_start (dev, lo); > + io_hi = 0; > + if ((hi >= 0) && (hi <= 6)) > + io_hi = pci_resource_start (dev, hi); > + else if (hi > 6) > + io_lo += hi; /* Reinterpret the meaning of > + "hi" as an offset (see SYBA > + def.) */ > + /* TODO: test if sharing interrupts works */ > + printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " > + "I/O at %#lx(%#lx)\n", > + parport_serial_pci_tbl[i].vendor, > + parport_serial_pci_tbl[i].device, io_lo, io_hi); > + port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, > + PARPORT_DMA_NONE, dev); > + if (port) { > + priv->port[priv->num_par++] = port; > + success = 1; > + } > + } > + > + if (cards[i].postinit_hook) > + cards[i].postinit_hook (dev, !success); > + > + return success ? 0 : 1; > +} > + > +static int __devinit parport_serial_pci_probe (struct pci_dev *dev, > + const struct pci_device_id *id) > +{ > + struct parport_serial_private *priv; > + int err; > + > + priv = kmalloc (sizeof *priv, GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + priv->num_ser = priv->num_par = 0; > + pci_set_drvdata (dev, priv); > + > + err = pci_enable_device (dev); > + if (err) { > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return err; > + } > + > + if (parport_register (dev, id)) { > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return -ENODEV; > + } > + > + if (serial_register (dev, id)) { > + int i; > + for (i = 0; i < priv->num_par; i++) > + parport_pc_unregister_port (priv->port[i]); > + pci_set_drvdata (dev, NULL); > + kfree (priv); > + return -ENODEV; > + } > + > + return 0; > +} > + > +static void __devexit parport_serial_pci_remove (struct pci_dev *dev) > +{ > + struct parport_serial_private *priv = pci_get_drvdata (dev); > + int i; > + > + // Serial ports > + for (i = 0; i < priv->num_ser; i++) { > + unregister_serial (priv->line[i]); > + > + if (priv->ser.init_fn) > + (priv->ser.init_fn) (dev, &priv->ser, 0); > + } > + pci_set_drvdata (dev, NULL); > + > + // Parallel ports > + for (i = 0; i < priv->num_par; i++) > + parport_pc_unregister_port (priv->port[i]); > + > + kfree (priv); > + return; > +} > + > +static struct pci_driver parport_serial_pci_driver = { > + name: "parport_serial", > + id_table: parport_serial_pci_tbl, > + probe: parport_serial_pci_probe, > + remove: __devexit_p(parport_serial_pci_remove), > +}; > + > + > +static int __init parport_serial_init (void) > +{ > + return pci_module_init (&parport_serial_pci_driver); > +} > + > +static void __exit parport_serial_exit (void) > +{ > + pci_unregister_driver (&parport_serial_pci_driver); > + return; > +} > + > +MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); > +MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); > +MODULE_LICENSE("GPL"); > + > +module_init(parport_serial_init); > +module_exit(parport_serial_exit); > diff -urpN linux-2.4.27-pre5-orig/drivers/parport/ChangeLog linux-2.4.27-pre5/drivers/parport/ChangeLog > --- linux-2.4.27-pre5-orig/drivers/parport/ChangeLog 2003-06-13 16:51:35.000000000 +0200 > +++ linux-2.4.27-pre5/drivers/parport/ChangeLog 2004-06-13 20:42:02.000000000 +0200 > @@ -1,3 +1,8 @@ > +2004-06-13 Marek Michalkiewicz <marekm@amelek.gda.pl> > + > + * parport_serial.c: Move from here to ../char/, must be initialised > + after serial.c for register_serial to work. > + > 2002-11-29 Tim Waugh <twaugh@redhat.com> > > * parport_pc.c: Fix ECP hang on Aladdin card. > diff -urpN linux-2.4.27-pre5-orig/drivers/parport/Makefile linux-2.4.27-pre5/drivers/parport/Makefile > --- linux-2.4.27-pre5-orig/drivers/parport/Makefile 2004-02-18 14:36:31.000000000 +0100 > +++ linux-2.4.27-pre5/drivers/parport/Makefile 2004-06-13 20:43:13.000000000 +0200 > @@ -22,7 +22,6 @@ endif > > obj-$(CONFIG_PARPORT) += parport.o > obj-$(CONFIG_PARPORT_PC) += parport_pc.o > -obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o > obj-$(CONFIG_PARPORT_PC_PCMCIA) += parport_cs.o > obj-$(CONFIG_PARPORT_AMIGA) += parport_amiga.o > obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o > diff -urpN linux-2.4.27-pre5-orig/drivers/parport/parport_serial.c linux-2.4.27-pre5/drivers/parport/parport_serial.c > --- linux-2.4.27-pre5-orig/drivers/parport/parport_serial.c 2002-08-03 02:39:44.000000000 +0200 > +++ linux-2.4.27-pre5/drivers/parport/parport_serial.c 1970-01-01 01:00:00.000000000 +0100 > @@ -1,426 +0,0 @@ > -/* > - * Support for common PCI multi-I/O cards (which is most of them) > - * > - * Copyright (C) 2001 Tim Waugh <twaugh@redhat.com> > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > - * > - * > - * Multi-function PCI cards are supposed to present separate logical > - * devices on the bus. A common thing to do seems to be to just use > - * one logical device with lots of base address registers for both > - * parallel ports and serial ports. This driver is for dealing with > - * that. > - * > - */ > - > -#include <linux/types.h> > -#include <linux/module.h> > -#include <linux/init.h> > -#include <linux/pci.h> > -#include <linux/parport.h> > -#include <linux/parport_pc.h> > -#include <linux/serial.h> > -#include <linux/serialP.h> > -#include <linux/list.h> > - > -#include <asm/serial.h> > - > -enum parport_pc_pci_cards { > - titan_110l = 0, > - titan_210l, > - avlab_1s1p, > - avlab_1s1p_650, > - avlab_1s1p_850, > - avlab_1s2p, > - avlab_1s2p_650, > - avlab_1s2p_850, > - avlab_2s1p, > - avlab_2s1p_650, > - avlab_2s1p_850, > - siig_1s1p_10x, > - siig_2s1p_10x, > - siig_2p1s_20x, > - siig_1s1p_20x, > - siig_2s1p_20x, > -}; > - > - > -/* each element directly indexed from enum list, above */ > -static struct parport_pc_pci { > - int numports; > - struct { /* BAR (base address registers) numbers in the config > - space header */ > - int lo; > - int hi; /* -1 if not there, >6 for offset-method (max > - BAR is 6) */ > - } addr[4]; > - > - /* If set, this is called immediately after pci_enable_device. > - * If it returns non-zero, no probing will take place and the > - * ports will not be used. */ > - int (*preinit_hook) (struct pci_dev *pdev, int autoirq, int autodma); > - > - /* If set, this is called after probing for ports. If 'failed' > - * is non-zero we couldn't use any of the ports. */ > - void (*postinit_hook) (struct pci_dev *pdev, int failed); > -} cards[] __devinitdata = { > - /* titan_110l */ { 1, { { 3, -1 }, } }, > - /* titan_210l */ { 1, { { 3, -1 }, } }, > - /* avlab_1s1p */ { 1, { { 1, 2}, } }, > - /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > - /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > - /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} }, > - /* avlab_2s1p */ { 1, { { 2, 3}, } }, > - /* avlab_2s1p_650 */ { 1, { { 2, 3}, } }, > - /* avlab_2s1p_850 */ { 1, { { 2, 3}, } }, > - /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, > - /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, > - /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, > - /* siig_1s1p_20x */ { 1, { { 1, 2 }, } }, > - /* siig_2s1p_20x */ { 1, { { 2, 3 }, } }, > -}; > - > -static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = { > - /* PCI cards */ > - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > - { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > - /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > - { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > - { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > - { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, > - { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, > - { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, > - { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, > - { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, > - { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, > - { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850, > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x }, > - > - { 0, } /* terminate list */ > -}; > -MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl); > - > -struct pci_board_no_ids { > - int flags; > - int num_ports; > - int base_baud; > - int uart_offset; > - int reg_shift; > - int (*init_fn)(struct pci_dev *dev, struct pci_board_no_ids *board, > - int enable); > - int first_uart_offset; > -}; > - > -static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > -{ > - return pci_siig10x_fn(dev, NULL, enable); > -} > - > -static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable) > -{ > - return pci_siig20x_fn(dev, NULL, enable); > -} > - > -static struct pci_board_no_ids pci_boards[] __devinitdata = { > - /* > - * PCI Flags, Number of Ports, Base (Maximum) Baud Rate, > - * Offset to get to next UART's registers, > - * Register shift to use for memory-mapped I/O, > - * Initialization function, first UART offset > - */ > - > -// Cards not tested are marked n/t > -// If you have one of these cards and it works for you, please tell me.. > - > -/* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > -/* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > -/* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_1s2p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > -/* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > -/* siig_1s1p_10x */ { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn }, > -/* siig_2s1p_10x */ { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn }, > -/* siig_2p1s_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -/* siig_1s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -/* siig_2s1p_20x */ { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn }, > -}; > - > -struct parport_serial_private { > - int num_ser; > - int line[20]; > - struct pci_board_no_ids ser; > - int num_par; > - struct parport *port[PARPORT_MAX]; > -}; > - > -static int __devinit get_pci_port (struct pci_dev *dev, > - struct pci_board_no_ids *board, > - struct serial_struct *req, > - int idx) > -{ > - unsigned long port; > - int base_idx; > - int max_port; > - int offset; > - > - base_idx = SPCI_FL_GET_BASE(board->flags); > - if (board->flags & SPCI_FL_BASE_TABLE) > - base_idx += idx; > - > - if (board->flags & SPCI_FL_REGION_SZ_CAP) { > - max_port = pci_resource_len(dev, base_idx) / 8; > - if (idx >= max_port) > - return 1; > - } > - > - offset = board->first_uart_offset; > - > - /* Timedia/SUNIX uses a mixture of BARs and offsets */ > - /* Ugh, this is ugly as all hell --- TYT */ > - if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */ > - switch(idx) { > - case 0: base_idx=0; > - break; > - case 1: base_idx=0; offset=8; > - break; > - case 2: base_idx=1; > - break; > - case 3: base_idx=1; offset=8; > - break; > - case 4: /* BAR 2*/ > - case 5: /* BAR 3 */ > - case 6: /* BAR 4*/ > - case 7: base_idx=idx-2; /* BAR 5*/ > - } > - > - port = pci_resource_start(dev, base_idx) + offset; > - > - if ((board->flags & SPCI_FL_BASE_TABLE) == 0) > - port += idx * (board->uart_offset ? board->uart_offset : 8); > - > - if (pci_resource_flags (dev, base_idx) & IORESOURCE_IO) { > - int high_bits_offset = ((sizeof(long)-sizeof(int))*8); > - req->port = port; > - if (high_bits_offset) > - req->port_high = port >> high_bits_offset; > - else > - req->port_high = 0; > - return 0; > - } > - req->io_type = SERIAL_IO_MEM; > - req->iomem_base = ioremap(port, board->uart_offset); > - req->iomem_reg_shift = board->reg_shift; > - req->port = 0; > - return req->iomem_base ? 0 : 1; > -} > - > -/* Register the serial port(s) of a PCI card. */ > -static int __devinit serial_register (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct pci_board_no_ids *board = &pci_boards[id->driver_data]; > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - struct serial_struct serial_req; > - int base_baud; > - int k; > - int success = 0; > - > - priv->ser = *board; > - if (board->init_fn && ((board->init_fn) (dev, board, 1) != 0)) > - return 1; > - > - base_baud = board->base_baud; > - if (!base_baud) > - base_baud = BASE_BAUD; > - memset (&serial_req, 0, sizeof (serial_req)); > - > - for (k = 0; k < board->num_ports; k++) { > - int line; > - serial_req.irq = dev->irq; > - if (get_pci_port (dev, board, &serial_req, k)) > - break; > - serial_req.flags = ASYNC_SKIP_TEST | ASYNC_AUTOPROBE; > - serial_req.baud_base = base_baud; > - line = register_serial (&serial_req); > - if (line < 0) { > - printk (KERN_DEBUG > - "parport_serial: register_serial failed\n"); > - continue; > - } > - priv->line[priv->num_ser++] = line; > - success = 1; > - } > - > - return success ? 0 : 1; > -} > - > -/* Register the parallel port(s) of a PCI card. */ > -static int __devinit parport_register (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - int i = id->driver_data, n; > - int success = 0; > - > - if (cards[i].preinit_hook && > - cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) > - return -ENODEV; > - > - for (n = 0; n < cards[i].numports; n++) { > - struct parport *port; > - int lo = cards[i].addr[n].lo; > - int hi = cards[i].addr[n].hi; > - unsigned long io_lo, io_hi; > - io_lo = pci_resource_start (dev, lo); > - io_hi = 0; > - if ((hi >= 0) && (hi <= 6)) > - io_hi = pci_resource_start (dev, hi); > - else if (hi > 6) > - io_lo += hi; /* Reinterpret the meaning of > - "hi" as an offset (see SYBA > - def.) */ > - /* TODO: test if sharing interrupts works */ > - printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " > - "I/O at %#lx(%#lx)\n", > - parport_serial_pci_tbl[i].vendor, > - parport_serial_pci_tbl[i].device, io_lo, io_hi); > - port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, > - PARPORT_DMA_NONE, dev); > - if (port) { > - priv->port[priv->num_par++] = port; > - success = 1; > - } > - } > - > - if (cards[i].postinit_hook) > - cards[i].postinit_hook (dev, !success); > - > - return success ? 0 : 1; > -} > - > -static int __devinit parport_serial_pci_probe (struct pci_dev *dev, > - const struct pci_device_id *id) > -{ > - struct parport_serial_private *priv; > - int err; > - > - priv = kmalloc (sizeof *priv, GFP_KERNEL); > - if (!priv) > - return -ENOMEM; > - priv->num_ser = priv->num_par = 0; > - pci_set_drvdata (dev, priv); > - > - err = pci_enable_device (dev); > - if (err) { > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return err; > - } > - > - if (parport_register (dev, id)) { > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return -ENODEV; > - } > - > - if (serial_register (dev, id)) { > - int i; > - for (i = 0; i < priv->num_par; i++) > - parport_pc_unregister_port (priv->port[i]); > - pci_set_drvdata (dev, NULL); > - kfree (priv); > - return -ENODEV; > - } > - > - return 0; > -} > - > -static void __devexit parport_serial_pci_remove (struct pci_dev *dev) > -{ > - struct parport_serial_private *priv = pci_get_drvdata (dev); > - int i; > - > - // Serial ports > - for (i = 0; i < priv->num_ser; i++) { > - unregister_serial (priv->line[i]); > - > - if (priv->ser.init_fn) > - (priv->ser.init_fn) (dev, &priv->ser, 0); > - } > - pci_set_drvdata (dev, NULL); > - > - // Parallel ports > - for (i = 0; i < priv->num_par; i++) > - parport_pc_unregister_port (priv->port[i]); > - > - kfree (priv); > - return; > -} > - > -static struct pci_driver parport_serial_pci_driver = { > - name: "parport_serial", > - id_table: parport_serial_pci_tbl, > - probe: parport_serial_pci_probe, > - remove: __devexit_p(parport_serial_pci_remove), > -}; > - > - > -static int __init parport_serial_init (void) > -{ > - return pci_module_init (&parport_serial_pci_driver); > -} > - > -static void __exit parport_serial_exit (void) > -{ > - pci_unregister_driver (&parport_serial_pci_driver); > - return; > -} > - > -MODULE_AUTHOR("Tim Waugh <twaugh@redhat.com>"); > -MODULE_DESCRIPTION("Driver for common parallel+serial multi-I/O PCI cards"); > -MODULE_LICENSE("GPL"); > - > -module_init(parport_serial_init); > -module_exit(parport_serial_exit); > > > Updated version of the 01_netmos.patch : > > diff -urpN linux-2.4.27-pre5+parport_serial/drivers/char/parport_serial.c linux-2.4.27-pre5/drivers/char/parport_serial.c > --- linux-2.4.27-pre5+parport_serial/drivers/char/parport_serial.c 2004-06-13 20:53:59.000000000 +0200 > +++ linux-2.4.27-pre5/drivers/char/parport_serial.c 2004-06-13 20:55:57.000000000 +0200 > @@ -32,6 +32,8 @@ > enum parport_pc_pci_cards { > titan_110l = 0, > titan_210l, > + netmos_9735, > + netmos_9835, > avlab_1s1p, > avlab_1s1p_650, > avlab_1s1p_850, > @@ -70,6 +72,8 @@ static struct parport_pc_pci { > } cards[] __devinitdata = { > /* titan_110l */ { 1, { { 3, -1 }, } }, > /* titan_210l */ { 1, { { 3, -1 }, } }, > + /* netmos_9735 (not tested) */ { 1, { { 2, -1 }, } }, > + /* netmos_9835 */ { 1, { { 2, -1 }, } }, > /* avlab_1s1p */ { 1, { { 1, 2}, } }, > /* avlab_1s1p_650 */ { 1, { { 1, 2}, } }, > /* avlab_1s1p_850 */ { 1, { { 1, 2}, } }, > @@ -92,6 +96,10 @@ static struct pci_device_id parport_seri > PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l }, > { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L, > PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 }, > /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ > { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, > { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, > @@ -171,6 +179,8 @@ static struct pci_board_no_ids pci_board > > /* titan_110l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 }, > /* titan_210l */ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, > +/* netmos_9735 (n/t)*/ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > +/* netmos_9835 */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 }, > /* avlab_1s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 }, > diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog linux-2.4.27-pre5/drivers/parport/ChangeLog > --- linux-2.4.27-pre5+parport_serial/drivers/parport/ChangeLog 2004-06-13 20:53:59.000000000 +0200 > +++ linux-2.4.27-pre5/drivers/parport/ChangeLog 2004-06-13 20:55:57.000000000 +0200 > @@ -7,6 +7,10 @@ > > * parport_pc.c: Fix ECP hang on Aladdin card. > > + 2001-10-11 Tim Waugh <twaugh@redhat.com> > + * parport_pc.c, parport_serial.c: Support for NetMos cards. > + Patch originally from Michael Reinelt <reinelt@eunet.at>. > + > 2002-04-25 Tim Waugh <twaugh@redhat.com> > > * parport_serial.c, parport_pc.c: Move some SIIG cards around. > diff -urpN linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c linux-2.4.27-pre5/drivers/parport/parport_pc.c > --- linux-2.4.27-pre5+parport_serial/drivers/parport/parport_pc.c 2004-06-13 20:53:59.000000000 +0200 > +++ linux-2.4.27-pre5/drivers/parport/parport_pc.c 2004-06-13 20:55:57.000000000 +0200 > @@ -2699,6 +2699,10 @@ enum parport_pc_pci_cards { > oxsemi_840, > aks_0100, > mobility_pp, > + netmos_9705, > + netmos_9805, > + netmos_9815, > + netmos_9855, > }; > > > @@ -2768,6 +2772,10 @@ static struct parport_pc_pci { > /* oxsemi_840 */ { 1, { { 0, -1 }, } }, > /* aks_0100 */ { 1, { { 0, -1 }, } }, > /* mobility_pp */ { 1, { { 0, 1 }, } }, > + /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ > + /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ > + /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ > + /* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ > }; > > static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = { > @@ -2836,6 +2844,15 @@ static struct pci_device_id parport_pc_p > PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, > { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, > PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, > + /* NetMos communication controllers */ > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, > + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, > + PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, > { 0, } /* terminate list */ > }; > MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); > diff -urpN linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h linux-2.4.27-pre5/include/linux/pci_ids.h > --- linux-2.4.27-pre5+parport_serial/include/linux/pci_ids.h 2004-06-13 20:53:59.000000000 +0200 > +++ linux-2.4.27-pre5/include/linux/pci_ids.h 2004-06-13 20:55:57.000000000 +0200 > @@ -1996,8 +1996,12 @@ > #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 > > #define PCI_VENDOR_ID_NETMOS 0x9710 > +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 > #define PCI_DEVICE_ID_NETMOS_9735 0x9735 > +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 > +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 > #define PCI_DEVICE_ID_NETMOS_9835 0x9835 > +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 > > #define PCI_SUBVENDOR_ID_EXSYS 0xd84d > #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 -- Jesper Juhl <juhl-lkml@dif.dk> ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <20040613171701.1750.70973.Mailman@linux.us.dell.com>]
* Re: Request: Netmos support in parport_serial for 2.4.27 [not found] <20040613171701.1750.70973.Mailman@linux.us.dell.com> @ 2004-06-14 4:44 ` Ryan Underwood 2004-06-15 14:06 ` Marcelo Tosatti 0 siblings, 1 reply; 19+ messages in thread From: Ryan Underwood @ 2004-06-14 4:44 UTC (permalink / raw) To: linux-kernel [-- Attachment #1: Type: text/plain, Size: 693 bytes --] > Hi, > > I bet you won't have any luck to see it included in anywhere if you > expect kernel maintainers to launch a web browser, find it on your > site, and possibly merge it by hand. You could make things easier to > them by updating the patch to 2.4.27-bk and post it right here. > > Cheers, > Willy It's not my patch or my site. I also wasn't the one who made previous requests for it. However, I have noticed that multiple requests for inclusion were ignored without any reason, so I figured it was just lost in the shadow of more important things till now. It has already been included in 2.6 for a long time, btw. -- Ryan Underwood, <nemesis@icequake.net> [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-14 4:44 ` Ryan Underwood @ 2004-06-15 14:06 ` Marcelo Tosatti 2004-06-16 11:50 ` Ryan Underwood 0 siblings, 1 reply; 19+ messages in thread From: Marcelo Tosatti @ 2004-06-15 14:06 UTC (permalink / raw) To: linux-kernel; +Cc: Ryan Underwood On Sun, Jun 13, 2004 at 11:44:33PM -0500, Ryan Underwood wrote: > > > Hi, > > > > I bet you won't have any luck to see it included in anywhere if you > > expect kernel maintainers to launch a web browser, find it on your > > site, and possibly merge it by hand. You could make things easier to > > them by updating the patch to 2.4.27-bk and post it right here. > > > > Cheers, > > Willy > > It's not my patch or my site. I also wasn't the one who made previous > requests for it. However, I have noticed that multiple requests for > inclusion were ignored without any reason, so I figured it was just lost > in the shadow of more important things till now. It has already been > included in 2.6 for a long time, btw. Ryan, Dont get Willy wrong -- your help bugging the maintainers is much appreciated. Are you sure it has been included in v2.6? It doesnt seem to be the case last time I checked v2.6.7-rc3. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Request: Netmos support in parport_serial for 2.4.27 2004-06-15 14:06 ` Marcelo Tosatti @ 2004-06-16 11:50 ` Ryan Underwood [not found] ` <20040616172421.GD8703@logos.cnet> 0 siblings, 1 reply; 19+ messages in thread From: Ryan Underwood @ 2004-06-16 11:50 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel, Ryan Underwood [-- Attachment #1: Type: text/plain, Size: 852 bytes --] On Tue, Jun 15, 2004 at 11:06:59AM -0300, Marcelo Tosatti wrote: > > > Willy > > > > It's not my patch or my site. I also wasn't the one who made previous > > requests for it. However, I have noticed that multiple requests for > > inclusion were ignored without any reason, so I figured it was just lost > > in the shadow of more important things till now. It has already been > > included in 2.6 for a long time, btw. > > Ryan, > > Dont get Willy wrong -- your help bugging the maintainers is much appreciated. > > Are you sure it has been included in v2.6? It doesnt seem to be the case last > time I checked v2.6.7-rc3. No, I don't think it has. I remember seeing a patch from Tim Waugh which made me think it had been included, but I guess not, from examining 2.6.7-rc3. -- Ryan Underwood, <nemesis@icequake.net> [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <20040616172421.GD8703@logos.cnet>]
* Re: Request: Netmos support in parport_serial for 2.4.27 [not found] ` <20040616172421.GD8703@logos.cnet> @ 2004-06-17 2:33 ` Ryan Underwood 0 siblings, 0 replies; 19+ messages in thread From: Ryan Underwood @ 2004-06-17 2:33 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel [-- Attachment #1.1: Type: text/plain, Size: 1974 bytes --] The Netmos patch is working fine on my Netmos 9815 as far as I can tell. I also attached a patch which addresses some things: 1) Wrong reporting of device and vendors ids.. I have no clue what the original code was even trying to do 2) Allows PCI parallel port to share an IRQ if possible. In limited testing this seems to be ok, but maybe the interrupt handler was not written for sharing. Someone else will need to ok this. 3) Adds a prod to get the user to specify an irq if one was probed but none specified, so if DMA is not being enabled, there is an outward looking cause for it. 4) Documentation clarification for Documentation/parport.txt Ryan On Wed, Jun 16, 2004 at 02:24:22PM -0300, Marcelo Tosatti wrote: > > Ryan, > > I'm going to release 2.4.27-pre6 in an hour or so with the NetMos patch included. > > Can you please test it with your card? > > TI > > > On Wed, Jun 16, 2004 at 06:50:31AM -0500, Ryan Underwood wrote: > > > > On Tue, Jun 15, 2004 at 11:06:59AM -0300, Marcelo Tosatti wrote: > > > > > Willy > > > > > > > > It's not my patch or my site. I also wasn't the one who made previous > > > > requests for it. However, I have noticed that multiple requests for > > > > inclusion were ignored without any reason, so I figured it was just lost > > > > in the shadow of more important things till now. It has already been > > > > included in 2.6 for a long time, btw. > > > > > > Ryan, > > > > > > Dont get Willy wrong -- your help bugging the maintainers is much appreciated. > > > > > > Are you sure it has been included in v2.6? It doesnt seem to be the case last > > > time I checked v2.6.7-rc3. > > > > No, I don't think it has. I remember seeing a patch from Tim Waugh > > which made me think it had been included, but I guess not, from > > examining 2.6.7-rc3. > > > > -- > > Ryan Underwood, <nemesis@icequake.net> > > -- Ryan Underwood, <nemesis@icequake.net> [-- Attachment #1.2: parport.diff --] [-- Type: text/plain, Size: 2594 bytes --] --- /tmp/linux-2.4.26/drivers/char/parport_serial.c 2004-06-16 19:56:18.000000000 -0500 +++ drivers/char/parport_serial.c 2004-06-16 20:12:59.000000000 -0500 @@ -334,9 +334,9 @@ /* TODO: test if sharing interrupts works */ printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " "I/O at %#lx(%#lx)\n", - parport_serial_pci_tbl[i].vendor, - parport_serial_pci_tbl[i].device, io_lo, io_hi); - port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, + dev->vendor, + dev->device, io_lo, io_hi); + port = parport_pc_probe_port (io_lo, io_hi, dev->irq, PARPORT_DMA_NONE, dev); if (port) { priv->port[priv->num_par++] = port; --- /tmp/linux-2.4.26/drivers/parport/parport_pc.c 2004-06-16 19:56:19.000000000 -0500 +++ drivers/parport/parport_pc.c 2004-06-16 21:20:09.000000000 -0500 @@ -2343,8 +2343,9 @@ printk ("(,...)"); #endif /* CONFIG_PARPORT_1284 */ printk("]\n"); - if (probedirq != PARPORT_IRQ_NONE) - printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq); + if (probedirq != PARPORT_IRQ_NONE) { + printk(KERN_INFO "%s: irq %d ignored (try irq=auto or irq=%d)\n", p->name, probedirq, probedirq); + } parport_proc_register(p); request_region (p->base, 3, p->name); @@ -2355,7 +2356,7 @@ if (p->irq != PARPORT_IRQ_NONE) { if (request_irq (p->irq, parport_pc_interrupt, - 0, p->name, p)) { + ((dev != NULL)? SA_SHIRQ : 0), p->name, p)) { printk (KERN_WARNING "%s: irq %d in use, " "resorting to polled operation\n", p->name, p->irq); @@ -2890,9 +2891,9 @@ /* TODO: test if sharing interrupts works */ printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " "I/O at %#lx(%#lx)\n", - parport_pc_pci_tbl[i + last_sio].vendor, - parport_pc_pci_tbl[i + last_sio].device, io_lo, io_hi); - if (parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, + dev->vendor, + dev->device, io_lo, io_hi); + if (parport_pc_probe_port (io_lo, io_hi, dev->irq, PARPORT_DMA_NONE, dev)) count++; } --- /tmp/linux-2.4.26/Documentation/parport.txt 2001-11-09 16:30:55.000000000 -0600 +++ /usr/src/linux/Documentation/parport.txt 2004-06-16 21:30:03.000000000 -0500 @@ -33,7 +33,9 @@ PCI parallel I/O card support comes from parport_pc. Base I/O addresses should not be specified for supported PCI cards since they -are automatically detected. +are automatically detected. If you have a multi PCI I/O card, try +to use the parport_serial module if parport_pc does not catch +all the ports by itself. KMod [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2004-06-21 2:09 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-13 11:19 Request: Netmos support in parport_serial for 2.4.27 Ryan Underwood
2004-06-13 12:39 ` Marcelo Tosatti
2004-06-13 20:30 ` Jesper Juhl
2004-06-13 21:04 ` Marcelo Tosatti
2004-06-13 22:07 ` Marcelo Tosatti
2004-06-14 4:10 ` Willy Tarreau
2004-06-14 4:51 ` Ryan Underwood
2004-06-14 14:59 ` Jesper Juhl
2004-06-21 1:49 ` Netmos 9835 in 2.6.x was " Marcelo Tosatti
2004-06-21 2:08 ` Andrew Morton
2004-06-14 8:20 ` Jesper Juhl
2004-06-13 13:05 ` Pavel Janík
2004-06-13 14:25 ` Willy Tarreau
2004-06-13 19:15 ` Jesper Juhl
2004-06-13 19:24 ` Jesper Juhl
[not found] <20040613171701.1750.70973.Mailman@linux.us.dell.com>
2004-06-14 4:44 ` Ryan Underwood
2004-06-15 14:06 ` Marcelo Tosatti
2004-06-16 11:50 ` Ryan Underwood
[not found] ` <20040616172421.GD8703@logos.cnet>
2004-06-17 2:33 ` Ryan Underwood
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox