isci: combine request flags
[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / scsi / isci / request.c
index 5201dc5..27376ba 100644 (file)
 #include "request.h"
 #include "sata.h"
 #include "scu_completion_codes.h"
+#include "scu_event_codes.h"
 #include "sas.h"
 
-/**
- * This method returns the sgl element pair for the specificed sgl_pair index.
- * @sci_req: This parameter specifies the IO request for which to retrieve
- *    the Scatter-Gather List element pair.
- * @sgl_pair_index: This parameter specifies the index into the SGL element
- *    pair to be retrieved.
- *
- * This method returns a pointer to an struct scu_sgl_element_pair.
- */
-static struct scu_sgl_element_pair *scic_sds_request_get_sgl_element_pair(
-       struct scic_sds_request *sci_req,
-       u32 sgl_pair_index
-       ) {
-       struct scu_task_context *task_context;
-
-       task_context = (struct scu_task_context *)sci_req->task_context_buffer;
+static struct scu_sgl_element_pair *to_sgl_element_pair(struct scic_sds_request *sci_req,
+                                                       int idx)
+{
+       if (idx == 0)
+               return &sci_req->tc->sgl_pair_ab;
+       else if (idx == 1)
+               return &sci_req->tc->sgl_pair_cd;
+       else if (idx < 0)
+               return NULL;
+       else
+               return &sci_req->sg_table[idx - 2];
+}
 
-       if (sgl_pair_index == 0) {
-               return &task_context->sgl_pair_ab;
-       } else if (sgl_pair_index == 1) {
-               return &task_context->sgl_pair_cd;
+static dma_addr_t to_sgl_element_pair_dma(struct scic_sds_controller *scic,
+                                         struct scic_sds_request *sci_req, u32 idx)
+{
+       u32 offset;
+
+       if (idx == 0) {
+               offset = (void *) &sci_req->tc->sgl_pair_ab -
+                        (void *) &scic->task_context_table[0];
+               return scic->task_context_dma + offset;
+       } else if (idx == 1) {
+               offset = (void *) &sci_req->tc->sgl_pair_cd -
+                        (void *) &scic->task_context_table[0];
+               return scic->task_context_dma + offset;
        }
 
-       return &sci_req->sg_table[sgl_pair_index - 2];
+       return scic_io_request_get_dma_addr(sci_req, &sci_req->sg_table[idx - 2]);
 }
 
-/**
- * This function will build the SGL list for an IO request.
- * @sci_req: This parameter specifies the IO request for which to build
- *    the Scatter-Gather List.
- *
- */
-void scic_sds_request_build_sgl(struct scic_sds_request *sds_request)
+static void init_sgl_element(struct scu_sgl_element *e, struct scatterlist *sg)
+{
+       e->length = sg_dma_len(sg);
+       e->address_upper = upper_32_bits(sg_dma_address(sg));
+       e->address_lower = lower_32_bits(sg_dma_address(sg));
+       e->address_modifier = 0;
+}
+
+static void scic_sds_request_build_sgl(struct scic_sds_request *sds_request)
 {
        struct isci_request *isci_request = sci_req_to_ireq(sds_request);
        struct isci_host *isci_host = isci_request->isci_host;
+       struct scic_sds_controller *scic = &isci_host->sci;
        struct sas_task *task = isci_request_access_task(isci_request);
        struct scatterlist *sg = NULL;
        dma_addr_t dma_addr;
@@ -107,25 +116,19 @@ void scic_sds_request_build_sgl(struct scic_sds_request *sds_request)
                sg = task->scatter;
 
                while (sg) {
-                       scu_sg = scic_sds_request_get_sgl_element_pair(
-                                       sds_request,
-                                       sg_idx);
-
-                       SCU_SGL_COPY(scu_sg->A, sg);
-
+                       scu_sg = to_sgl_element_pair(sds_request, sg_idx);
+                       init_sgl_element(&scu_sg->A, sg);
                        sg = sg_next(sg);
-
                        if (sg) {
-                               SCU_SGL_COPY(scu_sg->B, sg);
+                               init_sgl_element(&scu_sg->B, sg);
                                sg = sg_next(sg);
                        } else
-                               SCU_SGL_ZERO(scu_sg->B);
+                               memset(&scu_sg->B, 0, sizeof(scu_sg->B));
 
                        if (prev_sg) {
-                               dma_addr =
-                                       scic_io_request_get_dma_addr(
-                                                       sds_request,
-                                                       scu_sg);
+                               dma_addr = to_sgl_element_pair_dma(scic,
+                                                                  sds_request,
+                                                                  sg_idx);
 
                                prev_sg->next_pair_upper =
                                        upper_32_bits(dma_addr);
@@ -137,8 +140,7 @@ void scic_sds_request_build_sgl(struct scic_sds_request *sds_request)
                        sg_idx++;
                }
        } else {        /* handle when no sg */
-               scu_sg = scic_sds_request_get_sgl_element_pair(sds_request,
-                                                              sg_idx);
+               scu_sg = to_sgl_element_pair(sds_request, sg_idx);
 
                dma_addr = dma_map_single(&isci_host->pdev->dev,
                                          task->scatter,
@@ -210,11 +212,9 @@ static void scu_ssp_reqeust_construct_task_context(
        struct scu_task_context *task_context)
 {
        dma_addr_t dma_addr;
-       struct scic_sds_controller *controller;
        struct scic_sds_remote_device *target_device;
        struct scic_sds_port *target_port;
 
-       controller = scic_sds_request_get_controller(sds_request);
        target_device = scic_sds_request_get_device(sds_request);
        target_port = scic_sds_request_get_port(sds_request);
 
@@ -247,35 +247,12 @@ static void scu_ssp_reqeust_construct_task_context(
        /* task_context->type.ssp.tag = sci_req->io_tag; */
        task_context->task_phase = 0x01;
 
-       if (sds_request->was_tag_assigned_by_user) {
-               /*
-                * Build the task context now since we have already read
-                * the data
-                */
-               sds_request->post_context =
-                       (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
-                        (scic_sds_controller_get_protocol_engine_group(
-                                                       controller) <<
-                         SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
-                        (scic_sds_port_get_index(target_port) <<
-                         SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
-                        scic_sds_io_tag_get_index(sds_request->io_tag));
-       } else {
-               /*
-                * Build the task context now since we have already read
-                * the data
-                *
-                * I/O tag index is not assigned because we have to wait
-                * until we get a TCi
-                */
-               sds_request->post_context =
-                       (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
-                        (scic_sds_controller_get_protocol_engine_group(
-                                                       owning_controller) <<
-                         SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
-                        (scic_sds_port_get_index(target_port) <<
-                         SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT));
-       }
+       sds_request->post_context = (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
+                                    (scic_sds_controller_get_protocol_engine_group(controller) <<
+                                     SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
+                                    (scic_sds_port_get_index(target_port) <<
+                                     SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
+                                    ISCI_TAG_TCI(sds_request->io_tag));
 
        /*
         * Copy the physical address for the command buffer to the
@@ -303,14 +280,11 @@ static void scu_ssp_reqeust_construct_task_context(
  * @sci_req:
  *
  */
-static void scu_ssp_io_request_construct_task_context(
-       struct scic_sds_request *sci_req,
-       enum dma_data_direction dir,
-       u32 len)
+static void scu_ssp_io_request_construct_task_context(struct scic_sds_request *sci_req,
+                                                     enum dma_data_direction dir,
+                                                     u32 len)
 {
-       struct scu_task_context *task_context;
-
-       task_context = scic_sds_request_get_task_context(sci_req);
+       struct scu_task_context *task_context = sci_req->tc;
 
        scu_ssp_reqeust_construct_task_context(sci_req, task_context);
 
@@ -348,12 +322,9 @@ static void scu_ssp_io_request_construct_task_context(
  *    constructed.
  *
  */
-static void scu_ssp_task_request_construct_task_context(
-       struct scic_sds_request *sci_req)
+static void scu_ssp_task_request_construct_task_context(struct scic_sds_request *sci_req)
 {
-       struct scu_task_context *task_context;
-
-       task_context = scic_sds_request_get_task_context(sci_req);
+       struct scu_task_context *task_context = sci_req->tc;
 
        scu_ssp_reqeust_construct_task_context(sci_req, task_context);
 
@@ -366,27 +337,172 @@ static void scu_ssp_task_request_construct_task_context(
                sizeof(struct ssp_task_iu) / sizeof(u32);
 }
 
-
 /**
- * This method constructs the SSP Command IU data for this ssp passthrough
- *    comand request object.
- * @sci_req: This parameter specifies the request object for which the SSP
- *    command information unit is being built.
+ * This method is will fill in the SCU Task Context for any type of SATA
+ *    request.  This is called from the various SATA constructors.
+ * @sci_req: The general IO request object which is to be used in
+ *    constructing the SCU task context.
+ * @task_context: The buffer pointer for the SCU task context which is being
+ *    constructed.
  *
- * enum sci_status, returns invalid parameter is cdb > 16
+ * The general io request construction is complete. The buffer assignment for
+ * the command buffer is complete. none Revisit task context construction to
+ * determine what is common for SSP/SMP/STP task context structures.
  */
+static void scu_sata_reqeust_construct_task_context(
+       struct scic_sds_request *sci_req,
+       struct scu_task_context *task_context)
+{
+       dma_addr_t dma_addr;
+       struct scic_sds_remote_device *target_device;
+       struct scic_sds_port *target_port;
+
+       target_device = scic_sds_request_get_device(sci_req);
+       target_port = scic_sds_request_get_port(sci_req);
+
+       /* Fill in the TC with the its required data */
+       task_context->abort = 0;
+       task_context->priority = SCU_TASK_PRIORITY_NORMAL;
+       task_context->initiator_request = 1;
+       task_context->connection_rate = target_device->connection_rate;
+       task_context->protocol_engine_index =
+               scic_sds_controller_get_protocol_engine_group(controller);
+       task_context->logical_port_index =
+               scic_sds_port_get_index(target_port);
+       task_context->protocol_type = SCU_TASK_CONTEXT_PROTOCOL_STP;
+       task_context->valid = SCU_TASK_CONTEXT_VALID;
+       task_context->context_type = SCU_TASK_CONTEXT_TYPE;
+
+       task_context->remote_node_index =
+               scic_sds_remote_device_get_index(sci_req->target_device);
+       task_context->command_code = 0;
+
+       task_context->link_layer_control = 0;
+       task_context->do_not_dma_ssp_good_response = 1;
+       task_context->strict_ordering = 0;
+       task_context->control_frame = 0;
+       task_context->timeout_enable = 0;
+       task_context->block_guard_enable = 0;
+
+       task_context->address_modifier = 0;
+       task_context->task_phase = 0x01;
+
+       task_context->ssp_command_iu_length =
+               (sizeof(struct host_to_dev_fis) - sizeof(u32)) / sizeof(u32);
+
+       /* Set the first word of the H2D REG FIS */
+       task_context->type.words[0] = *(u32 *)&sci_req->stp.cmd;
+
+       sci_req->post_context = (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
+                                (scic_sds_controller_get_protocol_engine_group(controller) <<
+                                 SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
+                                (scic_sds_port_get_index(target_port) <<
+                                 SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
+                                ISCI_TAG_TCI(sci_req->io_tag));
+       /*
+        * Copy the physical address for the command buffer to the SCU Task
+        * Context. We must offset the command buffer by 4 bytes because the
+        * first 4 bytes are transfered in the body of the TC.
+        */
+       dma_addr = scic_io_request_get_dma_addr(sci_req,
+                                               ((char *) &sci_req->stp.cmd) +
+                                               sizeof(u32));
+
+       task_context->command_iu_upper = upper_32_bits(dma_addr);
+       task_context->command_iu_lower = lower_32_bits(dma_addr);
+
+       /* SATA Requests do not have a response buffer */
+       task_context->response_iu_upper = 0;
+       task_context->response_iu_lower = 0;
+}
+
+static void scu_stp_raw_request_construct_task_context(struct scic_sds_request *sci_req)
+{
+       struct scu_task_context *task_context = sci_req->tc;
+
+       scu_sata_reqeust_construct_task_context(sci_req, task_context);
+
+       task_context->control_frame         = 0;
+       task_context->priority              = SCU_TASK_PRIORITY_NORMAL;
+       task_context->task_type             = SCU_TASK_TYPE_SATA_RAW_FRAME;
+       task_context->type.stp.fis_type     = FIS_REGH2D;
+       task_context->transfer_length_bytes = sizeof(struct host_to_dev_fis) - sizeof(u32);
+}
+
+static enum sci_status
+scic_sds_stp_pio_request_construct(struct scic_sds_request *sci_req,
+                                  bool copy_rx_frame)
+{
+       struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
+       struct scic_sds_stp_pio_request *pio = &stp_req->type.pio;
+
+       scu_stp_raw_request_construct_task_context(sci_req);
+
+       pio->current_transfer_bytes = 0;
+       pio->ending_error = 0;
+       pio->ending_status = 0;
+
+       pio->request_current.sgl_offset = 0;
+       pio->request_current.sgl_set = SCU_SGL_ELEMENT_PAIR_A;
+
+       if (copy_rx_frame) {
+               scic_sds_request_build_sgl(sci_req);
+               pio->request_current.sgl_index = 0;
+       } else {
+               /* The user does not want the data copied to the SGL buffer location */
+               pio->request_current.sgl_index = -1;
+       }
 
+       return SCI_SUCCESS;
+}
 
 /**
- * This method constructs the SATA request object.
- * @sci_req:
- * @sat_protocol:
- * @transfer_length:
- * @data_direction:
- * @copy_rx_frame:
  *
- * enum sci_status
+ * @sci_req: This parameter specifies the request to be constructed as an
+ *    optimized request.
+ * @optimized_task_type: This parameter specifies whether the request is to be
+ *    an UDMA request or a NCQ request. - A value of 0 indicates UDMA. - A
+ *    value of 1 indicates NCQ.
+ *
+ * This method will perform request construction common to all types of STP
+ * requests that are optimized by the silicon (i.e. UDMA, NCQ). This method
+ * returns an indication as to whether the construction was successful.
  */
+static void scic_sds_stp_optimized_request_construct(struct scic_sds_request *sci_req,
+                                                    u8 optimized_task_type,
+                                                    u32 len,
+                                                    enum dma_data_direction dir)
+{
+       struct scu_task_context *task_context = sci_req->tc;
+
+       /* Build the STP task context structure */
+       scu_sata_reqeust_construct_task_context(sci_req, task_context);
+
+       /* Copy over the SGL elements */
+       scic_sds_request_build_sgl(sci_req);
+
+       /* Copy over the number of bytes to be transfered */
+       task_context->transfer_length_bytes = len;
+
+       if (dir == DMA_TO_DEVICE) {
+               /*
+                * The difference between the DMA IN and DMA OUT request task type
+                * values are consistent with the difference between FPDMA READ
+                * and FPDMA WRITE values.  Add the supplied task type parameter
+                * to this difference to set the task type properly for this
+                * DATA OUT (WRITE) case. */
+               task_context->task_type = optimized_task_type + (SCU_TASK_TYPE_DMA_OUT
+                                                                - SCU_TASK_TYPE_DMA_IN);
+       } else {
+               /*
+                * For the DATA IN (READ) case, simply save the supplied
+                * optimized task type. */
+               task_context->task_type = optimized_task_type;
+       }
+}
+
+
+
 static enum sci_status
 scic_io_request_construct_sata(struct scic_sds_request *sci_req,
                               u32 len,
@@ -402,9 +518,10 @@ scic_io_request_construct_sata(struct scic_sds_request *sci_req,
                struct isci_tmf *tmf = isci_request_access_tmf(ireq);
 
                if (tmf->tmf_code == isci_tmf_sata_srst_high ||
-                   tmf->tmf_code == isci_tmf_sata_srst_low)
-                       return scic_sds_stp_soft_reset_request_construct(sci_req);
-               else {
+                   tmf->tmf_code == isci_tmf_sata_srst_low) {
+                       scu_stp_raw_request_construct_task_context(sci_req);
+                       return SCI_SUCCESS;
+               } else {
                        dev_err(scic_to_dev(sci_req->owning_controller),
                                "%s: Request 0x%p received un-handled SAT "
                                "management protocol 0x%x.\n",
@@ -424,17 +541,26 @@ scic_io_request_construct_sata(struct scic_sds_request *sci_req,
        }
 
        /* non data */
-       if (task->data_dir == DMA_NONE)
-               return scic_sds_stp_non_data_request_construct(sci_req);
+       if (task->data_dir == DMA_NONE) {
+               scu_stp_raw_request_construct_task_context(sci_req);
+               return SCI_SUCCESS;
+       }
 
        /* NCQ */
-       if (task->ata_task.use_ncq)
-               return scic_sds_stp_ncq_request_construct(sci_req, len, dir);
+       if (task->ata_task.use_ncq) {
+               scic_sds_stp_optimized_request_construct(sci_req,
+                                                        SCU_TASK_TYPE_FPDMAQ_READ,
+                                                        len, dir);
+               return SCI_SUCCESS;
+       }
 
        /* DMA */
-       if (task->ata_task.dma_xfer)
-               return scic_sds_stp_udma_request_construct(sci_req, len, dir);
-       else /* PIO */
+       if (task->ata_task.dma_xfer) {
+               scic_sds_stp_optimized_request_construct(sci_req,
+                                                        SCU_TASK_TYPE_DMA_IN,
+                                                        len, dir);
+               return SCI_SUCCESS;
+       } else /* PIO */
                return scic_sds_stp_pio_request_construct(sci_req, copy);
 
        return status;
@@ -453,9 +579,7 @@ static enum sci_status scic_io_request_construct_basic_ssp(struct scic_sds_reque
 
        scic_sds_io_request_build_ssp_command_iu(sci_req);
 
-       sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_CONSTRUCTED);
+       sci_change_state(&sci_req->sm, SCI_REQ_CONSTRUCTED);
 
        return SCI_SUCCESS;
 }
@@ -469,22 +593,18 @@ enum sci_status scic_task_request_construct_ssp(
        /* Fill in the SSP Task IU */
        scic_sds_task_request_build_ssp_task_iu(sci_req);
 
-       sci_base_state_machine_change_state(&sci_req->state_machine,
-               SCI_BASE_REQUEST_STATE_CONSTRUCTED);
+       sci_change_state(&sci_req->sm, SCI_REQ_CONSTRUCTED);
 
        return SCI_SUCCESS;
 }
 
-
 static enum sci_status scic_io_request_construct_basic_sata(struct scic_sds_request *sci_req)
 {
        enum sci_status status;
-       struct scic_sds_stp_request *stp_req;
        bool copy = false;
        struct isci_request *isci_request = sci_req_to_ireq(sci_req);
        struct sas_task *task = isci_request_access_task(isci_request);
 
-       stp_req = &sci_req->stp.req;
        sci_req->protocol = SCIC_STP_PROTOCOL;
 
        copy = (task->data_dir == DMA_NONE) ? false : true;
@@ -495,13 +615,11 @@ static enum sci_status scic_io_request_construct_basic_sata(struct scic_sds_requ
                                                copy);
 
        if (status == SCI_SUCCESS)
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_CONSTRUCTED);
+               sci_change_state(&sci_req->sm, SCI_REQ_CONSTRUCTED);
 
        return status;
 }
 
-
 enum sci_status scic_task_request_construct_sata(struct scic_sds_request *sci_req)
 {
        enum sci_status status = SCI_SUCCESS;
@@ -513,7 +631,7 @@ enum sci_status scic_task_request_construct_sata(struct scic_sds_request *sci_re
 
                if (tmf->tmf_code == isci_tmf_sata_srst_high ||
                    tmf->tmf_code == isci_tmf_sata_srst_low) {
-                       status = scic_sds_stp_soft_reset_request_construct(sci_req);
+                       scu_stp_raw_request_construct_task_context(sci_req);
                } else {
                        dev_err(scic_to_dev(sci_req->owning_controller),
                                "%s: Request 0x%p received un-handled SAT "
@@ -524,10 +642,9 @@ enum sci_status scic_task_request_construct_sata(struct scic_sds_request *sci_re
                }
        }
 
-       if (status == SCI_SUCCESS)
-               sci_base_state_machine_change_state(
-                               &sci_req->state_machine,
-                               SCI_BASE_REQUEST_STATE_CONSTRUCTED);
+       if (status != SCI_SUCCESS)
+               return status;
+       sci_change_state(&sci_req->sm, SCI_REQ_CONSTRUCTED);
 
        return status;
 }
@@ -553,89 +670,164 @@ static u32 sci_req_tx_bytes(struct scic_sds_request *sci_req)
                 */
                ret_val = readl(scu_reg_base +
                                (SCU_TASK_CONTEXT_SRAM + offsetof(struct scu_task_context, type.ssp.data_offset)) +
-                               ((sizeof(struct scu_task_context)) * scic_sds_io_tag_get_index(sci_req->io_tag)));
+                               ((sizeof(struct scu_task_context)) * ISCI_TAG_TCI(sci_req->io_tag)));
        }
 
        return ret_val;
 }
 
-enum sci_status
-scic_sds_request_start(struct scic_sds_request *request)
+enum sci_status scic_sds_request_start(struct scic_sds_request *sci_req)
 {
-       if (request->device_sequence !=
-           scic_sds_remote_device_get_sequence(request->target_device))
-               return SCI_FAILURE;
+       enum sci_base_request_states state;
+       struct scu_task_context *tc = sci_req->tc;
+       struct scic_sds_controller *scic = sci_req->owning_controller;
 
-       if (request->state_handlers->start_handler)
-               return request->state_handlers->start_handler(request);
+       state = sci_req->sm.current_state_id;
+       if (state != SCI_REQ_CONSTRUCTED) {
+               dev_warn(scic_to_dev(scic),
+                       "%s: SCIC IO Request requested to start while in wrong "
+                        "state %d\n", __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       }
 
-       dev_warn(scic_to_dev(request->owning_controller),
-                "%s: SCIC IO Request requested to start while in wrong "
-                "state %d\n",
-                __func__,
-                sci_base_state_machine_get_state(&request->state_machine));
+       tc->task_index = ISCI_TAG_TCI(sci_req->io_tag);
 
-       return SCI_FAILURE_INVALID_STATE;
+       switch (tc->protocol_type) {
+       case SCU_TASK_CONTEXT_PROTOCOL_SMP:
+       case SCU_TASK_CONTEXT_PROTOCOL_SSP:
+               /* SSP/SMP Frame */
+               tc->type.ssp.tag = sci_req->io_tag;
+               tc->type.ssp.target_port_transfer_tag = 0xFFFF;
+               break;
+
+       case SCU_TASK_CONTEXT_PROTOCOL_STP:
+               /* STP/SATA Frame
+                * tc->type.stp.ncq_tag = sci_req->ncq_tag;
+                */
+               break;
+
+       case SCU_TASK_CONTEXT_PROTOCOL_NONE:
+               /* / @todo When do we set no protocol type? */
+               break;
+
+       default:
+               /* This should never happen since we build the IO
+                * requests */
+               break;
+       }
+
+       /* Add to the post_context the io tag value */
+       sci_req->post_context |= ISCI_TAG_TCI(sci_req->io_tag);
+
+       /* Everything is good go ahead and change state */
+       sci_change_state(&sci_req->sm, SCI_REQ_STARTED);
+
+       return SCI_SUCCESS;
 }
 
 enum sci_status
-scic_sds_io_request_terminate(struct scic_sds_request *request)
+scic_sds_io_request_terminate(struct scic_sds_request *sci_req)
 {
-       if (request->state_handlers->abort_handler)
-               return request->state_handlers->abort_handler(request);
+       enum sci_base_request_states state;
 
-       dev_warn(scic_to_dev(request->owning_controller),
-               "%s: SCIC IO Request requested to abort while in wrong "
-               "state %d\n",
-               __func__,
-               sci_base_state_machine_get_state(&request->state_machine));
+       state = sci_req->sm.current_state_id;
+
+       switch (state) {
+       case SCI_REQ_CONSTRUCTED:
+               scic_sds_request_set_status(sci_req,
+                       SCU_TASK_DONE_TASK_ABORT,
+                       SCI_FAILURE_IO_TERMINATED);
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               return SCI_SUCCESS;
+       case SCI_REQ_STARTED:
+       case SCI_REQ_TASK_WAIT_TC_COMP:
+       case SCI_REQ_SMP_WAIT_RESP:
+       case SCI_REQ_SMP_WAIT_TC_COMP:
+       case SCI_REQ_STP_UDMA_WAIT_TC_COMP:
+       case SCI_REQ_STP_UDMA_WAIT_D2H:
+       case SCI_REQ_STP_NON_DATA_WAIT_H2D:
+       case SCI_REQ_STP_NON_DATA_WAIT_D2H:
+       case SCI_REQ_STP_PIO_WAIT_H2D:
+       case SCI_REQ_STP_PIO_WAIT_FRAME:
+       case SCI_REQ_STP_PIO_DATA_IN:
+       case SCI_REQ_STP_PIO_DATA_OUT:
+       case SCI_REQ_STP_SOFT_RESET_WAIT_H2D_ASSERTED:
+       case SCI_REQ_STP_SOFT_RESET_WAIT_H2D_DIAG:
+       case SCI_REQ_STP_SOFT_RESET_WAIT_D2H:
+               sci_change_state(&sci_req->sm, SCI_REQ_ABORTING);
+               return SCI_SUCCESS;
+       case SCI_REQ_TASK_WAIT_TC_RESP:
+               sci_change_state(&sci_req->sm, SCI_REQ_ABORTING);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               return SCI_SUCCESS;
+       case SCI_REQ_ABORTING:
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               return SCI_SUCCESS;
+       case SCI_REQ_COMPLETED:
+       default:
+               dev_warn(scic_to_dev(sci_req->owning_controller),
+                        "%s: SCIC IO Request requested to abort while in wrong "
+                        "state %d\n",
+                        __func__,
+                        sci_req->sm.current_state_id);
+               break;
+       }
 
        return SCI_FAILURE_INVALID_STATE;
 }
 
-enum sci_status scic_sds_io_request_event_handler(
-       struct scic_sds_request *request,
-       u32 event_code)
+enum sci_status scic_sds_request_complete(struct scic_sds_request *sci_req)
 {
-       if (request->state_handlers->event_handler)
-               return request->state_handlers->event_handler(request, event_code);
+       enum sci_base_request_states state;
+       struct scic_sds_controller *scic = sci_req->owning_controller;
 
-       dev_warn(scic_to_dev(request->owning_controller),
-                "%s: SCIC IO Request given event code notification %x while "
-                "in wrong state %d\n",
-                __func__,
-                event_code,
-                sci_base_state_machine_get_state(&request->state_machine));
+       state = sci_req->sm.current_state_id;
+       if (WARN_ONCE(state != SCI_REQ_COMPLETED,
+                     "isci: request completion from wrong state (%d)\n", state))
+               return SCI_FAILURE_INVALID_STATE;
 
-       return SCI_FAILURE_INVALID_STATE;
+       if (sci_req->saved_rx_frame_index != SCU_INVALID_FRAME_INDEX)
+               scic_sds_controller_release_frame(scic,
+                                                 sci_req->saved_rx_frame_index);
+
+       /* XXX can we just stop the machine and remove the 'final' state? */
+       sci_change_state(&sci_req->sm, SCI_REQ_FINAL);
+       return SCI_SUCCESS;
 }
 
-/**
- *
- * @sci_req: The SCIC_SDS_IO_REQUEST_T object for which the start
- *    operation is to be executed.
- * @frame_index: The frame index returned by the hardware for the reqeust
- *    object.
- *
- * This method invokes the core state frame handler for the
- * SCIC_SDS_IO_REQUEST_T object. enum sci_status
- */
-enum sci_status scic_sds_io_request_frame_handler(
-       struct scic_sds_request *request,
-       u32 frame_index)
+enum sci_status scic_sds_io_request_event_handler(struct scic_sds_request *sci_req,
+                                                 u32 event_code)
 {
-       if (request->state_handlers->frame_handler)
-               return request->state_handlers->frame_handler(request, frame_index);
+       enum sci_base_request_states state;
+       struct scic_sds_controller *scic = sci_req->owning_controller;
 
-       dev_warn(scic_to_dev(request->owning_controller),
-                "%s: SCIC IO Request given unexpected frame %x while in "
-                "state %d\n",
-                __func__,
-                frame_index,
-                sci_base_state_machine_get_state(&request->state_machine));
+       state = sci_req->sm.current_state_id;
 
-       scic_sds_controller_release_frame(request->owning_controller, frame_index);
-       return SCI_FAILURE_INVALID_STATE;
+       if (state != SCI_REQ_STP_PIO_DATA_IN) {
+               dev_warn(scic_to_dev(scic), "%s: (%x) in wrong state %d\n",
+                        __func__, event_code, state);
+
+               return SCI_FAILURE_INVALID_STATE;
+       }
+
+       switch (scu_get_event_specifier(event_code)) {
+       case SCU_TASK_DONE_CRC_ERR << SCU_EVENT_SPECIFIC_CODE_SHIFT:
+               /* We are waiting for data and the SCU has R_ERR the data frame.
+                * Go back to waiting for the D2H Register FIS
+                */
+               sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
+               return SCI_SUCCESS;
+       default:
+               dev_err(scic_to_dev(scic),
+                       "%s: pio request unexpected event %#x\n",
+                       __func__, event_code);
+
+               /* TODO Should we fail the PIO request when we get an
+                * unexpected event?
+                */
+               return SCI_FAILURE;
+       }
 }
 
 /*
@@ -663,139 +855,15 @@ static void scic_sds_io_request_copy_response(struct scic_sds_request *sci_req)
        memcpy(resp_buf, ssp_response->resp_data, len);
 }
 
-/*
- * This method implements the action taken when a constructed
- * SCIC_SDS_IO_REQUEST_T object receives a scic_sds_request_start() request.
- * This method will, if necessary, allocate a TCi for the io request object and
- * then will, if necessary, copy the constructed TC data into the actual TC
- * buffer.  If everything is successful the post context field is updated with
- * the TCi so the controller can post the request to the hardware. enum sci_status
- * SCI_SUCCESS SCI_FAILURE_INSUFFICIENT_RESOURCES
- */
-static enum sci_status scic_sds_request_constructed_state_start_handler(
-       struct scic_sds_request *request)
-{
-       struct scu_task_context *task_context;
-
-       if (request->io_tag == SCI_CONTROLLER_INVALID_IO_TAG) {
-               request->io_tag =
-                       scic_controller_allocate_io_tag(request->owning_controller);
-       }
-
-       /* Record the IO Tag in the request */
-       if (request->io_tag != SCI_CONTROLLER_INVALID_IO_TAG) {
-               task_context = request->task_context_buffer;
-
-               task_context->task_index = scic_sds_io_tag_get_index(request->io_tag);
-
-               switch (task_context->protocol_type) {
-               case SCU_TASK_CONTEXT_PROTOCOL_SMP:
-               case SCU_TASK_CONTEXT_PROTOCOL_SSP:
-                       /* SSP/SMP Frame */
-                       task_context->type.ssp.tag = request->io_tag;
-                       task_context->type.ssp.target_port_transfer_tag = 0xFFFF;
-                       break;
-
-               case SCU_TASK_CONTEXT_PROTOCOL_STP:
-                       /*
-                        * STP/SATA Frame
-                        * task_context->type.stp.ncq_tag = request->ncq_tag; */
-                       break;
-
-               case SCU_TASK_CONTEXT_PROTOCOL_NONE:
-                       /* / @todo When do we set no protocol type? */
-                       break;
-
-               default:
-                       /* This should never happen since we build the IO requests */
-                       break;
-               }
-
-               /*
-                * Check to see if we need to copy the task context buffer
-                * or have been building into the task context buffer */
-               if (request->was_tag_assigned_by_user == false) {
-                       scic_sds_controller_copy_task_context(
-                               request->owning_controller, request);
-               }
-
-               /* Add to the post_context the io tag value */
-               request->post_context |= scic_sds_io_tag_get_index(request->io_tag);
-
-               /* Everything is good go ahead and change state */
-               sci_base_state_machine_change_state(&request->state_machine,
-                       SCI_BASE_REQUEST_STATE_STARTED);
-
-               return SCI_SUCCESS;
-       }
-
-       return SCI_FAILURE_INSUFFICIENT_RESOURCES;
-}
-
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_terminate() request. Since the request
- * has not yet been posted to the hardware the request transitions to the
- * completed state. enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_request_constructed_state_abort_handler(
-       struct scic_sds_request *request)
-{
-       /*
-        * This request has been terminated by the user make sure that the correct
-        * status code is returned */
-       scic_sds_request_set_status(request,
-               SCU_TASK_DONE_TASK_ABORT,
-               SCI_FAILURE_IO_TERMINATED);
-
-       sci_base_state_machine_change_state(&request->state_machine,
-               SCI_BASE_REQUEST_STATE_COMPLETED);
-       return SCI_SUCCESS;
-}
-
-/*
- * *****************************************************************************
- * *  STARTED STATE HANDLERS
- * ***************************************************************************** */
-
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_terminate() request. Since the request
- * has been posted to the hardware the io request state is changed to the
- * aborting state. enum sci_status SCI_SUCCESS
- */
-enum sci_status scic_sds_request_started_state_abort_handler(
-       struct scic_sds_request *request)
-{
-       if (request->has_started_substate_machine)
-               sci_base_state_machine_stop(&request->started_substate_machine);
-
-       sci_base_state_machine_change_state(&request->state_machine,
-               SCI_BASE_REQUEST_STATE_ABORTING);
-       return SCI_SUCCESS;
-}
-
-/*
- * scic_sds_request_started_state_tc_completion_handler() - This method process
- *    TC (task context) completions for normal IO request (i.e. Task/Abort
- *    Completions of type 0).  This method will update the
- *    SCIC_SDS_IO_REQUEST_T::status field.
- * @sci_req: This parameter specifies the request for which a completion
- *    occurred.
- * @completion_code: This parameter specifies the completion code received from
- *    the SCU.
- *
- */
 static enum sci_status
-scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sci_req,
-                                                    u32 completion_code)
+request_started_state_tc_event(struct scic_sds_request *sci_req,
+                              u32 completion_code)
 {
-       u8 datapres;
        struct ssp_response_iu *resp_iu;
+       u8 datapres;
 
-       /*
-        * TODO: Any SDMA return code of other than 0 is bad
-        *       decode 0x003C0000 to determine SDMA status
+       /* TODO: Any SDMA return code of other than 0 is bad decode 0x003C0000
+        * to determine SDMA status
         */
        switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
@@ -803,11 +871,8 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
                                            SCU_TASK_DONE_GOOD,
                                            SCI_SUCCESS);
                break;
-
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_EARLY_RESP):
-       {
-               /*
-                * There are times when the SCU hardware will return an early
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_EARLY_RESP): {
+               /* There are times when the SCU hardware will return an early
                 * response because the io request specified more data than is
                 * returned by the target device (mode pages, inquiry data,
                 * etc.).  We must check the response stats to see if this is
@@ -822,21 +887,17 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
                               word_cnt);
 
                if (resp->status == 0) {
-                       scic_sds_request_set_status(
-                               sci_req,
-                               SCU_TASK_DONE_GOOD,
-                               SCI_SUCCESS_IO_DONE_EARLY);
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_GOOD,
+                                                   SCI_SUCCESS_IO_DONE_EARLY);
                } else {
-                       scic_sds_request_set_status(
-                               sci_req,
-                               SCU_TASK_DONE_CHECK_RESPONSE,
-                               SCI_FAILURE_IO_RESPONSE_VALID);
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
                }
+               break;
        }
-       break;
-
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_CHECK_RESPONSE):
-       {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_CHECK_RESPONSE): {
                ssize_t word_cnt = SSP_RESP_IU_MAX_SIZE / sizeof(u32);
 
                sci_swab32_cpy(&sci_req->ssp.rsp,
@@ -850,24 +911,22 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
        }
 
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_RESP_LEN_ERR):
-               /*
-                * / @todo With TASK_DONE_RESP_LEN_ERR is the response frame
+               /* TODO With TASK_DONE_RESP_LEN_ERR is the response frame
                 * guaranteed to be received before this completion status is
                 * posted?
                 */
                resp_iu = &sci_req->ssp.rsp;
                datapres = resp_iu->datapres;
 
-               if ((datapres == 0x01) || (datapres == 0x02)) {
-                       scic_sds_request_set_status(
-                               sci_req,
-                               SCU_TASK_DONE_CHECK_RESPONSE,
-                               SCI_FAILURE_IO_RESPONSE_VALID);
+               if (datapres == 1 || datapres == 2) {
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
                } else
-                       scic_sds_request_set_status(
-                               sci_req, SCU_TASK_DONE_GOOD, SCI_SUCCESS);
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_GOOD,
+                                                   SCI_SUCCESS);
                break;
-
        /* only stp device gets suspended. */
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_ACK_NAK_TO):
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_LL_PERR):
@@ -881,14 +940,12 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_REG_ERR):
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SDB_ERR):
                if (sci_req->protocol == SCIC_STP_PROTOCOL) {
-                       scic_sds_request_set_status(
-                               sci_req,
+                       scic_sds_request_set_status(sci_req,
                                SCU_GET_COMPLETION_TL_STATUS(completion_code) >>
                                SCU_COMPLETION_TL_STATUS_SHIFT,
                                SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED);
                } else {
-                       scic_sds_request_set_status(
-                               sci_req,
+                       scic_sds_request_set_status(sci_req,
                                SCU_GET_COMPLETION_TL_STATUS(completion_code) >>
                                SCU_COMPLETION_TL_STATUS_SHIFT,
                                SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
@@ -906,11 +963,10 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_OPEN_REJECT_STP_RESOURCES_BUSY):
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_OPEN_REJECT_PROTOCOL_NOT_SUPPORTED):
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_OPEN_REJECT_CONNECTION_RATE_NOT_SUPPORTED):
-               scic_sds_request_set_status(
-                       sci_req,
-                       SCU_GET_COMPLETION_TL_STATUS(completion_code) >>
-                       SCU_COMPLETION_TL_STATUS_SHIFT,
-                       SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED);
+               scic_sds_request_set_status(sci_req,
+                                           SCU_GET_COMPLETION_TL_STATUS(completion_code) >>
+                                           SCU_COMPLETION_TL_STATUS_SHIFT,
+                                           SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED);
                break;
 
        /* neither ssp nor stp gets suspended. */
@@ -943,541 +999,1133 @@ scic_sds_request_started_state_tc_completion_handler(struct scic_sds_request *sc
         */
 
        /* In all cases we will treat this as the completion of the IO req. */
-       sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+       sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
        return SCI_SUCCESS;
 }
 
-enum sci_status
-scic_sds_io_request_tc_completion(struct scic_sds_request *request, u32 completion_code)
+static enum sci_status
+request_aborting_state_tc_event(struct scic_sds_request *sci_req,
+                               u32 completion_code)
 {
-       if (request->state_machine.current_state_id == SCI_BASE_REQUEST_STATE_STARTED &&
-           request->has_started_substate_machine == false)
-               return scic_sds_request_started_state_tc_completion_handler(request, completion_code);
-       else if (request->state_handlers->tc_completion_handler)
-               return request->state_handlers->tc_completion_handler(request, completion_code);
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case (SCU_TASK_DONE_GOOD << SCU_COMPLETION_TL_STATUS_SHIFT):
+       case (SCU_TASK_DONE_TASK_ABORT << SCU_COMPLETION_TL_STATUS_SHIFT):
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_TASK_ABORT,
+                                           SCI_FAILURE_IO_TERMINATED);
 
-       dev_warn(scic_to_dev(request->owning_controller),
-               "%s: SCIC IO Request given task completion notification %x "
-               "while in wrong state %d\n",
-               __func__,
-               completion_code,
-               sci_base_state_machine_get_state(&request->state_machine));
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
 
-       return SCI_FAILURE_INVALID_STATE;
+       default:
+               /* Unless we get some strange error wait for the task abort to complete
+                * TODO: Should there be a state change for this completion?
+                */
+               break;
+       }
+
+       return SCI_SUCCESS;
 }
 
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_frame_handler() request. This method
- * first determines the frame type received.  If this is a response frame then
- * the response data is copied to the io request response buffer for processing
- * at completion time. If the frame type is not a response buffer an error is
- * logged. enum sci_status SCI_SUCCESS SCI_FAILURE_INVALID_PARAMETER_VALUE
- */
-static enum sci_status
-scic_sds_request_started_state_frame_handler(struct scic_sds_request *sci_req,
-                                            u32 frame_index)
+static enum sci_status ssp_task_request_await_tc_event(struct scic_sds_request *sci_req,
+                                                      u32 completion_code)
 {
-       enum sci_status status;
-       u32 *frame_header;
-       struct ssp_frame_hdr ssp_hdr;
-       ssize_t word_cnt;
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
 
-       status = scic_sds_unsolicited_frame_control_get_header(
-               &(scic_sds_request_get_controller(sci_req)->uf_control),
-               frame_index,
-               (void **)&frame_header);
+               sci_change_state(&sci_req->sm, SCI_REQ_TASK_WAIT_TC_RESP);
+               break;
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_ACK_NAK_TO):
+               /* Currently, the decision is to simply allow the task request
+                * to timeout if the task IU wasn't received successfully.
+                * There is a potential for receiving multiple task responses if
+                * we decide to send the task IU again.
+                */
+               dev_warn(scic_to_dev(sci_req->owning_controller),
+                        "%s: TaskRequest:0x%p CompletionCode:%x - "
+                        "ACK/NAK timeout\n", __func__, sci_req,
+                        completion_code);
 
-       word_cnt = sizeof(struct ssp_frame_hdr) / sizeof(u32);
-       sci_swab32_cpy(&ssp_hdr, frame_header, word_cnt);
+               sci_change_state(&sci_req->sm, SCI_REQ_TASK_WAIT_TC_RESP);
+               break;
+       default:
+               /*
+                * All other completion status cause the IO to be complete.
+                * If a NAK was received, then it is up to the user to retry
+                * the request.
+                */
+               scic_sds_request_set_status(sci_req,
+                       SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-       if (ssp_hdr.frame_type == SSP_RESPONSE) {
-               struct ssp_response_iu *resp_iu;
-               ssize_t word_cnt = SSP_RESP_IU_MAX_SIZE / sizeof(u32);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
+       }
 
-               status = scic_sds_unsolicited_frame_control_get_buffer(
-                       &(scic_sds_request_get_controller(sci_req)->uf_control),
-                       frame_index,
-                       (void **)&resp_iu);
+       return SCI_SUCCESS;
+}
 
-               sci_swab32_cpy(&sci_req->ssp.rsp,
-                              resp_iu, word_cnt);
+static enum sci_status
+smp_request_await_response_tc_event(struct scic_sds_request *sci_req,
+                                   u32 completion_code)
+{
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               /* In the AWAIT RESPONSE state, any TC completion is
+                * unexpected.  but if the TC has success status, we
+                * complete the IO anyway.
+                */
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
 
-               resp_iu = &sci_req->ssp.rsp;
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
 
-               if ((resp_iu->datapres == 0x01) ||
-                   (resp_iu->datapres == 0x02)) {
-                       scic_sds_request_set_status(
-                               sci_req,
-                               SCU_TASK_DONE_CHECK_RESPONSE,
-                               SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
-               } else
-                       scic_sds_request_set_status(
-                               sci_req, SCU_TASK_DONE_GOOD, SCI_SUCCESS);
-       } else {
-               /* This was not a response frame why did it get forwarded? */
-               dev_err(scic_to_dev(sci_req->owning_controller),
-                       "%s: SCIC IO Request 0x%p received unexpected "
-                       "frame %d type 0x%02x\n",
-                       __func__,
-                       sci_req,
-                       frame_index,
-                       ssp_hdr.frame_type);
-       }
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_RESP_TO_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_UFI_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_FRM_TYPE_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_LL_RX_ERR):
+               /* These status has been seen in a specific LSI
+                * expander, which sometimes is not able to send smp
+                * response within 2 ms. This causes our hardware break
+                * the connection and set TC completion with one of
+                * these SMP_XXX_XX_ERR status. For these type of error,
+                * we ask scic user to retry the request.
+                */
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_SMP_RESP_TO_ERR,
+                                           SCI_FAILURE_RETRY_REQUIRED);
 
-       /*
-        * In any case we are done with this frame buffer return it to the
-        * controller
-        */
-       scic_sds_controller_release_frame(
-               sci_req->owning_controller, frame_index);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
 
-       return SCI_SUCCESS;
-}
+       default:
+               /* All other completion status cause the IO to be complete.  If a NAK
+                * was received, then it is up to the user to retry the request
+                */
+               scic_sds_request_set_status(sci_req,
+                                           SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-/*
- * *****************************************************************************
- * *  COMPLETED STATE HANDLERS
- * ***************************************************************************** */
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
+       }
 
+       return SCI_SUCCESS;
+}
 
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_complete() request. This method frees up
- * any io request resources that have been allocated and transitions the
- * request to its final state. Consider stopping the state machine instead of
- * transitioning to the final state? enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_request_completed_state_complete_handler(
-       struct scic_sds_request *request)
+static enum sci_status
+smp_request_await_tc_event(struct scic_sds_request *sci_req,
+                          u32 completion_code)
 {
-       if (request->was_tag_assigned_by_user != true) {
-               scic_controller_free_io_tag(
-                       request->owning_controller, request->io_tag);
-       }
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
+       default:
+               /* All other completion status cause the IO to be
+                * complete.  If a NAK was received, then it is up to
+                * the user to retry the request.
+                */
+               scic_sds_request_set_status(sci_req,
+                                           SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-       if (request->saved_rx_frame_index != SCU_INVALID_FRAME_INDEX) {
-               scic_sds_controller_release_frame(
-                       request->owning_controller, request->saved_rx_frame_index);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
        }
 
-       sci_base_state_machine_change_state(&request->state_machine,
-               SCI_BASE_REQUEST_STATE_FINAL);
        return SCI_SUCCESS;
 }
 
-/*
- * *****************************************************************************
- * *  ABORTING STATE HANDLERS
- * ***************************************************************************** */
+void scic_stp_io_request_set_ncq_tag(struct scic_sds_request *req,
+                                    u16 ncq_tag)
+{
+       /**
+        * @note This could be made to return an error to the user if the user
+        *       attempts to set the NCQ tag in the wrong state.
+        */
+       req->tc->type.stp.ncq_tag = ncq_tag;
+}
 
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_terminate() request. This method is the
- * io request aborting state abort handlers.  On receipt of a multiple
- * terminate requests the io request will transition to the completed state.
- * This should not happen in normal operation. enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_request_aborting_state_abort_handler(
-       struct scic_sds_request *request)
+static struct scu_sgl_element *pio_sgl_next(struct scic_sds_stp_request *stp_req)
 {
-       sci_base_state_machine_change_state(&request->state_machine,
-               SCI_BASE_REQUEST_STATE_COMPLETED);
-       return SCI_SUCCESS;
+       struct scu_sgl_element *sgl;
+       struct scu_sgl_element_pair *sgl_pair;
+       struct scic_sds_request *sci_req = to_sci_req(stp_req);
+       struct scic_sds_request_pio_sgl *pio_sgl = &stp_req->type.pio.request_current;
+
+       sgl_pair = to_sgl_element_pair(sci_req, pio_sgl->sgl_index);
+       if (!sgl_pair)
+               sgl = NULL;
+       else if (pio_sgl->sgl_set == SCU_SGL_ELEMENT_PAIR_A) {
+               if (sgl_pair->B.address_lower == 0 &&
+                   sgl_pair->B.address_upper == 0) {
+                       sgl = NULL;
+               } else {
+                       pio_sgl->sgl_set = SCU_SGL_ELEMENT_PAIR_B;
+                       sgl = &sgl_pair->B;
+               }
+       } else {
+               if (sgl_pair->next_pair_lower == 0 &&
+                   sgl_pair->next_pair_upper == 0) {
+                       sgl = NULL;
+               } else {
+                       pio_sgl->sgl_index++;
+                       pio_sgl->sgl_set = SCU_SGL_ELEMENT_PAIR_A;
+                       sgl_pair = to_sgl_element_pair(sci_req, pio_sgl->sgl_index);
+                       sgl = &sgl_pair->A;
+               }
+       }
+
+       return sgl;
 }
 
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_task_completion() request. This method
- * decodes the completion type waiting for the abort task complete
- * notification. When the abort task complete is received the io request
- * transitions to the completed state. enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_request_aborting_state_tc_completion_handler(
-       struct scic_sds_request *sci_req,
-       u32 completion_code)
+static enum sci_status
+stp_request_non_data_await_h2d_tc_event(struct scic_sds_request *sci_req,
+                                       u32 completion_code)
 {
        switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
-       case (SCU_TASK_DONE_GOOD << SCU_COMPLETION_TL_STATUS_SHIFT):
-       case (SCU_TASK_DONE_TASK_ABORT << SCU_COMPLETION_TL_STATUS_SHIFT):
-               scic_sds_request_set_status(
-                       sci_req, SCU_TASK_DONE_TASK_ABORT, SCI_FAILURE_IO_TERMINATED
-                       );
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
 
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_STP_NON_DATA_WAIT_D2H);
                break;
 
        default:
-               /*
-                * Unless we get some strange error wait for the task abort to complete
-                * TODO: Should there be a state change for this completion? */
+               /* All other completion status cause the IO to be
+                * complete.  If a NAK was received, then it is up to
+                * the user to retry the request.
+                */
+               scic_sds_request_set_status(sci_req,
+                                           SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
                break;
        }
 
        return SCI_SUCCESS;
 }
 
-/*
- * This method implements the action to be taken when an SCIC_SDS_IO_REQUEST_T
- * object receives a scic_sds_request_frame_handler() request. This method
- * discards the unsolicited frame since we are waiting for the abort task
- * completion. enum sci_status SCI_SUCCESS
+#define SCU_MAX_FRAME_BUFFER_SIZE  0x400  /* 1K is the maximum SCU frame data payload */
+
+/* transmit DATA_FIS from (current sgl + offset) for input
+ * parameter length. current sgl and offset is alreay stored in the IO request
  */
-static enum sci_status scic_sds_request_aborting_state_frame_handler(
+static enum sci_status scic_sds_stp_request_pio_data_out_trasmit_data_frame(
        struct scic_sds_request *sci_req,
-       u32 frame_index)
+       u32 length)
 {
-       /* TODO: Is it even possible to get an unsolicited frame in the aborting state? */
+       struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
+       struct scu_task_context *task_context = sci_req->tc;
+       struct scu_sgl_element_pair *sgl_pair;
+       struct scu_sgl_element *current_sgl;
+
+       /* Recycle the TC and reconstruct it for sending out DATA FIS containing
+        * for the data from current_sgl+offset for the input length
+        */
+       sgl_pair = to_sgl_element_pair(sci_req, stp_req->type.pio.request_current.sgl_index);
+       if (stp_req->type.pio.request_current.sgl_set == SCU_SGL_ELEMENT_PAIR_A)
+               current_sgl = &sgl_pair->A;
+       else
+               current_sgl = &sgl_pair->B;
 
-       scic_sds_controller_release_frame(
-               sci_req->owning_controller, frame_index);
+       /* update the TC */
+       task_context->command_iu_upper = current_sgl->address_upper;
+       task_context->command_iu_lower = current_sgl->address_lower;
+       task_context->transfer_length_bytes = length;
+       task_context->type.stp.fis_type = FIS_DATA;
 
-       return SCI_SUCCESS;
+       /* send the new TC out. */
+       return scic_controller_continue_io(sci_req);
 }
 
-/**
- * This method processes the completions transport layer (TL) status to
- *    determine if the RAW task management frame was sent successfully. If the
- *    raw frame was sent successfully, then the state for the task request
- *    transitions to waiting for a response frame.
- * @sci_req: This parameter specifies the request for which the TC
- *    completion was received.
- * @completion_code: This parameter indicates the completion status information
- *    for the TC.
- *
- * Indicate if the tc completion handler was successful. SCI_SUCCESS currently
- * this method always returns success.
- */
-static enum sci_status scic_sds_ssp_task_request_await_tc_completion_tc_completion_handler(
-       struct scic_sds_request *sci_req,
-       u32 completion_code)
+static enum sci_status scic_sds_stp_request_pio_data_out_transmit_data(struct scic_sds_request *sci_req)
 {
-       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
-               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
-                                           SCI_SUCCESS);
 
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_RESPONSE);
-               break;
+       struct scu_sgl_element *current_sgl;
+       u32 sgl_offset;
+       u32 remaining_bytes_in_current_sgl = 0;
+       enum sci_status status = SCI_SUCCESS;
+       struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
+       struct scu_sgl_element_pair *sgl_pair;
 
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_ACK_NAK_TO):
-               /*
-                * Currently, the decision is to simply allow the task request to
-                * timeout if the task IU wasn't received successfully.
-                * There is a potential for receiving multiple task responses if we
-                * decide to send the task IU again. */
-               dev_warn(scic_to_dev(sci_req->owning_controller),
-                        "%s: TaskRequest:0x%p CompletionCode:%x - "
-                        "ACK/NAK timeout\n",
-                        __func__,
-                        sci_req,
-                        completion_code);
+       sgl_offset = stp_req->type.pio.request_current.sgl_offset;
+       sgl_pair = to_sgl_element_pair(sci_req, stp_req->type.pio.request_current.sgl_index);
+       if (WARN_ONCE(!sgl_pair, "%s: null sgl element", __func__))
+               return SCI_FAILURE;
 
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_RESPONSE);
-               break;
+       if (stp_req->type.pio.request_current.sgl_set == SCU_SGL_ELEMENT_PAIR_A) {
+               current_sgl = &sgl_pair->A;
+               remaining_bytes_in_current_sgl = sgl_pair->A.length - sgl_offset;
+       } else {
+               current_sgl = &sgl_pair->B;
+               remaining_bytes_in_current_sgl = sgl_pair->B.length - sgl_offset;
+       }
 
-       default:
-               /*
-                * All other completion status cause the IO to be complete.  If a NAK
-                * was received, then it is up to the user to retry the request. */
-               scic_sds_request_set_status(
-                       sci_req,
-                       SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
-                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR
-                       );
+       if (stp_req->type.pio.pio_transfer_bytes > 0) {
+               if (stp_req->type.pio.pio_transfer_bytes >= remaining_bytes_in_current_sgl) {
+                       /* recycle the TC and send the H2D Data FIS from (current sgl + sgl_offset) and length = remaining_bytes_in_current_sgl */
+                       status = scic_sds_stp_request_pio_data_out_trasmit_data_frame(sci_req, remaining_bytes_in_current_sgl);
+                       if (status == SCI_SUCCESS) {
+                               stp_req->type.pio.pio_transfer_bytes -= remaining_bytes_in_current_sgl;
 
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
-               break;
+                               /* update the current sgl, sgl_offset and save for future */
+                               current_sgl = pio_sgl_next(stp_req);
+                               sgl_offset = 0;
+                       }
+               } else if (stp_req->type.pio.pio_transfer_bytes < remaining_bytes_in_current_sgl) {
+                       /* recycle the TC and send the H2D Data FIS from (current sgl + sgl_offset) and length = type.pio.pio_transfer_bytes */
+                       scic_sds_stp_request_pio_data_out_trasmit_data_frame(sci_req, stp_req->type.pio.pio_transfer_bytes);
+
+                       if (status == SCI_SUCCESS) {
+                               /* Sgl offset will be adjusted and saved for future */
+                               sgl_offset += stp_req->type.pio.pio_transfer_bytes;
+                               current_sgl->address_lower += stp_req->type.pio.pio_transfer_bytes;
+                               stp_req->type.pio.pio_transfer_bytes = 0;
+                       }
+               }
        }
 
-       return SCI_SUCCESS;
+       if (status == SCI_SUCCESS) {
+               stp_req->type.pio.request_current.sgl_offset = sgl_offset;
+       }
+
+       return status;
 }
 
 /**
- * This method is responsible for processing a terminate/abort request for this
- *    TC while the request is waiting for the task management response
- *    unsolicited frame.
- * @sci_req: This parameter specifies the request for which the
- *    termination was requested.
  *
- * This method returns an indication as to whether the abort request was
- * successfully handled. need to update to ensure the received UF doesn't cause
- * damage to subsequent requests (i.e. put the extended tag in a holding
- * pattern for this particular device).
+ * @stp_request: The request that is used for the SGL processing.
+ * @data_buffer: The buffer of data to be copied.
+ * @length: The length of the data transfer.
+ *
+ * Copy the data from the buffer for the length specified to the IO reqeust SGL
+ * specified data region. enum sci_status
  */
-static enum sci_status scic_sds_ssp_task_request_await_tc_response_abort_handler(
-       struct scic_sds_request *request)
+static enum sci_status
+scic_sds_stp_request_pio_data_in_copy_data_buffer(struct scic_sds_stp_request *stp_req,
+                                                 u8 *data_buf, u32 len)
 {
-       sci_base_state_machine_change_state(&request->state_machine,
-                       SCI_BASE_REQUEST_STATE_ABORTING);
-       sci_base_state_machine_change_state(&request->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+       struct scic_sds_request *sci_req;
+       struct isci_request *ireq;
+       u8 *src_addr;
+       int copy_len;
+       struct sas_task *task;
+       struct scatterlist *sg;
+       void *kaddr;
+       int total_len = len;
+
+       sci_req = to_sci_req(stp_req);
+       ireq = sci_req_to_ireq(sci_req);
+       task = isci_request_access_task(ireq);
+       src_addr = data_buf;
+
+       if (task->num_scatter > 0) {
+               sg = task->scatter;
+
+               while (total_len > 0) {
+                       struct page *page = sg_page(sg);
+
+                       copy_len = min_t(int, total_len, sg_dma_len(sg));
+                       kaddr = kmap_atomic(page, KM_IRQ0);
+                       memcpy(kaddr + sg->offset, src_addr, copy_len);
+                       kunmap_atomic(kaddr, KM_IRQ0);
+                       total_len -= copy_len;
+                       src_addr += copy_len;
+                       sg = sg_next(sg);
+               }
+       } else {
+               BUG_ON(task->total_xfer_len < total_len);
+               memcpy(task->scatter, src_addr, total_len);
+       }
+
        return SCI_SUCCESS;
 }
 
 /**
- * This method processes an unsolicited frame while the task mgmt request is
- *    waiting for a response frame.  It will copy the response data, release
- *    the unsolicited frame, and transition the request to the
- *    SCI_BASE_REQUEST_STATE_COMPLETED state.
- * @sci_req: This parameter specifies the request for which the
- *    unsolicited frame was received.
- * @frame_index: This parameter indicates the unsolicited frame index that
- *    should contain the response.
  *
- * This method returns an indication of whether the TC response frame was
- * handled successfully or not. SCI_SUCCESS Currently this value is always
- * returned and indicates successful processing of the TC response. Should
- * probably update to check frame type and make sure it is a response frame.
+ * @sci_req: The PIO DATA IN request that is to receive the data.
+ * @data_buffer: The buffer to copy from.
+ *
+ * Copy the data buffer to the io request data region. enum sci_status
  */
-static enum sci_status scic_sds_ssp_task_request_await_tc_response_frame_handler(
-       struct scic_sds_request *request,
-       u32 frame_index)
+static enum sci_status scic_sds_stp_request_pio_data_in_copy_data(
+       struct scic_sds_stp_request *sci_req,
+       u8 *data_buffer)
 {
-       scic_sds_io_request_copy_response(request);
+       enum sci_status status;
 
-       sci_base_state_machine_change_state(&request->state_machine,
-               SCI_BASE_REQUEST_STATE_COMPLETED);
-       scic_sds_controller_release_frame(request->owning_controller,
-                       frame_index);
-       return SCI_SUCCESS;
+       /*
+        * If there is less than 1K remaining in the transfer request
+        * copy just the data for the transfer */
+       if (sci_req->type.pio.pio_transfer_bytes < SCU_MAX_FRAME_BUFFER_SIZE) {
+               status = scic_sds_stp_request_pio_data_in_copy_data_buffer(
+                       sci_req, data_buffer, sci_req->type.pio.pio_transfer_bytes);
+
+               if (status == SCI_SUCCESS)
+                       sci_req->type.pio.pio_transfer_bytes = 0;
+       } else {
+               /* We are transfering the whole frame so copy */
+               status = scic_sds_stp_request_pio_data_in_copy_data_buffer(
+                       sci_req, data_buffer, SCU_MAX_FRAME_BUFFER_SIZE);
+
+               if (status == SCI_SUCCESS)
+                       sci_req->type.pio.pio_transfer_bytes -= SCU_MAX_FRAME_BUFFER_SIZE;
+       }
+
+       return status;
 }
 
-/**
- * This method processes an abnormal TC completion while the SMP request is
- *    waiting for a response frame.  It decides what happened to the IO based
- *    on TC completion status.
- * @sci_req: This parameter specifies the request for which the TC
- *    completion was received.
- * @completion_code: This parameter indicates the completion status information
- *    for the TC.
- *
- * Indicate if the tc completion handler was successful. SCI_SUCCESS currently
- * this method always returns success.
- */
-static enum sci_status scic_sds_smp_request_await_response_tc_completion_handler(
-       struct scic_sds_request *sci_req,
-       u32 completion_code)
+static enum sci_status
+stp_request_pio_await_h2d_completion_tc_event(struct scic_sds_request *sci_req,
+                                             u32 completion_code)
 {
+       enum sci_status status = SCI_SUCCESS;
+
        switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
-               /*
-                * In the AWAIT RESPONSE state, any TC completion is unexpected.
-                * but if the TC has success status, we complete the IO anyway. */
-               scic_sds_request_set_status(
-                       sci_req, SCU_TASK_DONE_GOOD, SCI_SUCCESS
-                       );
+               scic_sds_request_set_status(sci_req,
+                                           SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
                break;
 
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_RESP_TO_ERR):
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_UFI_ERR):
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_FRM_TYPE_ERR):
-       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_SMP_LL_RX_ERR):
-               /*
-                * These status has been seen in a specific LSI expander, which sometimes
-                * is not able to send smp response within 2 ms. This causes our hardware
-                * break the connection and set TC completion with one of these SMP_XXX_XX_ERR
-                * status. For these type of error, we ask scic user to retry the request. */
-               scic_sds_request_set_status(
-                       sci_req, SCU_TASK_DONE_SMP_RESP_TO_ERR, SCI_FAILURE_RETRY_REQUIRED
-                       );
+       default:
+               /* All other completion status cause the IO to be
+                * complete.  If a NAK was received, then it is up to
+                * the user to retry the request.
+                */
+               scic_sds_request_set_status(sci_req,
+                                           SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
+       }
+
+       return status;
+}
+
+static enum sci_status
+pio_data_out_tx_done_tc_event(struct scic_sds_request *sci_req,
+                             u32 completion_code)
+{
+       enum sci_status status = SCI_SUCCESS;
+       bool all_frames_transferred = false;
+       struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
+
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               /* Transmit data */
+               if (stp_req->type.pio.pio_transfer_bytes != 0) {
+                       status = scic_sds_stp_request_pio_data_out_transmit_data(sci_req);
+                       if (status == SCI_SUCCESS) {
+                               if (stp_req->type.pio.pio_transfer_bytes == 0)
+                                       all_frames_transferred = true;
+                       }
+               } else if (stp_req->type.pio.pio_transfer_bytes == 0) {
+                       /*
+                        * this will happen if the all data is written at the
+                        * first time after the pio setup fis is received
+                        */
+                       all_frames_transferred  = true;
+               }
+
+               /* all data transferred. */
+               if (all_frames_transferred) {
+                       /*
+                        * Change the state to SCI_REQ_STP_PIO_DATA_IN
+                        * and wait for PIO_SETUP fis / or D2H REg fis. */
+                       sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
+               }
                break;
 
        default:
                /*
-                * All other completion status cause the IO to be complete.  If a NAK
-                * was received, then it is up to the user to retry the request. */
+                * All other completion status cause the IO to be complete.
+                * If a NAK was received, then it is up to the user to retry
+                * the request.
+                */
                scic_sds_request_set_status(
                        sci_req,
                        SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
-                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR
-                       );
+                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
                break;
        }
 
-       return SCI_SUCCESS;
+       return status;
 }
 
-/*
- * This function processes an unsolicited frame while the SMP request is waiting
- *    for a response frame.  It will copy the response data, release the
- *    unsolicited frame, and transition the request to the
- *    SCI_BASE_REQUEST_STATE_COMPLETED state.
- * @sci_req: This parameter specifies the request for which the
- *    unsolicited frame was received.
- * @frame_index: This parameter indicates the unsolicited frame index that
- *    should contain the response.
- *
- * This function returns an indication of whether the response frame was handled
- * successfully or not. SCI_SUCCESS Currently this value is always returned and
- * indicates successful processing of the TC response.
- */
-static enum sci_status
-scic_sds_smp_request_await_response_frame_handler(struct scic_sds_request *sci_req,
-                                                 u32 frame_index)
+static void scic_sds_stp_request_udma_complete_request(
+       struct scic_sds_request *request,
+       u32 scu_status,
+       enum sci_status sci_status)
+{
+       scic_sds_request_set_status(request, scu_status, sci_status);
+       sci_change_state(&request->sm, SCI_REQ_COMPLETED);
+}
+
+static enum sci_status scic_sds_stp_request_udma_general_frame_handler(struct scic_sds_request *sci_req,
+                                                                      u32 frame_index)
 {
+       struct scic_sds_controller *scic = sci_req->owning_controller;
+       struct dev_to_host_fis *frame_header;
        enum sci_status status;
-       void *frame_header;
-       struct smp_resp *rsp_hdr = &sci_req->smp.rsp;
-       ssize_t word_cnt = SMP_RESP_HDR_SZ / sizeof(u32);
+       u32 *frame_buffer;
 
-       status = scic_sds_unsolicited_frame_control_get_header(
-               &(scic_sds_request_get_controller(sci_req)->uf_control),
-               frame_index,
-               &frame_header);
+       status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                              frame_index,
+                                                              (void **)&frame_header);
 
-       /* byte swap the header. */
-       sci_swab32_cpy(rsp_hdr, frame_header, word_cnt);
+       if ((status == SCI_SUCCESS) &&
+           (frame_header->fis_type == FIS_REGD2H)) {
+               scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                             frame_index,
+                                                             (void **)&frame_buffer);
 
-       if (rsp_hdr->frame_type == SMP_RESPONSE) {
-               void *smp_resp;
+               scic_sds_controller_copy_sata_response(&sci_req->stp.rsp,
+                                                      frame_header,
+                                                      frame_buffer);
+       }
 
-               status = scic_sds_unsolicited_frame_control_get_buffer(
-                       &(scic_sds_request_get_controller(sci_req)->uf_control),
-                       frame_index,
-                       &smp_resp);
+       scic_sds_controller_release_frame(scic, frame_index);
 
-               word_cnt = (sizeof(struct smp_req) - SMP_RESP_HDR_SZ) /
-                       sizeof(u32);
+       return status;
+}
 
-               sci_swab32_cpy(((u8 *) rsp_hdr) + SMP_RESP_HDR_SZ,
-                              smp_resp, word_cnt);
+enum sci_status
+scic_sds_io_request_frame_handler(struct scic_sds_request *sci_req,
+                                 u32 frame_index)
+{
+       struct scic_sds_controller *scic = sci_req->owning_controller;
+       struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
+       enum sci_base_request_states state;
+       enum sci_status status;
+       ssize_t word_cnt;
 
-               scic_sds_request_set_status(
-                       sci_req, SCU_TASK_DONE_GOOD, SCI_SUCCESS);
+       state = sci_req->sm.current_state_id;
+       switch (state)  {
+       case SCI_REQ_STARTED: {
+               struct ssp_frame_hdr ssp_hdr;
+               void *frame_header;
 
-               sci_base_state_machine_change_state(&sci_req->state_machine,
-                       SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_TC_COMPLETION);
-       } else {
-               /* This was not a response frame why did it get forwarded? */
-               dev_err(scic_to_dev(sci_req->owning_controller),
-                       "%s: SCIC SMP Request 0x%p received unexpected frame "
-                       "%d type 0x%02x\n",
-                       __func__,
-                       sci_req,
-                       frame_index,
-                       rsp_hdr->frame_type);
+               scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                             frame_index,
+                                                             &frame_header);
 
-               scic_sds_request_set_status(
-                       sci_req,
-                       SCU_TASK_DONE_SMP_FRM_TYPE_ERR,
-                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+               word_cnt = sizeof(struct ssp_frame_hdr) / sizeof(u32);
+               sci_swab32_cpy(&ssp_hdr, frame_header, word_cnt);
+
+               if (ssp_hdr.frame_type == SSP_RESPONSE) {
+                       struct ssp_response_iu *resp_iu;
+                       ssize_t word_cnt = SSP_RESP_IU_MAX_SIZE / sizeof(u32);
+
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&resp_iu);
+
+                       sci_swab32_cpy(&sci_req->ssp.rsp, resp_iu, word_cnt);
+
+                       resp_iu = &sci_req->ssp.rsp;
+
+                       if (resp_iu->datapres == 0x01 ||
+                           resp_iu->datapres == 0x02) {
+                               scic_sds_request_set_status(sci_req,
+                                                           SCU_TASK_DONE_CHECK_RESPONSE,
+                                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+                       } else
+                               scic_sds_request_set_status(sci_req,
+                                                           SCU_TASK_DONE_GOOD,
+                                                           SCI_SUCCESS);
+               } else {
+                       /* not a response frame, why did it get forwarded? */
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC IO Request 0x%p received unexpected "
+                               "frame %d type 0x%02x\n", __func__, sci_req,
+                               frame_index, ssp_hdr.frame_type);
+               }
+
+               /*
+                * In any case we are done with this frame buffer return it to
+                * the controller
+                */
+               scic_sds_controller_release_frame(scic, frame_index);
+
+               return SCI_SUCCESS;
+       }
+
+       case SCI_REQ_TASK_WAIT_TC_RESP:
+               scic_sds_io_request_copy_response(sci_req);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               scic_sds_controller_release_frame(scic,frame_index);
+               return SCI_SUCCESS;
+
+       case SCI_REQ_SMP_WAIT_RESP: {
+               struct smp_resp *rsp_hdr = &sci_req->smp.rsp;
+               void *frame_header;
+
+               scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                             frame_index,
+                                                             &frame_header);
+
+               /* byte swap the header. */
+               word_cnt = SMP_RESP_HDR_SZ / sizeof(u32);
+               sci_swab32_cpy(rsp_hdr, frame_header, word_cnt);
+
+               if (rsp_hdr->frame_type == SMP_RESPONSE) {
+                       void *smp_resp;
+
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     &smp_resp);
+
+                       word_cnt = (sizeof(struct smp_resp) - SMP_RESP_HDR_SZ) /
+                               sizeof(u32);
+
+                       sci_swab32_cpy(((u8 *) rsp_hdr) + SMP_RESP_HDR_SZ,
+                                      smp_resp, word_cnt);
+
+                       scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                                   SCI_SUCCESS);
+
+                       sci_change_state(&sci_req->sm, SCI_REQ_SMP_WAIT_TC_COMP);
+               } else {
+                       /*
+                        * This was not a response frame why did it get
+                        * forwarded?
+                        */
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC SMP Request 0x%p received unexpected "
+                               "frame %d type 0x%02x\n",
+                               __func__,
+                               sci_req,
+                               frame_index,
+                               rsp_hdr->frame_type);
+
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_SMP_FRM_TYPE_ERR,
+                                                   SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+
+                       sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               }
+
+               scic_sds_controller_release_frame(scic, frame_index);
+
+               return SCI_SUCCESS;
+       }
+
+       case SCI_REQ_STP_UDMA_WAIT_TC_COMP:
+               return scic_sds_stp_request_udma_general_frame_handler(sci_req,
+                                                                      frame_index);
+
+       case SCI_REQ_STP_UDMA_WAIT_D2H:
+               /* Use the general frame handler to copy the resposne data */
+               status = scic_sds_stp_request_udma_general_frame_handler(sci_req,
+                                                                        frame_index);
+
+               if (status != SCI_SUCCESS)
+                       return status;
+
+               scic_sds_stp_request_udma_complete_request(sci_req,
+                                                          SCU_TASK_DONE_CHECK_RESPONSE,
+                                                          SCI_FAILURE_IO_RESPONSE_VALID);
+
+               return SCI_SUCCESS;
+
+       case SCI_REQ_STP_NON_DATA_WAIT_D2H: {
+               struct dev_to_host_fis *frame_header;
+               u32 *frame_buffer;
+
+               status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                                      frame_index,
+                                                                      (void **)&frame_header);
+
+               if (status != SCI_SUCCESS) {
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC IO Request 0x%p could not get frame "
+                               "header for frame index %d, status %x\n",
+                               __func__,
+                               stp_req,
+                               frame_index,
+                               status);
+
+                       return status;
+               }
+
+               switch (frame_header->fis_type) {
+               case FIS_REGD2H:
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&frame_buffer);
+
+                       scic_sds_controller_copy_sata_response(&sci_req->stp.rsp,
+                                                              frame_header,
+                                                              frame_buffer);
+
+                       /* The command has completed with error */
+                       scic_sds_request_set_status(sci_req, SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
+                       break;
+
+               default:
+                       dev_warn(scic_to_dev(scic),
+                                "%s: IO Request:0x%p Frame Id:%d protocol "
+                                 "violation occurred\n", __func__, stp_req,
+                                 frame_index);
+
+                       scic_sds_request_set_status(sci_req, SCU_TASK_DONE_UNEXP_FIS,
+                                                   SCI_FAILURE_PROTOCOL_VIOLATION);
+                       break;
+               }
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+
+               /* Frame has been decoded return it to the controller */
+               scic_sds_controller_release_frame(scic, frame_index);
+
+               return status;
+       }
+
+       case SCI_REQ_STP_PIO_WAIT_FRAME: {
+               struct isci_request *ireq = sci_req_to_ireq(sci_req);
+               struct sas_task *task = isci_request_access_task(ireq);
+               struct dev_to_host_fis *frame_header;
+               u32 *frame_buffer;
+
+               status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                                      frame_index,
+                                                                      (void **)&frame_header);
+
+               if (status != SCI_SUCCESS) {
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC IO Request 0x%p could not get frame "
+                               "header for frame index %d, status %x\n",
+                               __func__, stp_req, frame_index, status);
+                       return status;
+               }
+
+               switch (frame_header->fis_type) {
+               case FIS_PIO_SETUP:
+                       /* Get from the frame buffer the PIO Setup Data */
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&frame_buffer);
+
+                       /* Get the data from the PIO Setup The SCU Hardware
+                        * returns first word in the frame_header and the rest
+                        * of the data is in the frame buffer so we need to
+                        * back up one dword
+                        */
+
+                       /* transfer_count: first 16bits in the 4th dword */
+                       stp_req->type.pio.pio_transfer_bytes = frame_buffer[3] & 0xffff;
+
+                       /* ending_status: 4th byte in the 3rd dword */
+                       stp_req->type.pio.ending_status = (frame_buffer[2] >> 24) & 0xff;
+
+                       scic_sds_controller_copy_sata_response(&sci_req->stp.rsp,
+                                                              frame_header,
+                                                              frame_buffer);
+
+                       sci_req->stp.rsp.status = stp_req->type.pio.ending_status;
+
+                       /* The next state is dependent on whether the
+                        * request was PIO Data-in or Data out
+                        */
+                       if (task->data_dir == DMA_FROM_DEVICE) {
+                               sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_DATA_IN);
+                       } else if (task->data_dir == DMA_TO_DEVICE) {
+                               /* Transmit data */
+                               status = scic_sds_stp_request_pio_data_out_transmit_data(sci_req);
+                               if (status != SCI_SUCCESS)
+                                       break;
+                               sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_DATA_OUT);
+                       }
+                       break;
+
+               case FIS_SETDEVBITS:
+                       sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
+                       break;
+
+               case FIS_REGD2H:
+                       if (frame_header->status & ATA_BUSY) {
+                               /*
+                                * Now why is the drive sending a D2H Register
+                                * FIS when it is still busy?  Do nothing since
+                                * we are still in the right state.
+                                */
+                               dev_dbg(scic_to_dev(scic),
+                                       "%s: SCIC PIO Request 0x%p received "
+                                       "D2H Register FIS with BSY status "
+                                       "0x%x\n",
+                                       __func__,
+                                       stp_req,
+                                       frame_header->status);
+                               break;
+                       }
+
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&frame_buffer);
+
+                       scic_sds_controller_copy_sata_response(&sci_req->stp.req,
+                                                              frame_header,
+                                                              frame_buffer);
+
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
+
+                       sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+                       break;
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               default:
+                       /* FIXME: what do we do here? */
+                       break;
+               }
+
+               /* Frame is decoded return it to the controller */
+               scic_sds_controller_release_frame(scic, frame_index);
+
+               return status;
        }
 
