Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git] / drivers / scsi / isci / remote_device.c
index 80eccdc..b6e6368 100644 (file)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "intel_sas.h"
-#include "intel_ata.h"
+#include <scsi/sas.h>
 #include "isci.h"
 #include "port.h"
 #include "remote_device.h"
 #include "request.h"
-#include "scic_controller.h"
-#include "scic_io_request.h"
-#include "scic_phy.h"
-#include "scic_port.h"
-#include "scic_sds_controller.h"
-#include "scic_sds_phy.h"
-#include "scic_sds_port.h"
 #include "remote_node_context.h"
-#include "scic_sds_request.h"
-#include "sci_environment.h"
-#include "sci_util.h"
 #include "scu_event_codes.h"
 #include "task.h"
 
 /**
- * isci_remote_device_change_state() - This function gets the status of the
- *    remote_device object.
- * @isci_device: This parameter points to the isci_remote_device object
- *
- * status of the object as a isci_status enum.
- */
-void isci_remote_device_change_state(
-       struct isci_remote_device *isci_device,
-       enum isci_status status)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&isci_device->state_lock, flags);
-       isci_device->status = status;
-       spin_unlock_irqrestore(&isci_device->state_lock, flags);
-}
-
-/**
- * isci_remote_device_not_ready() - This function is called by the scic when
+ * isci_remote_device_not_ready() - This function is called by the ihost when
  *    the remote device is not ready. We mark the isci device as ready (not
  *    "ready_for_io") and signal the waiting proccess.
  * @isci_host: This parameter specifies the isci host object.
  * @isci_device: This parameter specifies the remote device
  *
+ * sci_lock is held on entrance to this function.
  */
 static void isci_remote_device_not_ready(struct isci_host *ihost,
                                  struct isci_remote_device *idev, u32 reason)
 {
+       struct isci_request *ireq;
+
        dev_dbg(&ihost->pdev->dev,
                "%s: isci_device = %p\n", __func__, idev);
 
-       if (reason == SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED)
-               isci_remote_device_change_state(idev, isci_stopping);
-       else
-               /* device ready is actually a "not ready for io" state. */
-               isci_remote_device_change_state(idev, isci_ready);
+       switch (reason) {
+       case SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED:
+               set_bit(IDEV_GONE, &idev->flags);
+               break;
+       case SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED:
+               set_bit(IDEV_IO_NCQERROR, &idev->flags);
+
+               /* Kill all outstanding requests for the device. */
+               list_for_each_entry(ireq, &idev->reqs_in_process, dev_node) {
+
+                       dev_dbg(&ihost->pdev->dev,
+                               "%s: isci_device = %p request = %p\n",
+                               __func__, idev, ireq);
+
+                       sci_controller_terminate_request(ihost,
+                                                         idev,
+                                                         ireq);
+               }
+               /* Fall through into the default case... */
+       default:
+               clear_bit(IDEV_IO_READY, &idev->flags);
+               break;
+       }
 }
 
 /**
- * isci_remote_device_ready() - This function is called by the scic when the
+ * isci_remote_device_ready() - This function is called by the ihost when the
  *    remote device is ready. We mark the isci device as ready and signal the
  *    waiting proccess.
  * @ihost: our valid isci_host
@@ -124,1472 +116,701 @@ static void isci_remote_device_ready(struct isci_host *ihost, struct isci_remote
        dev_dbg(&ihost->pdev->dev,
                "%s: idev = %p\n", __func__, idev);
 
-       isci_remote_device_change_state(idev, isci_ready_for_io);
+       clear_bit(IDEV_IO_NCQERROR, &idev->flags);
+       set_bit(IDEV_IO_READY, &idev->flags);
        if (test_and_clear_bit(IDEV_START_PENDING, &idev->flags))
                wake_up(&ihost->eventq);
 }
 
-
-
-enum sci_status scic_remote_device_stop(
-       struct scic_sds_remote_device *sci_dev,
-       u32 timeout)
+/* called once the remote node context is ready to be freed.
+ * The remote device can now report that its stop operation is complete. none
+ */
+static void rnc_destruct_done(void *_dev)
 {
-       return sci_dev->state_handlers->stop_handler(sci_dev);
-}
+       struct isci_remote_device *idev = _dev;
 
-
-enum sci_status scic_remote_device_reset(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return sci_dev->state_handlers->reset_handler(sci_dev);
+       BUG_ON(idev->started_request_count != 0);
+       sci_change_state(&idev->sm, SCI_DEV_STOPPED);
 }
 
-
-enum sci_status scic_remote_device_reset_complete(
-       struct scic_sds_remote_device *sci_dev)
+static enum sci_status sci_remote_device_terminate_requests(struct isci_remote_device *idev)
 {
-       return sci_dev->state_handlers->reset_complete_handler(sci_dev);
-}
+       struct isci_host *ihost = idev->owning_port->owning_controller;
+       enum sci_status status  = SCI_SUCCESS;
+       u32 i;
 
-#define SCIC_SDS_REMOTE_DEVICE_MINIMUM_TIMER_COUNT (0)
-#define SCIC_SDS_REMOTE_DEVICE_MAXIMUM_TIMER_COUNT (SCI_MAX_REMOTE_DEVICES)
+       for (i = 0; i < SCI_MAX_IO_REQUESTS; i++) {
+               struct isci_request *ireq = ihost->reqs[i];
+               enum sci_status s;
 
-/**
- *
- * @sci_dev: The remote device for which the suspend is being requested.
- *
- * This method invokes the remote device suspend state handler. enum sci_status
- */
-enum sci_status scic_sds_remote_device_suspend(
-       struct scic_sds_remote_device *sci_dev,
-       u32 suspend_type)
-{
-       return sci_dev->state_handlers->suspend_handler(sci_dev, suspend_type);
-}
+               if (!test_bit(IREQ_ACTIVE, &ireq->flags) ||
+                   ireq->target_device != idev)
+                       continue;
 
-/**
- *
- * @sci_dev: The remote device for which the event handling is being
- *    requested.
- * @frame_index: This is the frame index that is being processed.
- *
- * This method invokes the frame handler for the remote device state machine
- * enum sci_status
- */
-enum sci_status scic_sds_remote_device_frame_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index)
-{
-       return sci_dev->state_handlers->frame_handler(sci_dev, frame_index);
-}
+               s = sci_controller_terminate_request(ihost, idev, ireq);
+               if (s != SCI_SUCCESS)
+                       status = s;
+       }
 
-/**
- *
- * @sci_dev: The remote device for which the event handling is being
- *    requested.
- * @event_code: This is the event code that is to be processed.
- *
- * This method invokes the remote device event handler. enum sci_status
- */
-enum sci_status scic_sds_remote_device_event_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code)
-{
-       return sci_dev->state_handlers->event_handler(sci_dev, event_code);
+       return status;
 }
 
-/**
- *
- * @controller: The controller that is starting the io request.
- * @sci_dev: The remote device for which the start io handling is being
- *    requested.
- * @io_request: The io request that is being started.
- *
- * This method invokes the remote device start io handler. enum sci_status
- */
-enum sci_status scic_sds_remote_device_start_io(
-       struct scic_sds_controller *controller,
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *io_request)
+enum sci_status sci_remote_device_stop(struct isci_remote_device *idev,
+                                       u32 timeout)
 {
-       return sci_dev->state_handlers->start_io_handler(
-                      sci_dev, io_request);
-}
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
 
-/**
- *
- * @controller: The controller that is completing the io request.
- * @sci_dev: The remote device for which the complete io handling is being
- *    requested.
- * @io_request: The io request that is being completed.
- *
- * This method invokes the remote device complete io handler. enum sci_status
- */
-enum sci_status scic_sds_remote_device_complete_io(
-       struct scic_sds_controller *controller,
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *io_request)
-{
-       return sci_dev->state_handlers->complete_io_handler(
-                      sci_dev, io_request);
+       switch (state) {
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_FINAL:
+       default:
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_DEV_STOPPED:
+               return SCI_SUCCESS;
+       case SCI_DEV_STARTING:
+               /* device not started so there had better be no requests */
+               BUG_ON(idev->started_request_count != 0);
+               sci_remote_node_context_destruct(&idev->rnc,
+                                                     rnc_destruct_done, idev);
+               /* Transition to the stopping state and wait for the
+                * remote node to complete being posted and invalidated.
+                */
+               sci_change_state(sm, SCI_DEV_STOPPING);
+               return SCI_SUCCESS;
+       case SCI_DEV_READY:
+       case SCI_STP_DEV_IDLE:
+       case SCI_STP_DEV_CMD:
+       case SCI_STP_DEV_NCQ:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_STP_DEV_AWAIT_RESET:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_SMP_DEV_CMD:
+               sci_change_state(sm, SCI_DEV_STOPPING);
+               if (idev->started_request_count == 0) {
+                       sci_remote_node_context_destruct(&idev->rnc,
+                                                             rnc_destruct_done, idev);
+                       return SCI_SUCCESS;
+               } else
+                       return sci_remote_device_terminate_requests(idev);
+               break;
+       case SCI_DEV_STOPPING:
+               /* All requests should have been terminated, but if there is an
+                * attempt to stop a device already in the stopping state, then
+                * try again to terminate.
+                */
+               return sci_remote_device_terminate_requests(idev);
+       case SCI_DEV_RESETTING:
+               sci_change_state(sm, SCI_DEV_STOPPING);
+               return SCI_SUCCESS;
+       }
 }
 
-/**
- *
- * @controller: The controller that is starting the task request.
- * @sci_dev: The remote device for which the start task handling is being
- *    requested.
- * @io_request: The task request that is being started.
- *
- * This method invokes the remote device start task handler. enum sci_status
- */
-enum sci_status scic_sds_remote_device_start_task(
-       struct scic_sds_controller *controller,
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *io_request)
+enum sci_status sci_remote_device_reset(struct isci_remote_device *idev)
 {
-       return sci_dev->state_handlers->start_task_handler(
-                      sci_dev, io_request);
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+
+       switch (state) {
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_STOPPED:
+       case SCI_DEV_STARTING:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_SMP_DEV_CMD:
+       case SCI_DEV_STOPPING:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_RESETTING:
+       case SCI_DEV_FINAL:
+       default:
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_DEV_READY:
+       case SCI_STP_DEV_IDLE:
+       case SCI_STP_DEV_CMD:
+       case SCI_STP_DEV_NCQ:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_STP_DEV_AWAIT_RESET:
+               sci_change_state(sm, SCI_DEV_RESETTING);
+               return SCI_SUCCESS;
+       }
 }
 
-/**
- *
- * @sci_dev:
- * @request:
- *
- * This method takes the request and bulids an appropriate SCU context for the
- * request and then requests the controller to post the request. none
- */
-void scic_sds_remote_device_post_request(
-       struct scic_sds_remote_device *sci_dev,
-       u32 request)
+enum sci_status sci_remote_device_reset_complete(struct isci_remote_device *idev)
 {
-       u32 context;
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
 
-       context = scic_sds_remote_device_build_command_context(sci_dev, request);
+       if (state != SCI_DEV_RESETTING) {
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       }
 
-       scic_sds_controller_post_request(
-               scic_sds_remote_device_get_controller(sci_dev),
-               context
-               );
+       sci_change_state(sm, SCI_DEV_READY);
+       return SCI_SUCCESS;
 }
 
-/* called once the remote node context is ready to be freed.
- * The remote device can now report that its stop operation is complete. none
- */
-static void scic_sds_cb_remote_device_rnc_destruct_complete(void *_dev)
+enum sci_status sci_remote_device_suspend(struct isci_remote_device *idev,
+                                              u32 suspend_type)
 {
-       struct scic_sds_remote_device *sci_dev = _dev;
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+
+       if (state != SCI_STP_DEV_CMD) {
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       }
 
-       BUG_ON(sci_dev->started_request_count != 0);
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_STOPPED);
+       return sci_remote_node_context_suspend(&idev->rnc,
+                                                   suspend_type, NULL, NULL);
 }
 
