]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/scsi/libsas/sas_scsi_host.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[linux-2.6-omap-h63xx.git] / drivers / scsi / libsas / sas_scsi_host.c
index 274e7eb47f37bd006beb39c0e8742abbb8cd2a41..f869fba8680721ed8365c0fed872fd4915ed7a84 100644 (file)
@@ -34,6 +34,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_sas.h>
+#include <scsi/sas_ata.h>
 #include "../scsi_sas_internal.h"
 #include "../scsi_transport_api.h"
 #include "../scsi_priv.h"
@@ -46,9 +47,6 @@
 
 /* ---------- SCSI Host glue ---------- */
 
-#define TO_SAS_TASK(_scsi_cmd)  ((void *)(_scsi_cmd)->host_scribble)
-#define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0)
-
 static void sas_scsi_task_done(struct sas_task *task)
 {
        struct task_status_struct *ts = &task->task_status;
@@ -110,7 +108,7 @@ static void sas_scsi_task_done(struct sas_task *task)
                        break;
                case SAM_CHECK_COND:
                        memcpy(sc->sense_buffer, ts->buf,
-                              max(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size));
+                              min(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size));
                        stat = SAM_CHECK_COND;
                        break;
                default:
@@ -150,7 +148,6 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
        if (!task)
                return NULL;
 
-       *(u32 *)cmd->sense_buffer = 0;
        task->uldd_task = cmd;
        ASSIGN_SAS_TASK(cmd, task);
 
@@ -173,7 +170,7 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
        return task;
 }
 
-static int sas_queue_up(struct sas_task *task)
+int sas_queue_up(struct sas_task *task)
 {
        struct sas_ha_struct *sas_ha = task->dev->port->ha;
        struct scsi_core *core = &sas_ha->core;
@@ -193,11 +190,6 @@ static int sas_queue_up(struct sas_task *task)
        return 0;
 }
 
-static inline int dev_is_sata(struct domain_device *dev)
-{
-       return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA);
-}
-
 /**
  * sas_queuecommand -- Enqueue a command for processing
  * @parameters: See SCSI Core documentation
@@ -207,6 +199,10 @@ static inline int dev_is_sata(struct domain_device *dev)
  */
 int sas_queuecommand(struct scsi_cmnd *cmd,
                     void (*scsi_done)(struct scsi_cmnd *))
+       __releases(host->host_lock)
+       __acquires(dev->sata_dev.ap->lock)
+       __releases(dev->sata_dev.ap->lock)
+       __acquires(host->host_lock)
 {
        int res = 0;
        struct domain_device *dev = cmd_to_domain_dev(cmd);
@@ -220,8 +216,12 @@ int sas_queuecommand(struct scsi_cmnd *cmd,
                struct sas_task *task;
 
                if (dev_is_sata(dev)) {
+                       unsigned long flags;
+
+                       spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
                        res = ata_sas_queuecmd(cmd, scsi_done,
                                               dev->sata_dev.ap);
+                       spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags);
                        goto out;
                }
 
@@ -413,7 +413,7 @@ static int sas_recover_I_T(struct domain_device *dev)
 }
 
 /* Find the sas_phy that's attached to this device */
-struct sas_phy *find_local_sas_phy(struct domain_device *dev)
+static struct sas_phy *find_local_sas_phy(struct domain_device *dev)
 {
        struct domain_device *pdev = dev->parent;
        struct ex_phy *exphy = NULL;
@@ -467,7 +467,7 @@ int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd)
        res = sas_phy_reset(phy, 1);
        if (res)
                SAS_DPRINTK("Bus reset of %s failed 0x%x\n",
-                           phy->dev.kobj.k_name,
+                           kobject_name(&phy->dev.kobj),
                            res);
        if (res == TMF_RESP_FUNC_SUCC || res == TMF_RESP_FUNC_COMPLETE)
                return SUCCESS;
@@ -696,88 +696,6 @@ enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)
        return EH_NOT_HANDLED;
 }
 