-       scic_sds_controller_release_frame(sci_req->owning_controller,
-                                         frame_index);
+       case SCI_REQ_STP_PIO_DATA_IN: {
+               struct dev_to_host_fis *frame_header;
+               struct sata_fis_data *frame_buffer;
+
+               status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                                      frame_index,
+                                                                      (void **)&frame_header);
+
+               if (status != SCI_SUCCESS) {
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC IO Request 0x%p could not get frame "
+                               "header for frame index %d, status %x\n",
+                               __func__,
+                               stp_req,
+                               frame_index,
+                               status);
+                       return status;
+               }
+
+               if (frame_header->fis_type != FIS_DATA) {
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC PIO Request 0x%p received frame %d "
+                               "with fis type 0x%02x when expecting a data "
+                               "fis.\n",
+                               __func__,
+                               stp_req,
+                               frame_index,
+                               frame_header->fis_type);
+
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_GOOD,
+                                                   SCI_FAILURE_IO_REQUIRES_SCSI_ABORT);
+
+                       sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+
+                       /* Frame is decoded return it to the controller */
+                       scic_sds_controller_release_frame(scic, frame_index);
+                       return status;
+               }
+
+               if (stp_req->type.pio.request_current.sgl_index < 0) {
+                       sci_req->saved_rx_frame_index = frame_index;
+                       stp_req->type.pio.pio_transfer_bytes = 0;
+               } else {
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&frame_buffer);
+
+                       status = scic_sds_stp_request_pio_data_in_copy_data(stp_req,
+                                                                           (u8 *)frame_buffer);
+
+                       /* Frame is decoded return it to the controller */
+                       scic_sds_controller_release_frame(scic, frame_index);
+               }
+
+               /* Check for the end of the transfer, are there more
+                * bytes remaining for this data transfer
+                */
+               if (status != SCI_SUCCESS ||
+                   stp_req->type.pio.pio_transfer_bytes != 0)
+                       return status;
+
+               if ((stp_req->type.pio.ending_status & ATA_BUSY) == 0) {
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
+
+                       sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               } else {
+                       sci_change_state(&sci_req->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
+               }
+               return status;
+       }
+
+       case SCI_REQ_STP_SOFT_RESET_WAIT_D2H: {
+               struct dev_to_host_fis *frame_header;
+               u32 *frame_buffer;
+
+               status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
+                                                                      frame_index,
+                                                                      (void **)&frame_header);
+               if (status != SCI_SUCCESS) {
+                       dev_err(scic_to_dev(scic),
+                               "%s: SCIC IO Request 0x%p could not get frame "
+                               "header for frame index %d, status %x\n",
+                               __func__,
+                               stp_req,
+                               frame_index,
+                               status);
+                       return status;
+               }
+
+               switch (frame_header->fis_type) {
+               case FIS_REGD2H:
+                       scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control,
+                                                                     frame_index,
+                                                                     (void **)&frame_buffer);
+
+                       scic_sds_controller_copy_sata_response(&sci_req->stp.rsp,
+                                                              frame_header,
+                                                              frame_buffer);
+
+                       /* The command has completed with error */
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_CHECK_RESPONSE,
+                                                   SCI_FAILURE_IO_RESPONSE_VALID);
+                       break;
+
+               default:
+                       dev_warn(scic_to_dev(scic),
+                                "%s: IO Request:0x%p Frame Id:%d protocol "
+                                "violation occurred\n",
+                                __func__,
+                                stp_req,
+                                frame_index);
+
+                       scic_sds_request_set_status(sci_req,
+                                                   SCU_TASK_DONE_UNEXP_FIS,
+                                                   SCI_FAILURE_PROTOCOL_VIOLATION);
+                       break;
+               }
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+
+               /* Frame has been decoded return it to the controller */
+               scic_sds_controller_release_frame(scic, frame_index);
+
+               return status;
+       }
+       case SCI_REQ_ABORTING:
+               /*
+                * TODO: Is it even possible to get an unsolicited frame in the
+                * aborting state?
+                */
+               scic_sds_controller_release_frame(scic, frame_index);
+               return SCI_SUCCESS;
+
+       default:
+               dev_warn(scic_to_dev(scic),
+                        "%s: SCIC IO Request given unexpected frame %x while "
+                        "in state %d\n",
+                        __func__,
+                        frame_index,
+                        state);
+
+               scic_sds_controller_release_frame(scic, frame_index);
+               return SCI_FAILURE_INVALID_STATE;
+       }
+}
+
+static enum sci_status stp_request_udma_await_tc_event(struct scic_sds_request *sci_req,
+                                                      u32 completion_code)
+{
+       enum sci_status status = SCI_SUCCESS;
+
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               scic_sds_stp_request_udma_complete_request(sci_req,
+                                                          SCU_TASK_DONE_GOOD,
+                                                          SCI_SUCCESS);
+               break;
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_UNEXP_FIS):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_REG_ERR):
+               /* We must check ther response buffer to see if the D2H
+                * Register FIS was received before we got the TC
+                * completion.
+                */
+               if (sci_req->stp.rsp.fis_type == FIS_REGD2H) {
+                       scic_sds_remote_device_suspend(sci_req->target_device,
+                               SCU_EVENT_SPECIFIC(SCU_NORMALIZE_COMPLETION_STATUS(completion_code)));
+
+                       scic_sds_stp_request_udma_complete_request(sci_req,
+                                                                  SCU_TASK_DONE_CHECK_RESPONSE,
+                                                                  SCI_FAILURE_IO_RESPONSE_VALID);
+               } else {
+                       /* If we have an error completion status for the
+                        * TC then we can expect a D2H register FIS from
+                        * the device so we must change state to wait
+                        * for it
+                        */
+                       sci_change_state(&sci_req->sm, SCI_REQ_STP_UDMA_WAIT_D2H);
+               }
+               break;
+
+       /* TODO Check to see if any of these completion status need to
+        * wait for the device to host register fis.
+        */
+       /* TODO We can retry the command for SCU_TASK_DONE_CMD_LL_R_ERR
+        * - this comes only for B0
+        */
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_INV_FIS_LEN):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_MAX_PLD_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_LL_R_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_CMD_LL_R_ERR):
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_CRC_ERR):
+               scic_sds_remote_device_suspend(sci_req->target_device,
+                       SCU_EVENT_SPECIFIC(SCU_NORMALIZE_COMPLETION_STATUS(completion_code)));
+       /* Fall through to the default case */
+       default:
+               /* All other completion status cause the IO to be complete. */
+               scic_sds_stp_request_udma_complete_request(sci_req,
+                                       SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+               break;
+       }
+
+       return status;
+}
+
+static enum sci_status
+stp_request_soft_reset_await_h2d_asserted_tc_event(struct scic_sds_request *sci_req,
+                                                  u32 completion_code)
+{
+       switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
+       case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
+
+               sci_change_state(&sci_req->sm, SCI_REQ_STP_SOFT_RESET_WAIT_H2D_DIAG);
+               break;
+
+       default:
+               /*
+                * All other completion status cause the IO to be complete.
+                * If a NAK was received, then it is up to the user to retry
+                * the request.
+                */
+               scic_sds_request_set_status(sci_req,
+                                           SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
+                                           SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
+
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
+               break;
+       }
 
        return SCI_SUCCESS;
 }
 