-/* called once the remote node context has transisitioned to a
- * ready state.  This is the indication that the remote device object can also
- * transition to ready.
- */
-static void remote_device_resume_done(void *_dev)
+enum sci_status sci_remote_device_frame_handler(struct isci_remote_device *idev,
+                                                    u32 frame_index)
 {
-       struct scic_sds_remote_device *sci_dev = _dev;
-       enum scic_sds_remote_device_states state;
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+       struct isci_host *ihost = idev->owning_port->owning_controller;
+       enum sci_status status;
 
-       state = sci_dev->state_machine.current_state_id;
        switch (state) {
-       case SCI_BASE_REMOTE_DEVICE_STATE_READY:
-       case SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE:
-       case SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD:
-       case SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ:
-       case SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR:
-       case SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET:
-       case SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE:
-       case SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD:
-               break;
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_STOPPED:
+       case SCI_DEV_STARTING:
+       case SCI_STP_DEV_IDLE:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_DEV_FINAL:
        default:
-               /* go 'ready' if we are not already in a ready state */
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCI_BASE_REMOTE_DEVICE_STATE_READY);
-               break;
-       }
-}
-
-/**
- *
- * @device: This parameter specifies the device for which the request is being
- *    started.
- * @request: This parameter specifies the request being started.
- * @status: This parameter specifies the current start operation status.
- *
- * This method will perform the STP request start processing common to IO
- * requests and task requests of all types. none
- */
-static void scic_sds_remote_device_start_request(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *sci_req,
-       enum sci_status status)
-{
-       /* We still have a fault in starting the io complete it on the port */
-       if (status == SCI_SUCCESS)
-               scic_sds_remote_device_increment_request_count(sci_dev);
-       else{
-               sci_dev->owning_port->state_handlers->complete_io_handler(
-                       sci_dev->owning_port, sci_dev, sci_req
-                       );
-       }
-}
-
-
-/**
- *
- * @request: This parameter specifies the request being continued.
- *
- * This method will continue to post tc for a STP request. This method usually
- * serves as a callback when RNC gets resumed during a task management
- * sequence. none
- */
-static void scic_sds_remote_device_continue_request(void *dev)
-{
-       struct scic_sds_remote_device *sci_dev = dev;
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               /* Return the frame back to the controller */
+               sci_controller_release_frame(ihost, frame_index);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_DEV_READY:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_STP_DEV_AWAIT_RESET:
+       case SCI_DEV_STOPPING:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_RESETTING: {
+               struct isci_request *ireq;
+               struct ssp_frame_hdr hdr;
+               void *frame_header;
+               ssize_t word_cnt;
+
+               status = sci_unsolicited_frame_control_get_header(&ihost->uf_control,
+                                                                      frame_index,
+                                                                      &frame_header);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-       /* we need to check if this request is still valid to continue. */
-       if (sci_dev->working_request)
-               scic_controller_continue_io(sci_dev->working_request);
-}
+               word_cnt = sizeof(hdr) / sizeof(u32);
+               sci_swab32_cpy(&hdr, frame_header, word_cnt);
 
-/**
- * This method will terminate all of the IO requests in the controllers IO
- *    request table that were targeted for this device.
- * @sci_dev: This parameter specifies the remote device for which to
- *    attempt to terminate all requests.
- *
- * This method returns an indication as to whether all requests were
- * successfully terminated.  If a single request fails to be terminated, then
- * this method will return the failure.
- */
-static enum sci_status scic_sds_remote_device_terminate_requests(
-       struct scic_sds_remote_device *sci_dev)
-{
-       enum sci_status status           = SCI_SUCCESS;
-       enum sci_status terminate_status = SCI_SUCCESS;
-       struct scic_sds_request *sci_req;
-       u32 index;
-       u32 request_count    = sci_dev->started_request_count;
-
-       for (index = 0;
-            (index < SCI_MAX_IO_REQUESTS) && (request_count > 0);
-            index++) {
-               sci_req = sci_dev->owning_port->owning_controller->io_request_table[index];
-
-               if ((sci_req != NULL) && (sci_req->target_device == sci_dev)) {
-                       terminate_status = scic_controller_terminate_request(
-                               sci_dev->owning_port->owning_controller,
-                               sci_dev,
-                               sci_req
-                               );
-
-                       if (terminate_status != SCI_SUCCESS)
-                               status = terminate_status;
-
-                       request_count--;
+               ireq = sci_request_by_tag(ihost, be16_to_cpu(hdr.tag));
+               if (ireq && ireq->target_device == idev) {
+                       /* The IO request is now in charge of releasing the frame */
+                       status = sci_io_request_frame_handler(ireq, frame_index);
+               } else {
+                       /* We could not map this tag to a valid IO
+                        * request Just toss the frame and continue
+                        */
+                       sci_controller_release_frame(ihost, frame_index);
                }
+               break;
        }
+       case SCI_STP_DEV_NCQ: {
+               struct dev_to_host_fis *hdr;
 
-       return status;
-}
-
-static enum sci_status
-default_device_handler(struct scic_sds_remote_device *sci_dev,
-                      const char *func)
-{
-       dev_warn(scirdev_to_dev(sci_dev),
-                "%s: in wrong state: %d\n", func,
-                sci_base_state_machine_get_state(&sci_dev->state_machine));
-       return SCI_FAILURE_INVALID_STATE;
-}
-
-static enum sci_status scic_sds_remote_device_default_stop_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return default_device_handler(sci_dev, __func__);
-}
+               status = sci_unsolicited_frame_control_get_header(&ihost->uf_control,
+                                                                      frame_index,
+                                                                      (void **)&hdr);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-static enum sci_status scic_sds_remote_device_default_fail_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return default_device_handler(sci_dev, __func__);
-}
+               if (hdr->fis_type == FIS_SETDEVBITS &&
+                   (hdr->status & ATA_ERR)) {
+                       idev->not_ready_reason = SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED;
 
-static enum sci_status scic_sds_remote_device_default_destruct_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return default_device_handler(sci_dev, __func__);
-}
+                       /* TODO Check sactive and complete associated IO if any. */
+                       sci_change_state(sm, SCI_STP_DEV_NCQ_ERROR);
+               } else if (hdr->fis_type == FIS_REGD2H &&
+                          (hdr->status & ATA_ERR)) {
+                       /*
+                        * Some devices return D2H FIS when an NCQ error is detected.
+                        * Treat this like an SDB error FIS ready reason.
+                        */
+                       idev->not_ready_reason = SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED;
+                       sci_change_state(&idev->sm, SCI_STP_DEV_NCQ_ERROR);
+               } else
+                       status = SCI_FAILURE;
+
+               sci_controller_release_frame(ihost, frame_index);
+               break;
+       }
+       case SCI_STP_DEV_CMD:
+       case SCI_SMP_DEV_CMD:
+               /* The device does not process any UF received from the hardware while
+                * in this state.  All unsolicited frames are forwarded to the io request
+                * object.
+                */
+               status = sci_io_request_frame_handler(idev->working_request, frame_index);
+               break;
+       }
 
-static enum sci_status scic_sds_remote_device_default_reset_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return default_device_handler(sci_dev, __func__);
+       return status;
 }
 
-static enum sci_status scic_sds_remote_device_default_reset_complete_handler(
-       struct scic_sds_remote_device *sci_dev)
+static bool is_remote_device_ready(struct isci_remote_device *idev)
 {
-       return default_device_handler(sci_dev, __func__);
-}
 
-static enum sci_status scic_sds_remote_device_default_suspend_handler(
-       struct scic_sds_remote_device *sci_dev, u32 suspend_type)
-{
-       return default_device_handler(sci_dev, __func__);
-}
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
 
-static enum sci_status scic_sds_remote_device_default_resume_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return default_device_handler(sci_dev, __func__);
+       switch (state) {
+       case SCI_DEV_READY:
+       case SCI_STP_DEV_IDLE:
+       case SCI_STP_DEV_CMD:
+       case SCI_STP_DEV_NCQ:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_STP_DEV_AWAIT_RESET:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_SMP_DEV_CMD:
+               return true;
+       default:
+               return false;
+       }
 }
 
