Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=58936d8d944e27b75c99b1c59cfeea3f253b03cb
Commit:     58936d8d944e27b75c99b1c59cfeea3f253b03cb
Parent:     2b1da41fb3eb41fab1e27cdcce7712b61ef45186
Author:     Jiri Slaby <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:36:13 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:23 2007 -0700

    Char: cyclades, create cy_pci_probe
    
    Move probing code to separate function for easy pci probing conversion.
    
    Signed-off-by: Jiri Slaby <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/cyclades.c |  623 ++++++++++++++++++++++++-----------------------
 1 files changed, 318 insertions(+), 305 deletions(-)

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index a492327..e5de040 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4698,7 +4698,8 @@ static int __init cy_detect_isa(void)
 #endif                         /* CONFIG_ISA */
 }                              /* cy_detect_isa */
 
-static void plx_init(void __iomem * addr, __u32 initctl)
+#ifdef CONFIG_PCI
+static void __devinit plx_init(void __iomem * addr, __u32 initctl)
 {
        /* Reset PLX */
        cy_writel(addr + initctl, readl(addr + initctl) | 0x40000000);
@@ -4800,355 +4801,367 @@ static int __devinit cy_init_Ze(unsigned long 
cy_pci_phys0,
        return 0;
 }
 
-/*
- * ---------------------------------------------------------------------
- * cy_detect_pci() - Test PCI bus presence and Cyclom-Ye/PCI.
- * sets global variables and return the number of PCI boards found.
- * ---------------------------------------------------------------------
- */
-static int __init cy_detect_pci(void)
+static int __devinit cy_pci_probe(struct pci_dev *pdev,
+               const struct pci_device_id *ent)
 {
-#ifdef CONFIG_PCI
-
-       struct pci_dev *pdev = NULL;
        unsigned char cyy_rev_id;
-       unsigned char cy_pci_irq = 0;
-       __u32 cy_pci_phys0, cy_pci_phys2;
+       unsigned char cy_pci_irq;
+       __u32 cy_pci_phys0, cy_pci_phys2, mailbox;
        void __iomem *cy_pci_addr0, *cy_pci_addr2;
-       unsigned short i, j, cy_pci_nchan, plx_ver;
-       unsigned short device_id, dev_index = 0;
-       __u32 mailbox;
+       unsigned int device_id;
+       unsigned short j, cy_pci_nchan, plx_ver;
        int retval;
 
-       for (i = 0; i < NR_CARDS; i++) {
-               /* look for a Cyclades card by vendor and device id */
-               while ((device_id = cy_pci_dev_id[dev_index].device) != 0) {
-                       if ((pdev = pci_get_device(PCI_VENDOR_ID_CYCLADES,
-                                                  device_id, pdev)) == NULL) {
-                               dev_index++;    /* try next device id */
-                       } else {
-                               break;  /* found a board */
-                       }
-               }
+       retval = pci_enable_device(pdev);
+       if (retval) {
+               dev_err(&pdev->dev, "cannot enable device\n");
+               return retval;
+       }
 
-               if (device_id == 0)
-                       break;
+       /* read PCI configuration area */
+       cy_pci_irq = pdev->irq;
+       cy_pci_phys0 = pci_resource_start(pdev, 0);
+       cy_pci_phys2 = pci_resource_start(pdev, 2);
+       pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id);
 
-               if (pci_enable_device(pdev))
-                       continue;
+       device_id = pdev->device & ~PCI_DEVICE_ID_MASK;
 
-               /* read PCI configuration area */
-               cy_pci_irq = pdev->irq;
-               cy_pci_phys0 = pci_resource_start(pdev, 0);
-               cy_pci_phys2 = pci_resource_start(pdev, 2);
-               pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id);
+       if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
+                       device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
+#ifdef CY_PCI_DEBUG
+               printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
+                       pdev->bus->number, pdev->devfn);
+               printk("rev_id=%d) IRQ%d\n",
+                       cyy_rev_id, (int)cy_pci_irq);
+               printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
+                       "ctladdr=0x%lx\n",
+                       (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
+#endif
 
-               device_id &= ~PCI_DEVICE_ID_MASK;
+               if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
+                       printk("  Warning: PCI I/O bit incorrectly "
+                               "set. Ignoring it...\n");
+                       pdev->resource[2].flags &= ~IORESOURCE_IO;
+               }
 
