9 files changed, 371 insertions, 16 deletions

diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
index c01a40d321d4..18f33cd54411 100644
--- a/drivers/scsi/libsas/Kconfig
+++ b/drivers/scsi/libsas/Kconfig
@@ -38,6 +38,15 @@ config SCSI_SAS_ATA
                 Builds in ATA support into libsas.  Will necessitate
                 the loading of libata along with libsas.
 
+config SCSI_SAS_HOST_SMP
+        bool "Support for SMP interpretation for SAS hosts"
+        default y
+        depends on SCSI_SAS_LIBSAS
+        help
+                Allows sas hosts to receive SMP frames.  Selecting this
+                option builds an SMP interpreter into libsas.  Say
+                N here if you want to save the few kb this consumes.
+
 config SCSI_SAS_LIBSAS_DEBUG
         bool "Compile the SAS Domain Transport Attributes in debug mode"
         default y
diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index fd387b91856e..1ad1323c60fa 100644
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -33,5 +33,7 @@ libsas-y +=  sas_init.o     \
                 sas_dump.o     \
                 sas_discover.o \
                 sas_expander.o \
-                sas_scsi_host.o
+                sas_scsi_host.o \
+                sas_task.o
 libsas-$(CONFIG_SCSI_SAS_ATA) +=        sas_ata.o
+libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=   sas_host_smp.o
\ No newline at end of file
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 827cfb132f21..0996f866f14c 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -498,7 +498,7 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
                         goto ex_err;
                 }
                 wait_for_completion(&task->completion);
-                res = -ETASK;
+                res = -ECOMM;
                 if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
                         int res2;
                         SAS_DPRINTK("task aborted, flags:0x%x\n",
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 5f3a0d7b18de..31b9af224243 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -98,7 +98,7 @@ static int sas_get_port_device(struct asd_sas_port *port)
                         dev->dev_type = SATA_PM;
                 else
                         dev->dev_type = SATA_DEV;
-                dev->tproto = SATA_PROTO;
+                dev->tproto = SAS_PROTOCOL_SATA;
         } else {
                 struct sas_identify_frame *id =
                         (struct sas_identify_frame *) dev->frame_rcvd;
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 8727436b222d..aefd865a5788 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -96,7 +96,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
                 }
 
                 wait_for_completion(&task->completion);
-                res = -ETASK;
+                res = -ECOMM;
                 if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
                         SAS_DPRINTK("smp task timed out or aborted\n");
                         i->dft->lldd_abort_task(task);