-/**
- *
- * @device: The struct scic_sds_remote_device which is then cast into a
- *    struct scic_sds_remote_device.
- * @event_code: The event code that the struct scic_sds_controller wants the device
- *    object to process.
- *
- * This method is the default event handler.  It will call the RNC state
- * machine handler for any RNC events otherwise it will log a warning and
- * returns a failure. enum sci_status SCI_FAILURE_INVALID_STATE
- */
-static enum sci_status  scic_sds_remote_device_core_event_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code,
-       bool is_ready_state)
+enum sci_status sci_remote_device_event_handler(struct isci_remote_device *idev,
+                                                    u32 event_code)
 {
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
        enum sci_status status;
 
        switch (scu_get_event_type(event_code)) {
        case SCU_EVENT_TYPE_RNC_OPS_MISC:
        case SCU_EVENT_TYPE_RNC_SUSPEND_TX:
        case SCU_EVENT_TYPE_RNC_SUSPEND_TX_RX:
-               status = scic_sds_remote_node_context_event_handler(&sci_dev->rnc, event_code);
+               status = sci_remote_node_context_event_handler(&idev->rnc, event_code);
                break;
        case SCU_EVENT_TYPE_PTX_SCHEDULE_EVENT:
-
                if (scu_get_event_code(event_code) == SCU_EVENT_IT_NEXUS_TIMEOUT) {
                        status = SCI_SUCCESS;
 
                        /* Suspend the associated RNC */
-                       scic_sds_remote_node_context_suspend(&sci_dev->rnc,
+                       sci_remote_node_context_suspend(&idev->rnc,
                                                              SCI_SOFTWARE_SUSPENSION,
                                                              NULL, NULL);
 
-                       dev_dbg(scirdev_to_dev(sci_dev),
+                       dev_dbg(scirdev_to_dev(idev),
                                "%s: device: %p event code: %x: %s\n",
-                               __func__, sci_dev, event_code,
-                               (is_ready_state)
+                               __func__, idev, event_code,
+                               is_remote_device_ready(idev)
                                ? "I_T_Nexus_Timeout event"
                                : "I_T_Nexus_Timeout event in wrong state");
 
                        break;
                }
        /* Else, fall through and treat as unhandled... */
-
        default:
-               dev_dbg(scirdev_to_dev(sci_dev),
+               dev_dbg(scirdev_to_dev(idev),
                        "%s: device: %p event code: %x: %s\n",
-                       __func__, sci_dev, event_code,
-                       (is_ready_state)
+                       __func__, idev, event_code,
+                       is_remote_device_ready(idev)
                        ? "unexpected event"
                        : "unexpected event in wrong state");
                status = SCI_FAILURE_INVALID_STATE;
                break;
        }
 
-       return status;
-}
-/**
- *
- * @device: The struct scic_sds_remote_device which is then cast into a
- *    struct scic_sds_remote_device.
- * @event_code: The event code that the struct scic_sds_controller wants the device
- *    object to process.
- *
- * This method is the default event handler.  It will call the RNC state
- * machine handler for any RNC events otherwise it will log a warning and
- * returns a failure. enum sci_status SCI_FAILURE_INVALID_STATE
- */
-static enum sci_status  scic_sds_remote_device_default_event_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code)
-{
-       return scic_sds_remote_device_core_event_handler(sci_dev,
-                                                         event_code,
-                                                         false);
-}
-
-/**
- *
- * @device: The struct scic_sds_remote_device which is then cast into a
- *    struct scic_sds_remote_device.
- * @frame_index: The frame index for which the struct scic_sds_controller wants this
- *    device object to process.
- *
- * This method is the default unsolicited frame handler.  It logs a warning,
- * releases the frame and returns a failure. enum sci_status
- * SCI_FAILURE_INVALID_STATE
- */
-static enum sci_status scic_sds_remote_device_default_frame_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index)
-{
-       dev_warn(scirdev_to_dev(sci_dev),
-                "%s: SCIC Remote Device requested to handle frame %x "
-                "while in wrong state %d\n",
-                __func__,
-                frame_index,
-                sci_base_state_machine_get_state(
-                        &sci_dev->state_machine));
-
-       /* Return the frame back to the controller */
-       scic_sds_controller_release_frame(
-               scic_sds_remote_device_get_controller(sci_dev), frame_index
-               );
-
-       return SCI_FAILURE_INVALID_STATE;
-}
-
-static enum sci_status scic_sds_remote_device_default_start_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       return default_device_handler(sci_dev, __func__);
-}
-
-static enum sci_status scic_sds_remote_device_default_complete_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       return default_device_handler(sci_dev, __func__);
-}
-
-static enum sci_status scic_sds_remote_device_default_continue_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       return default_device_handler(sci_dev, __func__);
-}
-
-/**
- *
- * @device: The struct scic_sds_remote_device which is then cast into a
- *    struct scic_sds_remote_device.
- * @frame_index: The frame index for which the struct scic_sds_controller wants this
- *    device object to process.
- *
- * This method is a general ssp frame handler.  In most cases the device object
- * needs to route the unsolicited frame processing to the io request object.
- * This method decodes the tag for the io request object and routes the
- * unsolicited frame to that object. enum sci_status SCI_FAILURE_INVALID_STATE
- */
-static enum sci_status scic_sds_remote_device_general_frame_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index)
-{
-       enum sci_status result;
-       struct sci_ssp_frame_header *frame_header;
-       struct scic_sds_request *io_request;
-
-       result = scic_sds_unsolicited_frame_control_get_header(
-               &(scic_sds_remote_device_get_controller(sci_dev)->uf_control),
-               frame_index,
-               (void **)&frame_header
-               );
-
-       if (SCI_SUCCESS == result) {
-               io_request = scic_sds_controller_get_io_request_from_tag(
-                       scic_sds_remote_device_get_controller(sci_dev), frame_header->tag);
-
-               if ((io_request == NULL)
-                   || (io_request->target_device != sci_dev)) {
-                       /*
-                        * We could not map this tag to a valid IO request
-                        * Just toss the frame and continue */
-                       scic_sds_controller_release_frame(
-                               scic_sds_remote_device_get_controller(sci_dev), frame_index
-                               );
-               } else {
-                       /* The IO request is now in charge of releasing the frame */
-                       result = io_request->state_handlers->frame_handler(
-                               io_request, frame_index);
-               }
-       }
-
-       return result;
-}
-
-/**
- *
- * @[in]: sci_dev This is the device object that is receiving the event.
- * @[in]: event_code The event code to process.
- *
- * This is a common method for handling events reported to the remote device
- * from the controller object. enum sci_status
- */
-static enum sci_status scic_sds_remote_device_general_event_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code)
-{
-       return scic_sds_remote_device_core_event_handler(sci_dev,
-                                                         event_code,
-                                                         true);
-}
-
-static enum sci_status scic_sds_remote_device_stopped_state_stop_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return SCI_SUCCESS;
-}
-
-/**
- *
- * @sci_dev: The struct scic_sds_remote_device which is cast into a
- *    struct scic_sds_remote_device.
- *
- * This method will destruct a struct scic_sds_remote_device that is in a stopped
- * state.  This is the only state from which a destruct request will succeed.
- * The RNi for this struct scic_sds_remote_device is returned to the free pool and the
- * device object transitions to the SCI_BASE_REMOTE_DEVICE_STATE_FINAL.
- * enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_device_stopped_state_destruct_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       struct scic_sds_controller *scic;
-
-       scic = scic_sds_remote_device_get_controller(sci_dev);
-       scic_sds_controller_free_remote_node_context(scic, sci_dev,
-                                                    sci_dev->rnc.remote_node_index);
-       sci_dev->rnc.remote_node_index = SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX;
-
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_FINAL);
-
-       return SCI_SUCCESS;
-}
-
-/*
- * *****************************************************************************
- * *  STARTING STATE HANDLERS
- * ***************************************************************************** */
-
-static enum sci_status scic_sds_remote_device_starting_state_stop_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       /*
-        * This device has not yet started so there had better be no IO requests
-        */
-       BUG_ON(sci_dev->started_request_count != 0);
-
-       /*
-        * Destroy the remote node context
-        */
-       scic_sds_remote_node_context_destruct(&sci_dev->rnc,
-               scic_sds_cb_remote_device_rnc_destruct_complete, sci_dev);
-
-       /*
-        * Transition to the stopping state and wait for the remote node to
-        * complete being posted and invalidated.
-        */
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_STOPPING);
-
-       return SCI_SUCCESS;
-}
-
-static enum sci_status scic_sds_remote_device_ready_state_stop_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       enum sci_status status = SCI_SUCCESS;
-
-       /* Request the parent state machine to transition to the stopping state */
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_STOPPING);
-
-       if (sci_dev->started_request_count == 0) {
-               scic_sds_remote_node_context_destruct(&sci_dev->rnc,
-                       scic_sds_cb_remote_device_rnc_destruct_complete,
-                       sci_dev);
-       } else
-               status = scic_sds_remote_device_terminate_requests(sci_dev);
-
-       return status;
-}
-
-/**
- *
- * @device: The struct scic_sds_remote_device object which is cast to a
- *    struct scic_sds_remote_device object.
- *
- * This is the ready state device reset handler enum sci_status
- */
-static enum sci_status scic_sds_remote_device_ready_state_reset_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       /* Request the parent state machine to transition to the stopping state */
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_RESETTING);
-
-       return SCI_SUCCESS;
-}
-
-/*
- * This method will attempt to start a task request for this device object. The
- * remote device object will issue the start request for the task and if
- * successful it will start the request for the port object then increment its
- * own requet count. enum sci_status SCI_SUCCESS if the task request is started for
- * this device object. SCI_FAILURE_INSUFFICIENT_RESOURCES if the io request
- * object could not get the resources to start.
- */
-static enum sci_status scic_sds_remote_device_ready_state_start_task_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status result;
-
-       /* See if the port is in a state where we can start the IO request */
-       result = scic_sds_port_start_io(
-               scic_sds_remote_device_get_port(sci_dev), sci_dev, request);
-
-       if (result == SCI_SUCCESS) {
-               result = scic_sds_remote_node_context_start_task(&sci_dev->rnc,
-                                                                request);
-               if (result == SCI_SUCCESS)
-                       result = scic_sds_request_start(request);
-
-               scic_sds_remote_device_start_request(sci_dev, request, result);
-       }
-
-       return result;
-}
-
-/*
- * This method will attempt to start an io request for this device object. The
- * remote device object will issue the start request for the io and if
- * successful it will start the request for the port object then increment its
- * own requet count. enum sci_status SCI_SUCCESS if the io request is started for
- * this device object. SCI_FAILURE_INSUFFICIENT_RESOURCES if the io request
- * object could not get the resources to start.
- */
-static enum sci_status scic_sds_remote_device_ready_state_start_io_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status result;
-
-       /* See if the port is in a state where we can start the IO request */
-       result = scic_sds_port_start_io(
-               scic_sds_remote_device_get_port(sci_dev), sci_dev, request);
-
-       if (result == SCI_SUCCESS) {
-               result = scic_sds_remote_node_context_start_io(&sci_dev->rnc, request);
-               if (result == SCI_SUCCESS)
-                       result = scic_sds_request_start(request);
-
-               scic_sds_remote_device_start_request(sci_dev, request, result);
-       }
-
-       return result;
-}
-
-/*
- * This method will complete the request for the remote device object.  The
- * method will call the completion handler for the request object and if
- * successful it will complete the request on the port object then decrement
- * its own started_request_count. enum sci_status
- */
-static enum sci_status scic_sds_remote_device_ready_state_complete_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status result;
-
-       result = scic_sds_request_complete(request);
-
-       if (result != SCI_SUCCESS)
-               return result;
-
-       /* See if the port is in a state
-        * where we can start the IO request */
-       result = scic_sds_port_complete_io(
-                       scic_sds_remote_device_get_port(sci_dev),
-                       sci_dev, request);
-
-       if (result == SCI_SUCCESS)
-               scic_sds_remote_device_decrement_request_count(sci_dev);
-
-       return result;
-}
-
-/*
- * *****************************************************************************
- * *  STOPPING STATE HANDLERS
- * ***************************************************************************** */
-
-/**
- *
- * @sci_dev: The struct scic_sds_remote_device which is cast into a
- *    struct scic_sds_remote_device.
- *
- * This method will stop a struct scic_sds_remote_device that is already in the
- * SCI_BASE_REMOTE_DEVICE_STATE_STOPPING state. This is not considered an error
- * since we allow a stop request on a device that is alreay stopping or
- * stopped. enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_device_stopping_state_stop_handler(
-       struct scic_sds_remote_device *device)
-{
-       /*
-        * All requests should have been terminated, but if there is an
-        * attempt to stop a device already in the stopping state, then
-        * try again to terminate. */
-       return scic_sds_remote_device_terminate_requests(device);
-}
-
-
-/**
- *
- * @device: The device object for which the request is completing.
- * @request: The task request that is being completed.
- *
- * This method completes requests for this struct scic_sds_remote_device while it is
- * in the SCI_BASE_REMOTE_DEVICE_STATE_STOPPING state. This method calls the
- * complete method for the request object and if that is successful the port
- * object is called to complete the task request. Then the device object itself
- * completes the task request. If struct scic_sds_remote_device started_request_count
- * goes to 0 and the invalidate RNC request has completed the device object can
- * transition to the SCI_BASE_REMOTE_DEVICE_STATE_STOPPED. enum sci_status
- */
-static enum sci_status scic_sds_remote_device_stopping_state_complete_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status status = SCI_SUCCESS;
-
-       status = scic_sds_request_complete(request);
-
        if (status != SCI_SUCCESS)
                return status;
 