-               if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
-                               device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
-#ifdef CY_PCI_DEBUG
+               /* Although we don't use this I/O region, we should
+                  request it from the kernel anyway, to avoid problems
+                  with other drivers accessing it. */
+               retval = pci_request_regions(pdev, "Cyclom-Y");
+               if (retval) {
+                       printk(KERN_ERR "cyclades: failed to reserve "
+                                       "PCI resources\n");
+                       return retval;
+               }
+#if defined(__alpha__)
+               if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo) {   /* below 1M? */
                        printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
                                pdev->bus->number, pdev->devfn);
                        printk("rev_id=%d) IRQ%d\n",
                                cyy_rev_id, (int)cy_pci_irq);
                        printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
                                "ctladdr=0x%lx\n",
-                               (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
-#endif
-
-                       if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
-                               printk("  Warning: PCI I/O bit incorrectly "
-                                       "set. Ignoring it...\n");
-                               pdev->resource[2].flags &= ~IORESOURCE_IO;
-                       }
-
-                       /* Although we don't use this I/O region, we should
-                          request it from the kernel anyway, to avoid problems
-                          with other drivers accessing it. */
-                       if (pci_request_regions(pdev, "Cyclom-Y") != 0) {
-                               printk(KERN_ERR "cyclades: failed to reserve "
-                                               "PCI resources\n");
-                               continue;
-                       }
-#if defined(__alpha__)
-                       if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo) {   /* 
below 1M? */
-                               printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
-                                       pdev->bus->number, pdev->devfn);
-                               printk("rev_id=%d) IRQ%d\n",
-                                       cyy_rev_id, (int)cy_pci_irq);
-                               printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
-                                       "ctladdr=0x%lx\n",
-                                       (ulong)cy_pci_phys2,
-                                       (ulong)cy_pci_phys0);
-                               printk("Cyclom-Y/PCI not supported for low "
-                                       "addresses in Alpha systems.\n");
-                               i--;
-                               continue;
-                       }
+                               (ulong)cy_pci_phys2,
+                               (ulong)cy_pci_phys0);
+                       printk("Cyclom-Y/PCI not supported for low "
+                               "addresses in Alpha systems.\n");
+                       return -EIO;
+               }
 #endif
-                       cy_pci_addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);
-                       cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);
+               cy_pci_addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);
+               cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);
 
 #ifdef CY_PCI_DEBUG
-                       printk("Cyclom-Y/PCI: relocate winaddr=0x%lx "
-                               "ctladdr=0x%lx\n",
-                               (u_long)cy_pci_addr2, (u_long)cy_pci_addr0);
+               printk("Cyclom-Y/PCI: relocate winaddr=0x%lx "
+                       "ctladdr=0x%lx\n",
+                       (u_long)cy_pci_addr2, (u_long)cy_pci_addr0);
 #endif
