Basic support for Moschip 9900 family I/O chips

Add I/O based support for serial and parallel ports of the following
chips:

Vendor: Moschip (0x9710)

Parts (device IDs)
* 9900 (0x9900)
* 9904 (0x9904
* 9901 (0x9912, also sold as 9912)
* 9922 (0x9922)

On all chips but the 9900, a single port is provided per PCI subdevice
(subvendor-ID 0xA000, subdevice-IDs 0x1000 for serial, 0x2000 for
parallel with proper class codes). In cascading configurations, the
9900 provides two devices per subdevice, with subvendor-ID 0xA000 and
subdevice-IDs 0x30ps where p is the number of parallel ports and s the
number of serial ports.

Basic testing was only done on the serial part of a 9912 to the point
where it can be used for a serial kernel console, and advanced features
are completely untested. It is possible to reduce functionality of the
chips by adding a configuration EEPROM, and the datasheet [1] is
inconsistent w.r.t subdevices in the 4s+2s1p and 2s1p+4s
configurations. The subdevice-ID 0x3012 should likely read 0x3011 with
a serial port in function 3, which would be consistent with the BAR
layouts. For now, the drivers ignore subdevices with ID 0x1000 and no
class code.

The parallel ports are integrated in parport_serial even for purely
parallel parts to reduce the footprint of the patch.

[1] http://www.moschip.com/data/products/MCS9900/MCS9900_Datasheet.pdf

Signed-off-by: Nicos Gollan <gtdev@spearhead.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 50 insertions, 16 deletions

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index f01e26440f11..342a3de6c674 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -33,6 +33,9 @@ enum parport_pc_pci_cards {
         netmos_9xx5_combo,
         netmos_9855,
         netmos_9855_2p,
+        netmos_9900,
+        netmos_9900_2p,
+        netmos_99xx_1p,
         avlab_1s1p,
         avlab_1s2p,
         avlab_2s1p,
@@ -72,22 +75,20 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc
                         dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
                         dev->subsystem_device == 0x0299)
                 return -ENODEV;
-        /*
-         * Netmos uses the subdevice ID to indicate the number of parallel
-         * and serial ports.  The form is 0x00PS, where <P> is the number of
-         * parallel ports and <S> is the number of serial ports.
-         */
-        par->numports = (dev->subsystem_device & 0xf0) >> 4;
-        if (par->numports > ARRAY_SIZE(par->addr))
-                par->numports = ARRAY_SIZE(par->addr);
-        /*
-         * This function is currently only called for cards with up to
-         * one parallel port.
-         * Parallel port BAR is either before or after serial ports BARS;
-         * hence, lo should be either 0 or equal to the number of serial ports.
-         */
-        if (par->addr[0].lo != 0)
-                par->addr[0].lo = dev->subsystem_device & 0xf;
+
+        if (dev->device == PCI_DEVICE_ID_NETMOS_9912) {
+                par->numports = 1;
+        } else {
+                /*
+                 * Netmos uses the subdevice ID to indicate the number of parallel
+                 * and serial ports.  The form is 0x00PS, where <P> is the number of
+                 * parallel ports and <S> is the number of serial ports.
+                 */
+                par->numports = (dev->subsystem_device & 0xf0) >> 4;
+                if (par->numports > ARRAY_SIZE(par->addr))
+                        par->numports = ARRAY_SIZE(par->addr);
+        }
+
         return 0;
 }
 
@@ -97,6 +98,9 @@ static struct parport_pc_pci cards[] __devinitdata = {
         /* netmos_9xx5_combo */         { 1, { { 2, -1 }, }, netmos_parallel_init },
         /* netmos_9855 */               { 1, { { 0, -1 }, }, netmos_parallel_init },
         /* netmos_9855_2p */            { 2, { { 0, -1 }, { 2, -1 }, } },
+        /* netmos_9900 */               {1, { { 3, 4 }, }, netmos_parallel_init },
+        /* netmos_9900_2p */            {2, { { 0, 1 }, { 3, 4 }, } },
+        /* netmos_99xx_1p */            {1, { { 0, 1 }, } },
         /* avlab_1s1p     */            { 1, { { 1, 2}, } },
         /* avlab_1s2p     */            { 2, { { 1, 2}, { 3, 4 },} },
         /* avlab_2s1p     */            { 1, { { 2, 3}, } },
@@ -127,6 +131,14 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
           0x1000, 0x0022, 0, 0, netmos_9855_2p },
         { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
+        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
+          0xA000, 0x3011, 0, 0, netmos_9900 },
+        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
+          0xA000, 0x3012, 0, 0, netmos_9900 },
+        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
+          0xA000, 0x3020, 0, 0, netmos_9900_2p },
+        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9912,
+          0xA000, 0x2000, 0, 0, netmos_99xx_1p },
         /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
         { PCI_VENDOR_ID_AFAVLAB, 0x2110,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
@@ -219,6 +231,24 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
+        [netmos_9900] = { /* n/t */
+                .flags          = FL_BASE0 | FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [netmos_9900_2p] = { /* parallel only */ /* n/t */
+                .flags          = FL_BASE0,
+                .num_ports      = 0,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [netmos_99xx_1p] = { /* parallel only */ /* n/t */
+                .flags          = FL_BASE0,
+                .num_ports      = 0,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
         [avlab_1s1p] = { /* n/t */
                 .flags          = FL_BASE0 | FL_BASE_BARS,
                 .num_ports      = 1,
@@ -285,6 +315,10 @@ static int __devinit serial_register (struct pci_dev *dev,
         struct serial_private *serial;
 
         board = &pci_parport_serial_boards[id->driver_data];
+
+        if (board->num_ports == 0)
+                return 0;
+
         serial = pciserial_init_ports(dev, board);
 
         if (IS_ERR(serial))