-/**
- * This method processes the completions transport layer (TL) status to
- *    determine if the SMP request was sent successfully. If the SMP request
- *    was sent successfully, then the state for the SMP request transits to
- *    waiting for a response frame.
- * @sci_req: This parameter specifies the request for which the TC
- *    completion was received.
- * @completion_code: This parameter indicates the completion status information
- *    for the TC.
- *
- * Indicate if the tc completion handler was successful. SCI_SUCCESS currently
- * this method always returns success.
- */
-static enum sci_status scic_sds_smp_request_await_tc_completion_tc_completion_handler(
-       struct scic_sds_request *sci_req,
-       u32 completion_code)
+static enum sci_status
+stp_request_soft_reset_await_h2d_diagnostic_tc_event(struct scic_sds_request *sci_req,
+                                                    u32 completion_code)
 {
        switch (SCU_GET_COMPLETION_TL_STATUS(completion_code)) {
        case SCU_MAKE_COMPLETION_STATUS(SCU_TASK_DONE_GOOD):
-               scic_sds_request_set_status(
-                       sci_req, SCU_TASK_DONE_GOOD, SCI_SUCCESS
-                       );
+               scic_sds_request_set_status(sci_req, SCU_TASK_DONE_GOOD,
+                                           SCI_SUCCESS);
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_STP_SOFT_RESET_WAIT_D2H);
                break;
 
        default:
-               /*
-                * All other completion status cause the IO to be complete.  If a NAK
-                * was received, then it is up to the user to retry the request. */
-               scic_sds_request_set_status(
-                       sci_req,
+               /* All other completion status cause the IO to be complete.  If
+                * a NAK was received, then it is up to the user to retry the
+                * request.
+                */
+               scic_sds_request_set_status(sci_req,
                        SCU_NORMALIZE_COMPLETION_STATUS(completion_code),
-                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR
-                       );
+                       SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR);
 
-               sci_base_state_machine_change_state(
-                       &sci_req->state_machine,
-                       SCI_BASE_REQUEST_STATE_COMPLETED);
+               sci_change_state(&sci_req->sm, SCI_REQ_COMPLETED);
                break;
        }
 
        return SCI_SUCCESS;
 }
 