-                       cy_pci_nchan = (unsigned short)(CyPORTS_PER_CHIP *
-                                       cyy_init_card(cy_pci_addr2, 1));
-                       if (cy_pci_nchan == 0) {
-                               printk("Cyclom-Y PCI host card with ");
-                               printk("no Serial-Modules at 0x%lx.\n",
-                                       (ulong) cy_pci_phys2);
-                               i--;
-                               continue;
-                       }
-                       if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                               printk("Cyclom-Y/PCI found at 0x%lx ",
-                                       (ulong) cy_pci_phys2);
-                               printk("but no channels are available.\n");
-                               printk("Change NR_PORTS in cyclades.c and "
-                                               "recompile kernel.\n");
-                               return i;
-                       }
-                       /* fill the next cy_card structure available */
-                       for (j = 0; j < NR_CARDS; j++) {
-                               if (cy_card[j].base_addr == 0)
-                                       break;
-                       }
-                       if (j == NR_CARDS) {    /* no more cy_cards available */
-                               printk("Cyclom-Y/PCI found at 0x%lx ",
-                                       (ulong) cy_pci_phys2);
-                               printk("but no more cards can be used.\n");
-                               printk("Change NR_CARDS in cyclades.c and "
-                                               "recompile kernel.\n");
-                               return i;
-                       }
-
-                       /* allocate IRQ */
-                       if (request_irq(cy_pci_irq, cyy_interrupt,
-                                       IRQF_SHARED, "Cyclom-Y", &cy_card[j])) {
-                               printk("Cyclom-Y/PCI found at 0x%lx ",
-                                       (ulong) cy_pci_phys2);
-                               printk("but could not allocate IRQ%d.\n",
-                                       cy_pci_irq);
-                               return i;
-                       }
-
-                       /* set cy_card */
-                       cy_card[j].base_phys = (ulong) cy_pci_phys2;
-                       cy_card[j].ctl_phys = (ulong) cy_pci_phys0;
-                       cy_card[j].base_addr = cy_pci_addr2;
-                       cy_card[j].ctl_addr = cy_pci_addr0;
-                       cy_card[j].irq = (int)cy_pci_irq;
-                       cy_card[j].bus_index = 1;
-                       cy_card[j].first_line = cy_next_channel;
-                       cy_card[j].num_chips = cy_pci_nchan / 4;
-                       cy_card[j].pdev = pdev;
-                       pci_set_drvdata(pdev, &cy_card[j]);
-
-                       /* enable interrupts in the PCI interface */
-                       plx_ver = readb(cy_pci_addr2 + CyPLX_VER) & 0x0f;
-                       switch (plx_ver) {
-                       case PLX_9050:
-
-                               cy_writeb(cy_pci_addr0 + 0x4c, 0x43);
+               cy_pci_nchan = (unsigned short)(CyPORTS_PER_CHIP *
+                               cyy_init_card(cy_pci_addr2, 1));
+               if (cy_pci_nchan == 0) {
+                       printk("Cyclom-Y PCI host card with ");
+                       printk("no Serial-Modules at 0x%lx.\n",
+                               (ulong) cy_pci_phys2);
+                       return -EIO;
+               }
+               if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
+                       printk("Cyclom-Y/PCI found at 0x%lx ",
+                               (ulong) cy_pci_phys2);
+                       printk("but no channels are available.\n");
+                       printk("Change NR_PORTS in cyclades.c and "
+                                       "recompile kernel.\n");
+                       return -EIO;
+               }
+               /* fill the next cy_card structure available */
+               for (j = 0; j < NR_CARDS; j++) {
+                       if (cy_card[j].base_addr == 0)
                                break;
+               }
+               if (j == NR_CARDS) {    /* no more cy_cards available */
+                       printk("Cyclom-Y/PCI found at 0x%lx ",
+                               (ulong) cy_pci_phys2);
+                       printk("but no more cards can be used.\n");
+                       printk("Change NR_CARDS in cyclades.c and "
+                                       "recompile kernel.\n");
+                       return -EIO;
+               }
 
-                       case PLX_9060:
-                       case PLX_9080:
-                       default:        /* Old boards, use PLX_9060 */
-
-                               plx_init(cy_pci_addr0, 0x6c);
-                       /* For some yet unknown reason, once the PLX9060 reloads
-                          the EEPROM, the IRQ is lost and, thus, we have to
-                          re-write it to the PCI config. registers.
-                          This will remain here until we find a permanent
-                          fix. */
-                               pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
-                                               cy_pci_irq);
-
-                               cy_writew(cy_pci_addr0 + 0x68,
-                                       readw(cy_pci_addr0 + 0x68) | 0x0900);
-                               break;
-                       }
+               /* allocate IRQ */
+               retval = request_irq(cy_pci_irq, cyy_interrupt,
+                               IRQF_SHARED, "Cyclom-Y", &cy_card[j]);
+               if (retval) {
+                       printk("Cyclom-Y/PCI found at 0x%lx ",
+                               (ulong) cy_pci_phys2);
+                       printk("but could not allocate IRQ%d.\n",
+                               cy_pci_irq);
+                       return retval;
+               }
 
