Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (79 commits)
  ata-acpi: don't call _GTF for disabled drive
  sata_mv add temporary 3 second init delay for SiliconImage PMs
  sata_mv remove redundant edma init code
  sata_mv add basic port multiplier support
  sata_mv fix SOC flags, enable NCQ on SOC
  sata_mv disable hotplug for now
  sata_mv cosmetics
  sata_mv hardreset rework
  [libata] improve Kconfig help text for new PMP, SFF options
  libata: make EH fail gracefully if no reset method is available
  libata: Be a bit more slack about early devices
  libata: cable logic
  libata: move link onlineness check out of softreset methods
  libata: kill dead code paths in reset path
  pata_scc: fix build breakage
  libata: make PMP support optional
  libata: implement PMP helpers
  libata: separate PMP support code from core code
  libata: make SFF support optional
  libata: don't use ap->ioaddr in non-SFF drivers
  ...

2 files changed, 30 insertions, 63 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index c72014a3e7d4..65dc18dea845 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3937,7 +3937,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
         if (ipr_is_gata(res) && res->sata_port) {
                 ap = res->sata_port->ap;
                 spin_unlock_irq(scsi_cmd->device->host->host_lock);
-                ata_do_eh(ap, NULL, NULL, ipr_sata_reset, NULL);
+                ata_std_error_handler(ap);
                 spin_lock_irq(scsi_cmd->device->host->host_lock);
 
                 list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {
@@ -5041,33 +5041,6 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc)
 }
 
 /**
- * ipr_tf_read - Read the current ATA taskfile for the ATA port
- * @ap: ATA port
- * @tf: destination ATA taskfile
- *
- * Return value:
- *      none
- **/
-static void ipr_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
-{
-        struct ipr_sata_port *sata_port = ap->private_data;
-        struct ipr_ioasa_gata *g = &sata_port->ioasa;
-
-        tf->feature = g->error;
-        tf->nsect = g->nsect;
-        tf->lbal = g->lbal;
-        tf->lbam = g->lbam;
-        tf->lbah = g->lbah;
-        tf->device = g->device;
-        tf->command = g->status;
-        tf->hob_nsect = g->hob_nsect;
-        tf->hob_lbal = g->hob_lbal;
-        tf->hob_lbam = g->hob_lbam;
-        tf->hob_lbah = g->hob_lbah;
-        tf->ctl = g->alt_status;
-}
-
-/**
  * ipr_copy_sata_tf - Copy a SATA taskfile to an IOA data structure
  * @regs:       destination
  * @tf: source ATA taskfile
@@ -5245,40 +5218,41 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
 }
 
 /**
- * ipr_ata_check_status - Return last ATA status
- * @ap: ATA port
+ * ipr_qc_fill_rtf - Read result TF
+ * @qc: ATA queued command
  *
  * Return value:
- *      ATA status
+ *      true
  **/
-static u8 ipr_ata_check_status(struct ata_port *ap)
+static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
 {
-        struct ipr_sata_port *sata_port = ap->private_data;
-        return sata_port->ioasa.status;
-}
+        struct ipr_sata_port *sata_port = qc->ap->private_data;
+        struct ipr_ioasa_gata *g = &sata_port->ioasa;
+        struct ata_taskfile *tf = &qc->result_tf;
 
-/**
- * ipr_ata_check_altstatus - Return last ATA altstatus
- * @ap: ATA port
- *
- * Return value:
- *      Alt ATA status
- **/
-static u8 ipr_ata_check_altstatus(struct ata_port *ap)
-{
-        struct ipr_sata_port *sata_port = ap->private_data;
-        return sata_port->ioasa.alt_status;
+        tf->feature = g->error;
+        tf->nsect = g->nsect;
+        tf->lbal = g->lbal;
+        tf->lbam = g->lbam;
+        tf->lbah = g->lbah;
+        tf->device = g->device;
+        tf->command = g->status;
+        tf->hob_nsect = g->hob_nsect;
+        tf->hob_lbal = g->hob_lbal;
+        tf->hob_lbam = g->hob_lbam;
+        tf->hob_lbah = g->hob_lbah;
+        tf->ctl = g->alt_status;
+
+        return true;
 }
 
 static struct ata_port_operations ipr_sata_ops = {
-        .check_status = ipr_ata_check_status,
-        .check_altstatus = ipr_ata_check_altstatus,
-        .dev_select = ata_noop_dev_select,
         .phy_reset = ipr_ata_phy_reset,
+        .hardreset = ipr_sata_reset,
         .post_internal_cmd = ipr_ata_post_internal,
-        .tf_read = ipr_tf_read,
         .qc_prep = ata_noop_qc_prep,
         .qc_issue = ipr_qc_issue,
+        .qc_fill_rtf = ipr_qc_fill_rtf,
         .port_start = ata_sas_port_start,
         .port_stop = ata_sas_port_stop
 };
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index b0e5ac372a32..a4811e4106df 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -225,10 +225,12 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         return 0;
 }
 
-static u8 sas_ata_check_status(struct ata_port *ap)
+static bool sas_ata_qc_fill_rtf(struct ata_queued_cmd *qc)
 {
-        struct domain_device *dev = ap->private_data;
-        return dev->sata_dev.tf.command;
+        struct domain_device *dev = qc->ap->private_data;
+
+        memcpy(&qc->result_tf, &dev->sata_dev.tf, sizeof(qc->result_tf));
+        return true;
 }
 
 static void sas_ata_phy_reset(struct ata_port *ap)
@@ -292,12 +294,6 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc)
         }
 }
 
-static void sas_ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
-{
-        struct domain_device *dev = ap->private_data;
-        memcpy(tf, &dev->sata_dev.tf, sizeof (*tf));
-}
-
 static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
                               u32 val)
 {
@@ -348,14 +344,11 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
 }
 
 static struct ata_port_operations sas_sata_ops = {
-        .check_status           = sas_ata_check_status,
-        .check_altstatus        = sas_ata_check_status,
-        .dev_select             = ata_noop_dev_select,
         .phy_reset              = sas_ata_phy_reset,
         .post_internal_cmd      = sas_ata_post_internal,
-        .tf_read                = sas_ata_tf_read,
         .qc_prep                = ata_noop_qc_prep,
         .qc_issue               = sas_ata_qc_issue,
+        .qc_fill_rtf            = sas_ata_qc_fill_rtf,
         .port_start             = ata_sas_port_start,
         .port_stop              = ata_sas_port_stop,
         .scr_read               = sas_ata_scr_read,