-static const struct scic_sds_io_request_state_handler scic_sds_request_state_handler_table[] = {
-       [SCI_BASE_REQUEST_STATE_INITIAL] = { },
-       [SCI_BASE_REQUEST_STATE_CONSTRUCTED] = {
-               .start_handler          = scic_sds_request_constructed_state_start_handler,
-               .abort_handler          = scic_sds_request_constructed_state_abort_handler,
-       },
-       [SCI_BASE_REQUEST_STATE_STARTED] = {
-               .abort_handler          = scic_sds_request_started_state_abort_handler,
-               .tc_completion_handler  = scic_sds_request_started_state_tc_completion_handler,
-               .frame_handler          = scic_sds_request_started_state_frame_handler,
-       },
-       [SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_COMPLETION] = {
-               .abort_handler          = scic_sds_request_started_state_abort_handler,
-               .tc_completion_handler  = scic_sds_ssp_task_request_await_tc_completion_tc_completion_handler,
-       },
-       [SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_RESPONSE] = {
-               .abort_handler          = scic_sds_ssp_task_request_await_tc_response_abort_handler,
-               .frame_handler          = scic_sds_ssp_task_request_await_tc_response_frame_handler,
-       },
-       [SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_RESPONSE] = {
-               .abort_handler          = scic_sds_request_started_state_abort_handler,
-               .tc_completion_handler  = scic_sds_smp_request_await_response_tc_completion_handler,
-               .frame_handler          = scic_sds_smp_request_await_response_frame_handler,
-       },
-       [SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_TC_COMPLETION] = {
-               .abort_handler          = scic_sds_request_started_state_abort_handler,
-               .tc_completion_handler  =  scic_sds_smp_request_await_tc_completion_tc_completion_handler,
-       },
-       [SCI_BASE_REQUEST_STATE_COMPLETED] = {
-               .complete_handler       = scic_sds_request_completed_state_complete_handler,
-       },
-       [SCI_BASE_REQUEST_STATE_ABORTING] = {
-               .abort_handler          = scic_sds_request_aborting_state_abort_handler,
-               .tc_completion_handler  = scic_sds_request_aborting_state_tc_completion_handler,
-               .frame_handler          = scic_sds_request_aborting_state_frame_handler,
-       },
-       [SCI_BASE_REQUEST_STATE_FINAL] = { },
-};
+enum sci_status
+scic_sds_io_request_tc_completion(struct scic_sds_request *sci_req,
+                                 u32 completion_code)
+{
+       enum sci_base_request_states state;
+       struct scic_sds_controller *scic = sci_req->owning_controller;
+
+       state = sci_req->sm.current_state_id;
+
+       switch (state) {
+       case SCI_REQ_STARTED:
+               return request_started_state_tc_event(sci_req, completion_code);
+
+       case SCI_REQ_TASK_WAIT_TC_COMP:
+               return ssp_task_request_await_tc_event(sci_req,
+                                                      completion_code);
+
+       case SCI_REQ_SMP_WAIT_RESP:
+               return smp_request_await_response_tc_event(sci_req,
+                                                          completion_code);
+
+       case SCI_REQ_SMP_WAIT_TC_COMP:
+               return smp_request_await_tc_event(sci_req, completion_code);
 
+       case SCI_REQ_STP_UDMA_WAIT_TC_COMP:
+               return stp_request_udma_await_tc_event(sci_req,
+                                                      completion_code);
+
+       case SCI_REQ_STP_NON_DATA_WAIT_H2D:
+               return stp_request_non_data_await_h2d_tc_event(sci_req,
+                                                              completion_code);
+
+       case SCI_REQ_STP_PIO_WAIT_H2D:
+               return stp_request_pio_await_h2d_completion_tc_event(sci_req,
+                                                                    completion_code);
+
+       case SCI_REQ_STP_PIO_DATA_OUT:
+               return pio_data_out_tx_done_tc_event(sci_req, completion_code);
+
+       case SCI_REQ_STP_SOFT_RESET_WAIT_H2D_ASSERTED:
+               return stp_request_soft_reset_await_h2d_asserted_tc_event(sci_req,
+                                                                         completion_code);
+
+       case SCI_REQ_STP_SOFT_RESET_WAIT_H2D_DIAG:
+               return stp_request_soft_reset_await_h2d_diagnostic_tc_event(sci_req,
+                                                                           completion_code);
+
+       case SCI_REQ_ABORTING:
+               return request_aborting_state_tc_event(sci_req,
+                                                      completion_code);
+
+       default:
+               dev_warn(scic_to_dev(scic),
+                        "%s: SCIC IO Request given task completion "
+                        "notification %x while in wrong state %d\n",
+                        __func__,
+                        completion_code,
+                        state);
+               return SCI_FAILURE_INVALID_STATE;
+       }
+}
 
 /**
  * isci_request_process_response_iu() - This function sets the status and
@@ -1535,7 +2183,7 @@ static void isci_request_set_open_reject_status(
        enum sas_open_rej_reason open_rej_reason)
 {
        /* Task in the target is done. */