-                       /* print message */
-                       printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
-                               j + 1, (ulong)cy_pci_phys2,
-                               (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1),
-                               (int)cy_pci_irq);
-                       printk("%d channels starting from port %d.\n",
-                               cy_pci_nchan, cy_next_channel);
+               /* set cy_card */
+               cy_card[j].base_phys = (ulong) cy_pci_phys2;
+               cy_card[j].ctl_phys = (ulong) cy_pci_phys0;
+               cy_card[j].base_addr = cy_pci_addr2;
+               cy_card[j].ctl_addr = cy_pci_addr0;
+               cy_card[j].irq = (int)cy_pci_irq;
+               cy_card[j].bus_index = 1;
+               cy_card[j].first_line = cy_next_channel;
+               cy_card[j].num_chips = cy_pci_nchan / 4;
+               cy_card[j].pdev = pdev;
+               pci_set_drvdata(pdev, &cy_card[j]);
 
-                       cy_next_channel += cy_pci_nchan;
-               } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) {
-                       /* print message */
-                       printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
-                               pdev->bus->number, pdev->devfn);
-                       printk("rev_id=%d) IRQ%d\n",
-                               cyy_rev_id, (int)cy_pci_irq);
-                       printk("Cyclades-Z/PCI: found winaddr=0x%lx "
-                               "ctladdr=0x%lx\n",
-                               (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
-                       printk("Cyclades-Z/PCI not supported for low "
-                               "addresses\n");
+               /* enable interrupts in the PCI interface */
+               plx_ver = readb(cy_pci_addr2 + CyPLX_VER) & 0x0f;
+               switch (plx_ver) {
+               case PLX_9050:
+
+                       cy_writeb(cy_pci_addr0 + 0x4c, 0x43);
                        break;
-               } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
-#ifdef CY_PCI_DEBUG
-                       printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
-                               pdev->bus->number, pdev->devfn);
-                       printk("rev_id=%d) IRQ%d\n",
-                               cyy_rev_id, (int)cy_pci_irq);
-                       printk("Cyclades-Z/PCI: found winaddr=0x%lx "
-                               "ctladdr=0x%lx\n",
-                               (ulong) cy_pci_phys2, (ulong) cy_pci_phys0);
-#endif
-                       cy_pci_addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);
 
-                       /* Disable interrupts on the PLX before resetting it */
-                       cy_writew(cy_pci_addr0 + 0x68,
-                               readw(cy_pci_addr0 + 0x68) & ~0x0900);
+               case PLX_9060:
+               case PLX_9080:
+               default:        /* Old boards, use PLX_9060 */
 
                        plx_init(cy_pci_addr0, 0x6c);
-                       /* For some yet unknown reason, once the PLX9060 reloads
-                          the EEPROM, the IRQ is lost and, thus, we have to
-                          re-write it to the PCI config. registers.
-                          This will remain here until we find a permanent
-                          fix. */
+               /* For some yet unknown reason, once the PLX9060 reloads
+                  the EEPROM, the IRQ is lost and, thus, we have to
+                  re-write it to the PCI config. registers.
+                  This will remain here until we find a permanent
+                  fix. */
                        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
-                                               cy_pci_irq);
+                                       cy_pci_irq);
 
-                       mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *)
-                                       cy_pci_addr0)->mail_box_0);
+                       cy_writew(cy_pci_addr0 + 0x68,
+                               readw(cy_pci_addr0 + 0x68) | 0x0900);
+                       break;
+               }
 
-                       if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
-                               printk("  Warning: PCI I/O bit incorrectly "
-                                       "set. Ignoring it...\n");
-                               pdev->resource[2].flags &= ~IORESOURCE_IO;
-                       }
+               /* print message */
+               printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
+                       j + 1, (ulong)cy_pci_phys2,
+                       (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1),
+                       (int)cy_pci_irq);
+               printk("%d channels starting from port %d.\n",
+                       cy_pci_nchan, cy_next_channel);
 
