1 files changed, 38 insertions, 33 deletions

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index f16f92a6ec0f..4a71578df3c1 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -93,7 +93,7 @@ enum {
         MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
         MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                    ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
-                                   ATA_FLAG_NO_ATAPI),
+                                   ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING),
         MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
 
         CRQB_FLAG_READ          = (1 << 0),
@@ -272,33 +272,33 @@ enum chip_type {
 
 /* Command ReQuest Block: 32B */
 struct mv_crqb {
-        u32                     sg_addr;
-        u32                     sg_addr_hi;
-        u16                     ctrl_flags;
-        u16                     ata_cmd[11];
+        __le32                  sg_addr;
+        __le32                  sg_addr_hi;
+        __le16                  ctrl_flags;
+        __le16                  ata_cmd[11];
 };
 
 struct mv_crqb_iie {
-        u32                     addr;
-        u32                     addr_hi;
-        u32                     flags;
-        u32                     len;
-        u32                     ata_cmd[4];
+        __le32                  addr;
+        __le32                  addr_hi;
+        __le32                  flags;
+        __le32                  len;
+        __le32                  ata_cmd[4];
 };
 
 /* Command ResPonse Block: 8B */
 struct mv_crpb {
-        u16                     id;
-        u16                     flags;
-        u32                     tmstmp;
+        __le16                  id;
+        __le16                  flags;
+        __le32                  tmstmp;
 };
 
 /* EDMA Physical Region Descriptor (ePRD); A.K.A. SG */
 struct mv_sg {
-        u32                     addr;
-        u32                     flags_size;
-        u32                     addr_hi;
-        u32                     reserved;
+        __le32                  addr;
+        __le32                  flags_size;
+        __le32                  addr_hi;
+        __le32                  reserved;
 };
 
 struct mv_port_priv {
@@ -390,6 +390,7 @@ static struct scsi_host_template mv_sht = {
         .proc_name              = DRV_NAME,
         .dma_boundary           = MV_DMA_BOUNDARY,
         .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
 };
 
@@ -406,6 +407,7 @@ static const struct ata_port_operations mv5_ops = {
 
         .qc_prep                = mv_qc_prep,
         .qc_issue               = mv_qc_issue,
+        .data_xfer              = ata_mmio_data_xfer,
 
         .eng_timeout            = mv_eng_timeout,
 
@@ -433,6 +435,7 @@ static const struct ata_port_operations mv6_ops = {
 
         .qc_prep                = mv_qc_prep,
         .qc_issue               = mv_qc_issue,
+        .data_xfer              = ata_mmio_data_xfer,
 
         .eng_timeout            = mv_eng_timeout,
 
@@ -683,7 +686,7 @@ static void mv_stop_dma(struct ata_port *ap)
         }
 
         if (EDMA_EN & reg) {
-                printk(KERN_ERR "ata%u: Unable to stop eDMA\n", ap->id);
+                ata_port_printk(ap, KERN_ERR, "Unable to stop eDMA\n");
                 /* FIXME: Consider doing a reset here to recover */
         }
 }
@@ -1028,7 +1031,7 @@ static inline unsigned mv_inc_q_index(unsigned index)
         return (index + 1) & MV_MAX_Q_DEPTH_MASK;
 }
 
-static inline void mv_crqb_pack_cmd(u16 *cmdw, u8 data, u8 addr, unsigned last)
+static inline void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last)
 {
         u16 tmp = data | (addr << CRQB_CMD_ADDR_SHIFT) | CRQB_CMD_CS |
                 (last ? CRQB_CMD_LAST : 0);
@@ -1051,7 +1054,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct mv_port_priv *pp = ap->private_data;
-        u16 *cw;
+        __le16 *cw;
         struct ata_taskfile *tf;
         u16 flags = 0;
         unsigned in_index;
@@ -1307,8 +1310,8 @@ static void mv_err_intr(struct ata_port *ap, int reset_allowed)
         edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
 
         if (EDMA_ERR_SERR & edma_err_cause) {
-                serr = scr_read(ap, SCR_ERROR);
-                scr_write_flush(ap, SCR_ERROR, serr);
+                sata_scr_read(ap, SCR_ERROR, &serr);
+                sata_scr_write_flush(ap, SCR_ERROR, serr);
         }
         if (EDMA_ERR_SELF_DIS & edma_err_cause) {
                 struct mv_port_priv *pp = ap->private_data;
@@ -1377,7 +1380,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                 /* Note that DEV_IRQ might happen spuriously during EDMA,
                  * and should be ignored in such cases.
                  * The cause of this is still under investigation.
-                 */ 
+                 */
                 if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
                         /* EDMA: check for response queue interrupt */
                         if ((CRPB_DMA_DONE << hard_port) & hc_irq_cause) {
@@ -1398,7 +1401,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                         }
                 }
 
-                if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))
+                if (ap && (ap->flags & ATA_FLAG_DISABLED))
                         continue;
 
                 err_mask = ac_err_mask(ata_status);