-       request->complete_in_target       = true;
+       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
        *response_ptr                     = SAS_TASK_UNDELIVERED;
        *status_ptr                       = SAS_OPEN_REJECT;
        *complete_to_host_ptr             = isci_perform_normal_io_completion;
@@ -1555,7 +2203,7 @@ static void isci_request_set_open_reject_status(
  * none.
  */
 static void isci_request_handle_controller_specific_errors(
-       struct isci_remote_device *isci_device,
+       struct isci_remote_device *idev,
        struct isci_request *request,
        struct sas_task *task,
        enum service_response *response_ptr,
@@ -1595,13 +2243,12 @@ static void isci_request_handle_controller_specific_errors(
                         * that we ignore the quiesce state, since we are
                         * concerned about the actual device state.
                         */
-                       if ((isci_device->status == isci_stopping) ||
-                           (isci_device->status == isci_stopped))
+                       if (!idev)
                                *status_ptr = SAS_DEVICE_UNKNOWN;
                        else
                                *status_ptr = SAS_ABORTED_TASK;
 
-                       request->complete_in_target = true;
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
 
                        *complete_to_host_ptr =
                                isci_perform_normal_io_completion;
@@ -1609,13 +2256,12 @@ static void isci_request_handle_controller_specific_errors(
                        /* Task in the target is not done. */
                        *response_ptr = SAS_TASK_UNDELIVERED;
 
-                       if ((isci_device->status == isci_stopping) ||
-                           (isci_device->status == isci_stopped))
+                       if (!idev)
                                *status_ptr = SAS_DEVICE_UNKNOWN;
                        else
                                *status_ptr = SAM_STAT_TASK_ABORTED;
 
-                       request->complete_in_target = false;
+                       clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
 
                        *complete_to_host_ptr =
                                isci_perform_error_io_completion;
@@ -1641,13 +2287,12 @@ static void isci_request_handle_controller_specific_errors(
                 * that we ignore the quiesce state, since we are
                 * concerned about the actual device state.
                 */
-               if ((isci_device->status == isci_stopping) ||
-                   (isci_device->status == isci_stopped))
+               if (!idev)
                        *status_ptr = SAS_DEVICE_UNKNOWN;
                else
                        *status_ptr = SAS_ABORTED_TASK;
 
-               request->complete_in_target = true;
+               set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
 
                *complete_to_host_ptr = isci_perform_normal_io_completion;
                break;
@@ -1750,9 +2395,16 @@ static void isci_request_handle_controller_specific_errors(
                /* Task in the target is not done. */
                *response_ptr = SAS_TASK_UNDELIVERED;
                *status_ptr = SAM_STAT_TASK_ABORTED;
-               request->complete_in_target = false;
 
-               *complete_to_host_ptr = isci_perform_error_io_completion;
+               if (task->task_proto == SAS_PROTOCOL_SMP) {
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
+
+                       *complete_to_host_ptr = isci_perform_normal_io_completion;
+               } else {
+                       clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
+
+                       *complete_to_host_ptr = isci_perform_error_io_completion;
+               }
                break;
        }
 }
@@ -1864,7 +2516,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
        struct ssp_response_iu *resp_iu;
        void *resp_buf;
        unsigned long task_flags;
-       struct isci_remote_device *isci_device   = request->isci_device;
+       struct isci_remote_device *idev = isci_lookup_device(task->dev);
        enum service_response response       = SAS_TASK_UNDELIVERED;
        enum exec_status status         = SAS_ABORTED_TASK;
        enum isci_request_status request_status;
@@ -1900,16 +2552,14 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                 *
                 * The target is still there (since the TMF was successful).
                 */
-               request->complete_in_target = true;
+               set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                response = SAS_TASK_COMPLETE;
 
                /* See if the device has been/is being stopped. Note
                 * that we ignore the quiesce state, since we are
                 * concerned about the actual device state.
                 */
-               if ((isci_device->status == isci_stopping)
-                   || (isci_device->status == isci_stopped)
-                   )
+               if (!idev)
                        status = SAS_DEVICE_UNKNOWN;
                else
                        status = SAS_ABORTED_TASK;
@@ -1929,11 +2579,10 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                 * Aborting also means an external thread is explicitly managing
                 * this request, so that we do not complete it up the stack.
                 */
-               request->complete_in_target = true;
+               set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                response = SAS_TASK_UNDELIVERED;
 
-               if ((isci_device->status == isci_stopping) ||
-                   (isci_device->status == isci_stopped))
+               if (!idev)
                        /* The device has been /is being stopped. Note that
                         * we ignore the quiesce state, since we are
                         * concerned about the actual device state.
@@ -1956,15 +2605,14 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                 * the device (reset, tear down, etc.), and the I/O needs
                 * to be completed up the stack.
                 */
-               request->complete_in_target = true;
+               set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                response = SAS_TASK_UNDELIVERED;
 
                /* See if the device has been/is being stopped. Note
                 * that we ignore the quiesce state, since we are
                 * concerned about the actual device state.
                 */
-               if ((isci_device->status == isci_stopping) ||
-                   (isci_device->status == isci_stopped))
+               if (!idev)
                        status = SAS_DEVICE_UNKNOWN;
                else
                        status = SAS_ABORTED_TASK;
@@ -1976,6 +2624,15 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                spin_unlock(&request->state_lock);
                break;
 
+       case dead:
+               /* This was a terminated request that timed-out during the
+                * termination process.  There is no task to complete to
+                * libsas.
+                */
+               complete_to_host = isci_perform_normal_io_completion;
+               spin_unlock(&request->state_lock);
+               break;
+
        default:
 
                /* The request is done from an SCU HW perspective. */
@@ -2018,7 +2675,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                        /* use the task status set in the task struct by the
                         * isci_request_process_response_iu call.
                         */
-                       request->complete_in_target = true;
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                        response = task->task_status.resp;
                        status = task->task_status.stat;
                        break;
@@ -2028,7 +2685,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
 
                        response = SAS_TASK_COMPLETE;
                        status   = SAM_STAT_GOOD;
-                       request->complete_in_target = true;
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
 
                        if (task->task_proto == SAS_PROTOCOL_SMP) {
                                void *rsp = &request->sci.smp.rsp;
@@ -2080,15 +2737,14 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                        /* The request was terminated explicitly.  No handling
                         * is needed in the SCSI error handler path.
                         */
-                       request->complete_in_target = true;
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                        response = SAS_TASK_UNDELIVERED;
 
                        /* See if the device has been/is being stopped. Note
                         * that we ignore the quiesce state, since we are
                         * concerned about the actual device state.
                         */
-                       if ((isci_device->status == isci_stopping) ||
-                           (isci_device->status == isci_stopped))
+                       if (!idev)
                                status = SAS_DEVICE_UNKNOWN;
                        else
                                status = SAS_ABORTED_TASK;
@@ -2099,7 +2755,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                case SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR:
 
                        isci_request_handle_controller_specific_errors(
-                               isci_device, request, task, &response, &status,
+                               idev, request, task, &response, &status,
                                &complete_to_host);
 
                        break;
@@ -2121,9 +2777,23 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                        status = SAM_STAT_TASK_ABORTED;
 
                        complete_to_host = isci_perform_error_io_completion;
-                       request->complete_in_target = false;
+                       clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
+                       break;
+
+               case SCI_FAILURE_RETRY_REQUIRED:
+
+                       /* Fail the I/O so it can be retried. */
+                       response = SAS_TASK_UNDELIVERED;
+                       if (!idev)
+                               status = SAS_DEVICE_UNKNOWN;
+                       else
+                               status = SAS_ABORTED_TASK;
+
+                       complete_to_host = isci_perform_normal_io_completion;
+                       set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                        break;
 
+
                default:
                        /* Catch any otherwise unhandled error codes here. */
                        dev_warn(&isci_host->pdev->dev,
@@ -2137,20 +2807,53 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
                         * that we ignore the quiesce state, since we are
                         * concerned about the actual device state.
                         */
-                       if ((isci_device->status == isci_stopping) ||
-                           (isci_device->status == isci_stopped))
+                       if (!idev)
                                status = SAS_DEVICE_UNKNOWN;
                        else
                                status = SAS_ABORTED_TASK;
 
-                       complete_to_host = isci_perform_error_io_completion;
-                       request->complete_in_target = false;
+                       if (SAS_PROTOCOL_SMP == task->task_proto) {
+                               set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
+                               complete_to_host = isci_perform_normal_io_completion;
+                       } else {
+                               clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
+                               complete_to_host = isci_perform_error_io_completion;
+                       }
                        break;
                }
                break;
        }
 
-       isci_request_unmap_sgl(request, isci_host->pdev);
+       switch (task->task_proto) {
+       case SAS_PROTOCOL_SSP:
+               if (task->data_dir == DMA_NONE)
+                       break;
+               if (task->num_scatter == 0)
+                       /* 0 indicates a single dma address */
+                       dma_unmap_single(&isci_host->pdev->dev,
+                                        request->zero_scatter_daddr,
+                                        task->total_xfer_len, task->data_dir);
+               else  /* unmap the sgl dma addresses */
+                       dma_unmap_sg(&isci_host->pdev->dev, task->scatter,
+                                    request->num_sg_entries, task->data_dir);
+               break;
+       case SAS_PROTOCOL_SMP: {
+               struct scatterlist *sg = &task->smp_task.smp_req;
+               struct smp_req *smp_req;
+               void *kaddr;
+
+               dma_unmap_sg(&isci_host->pdev->dev, sg, 1, DMA_TO_DEVICE);
+
+               /* need to swab it back in case the command buffer is re-used */
+               kaddr = kmap_atomic(sg_page(sg), KM_IRQ0);
+               smp_req = kaddr + sg->offset;
+               sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32));
+               kunmap_atomic(kaddr, KM_IRQ0);
+               break;
+       }
+       default:
+               break;
+       }
 
        /* Put the completed request on the correct list */
        isci_task_save_for_upper_layer_completion(isci_host, request, response,
@@ -2159,70 +2862,20 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
 
        /* complete the io request to the core. */
        scic_controller_complete_io(&isci_host->sci,
-                                   &isci_device->sci,
+                                   request->sci.target_device,
                                    &request->sci);
+       isci_put_device(idev);
+
        /* set terminated handle so it cannot be completed or
         * terminated again, and to cause any calls into abort
         * task to recognize the already completed case.
         */
-       request->terminated = true;
-
-       isci_host_can_dequeue(isci_host, 1);
-}
-
-/**
- * scic_sds_request_initial_state_enter() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_INITIAL state. This state is entered when the initial
- * base request is constructed. Entry into the initial state sets all handlers
- * for the io request object to their default handlers. none
- */
-static void scic_sds_request_initial_state_enter(void *object)
-{
-       struct scic_sds_request *sci_req = object;
-
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCI_BASE_REQUEST_STATE_INITIAL
-               );
-}
-
-/**
- * scic_sds_request_constructed_state_enter() -
- * @object: The io request object that is to enter the constructed state.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_CONSTRUCTED state. The method sets the state handlers
- * for the the constructed state. none
- */
-static void scic_sds_request_constructed_state_enter(void *object)
-{
-       struct scic_sds_request *sci_req = object;
-
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCI_BASE_REQUEST_STATE_CONSTRUCTED
-               );
+       set_bit(IREQ_TERMINATED, &request->flags);
 }
 