-                       /* Although we don't use this I/O region, we should
-                          request it from the kernel anyway, to avoid problems
-                          with other drivers accessing it. */
-                       if (pci_request_regions(pdev, "Cyclades-Z") != 0) {
-                               printk(KERN_ERR "cyclades: failed to reserve "
-                                       "PCI resources\n");
-                               continue;
-                       }
+               cy_next_channel += cy_pci_nchan;
+       } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) {
+               /* print message */
+               printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
+                       pdev->bus->number, pdev->devfn);
+               printk("rev_id=%d) IRQ%d\n",
+                       cyy_rev_id, (int)cy_pci_irq);
+               printk("Cyclades-Z/PCI: found winaddr=0x%lx "
+                       "ctladdr=0x%lx\n",
+                       (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
+               printk("Cyclades-Z/PCI not supported for low "
+                       "addresses\n");
+               return -EIO;
+       } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
+#ifdef CY_PCI_DEBUG
+               printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
+                       pdev->bus->number, pdev->devfn);
+               printk("rev_id=%d) IRQ%d\n",
+                       cyy_rev_id, (int)cy_pci_irq);
+               printk("Cyclades-Z/PCI: found winaddr=0x%lx "
+                       "ctladdr=0x%lx\n",
+                       (ulong) cy_pci_phys2, (ulong) cy_pci_phys0);
+#endif
+               cy_pci_addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);
+
+               /* Disable interrupts on the PLX before resetting it */
+               cy_writew(cy_pci_addr0 + 0x68,
+                       readw(cy_pci_addr0 + 0x68) & ~0x0900);
+
+               plx_init(cy_pci_addr0, 0x6c);
+               /* For some yet unknown reason, once the PLX9060 reloads
+                  the EEPROM, the IRQ is lost and, thus, we have to
+                  re-write it to the PCI config. registers.
+                  This will remain here until we find a permanent
+                  fix. */
+               pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
+                                       cy_pci_irq);
 
-                       if (mailbox == ZE_V1) {
-                               retval = cy_init_Ze(cy_pci_phys0, cy_pci_phys2,
-                                               cy_pci_addr0, cy_pci_irq, pdev);
-                               if (retval < 0)
-                                       i--;
-                               continue;
-                       } else {
-                               cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Zwin);
-                       }
+               mailbox = (__u32)readl(&((struct RUNTIME_9060 __iomem *)
+                               cy_pci_addr0)->mail_box_0);
+
+               if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
+                       printk("  Warning: PCI I/O bit incorrectly "
+                               "set. Ignoring it...\n");
+                       pdev->resource[2].flags &= ~IORESOURCE_IO;
+               }
+
+               /* Although we don't use this I/O region, we should
+                  request it from the kernel anyway, to avoid problems
+                  with other drivers accessing it. */
+               retval = pci_request_regions(pdev, "Cyclades-Z");
+               if (retval) {
+                       printk(KERN_ERR "cyclades: failed to reserve "
+                               "PCI resources\n");
+                       return retval;
+               }
+
+               if (mailbox == ZE_V1) {
+                       retval = cy_init_Ze(cy_pci_phys0, cy_pci_phys2,
+                                       cy_pci_addr0, cy_pci_irq, pdev);
+                       return retval;
+               } else {
+                       cy_pci_addr2 = pci_iomap(pdev, 2, CyPCI_Zwin);
+               }
 
 #ifdef CY_PCI_DEBUG
-                       printk("Cyclades-Z/PCI: relocate winaddr=0x%lx "
-                               "ctladdr=0x%lx\n",
-                               (ulong) cy_pci_addr2, (ulong) cy_pci_addr0);
-                       if (mailbox == ZO_V1) {
-                               cy_writel(&((struct RUNTIME_9060 *)
-                                       (cy_pci_addr0))->loc_addr_base,
-                                       WIN_CREG);
-                               printk("Cyclades-8Zo/PCI: FPGA id %lx, ver "
-                                       "%lx\n", (ulong) (0xff &
-                                       readl(&((struct CUSTOM_REG *)
-                                               (cy_pci_addr2))->fpga_id)),
-                                       (ulong)(0xff &
-                                       readl(&((struct CUSTOM_REG *)
-                                               (cy_pci_addr2))->
-                                                       fpga_version)));
-                               cy_writel(&((struct RUNTIME_9060 *)
-                                       (cy_pci_addr0))->loc_addr_base,
-                                       WIN_RAM);
-                       } else {
-                               printk("Cyclades-Z/PCI: New Cyclades-Z board.  "
-                                               "FPGA not loaded\n");
-                       }
+               printk("Cyclades-Z/PCI: relocate winaddr=0x%lx "
+                       "ctladdr=0x%lx\n",
+                       (ulong) cy_pci_addr2, (ulong) cy_pci_addr0);
+               if (mailbox == ZO_V1) {
+                       cy_writel(&((struct RUNTIME_9060 *)
+                               (cy_pci_addr0))->loc_addr_base,
+                               WIN_CREG);
+                       printk("Cyclades-8Zo/PCI: FPGA id %lx, ver "
+                               "%lx\n", (ulong) (0xff &
+                               readl(&((struct CUSTOM_REG *)
+                                       (cy_pci_addr2))->fpga_id)),
+                               (ulong)(0xff &
+                               readl(&((struct CUSTOM_REG *)
+                                       (cy_pci_addr2))->
+                                               fpga_version)));
+                       cy_writel(&((struct RUNTIME_9060 *)
+                               (cy_pci_addr0))->loc_addr_base,
+                               WIN_RAM);
+               } else {
+                       printk("Cyclades-Z/PCI: New Cyclades-Z board.  "
+                                       "FPGA not loaded\n");
+               }
 #endif
