projects / powerpc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libata: fix native mode disabled port handling
[powerpc.git] / drivers / ata / libata-sff.c
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 2ffcca0..93cc967 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -526,8 +526,8 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
        port = port * 2;
        for (i = 0; i < 2; i ++) {
                if (pci_resource_start(pdev, port + i) == 0 ||
-                       pci_resource_len(pdev, port + i) == 0)
-               return 0;
+                   pci_resource_len(pdev, port + i) == 0)
+                       return 0;
        }
        return 1;
 }
@@ -554,11 +554,26 @@ struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int ports)
 {
        struct ata_probe_ent *probe_ent;
-       int i, p = 0;
+       int i;
        void __iomem * const *iomap;
 
+       /* Discard disabled ports.  Some controllers show their unused
+        * channels this way.  Disabled ports will be made dummy.
+        */
+       if (ata_resources_present(pdev, 0) == 0)
+               ports &= ~ATA_PORT_PRIMARY;
+       if (ata_resources_present(pdev, 1) == 0)
+               ports &= ~ATA_PORT_SECONDARY;
+
+       if (!ports) {
+               dev_printk(KERN_ERR, &pdev->dev, "no available port\n");
+               return NULL;
+       }
+
        /* iomap BARs */
        for (i = 0; i < 4; i++) {
+               if (!(ports & (1 << (i / 2))))
+                       continue;
                if (pcim_iomap(pdev, i, 0) == NULL) {
                        dev_printk(KERN_ERR, &pdev->dev,
                                   "failed to iomap PCI BAR %d\n", i);
@@ -574,48 +589,41 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
        if (!probe_ent)
                return NULL;
 
+       probe_ent->n_ports = 2;
        probe_ent->irq = pdev->irq;
        probe_ent->irq_flags = IRQF_SHARED;
 
-       /* Discard disabled ports. Some controllers show their
-          unused channels this way */
-       if (ata_resources_present(pdev, 0) == 0)
-               ports &= ~ATA_PORT_PRIMARY;
-       if (ata_resources_present(pdev, 1) == 0)
-               ports &= ~ATA_PORT_SECONDARY;
-
        if (ports & ATA_PORT_PRIMARY) {
-               probe_ent->port[p].cmd_addr = iomap[0];
-               probe_ent->port[p].altstatus_addr =
-               probe_ent->port[p].ctl_addr = (void __iomem *)
+               probe_ent->port[0].cmd_addr = iomap[0];
+               probe_ent->port[0].altstatus_addr =
+               probe_ent->port[0].ctl_addr = (void __iomem *)
                        ((unsigned long)iomap[1] | ATA_PCI_CTL_OFS);
                if (iomap[4]) {
-                       if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
+                       if ((!(port[0]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
                            (ioread8(iomap[4] + 2) & 0x80))
                                probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
-                       probe_ent->port[p].bmdma_addr = iomap[4];
+                       probe_ent->port[0].bmdma_addr = iomap[4];
                }
-               ata_std_ports(&probe_ent->port[p]);
-               p++;
-       }
+               ata_std_ports(&probe_ent->port[0]);
+       } else
+               probe_ent->dummy_port_mask |= ATA_PORT_PRIMARY;
 
        if (ports & ATA_PORT_SECONDARY) {
-               probe_ent->port[p].cmd_addr = iomap[2];
-               probe_ent->port[p].altstatus_addr =
-               probe_ent->port[p].ctl_addr = (void __iomem *)
+               probe_ent->port[1].cmd_addr = iomap[2];
+               probe_ent->port[1].altstatus_addr =
+               probe_ent->port[1].ctl_addr = (void __iomem *)
                        ((unsigned long)iomap[3] | ATA_PCI_CTL_OFS);
                if (iomap[4]) {
-                       if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
+                       if ((!(port[1]->flags & ATA_FLAG_IGN_SIMPLEX)) &&
                            (ioread8(iomap[4] + 10) & 0x80))
                                probe_ent->_host_flags |= ATA_HOST_SIMPLEX;
-                       probe_ent->port[p].bmdma_addr = iomap[4] + 8;
+                       probe_ent->port[1].bmdma_addr = iomap[4] + 8;
                }
-               ata_std_ports(&probe_ent->port[p]);
+               ata_std_ports(&probe_ent->port[1]);
                probe_ent->pinfo2 = port[1];
-               p++;
-       }
+       } else
+               probe_ent->dummy_port_mask |= ATA_PORT_SECONDARY;
 
-       probe_ent->n_ports = p;
        return probe_ent;
 }
 
@@ -779,40 +787,16 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                /* Deal with combined mode hack. This side of the logic all
                   goes away once the combined mode hack is killed in 2.6.21 */
                if (!devm_request_region(dev, ATA_PRIMARY_CMD, 8, "libata")) {
-                       struct resource *conflict, res;
-                       res.start = ATA_PRIMARY_CMD;
-                       res.end = ATA_PRIMARY_CMD + 8 - 1;
-                       conflict = ____request_resource(&ioport_resource, &res);
-                       while (conflict->child)
-                               conflict = ____request_resource(conflict, &res);
-                       if (!strcmp(conflict->name, "libata"))
-                               legacy_mode |= ATA_PORT_PRIMARY;
-                       else {
-                               pcim_pin_device(pdev);
-                               printk(KERN_WARNING "ata: 0x%0X IDE port busy\n" \
-                                                   "ata: conflict with %s\n",
-                                                   ATA_PRIMARY_CMD,
-                                                   conflict->name);
-                       }
+                       pcim_pin_device(pdev);
+                       printk(KERN_WARNING "ata: 0x%0X IDE port busy\n",
+                                           ATA_PRIMARY_CMD);
                } else
                        legacy_mode |= ATA_PORT_PRIMARY;
 
                if (!devm_request_region(dev, ATA_SECONDARY_CMD, 8, "libata")) {
-                       struct resource *conflict, res;
-                       res.start = ATA_SECONDARY_CMD;
-                       res.end = ATA_SECONDARY_CMD + 8 - 1;
-                       conflict = ____request_resource(&ioport_resource, &res);
-                       while (conflict->child)
-                               conflict = ____request_resource(conflict, &res);
-                       if (!strcmp(conflict->name, "libata"))
-                               legacy_mode |= ATA_PORT_SECONDARY;
-                       else {
-                               pcim_pin_device(pdev);
-                               printk(KERN_WARNING "ata: 0x%X IDE port busy\n" \
-                                                   "ata: conflict with %s\n",
-                                                   ATA_SECONDARY_CMD,
-                                                   conflict->name);
-                       }
+                       pcim_pin_device(pdev);
+                       printk(KERN_WARNING "ata: 0x%X IDE port busy\n",
+                                           ATA_SECONDARY_CMD);
                } else
                        legacy_mode |= ATA_PORT_SECONDARY;
 
@@ -893,12 +877,12 @@ int ata_pci_clear_simplex(struct pci_dev *pdev)
        return 0;
 }
 
-unsigned long ata_pci_default_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long xfer_mask)
+unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long xfer_mask)
 {
        /* Filter out DMA modes if the device has been configured by
           the BIOS as PIO only */
 
-       if (ap->ioaddr.bmdma_addr == 0)
+       if (adev->ap->ioaddr.bmdma_addr == 0)
                xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
        return xfer_mask;
 }
DSM-G600 Linux 2.6