-/**
- * scic_sds_request_started_state_enter() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.  This is cast into a SCIC_SDS_IO_REQUEST object.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_STARTED state. If the io request object type is a
- * SCSI Task request we must enter the started substate machine. none
- */
-static void scic_sds_request_started_state_enter(void *object)
+static void scic_sds_request_started_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
-       struct sci_base_state_machine *sm = &sci_req->state_machine;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
        struct isci_request *ireq = sci_req_to_ireq(sci_req);
        struct domain_device *dev = sci_dev_to_domain(sci_req->target_device);
        struct sas_task *task;
@@ -2232,231 +2885,154 @@ static void scic_sds_request_started_state_enter(void *object)
         */
        task = ireq->ttype == io_task ? isci_request_access_task(ireq) : NULL;
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCI_BASE_REQUEST_STATE_STARTED
-               );
-
-       /* Most of the request state machines have a started substate machine so
-        * start its execution on the entry to the started state.
+       /* all unaccelerated request types (non ssp or ncq) handled with
+        * substates
         */
-       if (sci_req->has_started_substate_machine == true)
-               sci_base_state_machine_start(&sci_req->started_substate_machine);
-
        if (!task && dev->dev_type == SAS_END_DEV) {
-               sci_base_state_machine_change_state(sm,
-                       SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_COMPLETION);
+               sci_change_state(sm, SCI_REQ_TASK_WAIT_TC_COMP);
+       } else if (!task &&
+                  (isci_request_access_tmf(ireq)->tmf_code == isci_tmf_sata_srst_high ||
+                   isci_request_access_tmf(ireq)->tmf_code == isci_tmf_sata_srst_low)) {
+               sci_change_state(sm, SCI_REQ_STP_SOFT_RESET_WAIT_H2D_ASSERTED);
        } else if (task && task->task_proto == SAS_PROTOCOL_SMP) {
-               sci_base_state_machine_change_state(sm,
-                       SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_RESPONSE);
+               sci_change_state(sm, SCI_REQ_SMP_WAIT_RESP);
+       } else if (task && sas_protocol_ata(task->task_proto) &&
+                  !task->ata_task.use_ncq) {
+               u32 state;
+
+               if (task->data_dir == DMA_NONE)
+                       state = SCI_REQ_STP_NON_DATA_WAIT_H2D;
+               else if (task->ata_task.dma_xfer)
+                       state = SCI_REQ_STP_UDMA_WAIT_TC_COMP;
+               else /* PIO */
+                       state = SCI_REQ_STP_PIO_WAIT_H2D;
+
+               sci_change_state(sm, state);
        }
 }
 