@@ -1419,7 +1422,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                                 VPRINTK("port %u IRQ found for qc, "
                                         "ata_status 0x%x\n", port,ata_status);
                                 /* mark qc status appropriately */
-                                if (!(qc->tf.ctl & ATA_NIEN)) {
+                                if (!(qc->tf.flags & ATA_TFLAG_POLLING)) {
                                         qc->err_mask |= err_mask;
                                         ata_qc_complete(qc);
                                 }
@@ -1949,15 +1952,16 @@ static void __mv_phy_reset(struct ata_port *ap, int can_sleep)
 
         /* Issue COMRESET via SControl */
 comreset_retry:
-        scr_write_flush(ap, SCR_CONTROL, 0x301);
+        sata_scr_write_flush(ap, SCR_CONTROL, 0x301);
         __msleep(1, can_sleep);
 
-        scr_write_flush(ap, SCR_CONTROL, 0x300);
+        sata_scr_write_flush(ap, SCR_CONTROL, 0x300);
         __msleep(20, can_sleep);
 
         timeout = jiffies + msecs_to_jiffies(200);
         do {
-                sstatus = scr_read(ap, SCR_STATUS) & 0x3;
+                sata_scr_read(ap, SCR_STATUS, &sstatus);
+                sstatus &= 0x3;
                 if ((sstatus == 3) || (sstatus == 0))
                         break;
 
@@ -1974,11 +1978,12 @@ comreset_retry:
                 "SCtrl 0x%08x\n", mv_scr_read(ap, SCR_STATUS),
                 mv_scr_read(ap, SCR_ERROR), mv_scr_read(ap, SCR_CONTROL));
 
-        if (sata_dev_present(ap)) {
+        if (ata_port_online(ap)) {
                 ata_port_probe(ap);
         } else {
-                printk(KERN_INFO "ata%u: no device found (phy stat %08x)\n",
-                       ap->id, scr_read(ap, SCR_STATUS));
+                sata_scr_read(ap, SCR_STATUS, &sstatus);
+                ata_port_printk(ap, KERN_INFO,
+                                "no device found (phy stat %08x)\n", sstatus);
                 ata_port_disable(ap);
                 return;
         }
@@ -2005,7 +2010,7 @@ comreset_retry:
         tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr);
 
         dev->class = ata_dev_classify(&tf);
-        if (!ata_dev_present(dev)) {
+        if (!ata_dev_enabled(dev)) {
                 VPRINTK("Port disabled post-sig: No device present.\n");
                 ata_port_disable(ap);
         }
@@ -2037,7 +2042,7 @@ static void mv_eng_timeout(struct ata_port *ap)
         struct ata_queued_cmd *qc;
         unsigned long flags;
 
-        printk(KERN_ERR "ata%u: Entering mv_eng_timeout\n",ap->id);
+        ata_port_printk(ap, KERN_ERR, "Entering mv_eng_timeout\n");
         DPRINTK("All regs @ start of eng_timeout\n");
         mv_dump_all_regs(ap->host_set->mmio_base, ap->port_no,
                          to_pci_dev(ap->host_set->dev));