@@ -109,6 +109,16 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
                     task->task_status.stat == SAM_GOOD) {
                         res = 0;
                         break;
+                } if (task->task_status.resp == SAS_TASK_COMPLETE &&
+                      task->task_status.stat == SAS_DATA_UNDERRUN) {
+                        /* no error, but return the number of bytes of
+                         * underrun */
+                        res = task->task_status.residual;
+                        break;
+                } if (task->task_status.resp == SAS_TASK_COMPLETE &&
+                      task->task_status.stat == SAS_DATA_OVERRUN) {
+                        res = -EMSGSIZE;
+                        break;
                 } else {
                         SAS_DPRINTK("%s: task to dev %016llx response: 0x%x "
                                     "status 0x%x\n", __FUNCTION__,
@@ -656,9 +666,9 @@ static struct domain_device *sas_ex_discover_end_dev(
         sas_ex_get_linkrate(parent, child, phy);
 
 #ifdef CONFIG_SCSI_SAS_ATA
-        if ((phy->attached_tproto & SAS_PROTO_STP) || phy->attached_sata_dev) {
+        if ((phy->attached_tproto & SAS_PROTOCOL_STP) || phy->attached_sata_dev) {
                 child->dev_type = SATA_DEV;
-                if (phy->attached_tproto & SAS_PROTO_STP)
+                if (phy->attached_tproto & SAS_PROTOCOL_STP)
                         child->tproto = phy->attached_tproto;
                 if (phy->attached_sata_dev)
                         child->tproto |= SATA_DEV;
@@ -695,7 +705,7 @@ static struct domain_device *sas_ex_discover_end_dev(
                 }
         } else
 #endif
-          if (phy->attached_tproto & SAS_PROTO_SSP) {
+          if (phy->attached_tproto & SAS_PROTOCOL_SSP) {
                 child->dev_type = SAS_END_DEV;
                 rphy = sas_end_device_alloc(phy->port);
                 /* FIXME: error handling */
@@ -1896,11 +1906,9 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         }
 
         /* no rphy means no smp target support (ie aic94xx host) */
-        if (!rphy) {
-                printk("%s: can we send a smp request to a host?\n",
-                       __FUNCTION__);
-                return -EINVAL;
-        }
+        if (!rphy)
+                return sas_smp_host_handler(shost, req, rsp);
+
         type = rphy->identify.device_type;
 
         if (type != SAS_EDGE_EXPANDER_DEVICE &&
@@ -1926,6 +1934,15 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         ret = smp_execute_task(dev, bio_data(req->bio), req->data_len,
                                bio_data(rsp->bio), rsp->data_len);
+        if (ret > 0) {
+                /* positive number is the untransferred residual */
+                rsp->data_len = ret;
+                req->data_len = 0;
+                ret = 0;
+        } else if (ret == 0) {
+                rsp->data_len = 0;
+                req->data_len = 0;
+        }
 
         return ret;
 }
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c
new file mode 100644
index 000000000000..16f93123271e
--- /dev/null
+++ b/drivers/scsi/libsas/sas_host_smp.c
@@ -0,0 +1,274 @@
+/*
+ * Serial Attached SCSI (SAS) Expander discovery and configuration
+ *
+ * Copyright (C) 2007 James E.J. Bottomley
+ *              <James.Bottomley@HansenPartnership.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 only.
+ */
+#include <linux/scatterlist.h>
+#include <linux/blkdev.h>
+
+#include "sas_internal.h"
+
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_sas.h>
+#include "../scsi_sas_internal.h"
+
+static void sas_host_smp_discover(struct sas_ha_struct *sas_ha, u8 *resp_data,
+                                  u8 phy_id)
+{
+        struct sas_phy *phy;
+        struct sas_rphy *rphy;
+
+        if (phy_id >= sas_ha->num_phys) {
+                resp_data[2] = SMP_RESP_NO_PHY;
+                return;
+        }
+        resp_data[2] = SMP_RESP_FUNC_ACC;
+
+        phy = sas_ha->sas_phy[phy_id]->phy;
+        resp_data[9] = phy_id;
+        resp_data[13] = phy->negotiated_linkrate;
+        memcpy(resp_data + 16, sas_ha->sas_addr, SAS_ADDR_SIZE);
+        memcpy(resp_data + 24, sas_ha->sas_phy[phy_id]->attached_sas_addr,
+               SAS_ADDR_SIZE);
+        resp_data[40] = (phy->minimum_linkrate << 4) |
+                phy->minimum_linkrate_hw;
+        resp_data[41] = (phy->maximum_linkrate << 4) |
+                phy->maximum_linkrate_hw;
+
+        if (!sas_ha->sas_phy[phy_id]->port ||
+            !sas_ha->sas_phy[phy_id]->port->port_dev)
+                return;
+
+        rphy = sas_ha->sas_phy[phy_id]->port->port_dev->rphy;
+        resp_data[12] = rphy->identify.device_type << 4;
+        resp_data[14] = rphy->identify.initiator_port_protocols;
+        resp_data[15] = rphy->identify.target_port_protocols;
+}
+
+static void sas_report_phy_sata(struct sas_ha_struct *sas_ha, u8 *resp_data,
+                                u8 phy_id)
+{
+        struct sas_rphy *rphy;
+        struct dev_to_host_fis *fis;
+        int i;
+
+        if (phy_id >= sas_ha->num_phys) {
+                resp_data[2] = SMP_RESP_NO_PHY;
+                return;
+        }
+
+        resp_data[2] = SMP_RESP_PHY_NO_SATA;
+
+        if (!sas_ha->sas_phy[phy_id]->port)
+                return;
+
+        rphy = sas_ha->sas_phy[phy_id]->port->port_dev->rphy;
+        fis = (struct dev_to_host_fis *)
+                sas_ha->sas_phy[phy_id]->port->port_dev->frame_rcvd;
+        if (rphy->identify.target_port_protocols != SAS_PROTOCOL_SATA)
+                return;
+
+        resp_data[2] = SMP_RESP_FUNC_ACC;
+        resp_data[9] = phy_id;
+        memcpy(resp_data + 16, sas_ha->sas_phy[phy_id]->attached_sas_addr,
+               SAS_ADDR_SIZE);
+
+        /* check to see if we have a valid d2h fis */
+        if (fis->fis_type != 0x34)
+                return;
+
+        /* the d2h fis is required by the standard to be in LE format */
+        for (i = 0; i < 20; i += 4) {
+                u8 *dst = resp_data + 24 + i, *src =
+                        &sas_ha->sas_phy[phy_id]->port->port_dev->frame_rcvd[i];
+                dst[0] = src[3];
+                dst[1] = src[2];
+                dst[2] = src[1];
+                dst[3] = src[0];
+        }
+}
+
+static void sas_phy_control(struct sas_ha_struct *sas_ha, u8 phy_id,
+                            u8 phy_op, enum sas_linkrate min,
+                            enum sas_linkrate max, u8 *resp_data)
+{
+        struct sas_internal *i =
+                to_sas_internal(sas_ha->core.shost->transportt);
+        struct sas_phy_linkrates rates;
+
+        if (phy_id >= sas_ha->num_phys) {
+                resp_data[2] = SMP_RESP_NO_PHY;
+                return;
+        }
+        switch (phy_op) {
+        case PHY_FUNC_NOP:
+        case PHY_FUNC_LINK_RESET:
+        case PHY_FUNC_HARD_RESET:
+        case PHY_FUNC_DISABLE:
+        case PHY_FUNC_CLEAR_ERROR_LOG:
+        case PHY_FUNC_CLEAR_AFFIL:
+        case PHY_FUNC_TX_SATA_PS_SIGNAL:
+                break;
+
+        default:
+                resp_data[2] = SMP_RESP_PHY_UNK_OP;
+                return;
+        }
+
+        rates.minimum_linkrate = min;
+        rates.maximum_linkrate = max;
+
+        if (i->dft->lldd_control_phy(sas_ha->sas_phy[phy_id], phy_op, &rates))
+                resp_data[2] = SMP_RESP_FUNC_FAILED;
+        else
+                resp_data[2] = SMP_RESP_FUNC_ACC;
+}
+
+int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
+                         struct request *rsp)
+{
+        u8 *req_data = NULL, *resp_data = NULL, *buf;
+        struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);
+        int error = -EINVAL, resp_data_len = rsp->data_len;
+
+        /* eight is the minimum size for request and response frames */
+        if (req->data_len < 8 || rsp->data_len < 8)
+                goto out;
+
+        if (bio_offset(req->bio) + req->data_len > PAGE_SIZE ||
+            bio_offset(rsp->bio) + rsp->data_len > PAGE_SIZE) {
+                shost_printk(KERN_ERR, shost,
+                        "SMP request/response frame crosses page boundary");
+                goto out;
+        }
+
+        req_data = kzalloc(req->data_len, GFP_KERNEL);
+
+        /* make sure frame can always be built ... we copy
+         * back only the requested length */
+        resp_data = kzalloc(max(rsp->data_len, 128U), GFP_KERNEL);
+
+        if (!req_data || !resp_data) {
+                error = -ENOMEM;
+                goto out;
+        }
+
+        local_irq_disable();
+        buf = kmap_atomic(bio_page(req->bio), KM_USER0) + bio_offset(req->bio);
+        memcpy(req_data, buf, req->data_len);
+        kunmap_atomic(buf - bio_offset(req->bio), KM_USER0);
+        local_irq_enable();
+
+        if (req_data[0] != SMP_REQUEST)
+                goto out;
+
+        /* always succeeds ... even if we can't process the request
+         * the result is in the response frame */
+        error = 0;
+
+        /* set up default don't know response */
+        resp_data[0] = SMP_RESPONSE;
+        resp_data[1] = req_data[1];
+        resp_data[2] = SMP_RESP_FUNC_UNK;
+
+        switch (req_data[1]) {
+        case SMP_REPORT_GENERAL:
+                req->data_len -= 8;
+                resp_data_len -= 32;
+                resp_data[2] = SMP_RESP_FUNC_ACC;
+                resp_data[9] = sas_ha->num_phys;
+                break;
+
+        case SMP_REPORT_MANUF_INFO:
+                req->data_len -= 8;
+                resp_data_len -= 64;
+                resp_data[2] = SMP_RESP_FUNC_ACC;
+                memcpy(resp_data + 12, shost->hostt->name,
+                       SAS_EXPANDER_VENDOR_ID_LEN);
+                memcpy(resp_data + 20, "libsas virt phy",
+                       SAS_EXPANDER_PRODUCT_ID_LEN);
+                break;
+
+        case SMP_READ_GPIO_REG:
+                /* FIXME: need GPIO support in the transport class */
+                break;
+
+        case SMP_DISCOVER:
+                req->data_len =- 16;
+                if (req->data_len < 0) {
+                        req->data_len = 0;
+                        error = -EINVAL;
+                        goto out;
+                }
+                resp_data_len -= 56;
+                sas_host_smp_discover(sas_ha, resp_data, req_data[9]);
+                break;
+
+        case SMP_REPORT_PHY_ERR_LOG:
+                /* FIXME: could implement this with additional
+                 * libsas callbacks providing the HW supports it */
+                break;
+
+        case SMP_REPORT_PHY_SATA:
+                req->data_len =- 16;
+                if (req->data_len < 0) {
+                        req->data_len = 0;
+                        error = -EINVAL;
+                        goto out;
+                }
+                resp_data_len -= 60;
+                sas_report_phy_sata(sas_ha, resp_data, req_data[9]);
+                break;
+
+        case SMP_REPORT_ROUTE_INFO:
+                /* Can't implement; hosts have no routes */
+                break;
+
+        case SMP_WRITE_GPIO_REG:
+                /* FIXME: need GPIO support in the transport class */
+                break;
+
+        case SMP_CONF_ROUTE_INFO:
+                /* Can't implement; hosts have no routes */
+                break;
+
+        case SMP_PHY_CONTROL:
+                req->data_len =- 44;
+                if (req->data_len < 0) {
+                        req->data_len = 0;
+                        error = -EINVAL;
+                        goto out;
+                }
+                resp_data_len -= 8;
+                sas_phy_control(sas_ha, req_data[9], req_data[10],
+                                req_data[32] >> 4, req_data[33] >> 4,
+                                resp_data);
+                break;
+
+        case SMP_PHY_TEST_FUNCTION:
+                /* FIXME: should this be implemented? */
+                break;
+
+        default:
+                /* probably a 2.0 function */
+                break;
+        }
+
+        local_irq_disable();
+        buf = kmap_atomic(bio_page(rsp->bio), KM_USER0) + bio_offset(rsp->bio);
+        memcpy(buf, resp_data, rsp->data_len);
+        flush_kernel_dcache_page(bio_page(rsp->bio));
+        kunmap_atomic(buf - bio_offset(rsp->bio), KM_USER0);
+        local_irq_enable();
+        rsp->data_len = resp_data_len;
+
+ out:
+        kfree(req_data);
+        kfree(resp_data);
+        return error;
+}
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index 2b8213b1832d..b4f9368f116a 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -45,7 +45,7 @@
 void sas_scsi_recover_host(struct Scsi_Host *shost);
 
 int sas_show_class(enum sas_class class, char *buf);
-int sas_show_proto(enum sas_proto proto, char *buf);
+int sas_show_proto(enum sas_protocol proto, char *buf);
 int sas_show_linkrate(enum sas_linkrate linkrate, char *buf);
 int sas_show_oob_mode(enum sas_oob_mode oob_mode, char *buf);
 
@@ -80,6 +80,20 @@ struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy);
 
 void sas_hae_reset(struct work_struct *work);
 
+#ifdef CONFIG_SCSI_SAS_HOST_SMP
+extern int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
+                                struct request *rsp);
+#else
+static inline int sas_smp_host_handler(struct Scsi_Host *shost,
+                                       struct request *req,
+                                       struct request *rsp)
+{
+        shost_printk(KERN_ERR, shost,
+                "Cannot send SMP to a sas host (not enabled in CONFIG)\n");
+        return -EINVAL;
+}
+#endif
+
 static inline void sas_queue_event(int event, spinlock_t *lock,
                                    unsigned long *pending,
                                    struct work_struct *work,
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index a3fdc57e2673..f869fba86807 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -108,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:
@@ -148,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);
 
@@ -200,6 +199,10 @@ int sas_queue_up(struct sas_task *task)
  */
 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);