-       status = scic_sds_port_complete_io(scic_sds_remote_device_get_port(sci_dev),
-                                          sci_dev, request);
-       if (status != SCI_SUCCESS)
-               return status;
-
-       scic_sds_remote_device_decrement_request_count(sci_dev);
-
-       if (scic_sds_remote_device_get_request_count(sci_dev) == 0)
-               scic_sds_remote_node_context_destruct(&sci_dev->rnc,
-                                                     scic_sds_cb_remote_device_rnc_destruct_complete,
-                                                     sci_dev);
-       return SCI_SUCCESS;
-}
-
-static enum sci_status scic_sds_remote_device_resetting_state_reset_complete_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_READY);
-
-       return SCI_SUCCESS;
-}
-
-static enum sci_status scic_sds_remote_device_resetting_state_stop_handler(
-       struct scic_sds_remote_device *sci_dev)
-{
-       sci_base_state_machine_change_state(
-               &sci_dev->state_machine,
-               SCI_BASE_REMOTE_DEVICE_STATE_STOPPING
-               );
-
-       return SCI_SUCCESS;
-}
-
-/* complete requests for this device while it is in the
- * SCI_BASE_REMOTE_DEVICE_STATE_RESETTING state. This method calls the complete
- * method for the request object and if that is successful the port object is
- * called to complete the task request. Then the device object itself completes
- * the task request. enum sci_status
- */
-static enum sci_status scic_sds_remote_device_resetting_state_complete_request_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status status = SCI_SUCCESS;
-
-       status = scic_sds_request_complete(request);
-
-       if (status == SCI_SUCCESS) {
-               status = scic_sds_port_complete_io(
-                               scic_sds_remote_device_get_port(sci_dev),
-                               sci_dev, request);
-
-               if (status == SCI_SUCCESS) {
-                       scic_sds_remote_device_decrement_request_count(sci_dev);
-               }
-       }
-
-       return status;
-}
+       if (state == SCI_STP_DEV_IDLE) {
 
-static enum sci_status scic_sds_stp_remote_device_complete_request(struct scic_sds_remote_device *sci_dev,
-                                                                  struct scic_sds_request *sci_req)
-{
-       enum sci_status status;
-
-       status = scic_sds_io_request_complete(sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       status = scic_sds_port_complete_io(sci_dev->owning_port, sci_dev, sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       scic_sds_remote_device_decrement_request_count(sci_dev);
-       if (sci_req->sci_status == SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED) {
-               /* This request causes hardware error, device needs to be Lun Reset.
-                * So here we force the state machine to IDLE state so the rest IOs
-                * can reach RNC state handler, these IOs will be completed by RNC with
-                * status of "DEVICE_RESET_REQUIRED", instead of "INVALID STATE".
-                */
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET);
-       } else if (scic_sds_remote_device_get_request_count(sci_dev) == 0)
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
-
-
- out:
-       if (status != SCI_SUCCESS)
-               dev_err(scirdev_to_dev(sci_dev),
-                       "%s: Port:0x%p Device:0x%p Request:0x%p Status:0x%x "
-                       "could not complete\n", __func__, sci_dev->owning_port,
-                       sci_dev, sci_req, status);
-
-       return status;
-}
-
-/* scic_sds_stp_remote_device_ready_substate_start_request_handler - start stp
- * @device: The target device a task management request towards to.
- * @request: The task request.
- *
- * This is the READY NCQ substate handler to start task management request. In
- * this routine, we suspend and resume the RNC.  enum sci_status Always return
- * SCI_FAILURE_RESET_DEVICE_PARTIAL_SUCCESS status to let
- * controller_start_task_handler know that the controller can't post TC for
- * task request yet, instead, when RNC gets resumed, a controller_continue_task
- * callback will be called.
- */
-static enum sci_status scic_sds_stp_remote_device_ready_substate_start_request_handler(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request)
-{
-       enum sci_status status;
-
-       /* Will the port allow the io request to start? */
-       status = device->owning_port->state_handlers->start_io_handler(
-               device->owning_port, device, request);
-       if (status != SCI_SUCCESS)
-               return status;
-
-       status = scic_sds_remote_node_context_start_task(&device->rnc, request);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       status = request->state_handlers->start_handler(request);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       /*
-        * Note: If the remote device state is not IDLE this will replace
-        * the request that probably resulted in the task management request.
-        */
-       device->working_request = request;
-       sci_base_state_machine_change_state(&device->state_machine,
-                       SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
-
-       /*
-        * The remote node context must cleanup the TCi to NCQ mapping table.
-        * The only way to do this correctly is to either write to the TLCR
-        * register or to invalidate and repost the RNC. In either case the
-        * remote node context state machine will take the correct action when
-        * the remote node context is suspended and later resumed.
-        */
-       scic_sds_remote_node_context_suspend(&device->rnc,
-                       SCI_SOFTWARE_SUSPENSION, NULL, NULL);
-       scic_sds_remote_node_context_resume(&device->rnc,
-                       scic_sds_remote_device_continue_request,
-                       device);
-
-out:
-       scic_sds_remote_device_start_request(device, request, status);
-       /*
-        * We need to let the controller start request handler know that it can't
-        * post TC yet. We will provide a callback function to post TC when RNC gets
-        * resumed.
-        */
-       return SCI_FAILURE_RESET_DEVICE_PARTIAL_SUCCESS;
-}
-
-/* handle the start io operation for a sata device that is in the command idle
- * state. - Evalute the type of IO request to be started - If its an NCQ
- * request change to NCQ substate - If its any other command change to the CMD
- * substate
- *
- * If this is a softreset we may want to have a different substate.
- */
-static enum sci_status scic_sds_stp_remote_device_ready_idle_substate_start_io_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
-{
-       enum sci_status status;
-       struct isci_request *isci_request = request->ireq;
-       enum scic_sds_remote_device_states new_state;
-
-       /* Will the port allow the io request to start? */
-       status = sci_dev->owning_port->state_handlers->start_io_handler(
-                       sci_dev->owning_port, sci_dev, request);
-       if (status != SCI_SUCCESS)
-               return status;
-
-       status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, request);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       status = request->state_handlers->start_handler(request);
-       if (status != SCI_SUCCESS)
-               goto out;
-
-       if (isci_sata_get_sat_protocol(isci_request) == SAT_PROTOCOL_FPDMA)
-               new_state = SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ;
-       else {
-               sci_dev->working_request = request;
-               new_state = SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD;
+               /* We pick up suspension events to handle specifically to this
+                * state. We resume the RNC right away.
+                */
+               if (scu_get_event_type(event_code) == SCU_EVENT_TYPE_RNC_SUSPEND_TX ||
+                   scu_get_event_type(event_code) == SCU_EVENT_TYPE_RNC_SUSPEND_TX_RX)
+                       status = sci_remote_node_context_resume(&idev->rnc, NULL, NULL);
        }
-       sci_base_state_machine_change_state(&sci_dev->state_machine, new_state);
-out:
-       scic_sds_remote_device_start_request(sci_dev, request, status);
+
        return status;
 }
 
-
-static enum sci_status scic_sds_stp_remote_device_ready_idle_substate_event_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code)
+static void sci_remote_device_start_request(struct isci_remote_device *idev,
+                                                struct isci_request *ireq,
+                                                enum sci_status status)
 {
-       enum sci_status status;
+       struct isci_port *iport = idev->owning_port;
 
-       status = scic_sds_remote_device_general_event_handler(sci_dev, event_code);
+       /* cleanup requests that failed after starting on the port */
        if (status != SCI_SUCCESS)
-               return status;
-
-       /* We pick up suspension events to handle specifically to this state. We
-        * resume the RNC right away. enum sci_status
-        */
-       if (scu_get_event_type(event_code) == SCU_EVENT_TYPE_RNC_SUSPEND_TX ||
-           scu_get_event_type(event_code) == SCU_EVENT_TYPE_RNC_SUSPEND_TX_RX)
-               status = scic_sds_remote_node_context_resume(&sci_dev->rnc, NULL, NULL);
-
-       return status;
+               sci_port_complete_io(iport, idev, ireq);
+       else {
+               kref_get(&idev->kref);
+               idev->started_request_count++;
+       }
 }
 
-static enum sci_status scic_sds_stp_remote_device_ready_ncq_substate_start_io_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *request)
+enum sci_status sci_remote_device_start_io(struct isci_host *ihost,
+                                               struct isci_remote_device *idev,
+                                               struct isci_request *ireq)
 {
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+       struct isci_port *iport = idev->owning_port;
        enum sci_status status;
-       struct isci_request *isci_request = request->ireq;
-       scic_sds_port_io_request_handler_t start_io;
 
-       if (isci_sata_get_sat_protocol(isci_request) == SAT_PROTOCOL_FPDMA) {
-               start_io = sci_dev->owning_port->state_handlers->start_io_handler;
-               status = start_io(sci_dev->owning_port, sci_dev, request);
+       switch (state) {
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_STOPPED:
+       case SCI_DEV_STARTING:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_DEV_STOPPING:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_RESETTING:
+       case SCI_DEV_FINAL:
+       default:
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_DEV_READY:
+               /* attempt to start an io request for this device object. The remote
+                * device object will issue the start request for the io and if
+                * successful it will start the request for the port object then
+                * increment its own request count.
+                */
+               status = sci_port_start_io(iport, idev, ireq);
                if (status != SCI_SUCCESS)
                        return status;
 
-               status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, request);
-               if (status == SCI_SUCCESS)
-                       status = request->state_handlers->start_handler(request);
+               status = sci_remote_node_context_start_io(&idev->rnc, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-               scic_sds_remote_device_start_request(sci_dev, request, status);
-       } else
-               status = SCI_FAILURE_INVALID_STATE;
+               status = sci_request_start(ireq);
+               break;
+       case SCI_STP_DEV_IDLE: {
+               /* handle the start io operation for a sata device that is in
+                * the command idle state. - Evalute the type of IO request to
+                * be started - If its an NCQ request change to NCQ substate -
+                * If its any other command change to the CMD substate
+                *
+                * If this is a softreset we may want to have a different
+                * substate.
+                */
+               enum sci_remote_device_states new_state;
+               struct sas_task *task = isci_request_access_task(ireq);
 
-       return status;
-}
+               status = sci_port_start_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-static enum sci_status scic_sds_stp_remote_device_ready_ncq_substate_frame_handler(struct scic_sds_remote_device *sci_dev,
-                                                                                  u32 frame_index)
-{
-       enum sci_status status;
-       struct sata_fis_header *frame_header;
-       struct scic_sds_controller *scic = sci_dev->owning_port->owning_controller;
+               status = sci_remote_node_context_start_io(&idev->rnc, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-       status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control,
-                                                              frame_index,
-                                                              (void **)&frame_header);
-       if (status != SCI_SUCCESS)
-               return status;
+               status = sci_request_start(ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-       if (frame_header->fis_type == SATA_FIS_TYPE_SETDEVBITS &&
-           (frame_header->status & ATA_STATUS_REG_ERROR_BIT)) {
-               sci_dev->not_ready_reason = SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED;
+               if (task->ata_task.use_ncq)
+                       new_state = SCI_STP_DEV_NCQ;
+               else {
+                       idev->working_request = ireq;
+                       new_state = SCI_STP_DEV_CMD;
+               }
+               sci_change_state(sm, new_state);
+               break;
+       }
+       case SCI_STP_DEV_NCQ: {
+               struct sas_task *task = isci_request_access_task(ireq);
 
-               /* TODO Check sactive and complete associated IO if any. */
+               if (task->ata_task.use_ncq) {
+                       status = sci_port_start_io(iport, idev, ireq);
+                       if (status != SCI_SUCCESS)
+                               return status;
 
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR);
-       } else if (frame_header->fis_type == SATA_FIS_TYPE_REGD2H &&
-                  (frame_header->status & ATA_STATUS_REG_ERROR_BIT)) {
-               /*
-                * Some devices return D2H FIS when an NCQ error is detected.
-                * Treat this like an SDB error FIS ready reason.
-                */
-               sci_dev->not_ready_reason = SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED;
+                       status = sci_remote_node_context_start_io(&idev->rnc, ireq);
+                       if (status != SCI_SUCCESS)
+                               break;
 
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR);
-       } else
-               status = SCI_FAILURE;
+                       status = sci_request_start(ireq);
+               } else
+                       return SCI_FAILURE_INVALID_STATE;
+               break;
+       }
+       case SCI_STP_DEV_AWAIT_RESET:
+               return SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED;
+       case SCI_SMP_DEV_IDLE:
+               status = sci_port_start_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-       scic_sds_controller_release_frame(scic, frame_index);
+               status = sci_remote_node_context_start_io(&idev->rnc, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-       return status;
-}
+               status = sci_request_start(ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-static enum sci_status scic_sds_stp_remote_device_ready_cmd_substate_start_io_handler(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request)
-{
-       /* device is already handling a command it can not accept new commands
-        * until this one is complete.
-        */
-       return SCI_FAILURE_INVALID_STATE;
+               idev->working_request = ireq;
+               sci_change_state(&idev->sm, SCI_SMP_DEV_CMD);
+               break;
+       case SCI_STP_DEV_CMD:
+       case SCI_SMP_DEV_CMD:
+               /* device is already handling a command it can not accept new commands
+                * until this one is complete.
+                */
+               return SCI_FAILURE_INVALID_STATE;
+       }
+
+       sci_remote_device_start_request(idev, ireq, status);
+       return status;
 }
 
-static enum sci_status scic_sds_stp_remote_device_ready_cmd_substate_suspend_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 suspend_type)
+static enum sci_status common_complete_io(struct isci_port *iport,
+                                         struct isci_remote_device *idev,
+                                         struct isci_request *ireq)
 {
        enum sci_status status;
 
-       status = scic_sds_remote_node_context_suspend(&sci_dev->rnc,
-                                                     suspend_type, NULL, NULL);
-
-       return status;
-}
+       status = sci_request_complete(ireq);
+       if (status != SCI_SUCCESS)
+               return status;
 
