Merge branch 'upstream'

4 files changed, 67 insertions, 47 deletions

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 4cc1108f721a..c662bf531514 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -131,8 +131,8 @@ enum {
 static int piix_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent);
 
-static void piix_pata_phy_reset(struct ata_port *ap);
-static void piix_sata_phy_reset(struct ata_port *ap);
+static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);
+static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes);
 static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
 static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
 
@@ -207,7 +207,7 @@ static const struct ata_port_operations piix_pata_ops = {
         .exec_command           = ata_exec_command,
         .dev_select             = ata_std_dev_select,
 
-        .phy_reset              = piix_pata_phy_reset,
+        .probe_reset            = piix_pata_probe_reset,
 
         .bmdma_setup            = ata_bmdma_setup,
         .bmdma_start            = ata_bmdma_start,
@@ -235,7 +235,7 @@ static const struct ata_port_operations piix_sata_ops = {
         .exec_command           = ata_exec_command,
         .dev_select             = ata_std_dev_select,
 
-        .phy_reset              = piix_sata_phy_reset,
+        .probe_reset            = piix_sata_probe_reset,
 
         .bmdma_setup            = ata_bmdma_setup,
         .bmdma_start            = ata_bmdma_start,
@@ -258,8 +258,7 @@ static struct ata_port_info piix_port_info[] = {
         /* ich5_pata */
         {
                 .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
-                                  PIIX_FLAG_CHECKINTR,
+                .host_flags     = ATA_FLAG_SLAVE_POSS | PIIX_FLAG_CHECKINTR,
                 .pio_mask       = 0x1f, /* pio0-4 */
 #if 0
                 .mwdma_mask     = 0x06, /* mwdma1-2 */
@@ -273,8 +272,8 @@ static struct ata_port_info piix_port_info[] = {
         /* ich5_sata */
         {
                 .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
-                                  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR,
+                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED |
+                                  PIIX_FLAG_CHECKINTR,
                 .pio_mask       = 0x1f, /* pio0-4 */
                 .mwdma_mask     = 0x07, /* mwdma0-2 */
                 .udma_mask      = 0x7f, /* udma0-6 */
@@ -284,7 +283,7 @@ static struct ata_port_info piix_port_info[] = {
         /* piix4_pata */
         {
                 .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+                .host_flags     = ATA_FLAG_SLAVE_POSS,
                 .pio_mask       = 0x1f, /* pio0-4 */
 #if 0
                 .mwdma_mask     = 0x06, /* mwdma1-2 */
@@ -298,8 +297,7 @@ static struct ata_port_info piix_port_info[] = {
         /* ich6_sata */
         {
                 .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
-                                  PIIX_FLAG_COMBINED_ICH6 |
+                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
                                   PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS,
                 .pio_mask       = 0x1f, /* pio0-4 */
                 .mwdma_mask     = 0x07, /* mwdma0-2 */
@@ -310,8 +308,7 @@ static struct ata_port_info piix_port_info[] = {
         /* ich6_sata_ahci */
         {
                 .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
-                                  PIIX_FLAG_COMBINED_ICH6 |
+                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
                                   PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |
                                   PIIX_FLAG_AHCI,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -366,30 +363,42 @@ cbl40:
 }
 
 /**
- *      piix_pata_phy_reset - Probe specified port on PATA host controller
- *      @ap: Port to probe
+ *      piix_pata_probeinit - probeinit for PATA host controller
+ *      @ap: Target port
  *
- *      Probe PATA phy.
+ *      Probeinit including cable detection.
  *
  *      LOCKING:
  *      None (inherited from caller).
  */
+static void piix_pata_probeinit(struct ata_port *ap)
+{
+        piix_pata_cbl_detect(ap);
+        ata_std_probeinit(ap);
+}
 
-static void piix_pata_phy_reset(struct ata_port *ap)
+/**
+ *      piix_pata_probe_reset - Perform reset on PATA port and classify
+ *      @ap: Port to reset
+ *      @classes: Resulting classes of attached devices
+ *
+ *      Reset PATA phy and classify attached devices.
+ *
+ *      LOCKING:
+ *      None (inherited from caller).
+ */
+static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
 
         if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->hard_port_no])) {
-                ata_port_disable(ap);
                 printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
-                return;
+                return 0;
         }
 
-        piix_pata_cbl_detect(ap);
-
-        ata_port_probe(ap);
-
-        ata_bus_reset(ap);
+        return ata_drive_probe_reset(ap, piix_pata_probeinit,
+                                     ata_std_softreset, NULL,
+                                     ata_std_postreset, classes);
 }
 
 /**
@@ -437,28 +446,25 @@ static int piix_sata_probe (struct ata_port *ap)
 }
 
 /**
- *      piix_sata_phy_reset - Probe specified port on SATA host controller
- *      @ap: Port to probe
+ *      piix_sata_probe_reset - Perform reset on SATA port and classify
+ *      @ap: Port to reset
+ *      @classes: Resulting classes of attached devices
  *
- *      Probe SATA phy.
+ *      Reset SATA phy and classify attached devices.
  *
  *      LOCKING:
  *      None (inherited from caller).
  */
-
-static void piix_sata_phy_reset(struct ata_port *ap)
+static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes)
 {
         if (!piix_sata_probe(ap)) {
-                ata_port_disable(ap);
                 printk(KERN_INFO "ata%u: SATA port has no device.\n", ap->id);
-                return;
+                return 0;
         }
 
-        ap->cbl = ATA_CBL_SATA;
-
-        ata_port_probe(ap);
-
-        ata_bus_reset(ap);
+        return ata_drive_probe_reset(ap, ata_std_probeinit,
+                                     ata_std_softreset, NULL,
+                                     ata_std_postreset, classes);
 }
 
 /**
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index ed852348ba24..8b83c4e45208 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2113,7 +2113,6 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
  *      This function is invoked after a successful reset.  Note that
  *      the device might have been reset more than once using
  *      different reset methods before postreset is invoked.
- *      postreset is also reponsible for setting cable type.
  *
  *      This function is to be used as standard callback for
  *      ata_drive_*_reset().
@@ -2125,7 +2124,7 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes)
 {
         DPRINTK("ENTER\n");
 
-        /* set cable type */
+        /* set cable type if it isn't already set */
         if (ap->cbl == ATA_CBL_NONE && ap->flags & ATA_FLAG_SATA)
                 ap->cbl = ATA_CBL_SATA;
 
@@ -2592,7 +2591,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
         WARN_ON(sg == NULL);
 
         if (qc->flags & ATA_QCFLAG_SINGLE)
-                WARN_ON(qc->n_elem != 1);
+                WARN_ON(qc->n_elem > 1);
 
         VPRINTK("unmapping %u sg elements\n", qc->n_elem);
 
@@ -2615,7 +2614,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
                         kunmap_atomic(addr, KM_IRQ0);
                 }
         } else {
-                if (sg_dma_len(&sg[0]) > 0)
+                if (qc->n_elem)
                         dma_unmap_single(ap->host_set->dev,
                                 sg_dma_address(&sg[0]), sg_dma_len(&sg[0]),
                                 dir);
@@ -2648,7 +2647,7 @@ static void ata_fill_sg(struct ata_queued_cmd *qc)
         unsigned int idx;
 
         WARN_ON(qc->__sg == NULL);
-        WARN_ON(qc->n_elem == 0);
+        WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
 
         idx = 0;
         ata_for_each_sg(sg, qc) {
@@ -2793,6 +2792,7 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
         int dir = qc->dma_dir;
         struct scatterlist *sg = qc->__sg;
         dma_addr_t dma_address;
+        int trim_sg = 0;
 
         /* we must lengthen transfers to end on a 32-bit boundary */
         qc->pad_len = sg->length & 3;
@@ -2812,13 +2812,15 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
                 sg_dma_len(psg) = ATA_DMA_PAD_SZ;
                 /* trim sg */
                 sg->length -= qc->pad_len;
+                if (sg->length == 0)
+                        trim_sg = 1;
 
                 DPRINTK("padding done, sg->length=%u pad_len=%u\n",
                         sg->length, qc->pad_len);
         }
 
-        if (!sg->length) {
-                sg_dma_address(sg) = 0;
+        if (trim_sg) {
+                qc->n_elem--;
                 goto skip_map;
         }
 
@@ -2831,9 +2833,9 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
         }
 
         sg_dma_address(sg) = dma_address;
-skip_map:
         sg_dma_len(sg) = sg->length;
 
+skip_map:
         DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg),
                 qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
 
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index bfc1dc8e7779..bf7bb9ec18d0 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -277,7 +277,7 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
         u8 *prd = pp->pkt + QS_CPB_BYTES;
 
         WARN_ON(qc->__sg == NULL);
-        WARN_ON(qc->n_elem == 0);
+        WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
 
         nelem = 0;
         ata_for_each_sg(sg, qc) {
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 63500881acc6..2558abac9fb2 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -619,17 +619,29 @@ ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc)
 }
 
 static inline struct scatterlist *
+ata_qc_first_sg(struct ata_queued_cmd *qc)
+{
+        if (qc->n_elem)
+                return qc->__sg;
+        if (qc->pad_len)
+                return &qc->pad_sgent;
+        return NULL;
+}
+
+static inline struct scatterlist *
 ata_qc_next_sg(struct scatterlist *sg, struct ata_queued_cmd *qc)
 {
         if (sg == &qc->pad_sgent)
                 return NULL;
         if (++sg - qc->__sg < qc->n_elem)
                 return sg;
-        return qc->pad_len ? &qc->pad_sgent : NULL;
+        if (qc->pad_len)
+                return &qc->pad_sgent;
+        return NULL;
 }
 
 #define ata_for_each_sg(sg, qc) \
-        for (sg = qc->__sg; sg; sg = ata_qc_next_sg(sg, qc))
+        for (sg = ata_qc_first_sg(qc); sg; sg = ata_qc_next_sg(sg, qc))
 
 static inline unsigned int ata_tag_valid(unsigned int tag)
 {