-
-static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
-{
-       /* Cheesy attempt to translate SAS errors into ATA.  Hah! */
-
-       /* transport error */
-       if (ts->resp == SAS_TASK_UNDELIVERED)
-               return AC_ERR_ATA_BUS;
-
-       /* ts->resp == SAS_TASK_COMPLETE */
-       /* task delivered, what happened afterwards? */
-       switch (ts->stat) {
-               case SAS_DEV_NO_RESPONSE:
-                       return AC_ERR_TIMEOUT;
-
-               case SAS_INTERRUPTED:
-               case SAS_PHY_DOWN:
-               case SAS_NAK_R_ERR:
-                       return AC_ERR_ATA_BUS;
-
-
-               case SAS_DATA_UNDERRUN:
-                       /*
-                        * Some programs that use the taskfile interface
-                        * (smartctl in particular) can cause underrun
-                        * problems.  Ignore these errors, perhaps at our
-                        * peril.
-                        */
-                       return 0;
-
-               case SAS_DATA_OVERRUN:
-               case SAS_QUEUE_FULL:
-               case SAS_DEVICE_UNKNOWN:
-               case SAS_SG_ERR:
-                       return AC_ERR_INVALID;
-
-               case SAM_CHECK_COND:
-               case SAS_OPEN_TO:
-               case SAS_OPEN_REJECT:
-               case SAS_PROTO_RESPONSE:
-                       SAS_DPRINTK("%s: Saw error %d.  What to do?\n",
-                                   __FUNCTION__, ts->stat);
-                       return AC_ERR_OTHER;
-
-               case SAS_ABORTED_TASK:
-                       return AC_ERR_DEV;
-
-               default:
-                       return 0;
-       }
-}
-
-static void sas_ata_task_done(struct sas_task *task)
-{
-       struct ata_queued_cmd *qc = task->uldd_task;
-       struct domain_device *dev = qc->ap->private_data;
-       struct task_status_struct *stat = &task->task_status;
-       struct ata_task_resp *resp = (struct ata_task_resp *)stat->buf;
-       enum ata_completion_errors ac;
-
-       ac = sas_to_ata_err(stat);
-       if (ac) {
-               SAS_DPRINTK("%s: SAS error %x\n", __FUNCTION__, stat->stat);
-               /* We saw a SAS error. Send a vague error. */
-               qc->err_mask = ac;
-               dev->sata_dev.tf.feature = 0x04; /* status err */
-               dev->sata_dev.tf.command = ATA_ERR;
-               goto end;
-       }
-
-       ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf);
-       qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command);
-       dev->sata_dev.sstatus = resp->sstatus;
-       dev->sata_dev.serror = resp->serror;
-       dev->sata_dev.scontrol = resp->scontrol;
-       dev->sata_dev.ap->sactive = resp->sactive;
-end:
-       ata_qc_complete(qc);
-       list_del_init(&task->list);
-       sas_free_task(task);
-}
-
 int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 {
        struct domain_device *dev = sdev_to_domain_dev(sdev);
@@ -788,193 +706,6 @@ int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
        return -EINVAL;
 }
 