-static enum sci_status scic_sds_stp_remote_device_ready_cmd_substate_frame_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index)
-{
-       /* The device doe not process any UF received from the hardware while
-        * in this state.  All unsolicited frames are forwarded to the io
-        * request object.
-        */
-       return scic_sds_io_request_frame_handler(sci_dev->working_request,
-                                                frame_index);
-}
+       status = sci_port_complete_io(iport, idev, ireq);
+       if (status != SCI_SUCCESS)
+               return status;
 
-static enum sci_status scic_sds_stp_remote_device_ready_await_reset_substate_start_io_handler(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request)
-{
-       return SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED;
+       sci_remote_device_decrement_request_count(idev);
+       return status;
 }
 
-static enum sci_status scic_sds_stp_remote_device_ready_await_reset_substate_complete_request_handler(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request)
+enum sci_status sci_remote_device_complete_io(struct isci_host *ihost,
+                                                  struct isci_remote_device *idev,
+                                                  struct isci_request *ireq)
 {
-       struct scic_sds_request *sci_req = request;
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+       struct isci_port *iport = idev->owning_port;
        enum sci_status status;
 
-       status = scic_sds_io_request_complete(sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
+       switch (state) {
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_STOPPED:
+       case SCI_DEV_STARTING:
+       case SCI_STP_DEV_IDLE:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_FINAL:
+       default:
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_DEV_READY:
+       case SCI_STP_DEV_AWAIT_RESET:
+       case SCI_DEV_RESETTING:
+               status = common_complete_io(iport, idev, ireq);
+               break;
+       case SCI_STP_DEV_CMD:
+       case SCI_STP_DEV_NCQ:
+       case SCI_STP_DEV_NCQ_ERROR:
+               status = common_complete_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
-       status = scic_sds_port_complete_io(device->owning_port, device, sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
+               if (ireq->sci_status == SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED) {
+                       /* This request causes hardware error, device needs to be Lun Reset.
+                        * So here we force the state machine to IDLE state so the rest IOs
+                        * can reach RNC state handler, these IOs will be completed by RNC with
+                        * status of "DEVICE_RESET_REQUIRED", instead of "INVALID STATE".
+                        */
+                       sci_change_state(sm, SCI_STP_DEV_AWAIT_RESET);
+               } else if (idev->started_request_count == 0)
+                       sci_change_state(sm, SCI_STP_DEV_IDLE);
+               break;
+       case SCI_SMP_DEV_CMD:
+               status = common_complete_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
+               sci_change_state(sm, SCI_SMP_DEV_IDLE);
+               break;
+       case SCI_DEV_STOPPING:
+               status = common_complete_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
+
+               if (idev->started_request_count == 0)
+                       sci_remote_node_context_destruct(&idev->rnc,
+                                                        rnc_destruct_done,
+                                                        idev);
+               break;
+       }
 
-       scic_sds_remote_device_decrement_request_count(device);
- out:
        if (status != SCI_SUCCESS)
-               dev_err(scirdev_to_dev(device),
+               dev_err(scirdev_to_dev(idev),
                        "%s: Port:0x%p Device:0x%p Request:0x%p Status:0x%x "
-                       "could not complete\n",
-                       __func__, device->owning_port, device, sci_req, status);
+                       "could not complete\n", __func__, iport,
+                       idev, ireq, status);
+       else
+               isci_put_device(idev);
 
        return status;
 }
 
-static void scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(void *_dev)
+static void sci_remote_device_continue_request(void *dev)
 {
-       struct scic_sds_remote_device *sci_dev = _dev;
-       struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);
-       struct scic_sds_controller *scic = sci_dev->owning_port->owning_controller;
+       struct isci_remote_device *idev = dev;
 
-       /* For NCQ operation we do not issue a isci_remote_device_not_ready().
-        * As a result, avoid sending the ready notification.
-        */
-       if (sci_dev->state_machine.previous_state_id != SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ)
-               isci_remote_device_ready(scic->ihost, idev);
+       /* we need to check if this request is still valid to continue. */
+       if (idev->working_request)
+               sci_controller_continue_io(idev->working_request);
 }
 
-static enum sci_status scic_sds_smp_remote_device_ready_idle_substate_start_io_handler(
-       struct scic_sds_remote_device *sci_dev,
-       struct scic_sds_request *sci_req)
+enum sci_status sci_remote_device_start_task(struct isci_host *ihost,
+                                                 struct isci_remote_device *idev,
+                                                 struct isci_request *ireq)
 {
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+       struct isci_port *iport = idev->owning_port;
        enum sci_status status;
 
-       /* Will the port allow the io request to start? */
-       status = sci_dev->owning_port->state_handlers->start_io_handler(
-                       sci_dev->owning_port, sci_dev, sci_req);
-       if (status != SCI_SUCCESS)
-               return status;
+       switch (state) {
+       case SCI_DEV_INITIAL:
+       case SCI_DEV_STOPPED:
+       case SCI_DEV_STARTING:
+       case SCI_SMP_DEV_IDLE:
+       case SCI_SMP_DEV_CMD:
+       case SCI_DEV_STOPPING:
+       case SCI_DEV_FAILED:
+       case SCI_DEV_RESETTING:
+       case SCI_DEV_FINAL:
+       default:
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       case SCI_STP_DEV_IDLE:
+       case SCI_STP_DEV_CMD:
+       case SCI_STP_DEV_NCQ:
+       case SCI_STP_DEV_NCQ_ERROR:
+       case SCI_STP_DEV_AWAIT_RESET:
+               status = sci_port_start_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-       status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
+               status = sci_remote_node_context_start_task(&idev->rnc, ireq);
+               if (status != SCI_SUCCESS)
+                       goto out;
 
-       status = scic_sds_request_start(sci_req);
-       if (status != SCI_SUCCESS)
-               goto out;
+               status = sci_request_start(ireq);
+               if (status != SCI_SUCCESS)
+                       goto out;
+
+               /* Note: If the remote device state is not IDLE this will
+                * replace the request that probably resulted in the task
+                * management request.
+                */
+               idev->working_request = ireq;
+               sci_change_state(sm, SCI_STP_DEV_CMD);
+
+               /* The remote node context must cleanup the TCi to NCQ mapping
+                * table.  The only way to do this correctly is to either write
+                * to the TLCR register or to invalidate and repost the RNC. In
+                * either case the remote node context state machine will take
+                * the correct action when the remote node context is suspended
+                * and later resumed.
+                */
+               sci_remote_node_context_suspend(&idev->rnc,
+                               SCI_SOFTWARE_SUSPENSION, NULL, NULL);
+               sci_remote_node_context_resume(&idev->rnc,
+                               sci_remote_device_continue_request,
+                                                   idev);
+
+       out:
+               sci_remote_device_start_request(idev, ireq, status);
+               /* We need to let the controller start request handler know that
+                * it can't post TC yet. We will provide a callback function to
+                * post TC when RNC gets resumed.
+                */
+               return SCI_FAILURE_RESET_DEVICE_PARTIAL_SUCCESS;
+       case SCI_DEV_READY:
+               status = sci_port_start_io(iport, idev, ireq);
+               if (status != SCI_SUCCESS)
+                       return status;
 
-       sci_dev->working_request = sci_req;
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
+               status = sci_remote_node_context_start_task(&idev->rnc, ireq);
+               if (status != SCI_SUCCESS)
+                       break;
 
- out:
-       scic_sds_remote_device_start_request(sci_dev, sci_req, status);
+               status = sci_request_start(ireq);
+               break;
+       }
+       sci_remote_device_start_request(idev, ireq, status);
 
        return status;
 }
 
-static enum sci_status scic_sds_smp_remote_device_ready_cmd_substate_start_io_handler(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request)
+void sci_remote_device_post_request(struct isci_remote_device *idev, u32 request)
 {
-       /* device is already handling a command it can not accept new commands
-        * until this one is complete.
-        */
-       return SCI_FAILURE_INVALID_STATE;
-}
+       struct isci_port *iport = idev->owning_port;
+       u32 context;
 
-static enum sci_status
-scic_sds_smp_remote_device_ready_cmd_substate_complete_io_handler(struct scic_sds_remote_device *sci_dev,
-                                                                 struct scic_sds_request *sci_req)
-{
-       enum sci_status status;
+       context = request |
+                 (ISCI_PEG << SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
+                 (iport->physical_port_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
+                 idev->rnc.remote_node_index;
 
-       status = scic_sds_io_request_complete(sci_req);
-       if (status != SCI_SUCCESS)
-               return status;
+       sci_controller_post_request(iport->owning_controller, context);
+}
 
-       status = scic_sds_port_complete_io(sci_dev->owning_port, sci_dev, sci_req);
-       if (status != SCI_SUCCESS) {
-               dev_err(scirdev_to_dev(sci_dev),
-                       "%s: SCIC SDS Remote Device 0x%p io request "
-                       "0x%p could not be completd on the port 0x%p "
-                       "failed with status %d.\n", __func__, sci_dev, sci_req,
-                       sci_dev->owning_port, status);
-               return status;
-       }
+/* called once the remote node context has transisitioned to a
+ * ready state.  This is the indication that the remote device object can also
+ * transition to ready.
+ */
+static void remote_device_resume_done(void *_dev)
+{
+       struct isci_remote_device *idev = _dev;
 
-       scic_sds_remote_device_decrement_request_count(sci_dev);
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
+       if (is_remote_device_ready(idev))
+               return;
 
-       return status;
+       /* go 'ready' if we are not already in a ready state */
+       sci_change_state(&idev->sm, SCI_DEV_READY);
 }
 
-static enum sci_status scic_sds_smp_remote_device_ready_cmd_substate_frame_handler(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index)
+static void sci_stp_remote_device_ready_idle_substate_resume_complete_handler(void *_dev)
 {
-       enum sci_status status;
+       struct isci_remote_device *idev = _dev;
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
-       /* The device does not process any UF received from the hardware while
-        * in this state.  All unsolicited frames are forwarded to the io request
-        * object.
+       /* For NCQ operation we do not issue a isci_remote_device_not_ready().
+        * As a result, avoid sending the ready notification.
         */
-       status = scic_sds_io_request_frame_handler(
-               sci_dev->working_request,
-               frame_index
-               );
-
-       return status;
+       if (idev->sm.previous_state_id != SCI_STP_DEV_NCQ)
+               isci_remote_device_ready(ihost, idev);
 }
 
-static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_state_handler_table[] = {
-       [SCI_BASE_REMOTE_DEVICE_STATE_INITIAL] = {
-               .stop_handler           = scic_sds_remote_device_default_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_default_event_handler,
-               .frame_handler          = scic_sds_remote_device_default_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STOPPED] = {
-               .stop_handler           = scic_sds_remote_device_stopped_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_stopped_state_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_default_event_handler,
-               .frame_handler          = scic_sds_remote_device_default_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STARTING] = {
-               .stop_handler           = scic_sds_remote_device_starting_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_general_event_handler,
-               .frame_handler          = scic_sds_remote_device_default_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_READY] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_ready_state_start_io_handler,
-               .complete_io_handler    = scic_sds_remote_device_ready_state_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_ready_state_start_task_handler,
-               .complete_task_handler  = scic_sds_remote_device_ready_state_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_general_event_handler,
-               .frame_handler          = scic_sds_remote_device_general_frame_handler,
-       },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_stp_remote_device_ready_idle_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_stp_remote_device_ready_substate_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler                = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler                 = scic_sds_remote_device_default_resume_handler,
-               .event_handler                  = scic_sds_stp_remote_device_ready_idle_substate_event_handler,
-               .frame_handler                  = scic_sds_remote_device_default_frame_handler
-       },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_stp_remote_device_ready_cmd_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_stp_remote_device_complete_request,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_stp_remote_device_ready_substate_start_request_handler,
-               .complete_task_handler  = scic_sds_stp_remote_device_complete_request,
-               .suspend_handler                = scic_sds_stp_remote_device_ready_cmd_substate_suspend_handler,
-               .resume_handler                 = scic_sds_remote_device_default_resume_handler,
-               .event_handler                  = scic_sds_remote_device_general_event_handler,
-               .frame_handler                  = scic_sds_stp_remote_device_ready_cmd_substate_frame_handler
-       },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_stp_remote_device_ready_ncq_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_stp_remote_device_complete_request,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_stp_remote_device_ready_substate_start_request_handler,
-               .complete_task_handler  = scic_sds_stp_remote_device_complete_request,
-               .suspend_handler                = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler                 = scic_sds_remote_device_default_resume_handler,
-               .event_handler                  = scic_sds_remote_device_general_event_handler,
-               .frame_handler                  = scic_sds_stp_remote_device_ready_ncq_substate_frame_handler
-       },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_stp_remote_device_complete_request,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_stp_remote_device_ready_substate_start_request_handler,
-               .complete_task_handler  = scic_sds_stp_remote_device_complete_request,
-               .suspend_handler                = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler                 = scic_sds_remote_device_default_resume_handler,
-               .event_handler                  = scic_sds_remote_device_general_event_handler,
-               .frame_handler                  = scic_sds_remote_device_general_frame_handler
-       },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_ready_state_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_stp_remote_device_ready_await_reset_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_stp_remote_device_ready_await_reset_substate_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_stp_remote_device_ready_substate_start_request_handler,
-               .complete_task_handler  = scic_sds_stp_remote_device_complete_request,
-               .suspend_handler                = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler                 = scic_sds_remote_device_default_resume_handler,
-               .event_handler                  = scic_sds_remote_device_general_event_handler,
-               .frame_handler                  = scic_sds_remote_device_general_frame_handler
-       },
-       [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_smp_remote_device_ready_idle_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_general_event_handler,
-               .frame_handler          = scic_sds_remote_device_default_frame_handler
-       },
-       [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = {
-               .stop_handler           = scic_sds_remote_device_ready_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_smp_remote_device_ready_cmd_substate_start_io_handler,
-               .complete_io_handler    = scic_sds_smp_remote_device_ready_cmd_substate_complete_io_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_general_event_handler,
-               .frame_handler          = scic_sds_smp_remote_device_ready_cmd_substate_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STOPPING] = {
-               .stop_handler           = scic_sds_remote_device_stopping_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_stopping_state_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_stopping_state_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_general_event_handler,
-               .frame_handler          = scic_sds_remote_device_general_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_FAILED] = {
-               .stop_handler           = scic_sds_remote_device_default_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_default_event_handler,
-               .frame_handler          = scic_sds_remote_device_general_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_RESETTING] = {
-               .stop_handler           = scic_sds_remote_device_resetting_state_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_resetting_state_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_resetting_state_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_resetting_state_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_default_event_handler,
-               .frame_handler          = scic_sds_remote_device_general_frame_handler
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_FINAL] = {
-               .stop_handler           = scic_sds_remote_device_default_stop_handler,
-               .fail_handler           = scic_sds_remote_device_default_fail_handler,
-               .destruct_handler       = scic_sds_remote_device_default_destruct_handler,
-               .reset_handler          = scic_sds_remote_device_default_reset_handler,
-               .reset_complete_handler = scic_sds_remote_device_default_reset_complete_handler,
-               .start_io_handler       = scic_sds_remote_device_default_start_request_handler,
-               .complete_io_handler    = scic_sds_remote_device_default_complete_request_handler,
-               .continue_io_handler    = scic_sds_remote_device_default_continue_request_handler,
-               .start_task_handler     = scic_sds_remote_device_default_start_request_handler,
-               .complete_task_handler  = scic_sds_remote_device_default_complete_request_handler,
-               .suspend_handler        = scic_sds_remote_device_default_suspend_handler,
-               .resume_handler         = scic_sds_remote_device_default_resume_handler,
-               .event_handler          = scic_sds_remote_device_default_event_handler,
-               .frame_handler          = scic_sds_remote_device_default_frame_handler
-       }
-};
-
-static void scic_sds_remote_device_initial_state_enter(void *object)
+static void sci_remote_device_initial_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCI_BASE_REMOTE_DEVICE_STATE_INITIAL);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
 
        /* Initial state is a transitional state to the stopped state */
