ARCNET: add support for multi interfaces on com20020
[deliverable/linux.git] / drivers / net / arcnet / com20020-pci.c
index 7bb292e59559233096fd515cb12b63e7c401cc95..fe87576bae3ce5bc00f43949106756e8376689f3 100644 (file)
@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <linux/arcdevice.h>
 #include <linux/com20020.h>
+#include <linux/list.h>
 
 #include <asm/io.h>
 
@@ -61,115 +62,301 @@ module_param(clockp, int, 0);
 module_param(clockm, int, 0);
 MODULE_LICENSE("GPL");
 
+static void com20020pci_remove(struct pci_dev *pdev);
+
 static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+       struct com20020_pci_card_info *ci;
        struct net_device *dev;
        struct arcnet_local *lp;
-       int ioaddr, err;
+       struct com20020_priv *priv;
+       int i, ioaddr, ret;
+       struct resource *r;
 
        if (pci_enable_device(pdev))
                return -EIO;
-       dev = alloc_arcdev(device);
-       if (!dev)
-               return -ENOMEM;
 
-       dev->netdev_ops = &com20020_netdev_ops;
+       priv = devm_kzalloc(&pdev->dev, sizeof(struct com20020_priv),
+                           GFP_KERNEL);
+       ci = (struct com20020_pci_card_info *)id->driver_data;
+       priv->ci = ci;
 
-       lp = netdev_priv(dev);
+       INIT_LIST_HEAD(&priv->list_dev);
 
-       pci_set_drvdata(pdev, dev);
 
-       // SOHARD needs PCI base addr 4
-       if (pdev->vendor==0x10B5) {
-               BUGMSG(D_NORMAL, "SOHARD\n");
-               ioaddr = pci_resource_start(pdev, 4);
-       }
-       else {
-               BUGMSG(D_NORMAL, "Contemporary Controls\n");
-               ioaddr = pci_resource_start(pdev, 2);
-       }
+       for (i = 0; i < ci->devcount; i++) {
+               struct com20020_pci_channel_map *cm = &ci->chan_map_tbl[i];
+               struct com20020_dev *card;
 
-       if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com20020-pci")) {
-               BUGMSG(D_INIT, "IO region %xh-%xh already allocated.\n",
-                      ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
-               err = -EBUSY;
-               goto out_dev;
-       }
+               dev = alloc_arcdev(device);
+               if (!dev) {
+                       ret = -ENOMEM;
+                       goto out_port;
+               }
 
-       // Dummy access after Reset
-       // ARCNET controller needs this access to detect bustype
-       outb(0x00,ioaddr+1);
-       inb(ioaddr+1);
-
-       dev->base_addr = ioaddr;
-       dev->irq = pdev->irq;
-       dev->dev_addr[0] = node;
-       lp->card_name = "PCI COM20020";
-       lp->card_flags = id->driver_data;
-       lp->backplane = backplane;
-       lp->clockp = clockp & 7;
-       lp->clockm = clockm & 3;
-       lp->timeout = timeout;
-       lp->hw.owner = THIS_MODULE;
-
-       if (ASTATUS() == 0xFF) {
-               BUGMSG(D_NORMAL, "IO address %Xh was reported by PCI BIOS, "
-                      "but seems empty!\n", ioaddr);
-               err = -EIO;
-               goto out_port;
-       }
-       if (com20020_check(dev)) {
-               err = -EIO;
-               goto out_port;
+               dev->netdev_ops = &com20020_netdev_ops;
+
+               lp = netdev_priv(dev);
+
+               BUGMSG(D_NORMAL, "%s Controls\n", ci->name);
+               ioaddr = pci_resource_start(pdev, cm->bar) + cm->offset;
+
+               r = devm_request_region(&pdev->dev, ioaddr, cm->size,
+                                       "com20020-pci");
+               if (!r) {
+                       pr_err("IO region %xh-%xh already allocated.\n",
+                              ioaddr, ioaddr + cm->size - 1);
+                       ret = -EBUSY;
+                       goto out_port;
+               }
+
+               /* Dummy access after Reset
+                * ARCNET controller needs
+                * this access to detect bustype
+                */
+               outb(0x00, ioaddr + 1);
+               inb(ioaddr + 1);
+
+               dev->base_addr = ioaddr;
+               dev->dev_addr[0] = node;
+               dev->irq = pdev->irq;
+               lp->card_name = "PCI COM20020";
+               lp->card_flags = ci->flags;
+               lp->backplane = backplane;
+               lp->clockp = clockp & 7;
+               lp->clockm = clockm & 3;
+               lp->timeout = timeout;
+               lp->hw.owner = THIS_MODULE;
+
+               if (ASTATUS() == 0xFF) {
+                       pr_err("IO address %Xh is empty!\n", ioaddr);
+                       ret = -EIO;
+                       goto out_port;
+               }
+               if (com20020_check(dev)) {
+                       ret = -EIO;
+                       goto out_port;
+               }
+
+               card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
+                                   GFP_KERNEL);
+               if (!card) {
+                       pr_err("%s out of memory!\n", __func__);
+                       return -ENOMEM;
+               }
+
+               card->index = i;
+               card->pci_priv = priv;
+               card->dev = dev;
+
+               dev_set_drvdata(&dev->dev, card);
+
+               ret = com20020_found(dev, IRQF_SHARED);
+               if (ret)
+                       goto out_port;
+
+               list_add(&card->list, &priv->list_dev);
        }
 
