Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_osm_pci.c
index 49d799a..0c9c2f4 100644 (file)
 #include "aic7xxx_osm.h"
 #include "aic7xxx_pci.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-struct pci_device_id
-{
-};
-#endif
-
 static int     ahc_linux_pci_dev_probe(struct pci_dev *pdev,
                                        const struct pci_device_id *ent);
 static int     ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
@@ -55,7 +49,6 @@ static int    ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
 static int     ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
                                                 u_long *bus_addr,
                                                 uint8_t __iomem **maddr);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 static void    ahc_linux_pci_dev_remove(struct pci_dev *pdev);
 
 /* Define the macro locally since it's different for different class of chips.
@@ -147,29 +140,38 @@ struct pci_driver aic7xxx_pci_driver = {
 static void
 ahc_linux_pci_dev_remove(struct pci_dev *pdev)
 {
-       struct ahc_softc *ahc;
-       u_long l;
+       struct ahc_softc *ahc = pci_get_drvdata(pdev);
+       u_long s;
 
-       /*
-        * We should be able to just perform
-        * the free directly, but check our
-        * list for extra sanity.
-        */
-       ahc_list_lock(&l);
-       ahc = ahc_find_softc((struct ahc_softc *)pci_get_drvdata(pdev));
-       if (ahc != NULL) {
-               u_long s;
-
-               TAILQ_REMOVE(&ahc_tailq, ahc, links);
-               ahc_list_unlock(&l);
-               ahc_lock(ahc, &s);
-               ahc_intr_enable(ahc, FALSE);
-               ahc_unlock(ahc, &s);
-               ahc_free(ahc);
-       } else
-               ahc_list_unlock(&l);
+       if (ahc->platform_data && ahc->platform_data->host)
+                       scsi_remove_host(ahc->platform_data->host);
+
+       ahc_lock(ahc, &s);
+       ahc_intr_enable(ahc, FALSE);
+       ahc_unlock(ahc, &s);
+       ahc_free(ahc);
+}
+
+static void
+ahc_linux_pci_inherit_flags(struct ahc_softc *ahc)
+{
+       struct pci_dev *pdev = ahc->dev_softc, *master_pdev;
+       unsigned int master_devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+
+       master_pdev = pci_get_slot(pdev->bus, master_devfn);
+       if (master_pdev) {
+               struct ahc_softc *master = pci_get_drvdata(master_pdev);
+               if (master) {
+                       ahc->flags &= ~AHC_BIOS_ENABLED; 
+                       ahc->flags |= master->flags & AHC_BIOS_ENABLED;
+
+                       ahc->flags &= ~AHC_PRIMARY_CHANNEL; 
+                       ahc->flags |= master->flags & AHC_PRIMARY_CHANNEL;
+               } else
+                       printk(KERN_ERR "aic7xxx: no multichannel peer found!\n");
+               pci_dev_put(master_pdev);
+       } 
 }
-#endif /* !LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) */
 
 static int
 ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -181,22 +183,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct           ahc_pci_identity *entry;
        char            *name;
        int              error;
-
-       /*
-        * Some BIOSen report the same device multiple times.
-        */
-       TAILQ_FOREACH(ahc, &ahc_tailq, links) {
-               struct pci_dev *probed_pdev;
-
-               probed_pdev = ahc->dev_softc;
-               if (probed_pdev->bus->number == pdev->bus->number
-                && probed_pdev->devfn == pdev->devfn)
-                       break;
-       }
-       if (ahc != NULL) {
-               /* Skip duplicate. */
-               return (-ENODEV);
-       }
+       struct device   *dev = &pdev->dev;
 
        pci = pdev;
        entry = ahc_find_pci_device(pci);
@@ -219,7 +206,6 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        ahc = ahc_alloc(NULL, name);
        if (ahc == NULL)
                return (-ENOMEM);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        if (pci_enable_device(pdev)) {
                ahc_free(ahc);
                return (-ENODEV);
@@ -227,68 +213,41 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_set_master(pdev);
 
        if (sizeof(dma_addr_t) > 4
-        && ahc_linux_get_memsize() > 0x80000000
-        && pci_set_dma_mask(pdev, mask_39bit) == 0) {
+           && ahc->features & AHC_LARGE_SCBS
+           && dma_set_mask(dev, mask_39bit) == 0
+           && dma_get_required_mask(dev) > DMA_32BIT_MASK) {
                ahc->flags |= AHC_39BIT_ADDRESSING;
-               ahc->platform_data->hw_dma_mask = mask_39bit;
        } else {
-               if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+               if (dma_set_mask(dev, DMA_32BIT_MASK)) {
+                       ahc_free(ahc);
                        printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n");
                        return (-ENODEV);
                }
-               ahc->platform_data->hw_dma_mask = DMA_32BIT_MASK;
        }
-#endif
        ahc->dev_softc = pci;
        error = ahc_pci_config(ahc, entry);
        if (error != 0) {
                ahc_free(ahc);
                return (-error);
        }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+
+       /*
+        * Second Function PCI devices need to inherit some
+        * settings from function 0.
+        */
+       if ((ahc->features & AHC_MULTI_FUNC) && PCI_FUNC(pdev->devfn) != 0)
+               ahc_linux_pci_inherit_flags(ahc);
+
        pci_set_drvdata(pdev, ahc);
-       if (aic7xxx_detect_complete) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-               ahc_linux_register_host(ahc, &aic7xxx_driver_template);
-#else
-               printf("aic7xxx: ignoring PCI device found after "
-                      "initialization\n");
-               return (-ENODEV);
-#endif
-       }
-#endif
+       ahc_linux_register_host(ahc, &aic7xxx_driver_template);
        return (0);
 }
 
 int
 ahc_linux_pci_init(void)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        /* Translate error or zero return into zero or one */
        return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1;