-       sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                           SCI_BASE_REMOTE_DEVICE_STATE_STOPPED);
+       sci_change_state(&idev->sm, SCI_DEV_STOPPED);
 }
 
 /**
- * scic_remote_device_destruct() - free remote node context and destruct
+ * sci_remote_device_destruct() - free remote node context and destruct
  * @remote_device: This parameter specifies the remote device to be destructed.
  *
  * Remote device objects are a limited resource.  As such, they must be
@@ -1601,9 +822,25 @@ static void scic_sds_remote_device_initial_state_enter(void *object)
  * device isn't valid (e.g. it's already been destoryed, the handle isn't
  * valid, etc.).
  */
-static enum sci_status scic_remote_device_destruct(struct scic_sds_remote_device *sci_dev)
+static enum sci_status sci_remote_device_destruct(struct isci_remote_device *idev)
 {
-       return sci_dev->state_handlers->destruct_handler(sci_dev);
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
+       struct isci_host *ihost;
+
+       if (state != SCI_DEV_STOPPED) {
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
+                        __func__, state);
+               return SCI_FAILURE_INVALID_STATE;
+       }
+
+       ihost = idev->owning_port->owning_controller;
+       sci_controller_free_remote_node_context(ihost, idev,
+                                                    idev->rnc.remote_node_index);
+       idev->rnc.remote_node_index = SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX;
+       sci_change_state(sm, SCI_DEV_FINAL);
+
+       return SCI_SUCCESS;
 }
 
 /**
@@ -1621,358 +858,214 @@ static void isci_remote_device_deconstruct(struct isci_host *ihost, struct isci_
         * here should go through isci_remote_device_nuke_requests.
         * If we hit this condition, we will need a way to complete
         * io requests in process */
-       while (!list_empty(&idev->reqs_in_process)) {
+       BUG_ON(!list_empty(&idev->reqs_in_process));
 
-               dev_err(&ihost->pdev->dev,
-                       "%s: ** request list not empty! **\n", __func__);
-               BUG();
-       }
-
-       scic_remote_device_destruct(&idev->sci);
-       idev->domain_dev->lldd_dev = NULL;
-       idev->domain_dev = NULL;
-       idev->isci_port = NULL;
+       sci_remote_device_destruct(idev);
        list_del_init(&idev->node);
-
-       clear_bit(IDEV_START_PENDING, &idev->flags);
-       clear_bit(IDEV_STOP_PENDING, &idev->flags);
-       wake_up(&ihost->eventq);
-}
-
-/**
- * isci_remote_device_stop_complete() - This function is called by the scic
- *    when the remote device stop has completed. We mark the isci device as not
- *    ready and remove the isci remote device.
- * @ihost: This parameter specifies the isci host object.
- * @idev: This parameter specifies the remote device.
- * @status: This parameter specifies status of the completion.
- *
- */
-static void isci_remote_device_stop_complete(struct isci_host *ihost,
-                                            struct isci_remote_device *idev)
-{
-       dev_dbg(&ihost->pdev->dev, "%s: complete idev = %p\n", __func__, idev);
-
-       isci_remote_device_change_state(idev, isci_stopped);
-
-       /* after stop, we can tear down resources. */
-       isci_remote_device_deconstruct(ihost, idev);
+       isci_put_device(idev);
 }
 
-static void scic_sds_remote_device_stopped_state_enter(void *object)
+static void sci_remote_device_stopped_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic;
-       struct isci_remote_device *idev;
-       struct isci_host *ihost;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
        u32 prev_state;
 
-       scic = scic_sds_remote_device_get_controller(sci_dev);
-       ihost = scic->ihost;
-       idev = sci_dev_to_idev(sci_dev);
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCI_BASE_REMOTE_DEVICE_STATE_STOPPED);
-
        /* If we are entering from the stopping state let the SCI User know that
         * the stop operation has completed.
         */
-       prev_state = sci_dev->state_machine.previous_state_id;
-       if (prev_state == SCI_BASE_REMOTE_DEVICE_STATE_STOPPING)
-               isci_remote_device_stop_complete(ihost, idev);
+       prev_state = idev->sm.previous_state_id;
+       if (prev_state == SCI_DEV_STOPPING)
+               isci_remote_device_deconstruct(ihost, idev);
 
-       scic_sds_controller_remote_device_stopped(scic, sci_dev);
+       sci_controller_remote_device_stopped(ihost, idev);
 }
 
-static void scic_sds_remote_device_starting_state_enter(void *object)
+static void sci_remote_device_starting_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
-       struct isci_host *ihost = scic->ihost;
-       struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCI_BASE_REMOTE_DEVICE_STATE_STARTING);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
        isci_remote_device_not_ready(ihost, idev,
                                     SCIC_REMOTE_DEVICE_NOT_READY_START_REQUESTED);
 }
 
-static void scic_sds_remote_device_ready_state_enter(void *object)
+static void sci_remote_device_ready_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = sci_dev->owning_port->owning_controller;
-       struct domain_device *dev = sci_dev_to_domain(sci_dev);
-
-       SET_STATE_HANDLER(sci_dev,
-                         scic_sds_remote_device_state_handler_table,
-                         SCI_BASE_REMOTE_DEVICE_STATE_READY);
-
-       scic->remote_device_sequence[sci_dev->rnc.remote_node_index]++;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
+       struct domain_device *dev = idev->domain_dev;
 
        if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_SATA)) {
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
+               sci_change_state(&idev->sm, SCI_STP_DEV_IDLE);
        } else if (dev_is_expander(dev)) {
-               sci_base_state_machine_change_state(&sci_dev->state_machine,
-                                                   SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
+               sci_change_state(&idev->sm, SCI_SMP_DEV_IDLE);
        } else
-               isci_remote_device_ready(scic->ihost, sci_dev_to_idev(sci_dev));
+               isci_remote_device_ready(ihost, idev);
 }
 
-static void scic_sds_remote_device_ready_state_exit(void *object)
+static void sci_remote_device_ready_state_exit(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct domain_device *dev = sci_dev_to_domain(sci_dev);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct domain_device *dev = idev->domain_dev;
 
        if (dev->dev_type == SAS_END_DEV) {
-               struct scic_sds_controller *scic = sci_dev->owning_port->owning_controller;
-               struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);
+               struct isci_host *ihost = idev->owning_port->owning_controller;
 
-               isci_remote_device_not_ready(scic->ihost, idev,
+               isci_remote_device_not_ready(ihost, idev,
                                             SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED);
        }
 }
 
-static void scic_sds_remote_device_stopping_state_enter(void *object)
-{
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(
-               sci_dev,
-               scic_sds_remote_device_state_handler_table,
-               SCI_BASE_REMOTE_DEVICE_STATE_STOPPING
-               );
-}
-
-static void scic_sds_remote_device_failed_state_enter(void *object)
-{
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(
-               sci_dev,
-               scic_sds_remote_device_state_handler_table,
-               SCI_BASE_REMOTE_DEVICE_STATE_FAILED
-               );
-}
-
-static void scic_sds_remote_device_resetting_state_enter(void *object)
-{
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(
-               sci_dev,
-               scic_sds_remote_device_state_handler_table,
-               SCI_BASE_REMOTE_DEVICE_STATE_RESETTING
-               );
-
-       scic_sds_remote_node_context_suspend(
-               &sci_dev->rnc, SCI_SOFTWARE_SUSPENSION, NULL, NULL);
-}
-
-static void scic_sds_remote_device_resetting_state_exit(void *object)
+static void sci_remote_device_resetting_state_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
 