-       if ((err = com20020_found(dev, IRQF_SHARED)) != 0)
-               goto out_port;
+       pci_set_drvdata(pdev, priv);
 
        return 0;
 
 out_port:
-       release_region(ioaddr, ARCNET_TOTAL_SIZE);
-out_dev:
-       free_netdev(dev);
-       return err;
+       com20020pci_remove(pdev);
+       return ret;
 }
 
 static void com20020pci_remove(struct pci_dev *pdev)
 {
-       struct net_device *dev = pci_get_drvdata(pdev);
-       unregister_netdev(dev);
-       free_irq(dev->irq, dev);
-       release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
-       free_netdev(dev);
+       struct com20020_dev *card, *tmpcard;
+       struct com20020_priv *priv;
+
+       priv = pci_get_drvdata(pdev);
+
+       list_for_each_entry_safe(card, tmpcard, &priv->list_dev, list) {
+               struct net_device *dev = card->dev;
+
+               unregister_netdev(dev);
+               free_irq(dev->irq, dev);
+               free_netdev(dev);
+       }
 }
 
+static struct com20020_pci_card_info card_info_10mbit = {
+       .name = "ARC-PCI",
+       .devcount = 1,
+       .chan_map_tbl = {
+               { 2, 0x00, 0x08 },
+       },
+       .flags = ARC_CAN_10MBIT,
+};
+
+static struct com20020_pci_card_info card_info_5mbit = {
+       .name = "ARC-PCI",
+       .devcount = 1,
+       .chan_map_tbl = {
+               { 2, 0x00, 0x08 },
+       },
+       .flags = ARC_IS_5MBIT,
+};
+
+static struct com20020_pci_card_info card_info_sohard = {
+       .name = "PLX-PCI",
+       .devcount = 1,
+       /* SOHARD needs PCI base addr 4 */
+       .chan_map_tbl = {
+               {4, 0x00, 0x08},
+       },
+       .flags = ARC_CAN_10MBIT,
+};
+
 static const struct pci_device_id com20020pci_id_table[] = {
-       { 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0x1571, 0xa009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa00a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa00b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa00c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa00d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa00e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
-       { 0x1571, 0xa201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x1571, 0xa202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x1571, 0xa203, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x10B5, 0x9030, 0x10B5,     0x2978,     0, 0, ARC_CAN_10MBIT },
-       { 0x10B5, 0x9050, 0x10B5,     0x2273,     0, 0, ARC_CAN_10MBIT },
-       { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-       {0,}
+       {
+               0x1571, 0xa001,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0,
+       },
+       {
+               0x1571, 0xa002,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0,
+       },
+       {
+               0x1571, 0xa003,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0
+       },
+       {
+               0x1571, 0xa004,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0,
+       },
+       {
+               0x1571, 0xa005,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0
+       },
+       {
+               0x1571, 0xa006,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0
+       },
+       {
+               0x1571, 0xa007,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0
+       },
+       {
+               0x1571, 0xa008,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               0
+       },
+       {
+               0x1571, 0xa009,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa00a,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa00b,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa00c,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa00d,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa00e,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_5mbit
+       },
+       {
+               0x1571, 0xa201,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x1571, 0xa202,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x1571, 0xa203,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x1571, 0xa204,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x1571, 0xa205,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x1571, 0xa206,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x10B5, 0x9030,
+               0x10B5, 0x2978,
+               0, 0,
+               (kernel_ulong_t)&card_info_sohard
+       },
+       {
+               0x10B5, 0x9050,
+               0x10B5, 0x2273,
+               0, 0,
+               (kernel_ulong_t)&card_info_sohard
+       },
+       {
+               0x14BA, 0x6000,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       {
+               0x10B5, 0x2200,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&card_info_10mbit
+       },
+       { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, com20020pci_id_table);
This page took 0.030524 seconds and 5 git commands to generate.