@@ -410,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;
diff --git a/drivers/scsi/libsas/sas_task.c b/drivers/scsi/libsas/sas_task.c
new file mode 100644
index 000000000000..594524d5bfa1
--- /dev/null
+++ b/drivers/scsi/libsas/sas_task.c
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <scsi/sas.h>
+#include <scsi/libsas.h>
+
+/* fill task_status_struct based on SSP response frame */
+void sas_ssp_task_response(struct device *dev, struct sas_task *task,
+                           struct ssp_response_iu *iu)
+{
+        struct task_status_struct *tstat = &task->task_status;
+
+        tstat->resp = SAS_TASK_COMPLETE;
+
+        if (iu->datapres == 0)
+                tstat->stat = iu->status;
+        else if (iu->datapres == 1)
+                tstat->stat = iu->resp_data[3];
+        else if (iu->datapres == 2) {
+                tstat->stat = SAM_CHECK_COND;
+                tstat->buf_valid_size =
+                        min_t(int, SAS_STATUS_BUF_SIZE,
+                              be32_to_cpu(iu->sense_data_len));
+                memcpy(tstat->buf, iu->sense_data, tstat->buf_valid_size);
+
+                if (iu->status != SAM_CHECK_COND)
+                        dev_printk(KERN_WARNING, dev,
+                                   "dev %llx sent sense data, but "
+                                   "stat(%x) is not CHECK CONDITION\n",
+                                   SAS_ADDR(task->dev->sas_addr),
+                                   iu->status);
+        }
+        else
+                /* when datapres contains corrupt/unknown value... */
+                tstat->stat = SAM_CHECK_COND;
+}
+EXPORT_SYMBOL_GPL(sas_ssp_task_response);
+