-       scic_sds_remote_node_context_resume(&sci_dev->rnc, NULL, NULL);
+       sci_remote_node_context_suspend(
+               &idev->rnc, SCI_SOFTWARE_SUSPENSION, NULL, NULL);
 }
 
-static void scic_sds_remote_device_final_state_enter(void *object)
+static void sci_remote_device_resetting_state_exit(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
 
-       SET_STATE_HANDLER(
-               sci_dev,
-               scic_sds_remote_device_state_handler_table,
-               SCI_BASE_REMOTE_DEVICE_STATE_FINAL
-               );
+       sci_remote_node_context_resume(&idev->rnc, NULL, NULL);
 }
 
-static void scic_sds_stp_remote_device_ready_idle_substate_enter(void *object)
+static void sci_stp_remote_device_ready_idle_substate_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
 
-       sci_dev->working_request = NULL;
-       if (scic_sds_remote_node_context_is_ready(&sci_dev->rnc)) {
+       idev->working_request = NULL;
+       if (sci_remote_node_context_is_ready(&idev->rnc)) {
                /*
                 * Since the RNC is ready, it's alright to finish completion
                 * processing (e.g. signal the remote device is ready). */
-               scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(sci_dev);
+               sci_stp_remote_device_ready_idle_substate_resume_complete_handler(idev);
        } else {
-               scic_sds_remote_node_context_resume(&sci_dev->rnc,
-                       scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler,
-                       sci_dev);
+               sci_remote_node_context_resume(&idev->rnc,
+                       sci_stp_remote_device_ready_idle_substate_resume_complete_handler,
+                       idev);
        }
 }
 
-static void scic_sds_stp_remote_device_ready_cmd_substate_enter(void *object)
+static void sci_stp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
-       BUG_ON(sci_dev->working_request == NULL);
+       BUG_ON(idev->working_request == NULL);
 
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
-
-       isci_remote_device_not_ready(scic->ihost, sci_dev_to_idev(sci_dev),
+       isci_remote_device_not_ready(ihost, idev,
                                     SCIC_REMOTE_DEVICE_NOT_READY_SATA_REQUEST_STARTED);
 }
 
-static void scic_sds_stp_remote_device_ready_ncq_substate_enter(void *object)
-{
-       struct scic_sds_remote_device *sci_dev = object;
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ);
-}
-
-static void scic_sds_stp_remote_device_ready_ncq_error_substate_enter(void *object)
-{
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
-       struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR);
-
-       if (sci_dev->not_ready_reason == SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED)
-               isci_remote_device_not_ready(scic->ihost, idev,
-                                            sci_dev->not_ready_reason);
-}
-
-static void scic_sds_stp_remote_device_ready_await_reset_substate_enter(void *object)
+static void sci_stp_remote_device_ready_ncq_error_substate_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-               SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET);
+       if (idev->not_ready_reason == SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED)
+               isci_remote_device_not_ready(ihost, idev,
+                                            idev->not_ready_reason);
 }
 
-static void scic_sds_smp_remote_device_ready_idle_substate_enter(void *object)
+static void sci_smp_remote_device_ready_idle_substate_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
-
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
-       isci_remote_device_ready(scic->ihost, sci_dev_to_idev(sci_dev));
+       isci_remote_device_ready(ihost, idev);
 }
 
-static void scic_sds_smp_remote_device_ready_cmd_substate_enter(void *object)
+static void sci_smp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
-       struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
+       struct isci_host *ihost = idev->owning_port->owning_controller;
 
-       BUG_ON(sci_dev->working_request == NULL);
+       BUG_ON(idev->working_request == NULL);
 
-       SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
-                         SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
-
-       isci_remote_device_not_ready(scic->ihost, sci_dev_to_idev(sci_dev),
+       isci_remote_device_not_ready(ihost, idev,
                                     SCIC_REMOTE_DEVICE_NOT_READY_SMP_REQUEST_STARTED);
 }
 
-static void scic_sds_smp_remote_device_ready_cmd_substate_exit(void *object)
+static void sci_smp_remote_device_ready_cmd_substate_exit(struct sci_base_state_machine *sm)
 {
-       struct scic_sds_remote_device *sci_dev = object;
+       struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
 
-       sci_dev->working_request = NULL;
+       idev->working_request = NULL;
 }
 