-#else
-       struct pci_dev *pdev;
-       u_int class;
-       int found;
-
-       /* If we don't have a PCI bus, we can't find any adapters. */
-       if (pci_present() == 0)
-               return (0);
-
-       found = 0;
-       pdev = NULL;
-       class = PCI_CLASS_STORAGE_SCSI << 8;
-       while ((pdev = pci_find_class(class, pdev)) != NULL) {
-               ahc_dev_softc_t pci;
-               int error;
-
-               pci = pdev;
-               error = ahc_linux_pci_dev_probe(pdev, /*pci_devid*/NULL);
-               if (error == 0)
-                       found++;
-       }
-       return (found);
-#endif
 }
 
 void
@@ -303,22 +262,11 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, u_long *base)
        if (aic7xxx_allow_memio == 0)
                return (ENOMEM);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
        *base = pci_resource_start(ahc->dev_softc, 0);
-#else
-       *base = ahc_pci_read_config(ahc->dev_softc, PCIR_MAPS, 4);
-       *base &= PCI_BASE_ADDRESS_IO_MASK;
-#endif
        if (*base == 0)
                return (ENOMEM);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-       if (check_region(*base, 256) != 0)
-               return (ENOMEM);
-       request_region(*base, 256, "aic7xxx");
-#else
        if (request_region(*base, 256, "aic7xxx") == 0)
                return (ENOMEM);
-#endif
        return (0);
 }
 
@@ -334,17 +282,13 @@ ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
        start = pci_resource_start(ahc->dev_softc, 1);
        if (start != 0) {
                *bus_addr = start;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
                if (request_mem_region(start, 0x1000, "aic7xxx") == 0)
                        error = ENOMEM;
-#endif
                if (error == 0) {
                        *maddr = ioremap_nocache(start, 256);
                        if (*maddr == NULL) {
                                error = ENOMEM;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
                                release_mem_region(start, 0x1000);
-#endif
                        }
                }
        } else
@@ -387,10 +331,8 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
                               ahc_get_pci_slot(ahc->dev_softc),
                               ahc_get_pci_function(ahc->dev_softc));
                        iounmap(maddr);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
                        release_mem_region(ahc->platform_data->mem_busaddr,
                                           0x1000);
-#endif
                        ahc->bsh.maddr = NULL;
                        maddr = NULL;
                } else
@@ -440,41 +382,3 @@ ahc_pci_map_int(struct ahc_softc *ahc)
        return (-error);
 }
 
-void
-ahc_power_state_change(struct ahc_softc *ahc, ahc_power_state new_state)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-       pci_set_power_state(ahc->dev_softc, new_state);
-#else
-       uint32_t cap;
-       u_int cap_offset;
-
-       /*
-        * Traverse the capability list looking for
-        * the power management capability.
-        */
-       cap = 0;
-       cap_offset = ahc_pci_read_config(ahc->dev_softc,
-                                        PCIR_CAP_PTR, /*bytes*/1);
-       while (cap_offset != 0) {
-
-               cap = ahc_pci_read_config(ahc->dev_softc,
-                                         cap_offset, /*bytes*/4);
-               if ((cap & 0xFF) == 1
-                && ((cap >> 16) & 0x3) > 0) {
-                       uint32_t pm_control;
-
-                       pm_control = ahc_pci_read_config(ahc->dev_softc,
-                                                        cap_offset + 4,
-                                                        /*bytes*/4);
-                       pm_control &= ~0x3;
-                       pm_control |= new_state;
-                       ahc_pci_write_config(ahc->dev_softc,
-                                            cap_offset + 4,
-                                            pm_control, /*bytes*/2);
-                       break;
-               }
-               cap_offset = (cap >> 8) & 0xFF;
-       }
-#endif 
-}