-static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
-{
-       int res = -ENOMEM;
-       struct sas_task *task;
-       struct domain_device *dev = qc->ap->private_data;
-       struct sas_ha_struct *sas_ha = dev->port->ha;
-       struct Scsi_Host *host = sas_ha->core.shost;
-       struct sas_internal *i = to_sas_internal(host->transportt);
-       struct scatterlist *sg;
-       unsigned int num = 0;
-       unsigned int xfer = 0;
-
-       task = sas_alloc_task(GFP_ATOMIC);
-       if (!task)
-               goto out;
-       task->dev = dev;
-       task->task_proto = SAS_PROTOCOL_STP;
-       task->task_done = sas_ata_task_done;
-
-       ata_tf_to_fis(&qc->tf, (u8*)&task->ata_task.fis, 0);
-       task->uldd_task = qc;
-       if (is_atapi_taskfile(&qc->tf)) {
-               memcpy(task->ata_task.atapi_packet, qc->cdb, ATAPI_CDB_LEN);
-               task->total_xfer_len = qc->nbytes + qc->pad_len;
-               task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
-       } else {
-               ata_for_each_sg(sg, qc) {
-                       num++;
-                       xfer += sg->length;
-               }
-
-               task->total_xfer_len = xfer;
-               task->num_scatter = num;
-       }
-
-       task->data_dir = qc->dma_dir;
-       task->scatter = qc->__sg;
-       task->ata_task.retry_count = 1;
-       task->task_state_flags = SAS_TASK_STATE_PENDING;
-
-       switch (qc->tf.protocol) {
-       case ATA_PROT_NCQ:
-               task->ata_task.use_ncq = 1;
-               /* fall through */
-       case ATA_PROT_DMA:
-               task->ata_task.dma_xfer = 1;
-               break;
-       }
-
-       if (sas_ha->lldd_max_execute_num < 2)
-               res = i->dft->lldd_execute_task(task, 1, GFP_ATOMIC);
-       else
-               res = sas_queue_up(task);
-
-       /* Examine */
-       if (res) {
-               SAS_DPRINTK("lldd_execute_task returned: %d\n", res);
-
-               sas_free_task(task);
-               if (res == -SAS_QUEUE_FULL)
-                       return -ENOMEM;
-       }
-
-out:
-       return res;
-}
-
-static u8 sas_ata_check_status(struct ata_port *ap)
-{
-       struct domain_device *dev = ap->private_data;
-       return dev->sata_dev.tf.command;
-}
-
-static void sas_ata_phy_reset(struct ata_port *ap)
-{
-       struct domain_device *dev = ap->private_data;
-       struct sas_internal *i =
-               to_sas_internal(dev->port->ha->core.shost->transportt);
-       int res = 0;
-
-       if (i->dft->lldd_I_T_nexus_reset)
-               res = i->dft->lldd_I_T_nexus_reset(dev);
-
-       if (res)
-               SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __FUNCTION__);
-
-       switch (dev->sata_dev.command_set) {
-               case ATA_COMMAND_SET:
-                       SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
-                       ap->device[0].class = ATA_DEV_ATA;
-                       break;
-               case ATAPI_COMMAND_SET:
-                       SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
-                       ap->device[0].class = ATA_DEV_ATAPI;
-                       break;
-               default:
-                       SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
-                                   __FUNCTION__,
-                                   dev->sata_dev.command_set);
-                       ap->device[0].class = ATA_DEV_ATA;
-                       break;
-       }
-
-       ap->cbl = ATA_CBL_SATA;
-}
-
-static void sas_ata_post_internal(struct ata_queued_cmd *qc)
-{
-       if (qc->flags & ATA_QCFLAG_FAILED)
-               qc->err_mask |= AC_ERR_OTHER;
-
-       if (qc->err_mask)
-               SAS_DPRINTK("%s: Failure; reset phy!\n", __FUNCTION__);
-}
-
-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 void sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
-                             u32 val)
-{
-       struct domain_device *dev = ap->private_data;
-
-       SAS_DPRINTK("STUB %s\n", __FUNCTION__);
-       switch (sc_reg_in) {
-               case SCR_STATUS:
-                       dev->sata_dev.sstatus = val;
-                       break;
-               case SCR_CONTROL:
-                       dev->sata_dev.scontrol = val;
-                       break;
-               case SCR_ERROR:
-                       dev->sata_dev.serror = val;
-                       break;
-               case SCR_ACTIVE:
-                       dev->sata_dev.ap->sactive = val;
-                       break;
-       }
-}
-
-static u32 sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in)
-{
-       struct domain_device *dev = ap->private_data;
-
-       SAS_DPRINTK("STUB %s\n", __FUNCTION__);
-       switch (sc_reg_in) {
-               case SCR_STATUS:
-                       return dev->sata_dev.sstatus;
-               case SCR_CONTROL:
-                       return dev->sata_dev.scontrol;
-               case SCR_ERROR:
-                       return dev->sata_dev.serror;
-               case SCR_ACTIVE:
-                       return dev->sata_dev.ap->sactive;
-               default:
-                       return 0xffffffffU;
-       }
-}
-
-static struct ata_port_operations sas_sata_ops = {
-       .port_disable           = ata_port_disable,
-       .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,
-       .port_start             = ata_sas_port_start,
-       .port_stop              = ata_sas_port_stop,
-       .scr_read               = sas_ata_scr_read,
-       .scr_write              = sas_ata_scr_write
-};
-
-static struct ata_port_info sata_port_info = {
-       .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET |
-               ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ,
-       .pio_mask = 0x1f, /* PIO0-4 */
-       .mwdma_mask = 0x07, /* MWDMA0-2 */
-       .udma_mask = ATA_UDMA6,
-       .port_ops = &sas_sata_ops
-};
-
 struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy)
 {
        struct Scsi_Host *shost = dev_to_shost(rphy->dev.parent);
@@ -1013,32 +744,16 @@ static inline struct domain_device *sas_find_target(struct scsi_target *starget)
 
 int sas_target_alloc(struct scsi_target *starget)
 {
-       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
-       struct sas_ha_struct *ha = SHOST_TO_SAS_HA(shost);
        struct domain_device *found_dev = sas_find_target(starget);
+       int res;
 
        if (!found_dev)
                return -ENODEV;
 
        if (dev_is_sata(found_dev)) {
-               struct ata_port *ap;
-
-               ata_host_init(&found_dev->sata_dev.ata_host,
-                             &ha->pcidev->dev,
-                             sata_port_info.flags,
-                             &sas_sata_ops);
-               ap = ata_sas_port_alloc(&found_dev->sata_dev.ata_host,
-                                       &sata_port_info,
-                                       shost);
-               if (!ap) {
-                       SAS_DPRINTK("ata_sas_port_alloc failed.\n");
-                       return -ENODEV;
-               }
-
-               ap->private_data = found_dev;
-               ap->cbl = ATA_CBL_SATA;
-               ap->scsi_host = shost;
-               found_dev->sata_dev.ap = ap;
+               res = sas_ata_init_host_and_port(found_dev, starget);
+               if (res)
+                       return res;
        }
 
        starget->hostdata = found_dev;
@@ -1303,6 +1018,11 @@ void sas_task_abort(struct sas_task *task)
                return;
        }
 
+       if (dev_is_sata(task->dev)) {
+               sas_ata_task_abort(task);
+               return;
+       }
+
        scsi_req_abort_cmd(sc);
        scsi_schedule_eh(sc->device->host);
 }