-static const struct sci_base_state scic_sds_remote_device_state_table[] = {
-       [SCI_BASE_REMOTE_DEVICE_STATE_INITIAL] = {
-               .enter_state = scic_sds_remote_device_initial_state_enter,
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STOPPED] = {
-               .enter_state = scic_sds_remote_device_stopped_state_enter,
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STARTING] = {
-               .enter_state = scic_sds_remote_device_starting_state_enter,
+static const struct sci_base_state sci_remote_device_state_table[] = {
+       [SCI_DEV_INITIAL] = {
+               .enter_state = sci_remote_device_initial_state_enter,
        },
-       [SCI_BASE_REMOTE_DEVICE_STATE_READY] = {
-               .enter_state = scic_sds_remote_device_ready_state_enter,
-               .exit_state  = scic_sds_remote_device_ready_state_exit
+       [SCI_DEV_STOPPED] = {
+               .enter_state = sci_remote_device_stopped_state_enter,
        },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = {
-               .enter_state = scic_sds_stp_remote_device_ready_idle_substate_enter,
+       [SCI_DEV_STARTING] = {
+               .enter_state = sci_remote_device_starting_state_enter,
        },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = {
-               .enter_state = scic_sds_stp_remote_device_ready_cmd_substate_enter,
+       [SCI_DEV_READY] = {
+               .enter_state = sci_remote_device_ready_state_enter,
+               .exit_state  = sci_remote_device_ready_state_exit
        },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ] = {
-               .enter_state = scic_sds_stp_remote_device_ready_ncq_substate_enter,
+       [SCI_STP_DEV_IDLE] = {
+               .enter_state = sci_stp_remote_device_ready_idle_substate_enter,
        },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR] = {
-               .enter_state = scic_sds_stp_remote_device_ready_ncq_error_substate_enter,
+       [SCI_STP_DEV_CMD] = {
+               .enter_state = sci_stp_remote_device_ready_cmd_substate_enter,
        },
-       [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET] = {
-               .enter_state = scic_sds_stp_remote_device_ready_await_reset_substate_enter,
+       [SCI_STP_DEV_NCQ] = { },
+       [SCI_STP_DEV_NCQ_ERROR] = {
+               .enter_state = sci_stp_remote_device_ready_ncq_error_substate_enter,
        },
-       [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = {
-               .enter_state = scic_sds_smp_remote_device_ready_idle_substate_enter,
+       [SCI_STP_DEV_AWAIT_RESET] = { },
+       [SCI_SMP_DEV_IDLE] = {
+               .enter_state = sci_smp_remote_device_ready_idle_substate_enter,
        },
-       [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = {
-               .enter_state = scic_sds_smp_remote_device_ready_cmd_substate_enter,
-               .exit_state  = scic_sds_smp_remote_device_ready_cmd_substate_exit,
+       [SCI_SMP_DEV_CMD] = {
+               .enter_state = sci_smp_remote_device_ready_cmd_substate_enter,
+               .exit_state  = sci_smp_remote_device_ready_cmd_substate_exit,
        },
-       [SCI_BASE_REMOTE_DEVICE_STATE_STOPPING] = {
-               .enter_state = scic_sds_remote_device_stopping_state_enter,
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_FAILED] = {
-               .enter_state = scic_sds_remote_device_failed_state_enter,
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_RESETTING] = {
-               .enter_state = scic_sds_remote_device_resetting_state_enter,
-               .exit_state  = scic_sds_remote_device_resetting_state_exit
-       },
-       [SCI_BASE_REMOTE_DEVICE_STATE_FINAL] = {
-               .enter_state = scic_sds_remote_device_final_state_enter,
+       [SCI_DEV_STOPPING] = { },
+       [SCI_DEV_FAILED] = { },
+       [SCI_DEV_RESETTING] = {
+               .enter_state = sci_remote_device_resetting_state_enter,
+               .exit_state  = sci_remote_device_resetting_state_exit
        },
+       [SCI_DEV_FINAL] = { },
 };
 
 /**
- * scic_remote_device_construct() - common construction
+ * sci_remote_device_construct() - common construction
  * @sci_port: SAS/SATA port through which this device is accessed.
  * @sci_dev: remote device to construct
  *
  * This routine just performs benign initialization and does not
  * allocate the remote_node_context which is left to
- * scic_remote_device_[de]a_construct().  scic_remote_device_destruct()
+ * sci_remote_device_[de]a_construct().  sci_remote_device_destruct()
  * frees the remote_node_context(s) for the device.
  */
-static void scic_remote_device_construct(struct scic_sds_port *sci_port,
-                                 struct scic_sds_remote_device *sci_dev)
+static void sci_remote_device_construct(struct isci_port *iport,
+                                 struct isci_remote_device *idev)
 {
-       sci_dev->owning_port = sci_port;
-       sci_dev->started_request_count = 0;
-
-       sci_base_state_machine_construct(
-               &sci_dev->state_machine,
-               sci_dev,
-               scic_sds_remote_device_state_table,
-               SCI_BASE_REMOTE_DEVICE_STATE_INITIAL
-               );
+       idev->owning_port = iport;
+       idev->started_request_count = 0;
 
-       sci_base_state_machine_start(
-               &sci_dev->state_machine
-               );
+       sci_init_sm(&idev->sm, sci_remote_device_state_table, SCI_DEV_INITIAL);
 
-       scic_sds_remote_node_context_construct(&sci_dev->rnc,
+       sci_remote_node_context_construct(&idev->rnc,
                                               SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX);
 }
 
 /**
- * scic_remote_device_da_construct() - construct direct attached device.
+ * sci_remote_device_da_construct() - construct direct attached device.
  *
  * The information (e.g. IAF, Signature FIS, etc.) necessary to build
  * the device is known to the SCI Core since it is contained in the
- * scic_phy object.  Remote node context(s) is/are a global resource
- * allocated by this routine, freed by scic_remote_device_destruct().
+ * sci_phy object.  Remote node context(s) is/are a global resource
+ * allocated by this routine, freed by sci_remote_device_destruct().
  *
  * Returns:
  * SCI_FAILURE_DEVICE_EXISTS - device has already been constructed.
@@ -1980,22 +1073,22 @@ static void scic_remote_device_construct(struct scic_sds_port *sci_port,
  * sata-only controller instance.
  * SCI_FAILURE_INSUFFICIENT_RESOURCES - remote node contexts exhausted.
  */
-static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci_port,
-                                                      struct scic_sds_remote_device *sci_dev)
+static enum sci_status sci_remote_device_da_construct(struct isci_port *iport,
+                                                      struct isci_remote_device *idev)
 {
        enum sci_status status;
-       struct domain_device *dev = sci_dev_to_domain(sci_dev);
+       struct domain_device *dev = idev->domain_dev;
 
-       scic_remote_device_construct(sci_port, sci_dev);
+       sci_remote_device_construct(iport, idev);
 
        /*
         * This information is request to determine how many remote node context
         * entries will be needed to store the remote node.
         */
-       sci_dev->is_direct_attached = true;
-       status = scic_sds_controller_allocate_remote_node_context(sci_port->owning_controller,
-                                                                 sci_dev,
-                                                                 &sci_dev->rnc.remote_node_index);
+       idev->is_direct_attached = true;
+       status = sci_controller_allocate_remote_node_context(iport->owning_controller,
+                                                                 idev,
+                                                                 &idev->rnc.remote_node_index);
 
        if (status != SCI_SUCCESS)
                return status;
@@ -2006,19 +1099,19 @@ static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci
        else
                return SCI_FAILURE_UNSUPPORTED_PROTOCOL;
 
-       sci_dev->connection_rate = scic_sds_port_get_max_allowed_speed(sci_port);
+       idev->connection_rate = sci_port_get_max_allowed_speed(iport);
 
        /* / @todo Should I assign the port width by reading all of the phys on the port? */
-       sci_dev->device_port_width = 1;
+       idev->device_port_width = 1;
 
        return SCI_SUCCESS;
 }
 
 /**
- * scic_remote_device_ea_construct() - construct expander attached device
+ * sci_remote_device_ea_construct() - construct expander attached device
  *
  * Remote node context(s) is/are a global resource allocated by this
- * routine, freed by scic_remote_device_destruct().
+ * routine, freed by sci_remote_device_destruct().
  *
  * Returns:
  * SCI_FAILURE_DEVICE_EXISTS - device has already been constructed.
@@ -2026,17 +1119,17 @@ static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci
  * sata-only controller instance.
  * SCI_FAILURE_INSUFFICIENT_RESOURCES - remote node contexts exhausted.
  */
-static enum sci_status scic_remote_device_ea_construct(struct scic_sds_port *sci_port,
-                                                      struct scic_sds_remote_device *sci_dev)
+static enum sci_status sci_remote_device_ea_construct(struct isci_port *iport,
+                                                      struct isci_remote_device *idev)
 {
-       struct domain_device *dev = sci_dev_to_domain(sci_dev);
+       struct domain_device *dev = idev->domain_dev;
        enum sci_status status;
 
-       scic_remote_device_construct(sci_port, sci_dev);
+       sci_remote_device_construct(iport, idev);
 
-       status = scic_sds_controller_allocate_remote_node_context(sci_port->owning_controller,
-                                                                 sci_dev,
-                                                                 &sci_dev->rnc.remote_node_index);
+       status = sci_controller_allocate_remote_node_context(iport->owning_controller,
+                                                                 idev,
+                                                                 &idev->rnc.remote_node_index);
        if (status != SCI_SUCCESS)
                return status;
 
@@ -2053,17 +1146,17 @@ static enum sci_status scic_remote_device_ea_construct(struct scic_sds_port *sci
         * connection the logical link rate is that same as the
         * physical.  Furthermore, the SAS-2 and SAS-1.1 fields overlay
         * one another, so this code works for both situations. */
-       sci_dev->connection_rate = min_t(u16, scic_sds_port_get_max_allowed_speed(sci_port),
+       idev->connection_rate = min_t(u16, sci_port_get_max_allowed_speed(iport),
                                         dev->linkrate);
 
        /* / @todo Should I assign the port width by reading all of the phys on the port? */
-       sci_dev->device_port_width = 1;
+       idev->device_port_width = 1;
 
        return SCI_SUCCESS;
 }
 
 /**
- * scic_remote_device_start() - This method will start the supplied remote
+ * sci_remote_device_start() - This method will start the supplied remote
  *    device.  This method enables normal IO requests to flow through to the
  *    remote device.
  * @remote_device: This parameter specifies the device to be started.
@@ -2075,26 +1168,26 @@ static enum sci_status scic_remote_device_ea_construct(struct scic_sds_port *sci
  * SCI_FAILURE_INVALID_PHY This value is returned if the user attempts to start
  * the device when there have been no phys added to it.
  */
-static enum sci_status scic_remote_device_start(struct scic_sds_remote_device *sci_dev,
+static enum sci_status sci_remote_device_start(struct isci_remote_device *idev,
                                                u32 timeout)
 {
-       struct sci_base_state_machine *sm = &sci_dev->state_machine;
-       enum scic_sds_remote_device_states state = sm->current_state_id;
+       struct sci_base_state_machine *sm = &idev->sm;
+       enum sci_remote_device_states state = sm->current_state_id;
        enum sci_status status;
 
-       if (state != SCI_BASE_REMOTE_DEVICE_STATE_STOPPED) {
-               dev_warn(scirdev_to_dev(sci_dev), "%s: in wrong state: %d\n",
+       if (state != SCI_DEV_STOPPED) {
+               dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
                         __func__, state);
                return SCI_FAILURE_INVALID_STATE;
        }
 
-       status = scic_sds_remote_node_context_resume(&sci_dev->rnc,
+       status = sci_remote_node_context_resume(&idev->rnc,
                                                     remote_device_resume_done,
-                                                    sci_dev);
+                                                    idev);
        if (status != SCI_SUCCESS)
                return status;
 
-       sci_base_state_machine_change_state(sm, SCI_BASE_REMOTE_DEVICE_STATE_STARTING);
+       sci_change_state(sm, SCI_DEV_STARTING);
 
        return SCI_SUCCESS;
 }
@@ -2102,15 +1195,14 @@ static enum sci_status scic_remote_device_start(struct scic_sds_remote_device *s
 static enum sci_status isci_remote_device_construct(struct isci_port *iport,
                                                    struct isci_remote_device *idev)
 {
-       struct scic_sds_port *sci_port = iport->sci_port_handle;
        struct isci_host *ihost = iport->isci_host;
        struct domain_device *dev = idev->domain_dev;
        enum sci_status status;
 
        if (dev->parent && dev_is_expander(dev->parent))
-               status = scic_remote_device_ea_construct(sci_port, &idev->sci);
+               status = sci_remote_device_ea_construct(iport, idev);
        else
-               status = scic_remote_device_da_construct(sci_port, &idev->sci);
+               status = sci_remote_device_da_construct(iport, idev);
 
        if (status != SCI_SUCCESS) {
                dev_dbg(&ihost->pdev->dev, "%s: construct failed: %d\n",
@@ -2120,7 +1212,7 @@ static enum sci_status isci_remote_device_construct(struct isci_port *iport,
        }
 
        /* start the device. */
-       status = scic_remote_device_start(&idev->sci, ISCI_REMOTE_DEVICE_START_TIMEOUT);
+       status = sci_remote_device_start(idev, ISCI_REMOTE_DEVICE_START_TIMEOUT);
 
        if (status != SCI_SUCCESS)
                dev_warn(&ihost->pdev->dev, "remote device start failed: %d\n",
@@ -2137,7 +1229,7 @@ void isci_remote_device_nuke_requests(struct isci_host *ihost, struct isci_remot
                "%s: idev = %p\n", __func__, idev);
 
        /* Cleanup all requests pending for this device. */
-       isci_terminate_pending_requests(ihost, idev, terminating);
+       isci_terminate_pending_requests(ihost, idev);
 
        dev_dbg(&ihost->pdev->dev,
                "%s: idev = %p, done\n", __func__, idev);
@@ -2174,18 +1266,33 @@ isci_remote_device_alloc(struct isci_host *ihost, struct isci_port *iport)
        if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n"))
                return NULL;
 
-       isci_remote_device_change_state(idev, isci_freed);
-
        return idev;
 }
 
+void isci_remote_device_release(struct kref *kref)
+{
+       struct isci_remote_device *idev = container_of(kref, typeof(*idev), kref);
+       struct isci_host *ihost = idev->isci_port->isci_host;
+
+       idev->domain_dev = NULL;
+       idev->isci_port = NULL;
+       clear_bit(IDEV_START_PENDING, &idev->flags);
+       clear_bit(IDEV_STOP_PENDING, &idev->flags);
+       clear_bit(IDEV_IO_READY, &idev->flags);
+       clear_bit(IDEV_GONE, &idev->flags);
+       clear_bit(IDEV_EH, &idev->flags);
+       smp_mb__before_clear_bit();
+       clear_bit(IDEV_ALLOCATED, &idev->flags);
+       wake_up(&ihost->eventq);
+}
+
 /**
  * isci_remote_device_stop() - This function is called internally to stop the
  *    remote device.
  * @isci_host: This parameter specifies the isci host object.
  * @isci_device: This parameter specifies the remote device.
  *
- * The status of the scic request to stop.
+ * The status of the ihost request to stop.
  */
 enum sci_status isci_remote_device_stop(struct isci_host *ihost, struct isci_remote_device *idev)
 {
@@ -2195,7 +1302,10 @@ enum sci_status isci_remote_device_stop(struct isci_host *ihost, struct isci_rem
        dev_dbg(&ihost->pdev->dev,
                "%s: isci_device = %p\n", __func__, idev);
 
-       isci_remote_device_change_state(idev, isci_stopping);
+       spin_lock_irqsave(&ihost->scic_lock, flags);
+       idev->domain_dev->lldd_dev = NULL; /* disable new lookups */
+       set_bit(IDEV_GONE, &idev->flags);
+       spin_unlock_irqrestore(&ihost->scic_lock, flags);
 
        /* Kill all outstanding requests. */
        isci_remote_device_nuke_requests(ihost, idev);
@@ -2203,18 +1313,14 @@ enum sci_status isci_remote_device_stop(struct isci_host *ihost, struct isci_rem
        set_bit(IDEV_STOP_PENDING, &idev->flags);
 
        spin_lock_irqsave(&ihost->scic_lock, flags);
-       status = scic_remote_device_stop(&idev->sci, 50);
+       status = sci_remote_device_stop(idev, 50);
        spin_unlock_irqrestore(&ihost->scic_lock, flags);
 
        /* Wait for the stop complete callback. */
-       if (status == SCI_SUCCESS) {
+       if (WARN_ONCE(status != SCI_SUCCESS, "failed to stop device\n"))
+               /* nothing to wait for */;
+       else
                wait_for_device_stop(ihost, idev);
-               clear_bit(IDEV_ALLOCATED, &idev->flags);
-       }
-
-       dev_dbg(&ihost->pdev->dev,
-               "%s: idev = %p - after completion wait\n",
-               __func__, idev);
 
        return status;
 }
@@ -2265,7 +1371,7 @@ int isci_remote_device_found(struct domain_device *domain_dev)
        sas_port = domain_dev->port;
        sas_phy = list_first_entry(&sas_port->phy_list, struct asd_sas_phy,
                                   port_phy_el);
-       isci_phy = to_isci_phy(sas_phy);
+       isci_phy = to_iphy(sas_phy);
        isci_port = isci_phy->isci_port;
 
        /* we are being called for a device on this port,
@@ -2281,39 +1387,32 @@ int isci_remote_device_found(struct domain_device *domain_dev)
        if (!isci_device)
                return -ENODEV;
 
+       kref_init(&isci_device->kref);
        INIT_LIST_HEAD(&isci_device->node);
-       domain_dev->lldd_dev = isci_device;
-       isci_device->domain_dev = domain_dev;
-       isci_device->isci_port = isci_port;
-       isci_remote_device_change_state(isci_device, isci_starting);
-
 
        spin_lock_irq(&isci_host->scic_lock);
+       isci_device->domain_dev = domain_dev;
+       isci_device->isci_port = isci_port;
        list_add_tail(&isci_device->node, &isci_port->remote_dev_list);
 
        set_bit(IDEV_START_PENDING, &isci_device->flags);
        status = isci_remote_device_construct(isci_port, isci_device);
-       spin_unlock_irq(&isci_host->scic_lock);
 
        dev_dbg(&isci_host->pdev->dev,
                "%s: isci_device = %p\n",
                __func__, isci_device);
 
-       if (status != SCI_SUCCESS) {
-
-               spin_lock_irq(&isci_host->scic_lock);
-               isci_remote_device_deconstruct(
-                       isci_host,
-                       isci_device
-                       );
-               spin_unlock_irq(&isci_host->scic_lock);
-               return -ENODEV;
-       }
+       if (status == SCI_SUCCESS) {
+               /* device came up, advertise it to the world */
+               domain_dev->lldd_dev = isci_device;
+       } else
+               isci_put_device(isci_device);
+       spin_unlock_irq(&isci_host->scic_lock);
 
        /* wait for the device ready callback. */
        wait_for_device_start(isci_host, isci_device);
 
-       return 0;
+       return status == SCI_SUCCESS ? 0 : -ENODEV;
 }
 /**
  * isci_device_is_reset_pending() - This function will check if there is any