-                       /* The following clears the firmware id word.  This
-                          ensures that the driver will not attempt to talk to
-                          the board until it has been properly initialized.
-                        */
-                       if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
-                               cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L);
-
-                       /* This must be a Cyclades-8Zo/PCI.  The extendable
-                          version will have a different device_id and will
-                          be allocated its maximum number of ports. */
-                       cy_pci_nchan = 8;
-
-                       if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                               printk("Cyclades-8Zo/PCI found at 0x%lx but"
-                                       "no channels are available.\nChange "
-                                       "NR_PORTS in cyclades.c and recompile "
-                                       "kernel.\n", (ulong)cy_pci_phys2);
-                               return i;
-                       }
+               /* The following clears the firmware id word.  This
+                  ensures that the driver will not attempt to talk to
+                  the board until it has been properly initialized.
+                */
+               if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
+                       cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L);
+
+               /* This must be a Cyclades-8Zo/PCI.  The extendable
+                  version will have a different device_id and will
+                  be allocated its maximum number of ports. */
+               cy_pci_nchan = 8;
+
+               if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
+                       printk("Cyclades-8Zo/PCI found at 0x%lx but"
+                               "no channels are available.\nChange "
+                               "NR_PORTS in cyclades.c and recompile "
+                               "kernel.\n", (ulong)cy_pci_phys2);
+                       return -EIO;
+               }
 
-                       /* fill the next cy_card structure available */
-                       for (j = 0; j < NR_CARDS; j++) {
-                               if (cy_card[j].base_addr == 0)
-                                       break;
-                       }
-                       if (j == NR_CARDS) {    /* no more cy_cards available */
-                               printk("Cyclades-8Zo/PCI found at 0x%lx but"
-                                       "no more cards can be used.\nChange "
-                                       "NR_CARDS in cyclades.c and recompile "
-                                       "kernel.\n", (ulong)cy_pci_phys2);
-                               return i;
-                       }
+               /* fill the next cy_card structure available */
+               for (j = 0; j < NR_CARDS; j++) {
+                       if (cy_card[j].base_addr == 0)
+                               break;
+               }
+               if (j == NR_CARDS) {    /* no more cy_cards available */
+                       printk("Cyclades-8Zo/PCI found at 0x%lx but"
+                               "no more cards can be used.\nChange "
+                               "NR_CARDS in cyclades.c and recompile "
+                               "kernel.\n", (ulong)cy_pci_phys2);
+                       return -EIO;
+               }
 #ifdef CONFIG_CYZ_INTR
-                       /* allocate IRQ only if board has an IRQ */
-                       if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
-                               if (request_irq(cy_pci_irq, cyz_interrupt,
-                                               IRQF_SHARED, "Cyclades-Z",
-                                               &cy_card[j])) {
-                                       printk("Cyclom-8Zo/PCI found at 0x%lx "
-                                               "but could not allocate "
-                                               "IRQ%d.\n", (ulong)cy_pci_phys2,
-                                               cy_pci_irq);
-                                       return i;
-                               }
+               /* allocate IRQ only if board has an IRQ */
+               if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
+                       retval = request_irq(cy_pci_irq, cyz_interrupt,
+                                       IRQF_SHARED, "Cyclades-Z",
+                                       &cy_card[j]);
+                       if (retval) {
+                               printk("Cyclom-8Zo/PCI found at 0x%lx "
+                                       "but could not allocate "
+                                       "IRQ%d.\n", (ulong)cy_pci_phys2,
+                                       cy_pci_irq);
+                               return retval;
                        }
