1 files changed, 26 insertions, 8 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 0b299b0f8172..f93dc029dfde 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -773,18 +773,32 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,
         else
                 iowrite32_rep(data_addr, buf, words);
 
+        /* Transfer trailing bytes, if any */
         if (unlikely(slop)) {
-                __le32 pad;
+                unsigned char pad[4];
+
+                /* Point buf to the tail of buffer */
+                buf += buflen - slop;
+
+                /*
+                 * Use io*_rep() accessors here as well to avoid pointlessly
+                 * swapping bytes to and fro on the big endian machines...
+                 */
                 if (rw == READ) {
-                        pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                        memcpy(buf + buflen - slop, &pad, slop);
+                        if (slop < 3)
+                                ioread16_rep(data_addr, pad, 1);
+                        else
+                                ioread32_rep(data_addr, pad, 1);
+                        memcpy(buf, pad, slop);
                 } else {
-                        memcpy(&pad, buf + buflen - slop, slop);
-                        iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
+                        memcpy(pad, buf, slop);
+                        if (slop < 3)
+                                iowrite16_rep(data_addr, pad, 1);
+                        else
+                                iowrite32_rep(data_addr, pad, 1);
                 }
-                words++;
         }
-        return words << 2;
+        return (buflen + 1) & ~1;
 }
 EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);
 
@@ -2052,6 +2066,7 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
         iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
         udelay(20);     /* FIXME: flush */
         iowrite8(ap->ctl, ioaddr->ctl_addr);
+        ap->last_ctl = ap->ctl;
 
         /* wait the port to become ready */
         return ata_sff_wait_after_reset(&ap->link, devmask, deadline);
@@ -2176,8 +2191,10 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
         }
 
         /* set up device control */
-        if (ap->ioaddr.ctl_addr)
+        if (ap->ioaddr.ctl_addr) {
                 iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
+                ap->last_ctl = ap->ctl;
+        }
 }
 EXPORT_SYMBOL_GPL(ata_sff_postreset);
 
@@ -2520,6 +2537,7 @@ void ata_bus_reset(struct ata_port *ap)
         if (ap->flags & (ATA_FLAG_SATA_RESET | ATA_FLAG_SRST)) {
                 /* set up device control for ATA_FLAG_SATA_RESET */
                 iowrite8(ap->ctl, ioaddr->ctl_addr);
+                ap->last_ctl = ap->ctl;
         }
 
         DPRINTK("EXIT\n");