-/**
- * scic_sds_request_started_state_exit() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.  This object is cast into a SCIC_SDS_IO_REQUEST
- *    object.
- *
- * This method implements the actions taken when exiting the
- * SCI_BASE_REQUEST_STATE_STARTED state. For task requests the action will be
- * to stop the started substate machine. none
- */
-static void scic_sds_request_started_state_exit(void *object)
-{
-       struct scic_sds_request *sci_req = object;
-
-       if (sci_req->has_started_substate_machine == true)
-               sci_base_state_machine_stop(&sci_req->started_substate_machine);
-}
-
-/**
- * scic_sds_request_completed_state_enter() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.  This object is cast into a SCIC_SDS_IO_REQUEST
- *    object.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_COMPLETED state.  This state is entered when the
- * SCIC_SDS_IO_REQUEST has completed.  The method will decode the request
- * completion status and convert it to an enum sci_status to return in the
- * completion callback function. none
- */
-static void scic_sds_request_completed_state_enter(void *object)
+static void scic_sds_request_completed_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
-       struct scic_sds_controller *scic =
-               scic_sds_request_get_controller(sci_req);
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
+       struct scic_sds_controller *scic = sci_req->owning_controller;
        struct isci_host *ihost = scic_to_ihost(scic);
        struct isci_request *ireq = sci_req_to_ireq(sci_req);
 
-       SET_STATE_HANDLER(sci_req,
-                         scic_sds_request_state_handler_table,
-                         SCI_BASE_REQUEST_STATE_COMPLETED);
-
        /* Tell the SCI_USER that the IO request is complete */
-       if (sci_req->is_task_management_request == false)
+       if (!test_bit(IREQ_TMF, &ireq->flags))
                isci_request_io_request_complete(ihost, ireq,
                                                 sci_req->sci_status);
        else
                isci_task_request_complete(ihost, ireq, sci_req->sci_status);
 }
 
-/**
- * scic_sds_request_aborting_state_enter() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.  This object is cast into a SCIC_SDS_IO_REQUEST
- *    object.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_ABORTING state. none
- */
-static void scic_sds_request_aborting_state_enter(void *object)
+static void scic_sds_request_aborting_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
 
        /* Setting the abort bit in the Task Context is required by the silicon. */
-       sci_req->task_context_buffer->abort = 1;
-
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCI_BASE_REQUEST_STATE_ABORTING
-               );
+       sci_req->tc->abort = 1;
 }
 
-/**
- * scic_sds_request_final_state_enter() -
- * @object: This parameter specifies the base object for which the state
- *    transition is occurring.  This is cast into a SCIC_SDS_IO_REQUEST object.
- *
- * This method implements the actions taken when entering the
- * SCI_BASE_REQUEST_STATE_FINAL state. The only action required is to put the
- * state handlers in place. none
- */
-static void scic_sds_request_final_state_enter(void *object)
+static void scic_sds_stp_request_started_non_data_await_h2d_completion_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCI_BASE_REQUEST_STATE_FINAL
-               );
+       scic_sds_remote_device_set_working_request(sci_req->target_device,
+                                                  sci_req);
 }
 
-static void scic_sds_io_request_started_task_mgmt_await_tc_completion_substate_enter(
-       void *object)
+static void scic_sds_stp_request_started_pio_await_h2d_completion_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_COMPLETION
-               );
+       scic_sds_remote_device_set_working_request(sci_req->target_device,
+                                                  sci_req);
 }
 
-static void scic_sds_io_request_started_task_mgmt_await_task_response_substate_enter(
-       void *object)
+static void scic_sds_stp_request_started_soft_reset_await_h2d_asserted_completion_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_RESPONSE
-               );
+       scic_sds_remote_device_set_working_request(sci_req->target_device,
+                                                  sci_req);
 }
 
-static void scic_sds_smp_request_started_await_response_substate_enter(void *object)
+static void scic_sds_stp_request_started_soft_reset_await_h2d_diagnostic_completion_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_request *sci_req = object;
+       struct scic_sds_request *sci_req = container_of(sm, typeof(*sci_req), sm);
+       struct scu_task_context *tc = sci_req->tc;
+       struct host_to_dev_fis *h2d_fis;
+       enum sci_status status;
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_RESPONSE
-               );
-}
+       /* Clear the SRST bit */
+       h2d_fis = &sci_req->stp.cmd;
+       h2d_fis->control = 0;
 