+               }
 #endif                         /* CONFIG_CYZ_INTR */
 
-                       /* set cy_card */
-                       cy_card[j].base_phys = cy_pci_phys2;
-                       cy_card[j].ctl_phys = cy_pci_phys0;
-                       cy_card[j].base_addr = cy_pci_addr2;
-                       cy_card[j].ctl_addr = cy_pci_addr0;
-                       cy_card[j].irq = (int)cy_pci_irq;
-                       cy_card[j].bus_index = 1;
-                       cy_card[j].first_line = cy_next_channel;
-                       cy_card[j].num_chips = -1;
-                       cy_card[j].pdev = pdev;
-                       pci_set_drvdata(pdev, &cy_card[j]);
-
-                       /* print message */
+               /* set cy_card */
+               cy_card[j].base_phys = cy_pci_phys2;
+               cy_card[j].ctl_phys = cy_pci_phys0;
+               cy_card[j].base_addr = cy_pci_addr2;
+               cy_card[j].ctl_addr = cy_pci_addr0;
+               cy_card[j].irq = (int)cy_pci_irq;
+               cy_card[j].bus_index = 1;
+               cy_card[j].first_line = cy_next_channel;
+               cy_card[j].num_chips = -1;
+               cy_card[j].pdev = pdev;
+               pci_set_drvdata(pdev, &cy_card[j]);
+
+               /* print message */
 #ifdef CONFIG_CYZ_INTR
-                       /* don't report IRQ if board is no IRQ */
-                       if ((cy_pci_irq != 0) && (cy_pci_irq != 255))
-                               printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, "
-                                       "IRQ%d, ", j + 1, (ulong)cy_pci_phys2,
-                                       (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1),
-                                       (int)cy_pci_irq);
-                       else
+               /* don't report IRQ if board is no IRQ */
+               if ((cy_pci_irq != 0) && (cy_pci_irq != 255))
+                       printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, "
+                               "IRQ%d, ", j + 1, (ulong)cy_pci_phys2,
+                               (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1),
+                               (int)cy_pci_irq);
+               else
 #endif                         /* CONFIG_CYZ_INTR */
-                               printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ",
-                                       j + 1, (ulong)cy_pci_phys2,
-                                       (ulong)(cy_pci_phys2 + CyPCI_Zwin - 1));
+                       printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ",
+                               j + 1, (ulong)cy_pci_phys2,
+                               (ulong)(cy_pci_phys2 + CyPCI_Zwin - 1));
+
+               printk("%d channels starting from port %d.\n",
+                               cy_pci_nchan, cy_next_channel);
+               cy_next_channel += cy_pci_nchan;
+       }
+
+       return 0;
+}
+#endif
+
+/*
+ * ---------------------------------------------------------------------
+ * cy_detect_pci() - Test PCI bus presence and Cyclom-Ye/PCI.
+ * sets global variables and return the number of PCI boards found.
+ * ---------------------------------------------------------------------
+ */
+static int __init cy_detect_pci(void)
+{
+#ifdef CONFIG_PCI
+       struct pci_dev *pdev = NULL;
+       unsigned int i, device_id, dev_index = 0;
 
-                       printk("%d channels starting from port %d.\n",
-                                       cy_pci_nchan, cy_next_channel);
-                       cy_next_channel += cy_pci_nchan;
+       for (i = 0; i < NR_CARDS; i++) {
+               /* look for a Cyclades card by vendor and device id */
+               while ((device_id = cy_pci_dev_id[dev_index].device) != 0) {
+                       if ((pdev = pci_get_device(PCI_VENDOR_ID_CYCLADES,
+                                                  device_id, pdev)) == NULL) {
+                               dev_index++;    /* try next device id */
+                       } else {
+                               break;  /* found a board */
+                       }
                }
+
+               if (device_id == 0)
+                       break;
+
+               i -= !!cy_pci_probe(pdev, &cy_pci_dev_id[dev_index]);
        }
 
        return i;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to