1 files changed, 40 insertions, 43 deletions

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 9c48b418ad7f..5ce4f593687d 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -135,31 +135,31 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
         unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
 
         if (tf->ctl != ap->last_ctl) {
-                writeb(tf->ctl, (void __iomem *) ioaddr->ctl_addr);
+                writeb(tf->ctl, ioaddr->ctl_addr);
                 ap->last_ctl = tf->ctl;
                 ata_wait_idle(ap);
         }
         if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
                 writew(tf->feature | (((u16)tf->hob_feature) << 8),
-                       (void __iomem *) ioaddr->feature_addr);
+                       ioaddr->feature_addr);
                 writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
-                       (void __iomem *) ioaddr->nsect_addr);
+                       ioaddr->nsect_addr);
                 writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
-                       (void __iomem *) ioaddr->lbal_addr);
+                       ioaddr->lbal_addr);
                 writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
-                       (void __iomem *) ioaddr->lbam_addr);
+                       ioaddr->lbam_addr);
                 writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
-                       (void __iomem *) ioaddr->lbah_addr);
+                       ioaddr->lbah_addr);
         } else if (is_addr) {
-                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
-                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
-                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
-                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
-                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
+                writew(tf->feature, ioaddr->feature_addr);
+                writew(tf->nsect, ioaddr->nsect_addr);
+                writew(tf->lbal, ioaddr->lbal_addr);
+                writew(tf->lbam, ioaddr->lbam_addr);
+                writew(tf->lbah, ioaddr->lbah_addr);
         }
 
         if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
+                writeb(tf->device, ioaddr->device_addr);
 
         ata_wait_idle(ap);
 }
@@ -171,12 +171,12 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         u16 nsect, lbal, lbam, lbah, feature;
 
         tf->command = k2_stat_check_status(ap);
-        tf->device = readw((void __iomem *)ioaddr->device_addr);
-        feature = readw((void __iomem *)ioaddr->error_addr);
-        nsect = readw((void __iomem *)ioaddr->nsect_addr);
-        lbal = readw((void __iomem *)ioaddr->lbal_addr);
-        lbam = readw((void __iomem *)ioaddr->lbam_addr);
-        lbah = readw((void __iomem *)ioaddr->lbah_addr);
+        tf->device = readw(ioaddr->device_addr);
+        feature = readw(ioaddr->error_addr);
+        nsect = readw(ioaddr->nsect_addr);
+        lbal = readw(ioaddr->lbal_addr);
+        lbam = readw(ioaddr->lbam_addr);
+        lbah = readw(ioaddr->lbah_addr);
 
         tf->feature = feature;
         tf->nsect = nsect;
@@ -349,7 +349,7 @@ static const struct ata_port_operations k2_sata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
-        .data_xfer              = ata_mmio_data_xfer,
+        .data_xfer              = ata_data_xfer,
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
         .error_handler          = ata_bmdma_error_handler,
@@ -361,7 +361,7 @@ static const struct ata_port_operations k2_sata_ops = {
         .port_start             = ata_port_start,
 };
 
-static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
+static void k2_sata_setup_port(struct ata_ioports *port, void __iomem *base)
 {
         port->cmd_addr          = base + K2_SATA_TF_CMD_OFFSET;
         port->data_addr         = base + K2_SATA_TF_DATA_OFFSET;
@@ -386,7 +386,6 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         struct device *dev = &pdev->dev;
         struct ata_probe_ent *probe_ent;
-        unsigned long base;
         void __iomem *mmio_base;
         const struct k2_board_info *board_info =
                         &k2_board_info[ent->driver_data];
@@ -410,12 +409,12 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         if (pci_resource_len(pdev, 5) == 0)
                 return -ENODEV;
 
-        /* Request PCI regions */
-        rc = pci_request_regions(pdev, DRV_NAME);
-        if (rc) {
+        /* Request and iomap PCI regions */
+        rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME);
+        if (rc == -EBUSY)
                 pcim_pin_device(pdev);
+        if (rc)
                 return rc;
-        }
 
         rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
         if (rc)
@@ -431,22 +430,6 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = pcim_iomap(pdev, 5, 0);
-        if (mmio_base == NULL)
-                return -ENOMEM;
-        base = (unsigned long) mmio_base;
-
-        /* Clear a magic bit in SCR1 according to Darwin, those help
-         * some funky seagate drives (though so far, those were already
-         * set by the firmware on the machines I had access to)
-         */
-        writel(readl(mmio_base + K2_SATA_SICR1_OFFSET) & ~0x00040000,
-               mmio_base + K2_SATA_SICR1_OFFSET);
-
-        /* Clear SATA error & interrupts we don't use */
-        writel(0xffffffff, mmio_base + K2_SATA_SCR_ERROR_OFFSET);
-        writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);
-
         probe_ent->sht = &k2_sata_sht;
         probe_ent->port_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                 ATA_FLAG_MMIO | board_info->port_flags;
@@ -454,7 +437,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->n_ports = 4;
         probe_ent->irq = pdev->irq;
         probe_ent->irq_flags = IRQF_SHARED;
-        probe_ent->mmio_base = mmio_base;
+        probe_ent->iomap = pcim_iomap_table(pdev);
 
         /* We don't care much about the PIO/UDMA masks, but the core won't like us
          * if we don't fill these
@@ -463,11 +446,25 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->mwdma_mask = 0x7;
         probe_ent->udma_mask = 0x7f;
 
+        mmio_base = probe_ent->iomap[5];
+
         /* different controllers have different number of ports - currently 4 or 8 */
         /* All ports are on the same function. Multi-function device is no
          * longer available. This should not be seen in any system. */
         for (i = 0; i < board_info->n_ports; i++)
-                k2_sata_setup_port(&probe_ent->port[i], base + i * K2_SATA_PORT_OFFSET);
+                k2_sata_setup_port(&probe_ent->port[i],
+                                   mmio_base + i * K2_SATA_PORT_OFFSET);
+
+        /* Clear a magic bit in SCR1 according to Darwin, those help
+         * some funky seagate drives (though so far, those were already
+         * set by the firmware on the machines I had access to)
+         */
+        writel(readl(mmio_base + K2_SATA_SICR1_OFFSET) & ~0x00040000,
+               mmio_base + K2_SATA_SICR1_OFFSET);
+
+        /* Clear SATA error & interrupts we don't use */
+        writel(0xffffffff, mmio_base + K2_SATA_SCR_ERROR_OFFSET);
+        writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);
 
         pci_set_master(pdev);