-static void scic_sds_smp_request_started_await_tc_completion_substate_enter(void *object)
-{
-       struct scic_sds_request *sci_req = object;
+       /* Clear the TC control bit */
+       tc->control_frame = 0;
 
-       SET_STATE_HANDLER(
-               sci_req,
-               scic_sds_request_state_handler_table,
-               SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_TC_COMPLETION
-               );
+       status = scic_controller_continue_io(sci_req);
+       WARN_ONCE(status != SCI_SUCCESS, "isci: continue io failure\n");
 }
 
 static const struct sci_base_state scic_sds_request_state_table[] = {
-       [SCI_BASE_REQUEST_STATE_INITIAL] = {
-               .enter_state = scic_sds_request_initial_state_enter,
-       },
-       [SCI_BASE_REQUEST_STATE_CONSTRUCTED] = {
-               .enter_state = scic_sds_request_constructed_state_enter,
-       },
-       [SCI_BASE_REQUEST_STATE_STARTED] = {
+       [SCI_REQ_INIT] = { },
+       [SCI_REQ_CONSTRUCTED] = { },
+       [SCI_REQ_STARTED] = {
                .enter_state = scic_sds_request_started_state_enter,
-               .exit_state  = scic_sds_request_started_state_exit
        },
-       [SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_COMPLETION] = {
-               .enter_state = scic_sds_io_request_started_task_mgmt_await_tc_completion_substate_enter,
+       [SCI_REQ_STP_NON_DATA_WAIT_H2D] = {
+               .enter_state = scic_sds_stp_request_started_non_data_await_h2d_completion_enter,
        },
-       [SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATE_AWAIT_TC_RESPONSE] = {
-               .enter_state = scic_sds_io_request_started_task_mgmt_await_task_response_substate_enter,
+       [SCI_REQ_STP_NON_DATA_WAIT_D2H] = { },
+       [SCI_REQ_STP_PIO_WAIT_H2D] = {
+               .enter_state = scic_sds_stp_request_started_pio_await_h2d_completion_enter,
        },
-       [SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_RESPONSE] = {
-               .enter_state = scic_sds_smp_request_started_await_response_substate_enter,
+       [SCI_REQ_STP_PIO_WAIT_FRAME] = { },
+       [SCI_REQ_STP_PIO_DATA_IN] = { },
+       [SCI_REQ_STP_PIO_DATA_OUT] = { },
+       [SCI_REQ_STP_UDMA_WAIT_TC_COMP] = { },
+       [SCI_REQ_STP_UDMA_WAIT_D2H] = { },
+       [SCI_REQ_STP_SOFT_RESET_WAIT_H2D_ASSERTED] = {
+               .enter_state = scic_sds_stp_request_started_soft_reset_await_h2d_asserted_completion_enter,
        },
-       [SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATE_AWAIT_TC_COMPLETION] = {
-               .enter_state = scic_sds_smp_request_started_await_tc_completion_substate_enter,
+       [SCI_REQ_STP_SOFT_RESET_WAIT_H2D_DIAG] = {
+               .enter_state = scic_sds_stp_request_started_soft_reset_await_h2d_diagnostic_completion_enter,
        },
-       [SCI_BASE_REQUEST_STATE_COMPLETED] = {
+       [SCI_REQ_STP_SOFT_RESET_WAIT_D2H] = { },
+       [SCI_REQ_TASK_WAIT_TC_COMP] = { },
+       [SCI_REQ_TASK_WAIT_TC_RESP] = { },
+       [SCI_REQ_SMP_WAIT_RESP] = { },
+       [SCI_REQ_SMP_WAIT_TC_COMP] = { },
+       [SCI_REQ_COMPLETED] = {
                .enter_state = scic_sds_request_completed_state_enter,
        },
-       [SCI_BASE_REQUEST_STATE_ABORTING] = {
+       [SCI_REQ_ABORTING] = {
                .enter_state = scic_sds_request_aborting_state_enter,
        },
-       [SCI_BASE_REQUEST_STATE_FINAL] = {
-               .enter_state = scic_sds_request_final_state_enter,
-       },
+       [SCI_REQ_FINAL] = { },
 };
 
-static void scic_sds_general_request_construct(struct scic_sds_controller *scic,
-                                              struct scic_sds_remote_device *sci_dev,
-                                              u16 io_tag, struct scic_sds_request *sci_req)
+static void
+scic_sds_general_request_construct(struct scic_sds_controller *scic,
+                                  struct scic_sds_remote_device *sci_dev,
+                                  u16 io_tag,
+                                  struct scic_sds_request *sci_req)
 {
-       sci_base_state_machine_construct(&sci_req->state_machine, sci_req,
-                       scic_sds_request_state_table, SCI_BASE_REQUEST_STATE_INITIAL);
-       sci_base_state_machine_start(&sci_req->state_machine);
+       sci_init_sm(&sci_req->sm, scic_sds_request_state_table, SCI_REQ_INIT);
 
        sci_req->io_tag = io_tag;
        sci_req->owning_controller = scic;
        sci_req->target_device = sci_dev;
-       sci_req->has_started_substate_machine = false;
        sci_req->protocol = SCIC_NO_PROTOCOL;
        sci_req->saved_rx_frame_index = SCU_INVALID_FRAME_INDEX;
-       sci_req->device_sequence = scic_sds_remote_device_get_sequence(sci_dev);
 
        sci_req->sci_status   = SCI_SUCCESS;
        sci_req->scu_status   = 0;
        sci_req->post_context = 0xFFFFFFFF;
-
-       sci_req->is_task_management_request = false;
-
-       if (io_tag == SCI_CONTROLLER_INVALID_IO_TAG) {
-               sci_req->was_tag_assigned_by_user = false;
-               sci_req->task_context_buffer = &sci_req->tc;
-       } else {
-               sci_req->was_tag_assigned_by_user = true;
-
-               sci_req->task_context_buffer =
-                       scic_sds_controller_get_task_context_buffer(scic, io_tag);
-       }
+       sci_req->tc = &scic->task_context_table[ISCI_TAG_TCI(io_tag)];
+       WARN_ONCE(io_tag == SCI_CONTROLLER_INVALID_IO_TAG, "straggling invalid tag usage\n");
 }
 
 static enum sci_status
@@ -2478,12 +3054,11 @@ scic_io_request_construct(struct scic_sds_controller *scic,
        else if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP))
                memset(&sci_req->stp.cmd, 0, sizeof(sci_req->stp.cmd));
        else if (dev_is_expander(dev))
-               memset(&sci_req->smp.cmd, 0, sizeof(sci_req->smp.cmd));
+               /* pass */;
        else
                return SCI_FAILURE_UNSUPPORTED_PROTOCOL;
 
-       memset(sci_req->task_context_buffer, 0,
-              offsetof(struct scu_task_context, sgl_pair_ab));
+       memset(sci_req->tc, 0, offsetof(struct scu_task_context, sgl_pair_ab));
 
        return status;
 }
@@ -2500,8 +3075,8 @@ enum sci_status scic_task_request_construct(struct scic_sds_controller *scic,
 
        if (dev->dev_type == SAS_END_DEV ||
            dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {
-               sci_req->is_task_management_request = true;
-               memset(sci_req->task_context_buffer, 0, sizeof(struct scu_task_context));
+               set_bit(IREQ_TMF, &sci_req_to_ireq(sci_req)->flags);
+               memset(sci_req->tc, 0, sizeof(struct scu_task_context));
        } else
                status = SCI_FAILURE_UNSUPPORTED_PROTOCOL;
 
@@ -2554,35 +3129,57 @@ static enum sci_status isci_request_stp_request_construct(
        return status;
 }
 
-/*
- * This function will fill in the SCU Task Context for a SMP request. The
- *    following important settings are utilized: -# task_type ==
- *    SCU_TASK_TYPE_SMP.  This simply indicates that a normal request type
- *    (i.e. non-raw frame) is being utilized to perform task management. -#
- *    control_frame == 1.  This ensures that the proper endianess is set so
- *    that the bytes are transmitted in the right order for a smp request frame.
- * @sci_req: This parameter specifies the smp request object being
- *    constructed.
- *
- */
-static void
-scu_smp_request_construct_task_context(struct scic_sds_request *sci_req,
-                                      struct smp_req *smp_req)
+static enum sci_status
+scic_io_request_construct_smp(struct device *dev,
+                             struct scic_sds_request *sci_req,
+                             struct sas_task *task)
 {
-       dma_addr_t dma_addr;
-       struct scic_sds_controller *scic;
+       struct scatterlist *sg = &task->smp_task.smp_req;
        struct scic_sds_remote_device *sci_dev;
-       struct scic_sds_port *sci_port;
        struct scu_task_context *task_context;
-       ssize_t word_cnt = sizeof(struct smp_req) / sizeof(u32);
+       struct scic_sds_port *sci_port;
+       struct smp_req *smp_req;
+       void *kaddr;
+       u8 req_len;
+       u32 cmd;
+
+       kaddr = kmap_atomic(sg_page(sg), KM_IRQ0);
+       smp_req = kaddr + sg->offset;
+       /*
+        * Look at the SMP requests' header fields; for certain SAS 1.x SMP
+        * functions under SAS 2.0, a zero request length really indicates
+        * a non-zero default length.
+        */
+       if (smp_req->req_len == 0) {
+               switch (smp_req->func) {
+               case SMP_DISCOVER:
+               case SMP_REPORT_PHY_ERR_LOG:
+               case SMP_REPORT_PHY_SATA:
+               case SMP_REPORT_ROUTE_INFO:
+                       smp_req->req_len = 2;
+                       break;
+               case SMP_CONF_ROUTE_INFO:
+               case SMP_PHY_CONTROL:
+               case SMP_PHY_TEST_FUNCTION:
+                       smp_req->req_len = 9;
+                       break;
+                       /* Default - zero is a valid default for 2.0. */
+               }
+       }
+       req_len = smp_req->req_len;
+       sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32));
+       cmd = *(u32 *) smp_req;
+       kunmap_atomic(kaddr, KM_IRQ0);
+
+       if (!dma_map_sg(dev, sg, 1, DMA_TO_DEVICE))
+               return SCI_FAILURE;
+
+       sci_req->protocol = SCIC_SMP_PROTOCOL;
 
        /* byte swap the smp request. */
-       sci_swab32_cpy(&sci_req->smp.cmd, smp_req,
-                      word_cnt);
 
-       task_context = scic_sds_request_get_task_context(sci_req);
+       task_context = sci_req->tc;
 
-       scic = scic_sds_request_get_controller(sci_req);
        sci_dev = scic_sds_request_get_device(sci_req);
        sci_port = scic_sds_request_get_port(sci_req);
 
@@ -2618,7 +3215,7 @@ scu_smp_request_construct_task_context(struct scic_sds_request *sci_req,
        task_context->address_modifier = 0;
 
        /* 10h */
-       task_context->ssp_command_iu_length = smp_req->req_len;
+       task_context->ssp_command_iu_length = req_len;
 
        /* 14h */
        task_context->transfer_length_bytes = 0;
@@ -2627,7 +3224,7 @@ scu_smp_request_construct_task_context(struct scic_sds_request *sci_req,
         * 18h ~ 30h, protocol specific
         * since commandIU has been build by framework at this point, we just
         * copy the frist DWord from command IU to this location. */
-       memcpy(&task_context->type.smp, &sci_req->smp.cmd, sizeof(u32));
+       memcpy(&task_context->type.smp, &cmd, sizeof(u32));
 
        /*
         * 40h
@@ -2636,88 +3233,24 @@ scu_smp_request_construct_task_context(struct scic_sds_request *sci_req,
         */
        task_context->task_phase = 0;
 
-       if (sci_req->was_tag_assigned_by_user) {
-               /*
-                * Build the task context now since we have already read
-                * the data
-                */
-               sci_req->post_context =
-                       (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
-                        (scic_sds_controller_get_protocol_engine_group(scic) <<
-                         SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
-                        (scic_sds_port_get_index(sci_port) <<
-                         SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
-                        scic_sds_io_tag_get_index(sci_req->io_tag));
-       } else {
-               /*
-                * Build the task context now since we have already read
-                * the data.
-                * I/O tag index is not assigned because we have to wait
-                * until we get a TCi.
-                */
-               sci_req->post_context =
-                       (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
-                        (scic_sds_controller_get_protocol_engine_group(scic) <<
-                         SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
-                        (scic_sds_port_get_index(sci_port) <<
-                         SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT));
-       }
-
+       sci_req->post_context = (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
+                                (scic_sds_controller_get_protocol_engine_group(scic) <<
+                                 SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
+                                (scic_sds_port_get_index(sci_port) <<
+                                 SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
+                                ISCI_TAG_TCI(sci_req->io_tag));
        /*
         * Copy the physical address for the command buffer to the SCU Task
         * Context command buffer should not contain command header.
         */
-       dma_addr = scic_io_request_get_dma_addr(sci_req,
-                                               ((char *) &sci_req->smp.cmd) +
-                                               sizeof(u32));
-
-       task_context->command_iu_upper = upper_32_bits(dma_addr);
-       task_context->command_iu_lower = lower_32_bits(dma_addr);
+       task_context->command_iu_upper = upper_32_bits(sg_dma_address(sg));
+       task_context->command_iu_lower = lower_32_bits(sg_dma_address(sg) + sizeof(u32));
 
        /* SMP response comes as UF, so no need to set response IU address. */
        task_context->response_iu_upper = 0;
        task_context->response_iu_lower = 0;
-}
-
-static enum sci_status scic_io_request_construct_smp(struct scic_sds_request *sci_req)
-{
-       struct smp_req *smp_req = kmalloc(sizeof(*smp_req), GFP_KERNEL);
-
-       if (!smp_req)
-               return SCI_FAILURE_INSUFFICIENT_RESOURCES;
-
-       sci_req->protocol = SCIC_SMP_PROTOCOL;
-
-       /* Construct the SMP SCU Task Context */
-       memcpy(smp_req, &sci_req->smp.cmd, sizeof(*smp_req));
-
-       /*
-        * Look at the SMP requests' header fields; for certain SAS 1.x SMP
-        * functions under SAS 2.0, a zero request length really indicates
-        * a non-zero default length. */
-       if (smp_req->req_len == 0) {
-               switch (smp_req->func) {
-               case SMP_DISCOVER:
-               case SMP_REPORT_PHY_ERR_LOG:
-               case SMP_REPORT_PHY_SATA:
-               case SMP_REPORT_ROUTE_INFO:
-                       smp_req->req_len = 2;
-                       break;
-               case SMP_CONF_ROUTE_INFO:
-               case SMP_PHY_CONTROL:
-               case SMP_PHY_TEST_FUNCTION:
-                       smp_req->req_len = 9;
-                       break;
-                       /* Default - zero is a valid default for 2.0. */
-               }
-       }
-
-       scu_smp_request_construct_task_context(sci_req, smp_req);
 
-       sci_base_state_machine_change_state(&sci_req->state_machine,
-               SCI_BASE_REQUEST_STATE_CONSTRUCTED);
-
-       kfree(smp_req);
+       sci_change_state(&sci_req->sm, SCI_REQ_CONSTRUCTED);
 
        return SCI_SUCCESS;
 }
@@ -2731,24 +3264,12 @@ static enum sci_status scic_io_request_construct_smp(struct scic_sds_request *sc
  */
 static enum sci_status isci_smp_request_build(struct isci_request *ireq)
 {
-       enum sci_status status = SCI_FAILURE;
        struct sas_task *task = isci_request_access_task(ireq);
+       struct device *dev = &ireq->isci_host->pdev->dev;
        struct scic_sds_request *sci_req = &ireq->sci;
+       enum sci_status status = SCI_FAILURE;
 
-       dev_dbg(&ireq->isci_host->pdev->dev,
-               "%s: request = %p\n", __func__, ireq);
-
-       dev_dbg(&ireq->isci_host->pdev->dev,
-               "%s: smp_req len = %d\n",
-               __func__,
-               task->smp_task.smp_req.length);
-
-       /* copy the smp_command to the address; */
-       sg_copy_to_buffer(&task->smp_task.smp_req, 1,
-                         &sci_req->smp.cmd,
-                         sizeof(struct smp_req));
-
-       status = scic_io_request_construct_smp(sci_req);
+       status = scic_io_request_construct_smp(dev, sci_req, task);
        if (status != SCI_SUCCESS)
                dev_warn(&ireq->isci_host->pdev->dev,
                         "%s: failed with status = %d\n",
@@ -2768,10 +3289,10 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq)
  *
  * SCI_SUCCESS on successfull completion, or specific failure code.
  */
-static enum sci_status isci_io_request_build(
-       struct isci_host *isci_host,
-       struct isci_request *request,
-       struct isci_remote_device *isci_device)
+static enum sci_status isci_io_request_build(struct isci_host *isci_host,
+                                            struct isci_request *request,
+                                            struct isci_remote_device *isci_device,
+                                            u16 tag)
 {
        enum sci_status status = SCI_SUCCESS;
        struct sas_task *task = isci_request_access_task(request);
@@ -2808,8 +3329,7 @@ static enum sci_status isci_io_request_build(
         * we will let the core allocate the IO tag.
         */
        status = scic_io_request_construct(&isci_host->sci, sci_device,
-                                          SCI_CONTROLLER_INVALID_IO_TAG,
-                                          &request->sci);
+                                          tag, &request->sci);
 
        if (status != SCI_SUCCESS) {
                dev_warn(&isci_host->pdev->dev,
@@ -2839,172 +3359,115 @@ static enum sci_status isci_io_request_build(
        return SCI_SUCCESS;
 }
 
-/**
- * isci_request_alloc_core() - This function gets the request object from the
- *    isci_host dma cache.
- * @isci_host: This parameter specifies the ISCI host object
- * @isci_request: This parameter will contain the pointer to the new
- *    isci_request object.
- * @isci_device: This parameter is the pointer to the isci remote device object
- *    that is the destination for this request.
- * @gfp_flags: This parameter specifies the os allocation flags.
- *
- * SCI_SUCCESS on successfull completion, or specific failure code.
- */
-static int isci_request_alloc_core(
-       struct isci_host *isci_host,
-       struct isci_request **isci_request,
-       struct isci_remote_device *isci_device,
-       gfp_t gfp_flags)
+static struct isci_request *isci_request_alloc_core(struct isci_host *ihost,
+                                                   gfp_t gfp_flags)
 {
-       int ret = 0;
        dma_addr_t handle;
-       struct isci_request *request;
-
+       struct isci_request *ireq;
 
-       /* get pointer to dma memory. This actually points
-        * to both the isci_remote_device object and the
-        * sci object. The isci object is at the beginning
-        * of the memory allocated here.
-        */
-       request = dma_pool_alloc(isci_host->dma_pool, gfp_flags, &handle);
-       if (!request) {
-               dev_warn(&isci_host->pdev->dev,
+       ireq = dma_pool_alloc(ihost->dma_pool, gfp_flags, &handle);
+       if (!ireq) {
+               dev_warn(&ihost->pdev->dev,
                         "%s: dma_pool_alloc returned NULL\n", __func__);
-               return -ENOMEM;
+               return NULL;
        }
 
        /* initialize the request object.       */
-       spin_lock_init(&request->state_lock);
-       request->request_daddr = handle;
-       request->isci_host = isci_host;
-       request->isci_device = isci_device;
-       request->io_request_completion = NULL;
-       request->terminated = false;
-
-       request->num_sg_entries = 0;
-
-       request->complete_in_target = false;
-
-       INIT_LIST_HEAD(&request->completed_node);
-       INIT_LIST_HEAD(&request->dev_node);
-
-       *isci_request = request;
-       isci_request_change_state(request, allocated);
-
-       return ret;
+       spin_lock_init(&ireq->state_lock);
+       ireq->request_daddr = handle;
+       ireq->isci_host = ihost;
+       ireq->io_request_completion = NULL;
+       ireq->flags = 0;
+       ireq->num_sg_entries = 0;
+       INIT_LIST_HEAD(&ireq->completed_node);
+       INIT_LIST_HEAD(&ireq->dev_node);
+
+       isci_request_change_state(ireq, allocated);
+
+       return ireq;
 }
 
-static int isci_request_alloc_io(
-       struct isci_host *isci_host,
-       struct sas_task *task,
-       struct isci_request **isci_request,
-       struct isci_remote_device *isci_device,
-       gfp_t gfp_flags)
+static struct isci_request *isci_request_alloc_io(struct isci_host *ihost,
+                                                 struct sas_task *task,
+                                                 gfp_t gfp_flags)
 {
-       int retval = isci_request_alloc_core(isci_host, isci_request,
-                                            isci_device, gfp_flags);
-
-       if (!retval) {
-               (*isci_request)->ttype_ptr.io_task_ptr = task;
-               (*isci_request)->ttype                 = io_task;
+       struct isci_request *ireq;
 
-               task->lldd_task = *isci_request;
+       ireq = isci_request_alloc_core(ihost, gfp_flags);
+       if (ireq) {
+               ireq->ttype_ptr.io_task_ptr = task;
+               ireq->ttype = io_task;
+               task->lldd_task = ireq;
        }
-       return retval;
+       return ireq;
 }
 
-/**
- * isci_request_alloc_tmf() - This function gets the request object from the
- *    isci_host dma cache and initializes the relevant fields as a sas_task.
- * @isci_host: This parameter specifies the ISCI host object
- * @sas_task: This parameter is the task struct from the upper layer driver.
- * @isci_request: This parameter will contain the pointer to the new
- *    isci_request object.
- * @isci_device: This parameter is the pointer to the isci remote device object
- *    that is the destination for this request.
- * @gfp_flags: This parameter specifies the os allocation flags.
- *
- * SCI_SUCCESS on successfull completion, or specific failure code.
- */
-int isci_request_alloc_tmf(
-       struct isci_host *isci_host,
-       struct isci_tmf *isci_tmf,
-       struct isci_request **isci_request,
-       struct isci_remote_device *isci_device,
-       gfp_t gfp_flags)
+struct isci_request *isci_request_alloc_tmf(struct isci_host *ihost,
+                                           struct isci_tmf *isci_tmf,
+                                           gfp_t gfp_flags)
 {
-       int retval = isci_request_alloc_core(isci_host, isci_request,
-                                            isci_device, gfp_flags);
+       struct isci_request *ireq;
 
-       if (!retval) {
-
-               (*isci_request)->ttype_ptr.tmf_task_ptr = isci_tmf;
-               (*isci_request)->ttype = tmf_task;
+       ireq = isci_request_alloc_core(ihost, gfp_flags);
+       if (ireq) {
+               ireq->ttype_ptr.tmf_task_ptr = isci_tmf;
+               ireq->ttype = tmf_task;
        }
-       return retval;
+       return ireq;
 }
 
-/**
- * isci_request_execute() - This function allocates the isci_request object,
- *    all fills in some common fields.
- * @isci_host: This parameter specifies the ISCI host object
- * @sas_task: This parameter is the task struct from the upper layer driver.
- * @isci_request: This parameter will contain the pointer to the new
- *    isci_request object.
- * @gfp_flags: This parameter specifies the os allocation flags.
- *
- * SCI_SUCCESS on successfull completion, or specific failure code.
- */
-int isci_request_execute(
-       struct isci_host *isci_host,
-       struct sas_task *task,
-       struct isci_request **isci_request,
-       gfp_t gfp_flags)
+int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *idev,
+                        struct sas_task *task, u16 tag, gfp_t gfp_flags)
 {
-       int ret = 0;
-       struct scic_sds_remote_device *sci_device;
        enum sci_status status = SCI_FAILURE_UNSUPPORTED_PROTOCOL;
-       struct isci_remote_device *isci_device;
-       struct isci_request *request;
+       struct isci_request *ireq;
        unsigned long flags;
-
-       isci_device = task->dev->lldd_dev;
-       sci_device = &isci_device->sci;
+       int ret = 0;
 
        /* do common allocation and init of request object. */
-       ret = isci_request_alloc_io(
-               isci_host,
-               task,
-               &request,
-               isci_device,
-               gfp_flags
-               );
-
-       if (ret)
+       ireq = isci_request_alloc_io(ihost, task, gfp_flags);
+       if (!ireq)
                goto out;
 
-       status = isci_io_request_build(isci_host, request, isci_device);
+       status = isci_io_request_build(ihost, ireq, idev, tag);
        if (status != SCI_SUCCESS) {
-               dev_warn(&isci_host->pdev->dev,
+               dev_warn(&ihost->pdev->dev,
                         "%s: request_construct failed - status = 0x%x\n",
                         __func__,
                         status);
                goto out;
        }
 
-       spin_lock_irqsave(&isci_host->scic_lock, flags);
+       spin_lock_irqsave(&ihost->scic_lock, flags);
+
+       if (test_bit(IDEV_IO_NCQERROR, &idev->flags)) {
+
+               if (isci_task_is_ncq_recovery(task)) {
+
+                       /* The device is in an NCQ recovery state.  Issue the
+                        * request on the task side.  Note that it will
+                        * complete on the I/O request side because the
+                        * request was built that way (ie.
+                        * ireq->is_task_management_request is false).
+                        */
+                       status = scic_controller_start_task(&ihost->sci,
+                                                           &idev->sci,
+                                                           &ireq->sci);
+               } else {
+                       status = SCI_FAILURE;
+               }
+       } else {
+               /* send the request, let the core assign the IO TAG.    */
+               status = scic_controller_start_io(&ihost->sci, &idev->sci,
+                                                 &ireq->sci);
+       }
 
-       /* send the request, let the core assign the IO TAG.    */
-       status = scic_controller_start_io(&isci_host->sci, sci_device,
-                                         &request->sci,
-                                         SCI_CONTROLLER_INVALID_IO_TAG);
        if (status != SCI_SUCCESS &&
            status != SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED) {
-               dev_warn(&isci_host->pdev->dev,
+               dev_warn(&ihost->pdev->dev,
                         "%s: failed request start (0x%x)\n",
                         __func__, status);
-               spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+               spin_unlock_irqrestore(&ihost->scic_lock, flags);
                goto out;
        }
 
@@ -3016,55 +3479,52 @@ int isci_request_execute(
         * Update it's status and add it to the list in the
         * remote device object.
         */
-       isci_request_change_state(request, started);
-       list_add(&request->dev_node, &isci_device->reqs_in_process);
+       list_add(&ireq->dev_node, &idev->reqs_in_process);
 
        if (status == SCI_SUCCESS) {
                /* Save the tag for possible task mgmt later. */
-               request->io_tag = request->sci.io_tag;
+               ireq->io_tag = ireq->sci.io_tag;
+               isci_request_change_state(ireq, started);
        } else {
                /* The request did not really start in the
                 * hardware, so clear the request handle
                 * here so no terminations will be done.
                 */
-               request->terminated = true;
+               set_bit(IREQ_TERMINATED, &ireq->flags);
+               isci_request_change_state(ireq, completed);
        }
-       spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+       spin_unlock_irqrestore(&ihost->scic_lock, flags);
 
        if (status ==
            SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED) {
                /* Signal libsas that we need the SCSI error
-               * handler thread to work on this I/O and that
-               * we want a device reset.
-               */
+                * handler thread to work on this I/O and that
+                * we want a device reset.
+                */
                spin_lock_irqsave(&task->task_state_lock, flags);
                task->task_state_flags |= SAS_TASK_NEED_DEV_RESET;
                spin_unlock_irqrestore(&task->task_state_lock, flags);
 
                /* Cause this task to be scheduled in the SCSI error
-               * handler thread.
-               */
-               isci_execpath_callback(isci_host, task,
+                * handler thread.
+                */
+               isci_execpath_callback(ihost, task,
                                       sas_task_abort);
 
                /* Change the status, since we are holding
-               * the I/O until it is managed by the SCSI
-               * error handler.
-               */
+                * the I/O until it is managed by the SCSI
+                * error handler.
+                */
                status = SCI_SUCCESS;
        }
 
  out:
        if (status != SCI_SUCCESS) {
                /* release dma memory on failure. */
-               isci_request_free(isci_host, request);
-               request = NULL;
+               isci_request_free(ihost, ireq);
+               ireq = NULL;
                ret = SCI_FAILURE;
        }
 
-       *isci_request = request;
        return ret;
 }
-
-
-