summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/remote_node_context.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-12 20:27:52 +0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 15:04:49 +0400
commitf34d9e5d3f34f395a497a8747316b04ef3e865b1 (patch)
tree30a779e43cf6323cba5993e6df94acb4f6616faf /drivers/scsi/isci/remote_node_context.c
parented3efb7784cb0772558e9cc9440bd6c9a3139be4 (diff)
downloadlinux-f34d9e5d3f34f395a497a8747316b04ef3e865b1.tar.xz
isci: unify rnc start{io|task} handlers
Unify rnc start{io|task} handlers and delete the state handler infrastructure. Reported-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/remote_node_context.c')
-rw-r--r--drivers/scsi/isci/remote_node_context.c306
1 files changed, 43 insertions, 263 deletions
diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c
index 095d61288c3b..82507bd228d4 100644
--- a/drivers/scsi/isci/remote_node_context.c
+++ b/drivers/scsi/isci/remote_node_context.c
@@ -176,15 +176,6 @@ static void scic_sds_remote_node_context_setup_to_resume(
}
}
-/**
- *
- * @sci_rnc:
- * @callback:
- * @callback_parameter:
- *
- * This method will setup the remote node context object so it will transistion
- * to its final state. none
- */
static void scic_sds_remote_node_context_setup_to_destory(
struct scic_sds_remote_node_context *sci_rnc,
scics_sds_remote_node_context_callback callback,
@@ -195,146 +186,6 @@ static void scic_sds_remote_node_context_setup_to_destory(
sci_rnc->user_cookie = callback_parameter;
}
-static enum sci_status scic_sds_remote_node_context_default_start_io_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- dev_warn(scirdev_to_dev(rnc_to_dev(sci_rnc)),
- "%s: SCIC Remote Node Context 0x%p requested to start io "
- "0x%p while in wrong state %d\n",
- __func__,
- sci_rnc,
- sci_req,
- sci_base_state_machine_get_state(&sci_rnc->state_machine));
-
- return SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED;
-}
-
-static enum sci_status scic_sds_remote_node_context_default_start_task_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- dev_warn(scirdev_to_dev(rnc_to_dev(sci_rnc)),
- "%s: SCIC Remote Node Context 0x%p requested to start "
- "task 0x%p while in wrong state %d\n",
- __func__,
- sci_rnc,
- sci_req,
- sci_base_state_machine_get_state(&sci_rnc->state_machine));
-
- return SCI_FAILURE;
-}
-
-/**
- *
- * @sci_rnc: The rnc for which the task request is targeted.
- * @sci_req: The request which is going to be started.
- *
- * This method determines if the task request can be started by the SCU
- * hardware. When the RNC is in the ready state any task can be started.
- * enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_node_context_success_start_task_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- return SCI_SUCCESS;
-}
-
-/**
- *
- * @sci_rnc: The rnc for which the io request is targeted.
- * @sci_req: The request which is going to be started.
- *
- * This method determines if the io request can be started by the SCU hardware.
- * When the RNC is in the ready state any io request can be started. enum sci_status
- * SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_node_context_ready_state_start_io_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- return SCI_SUCCESS;
-}
-
-/**
- *
- * @sci_rnc: The remote node context which is to receive the task request.
- * @sci_req: The task request to be transmitted to to the remote target
- * device.
- *
- * This method will report a success or failure attempt to start a new task
- * request to the hardware. Since all task requests are sent on the high
- * priority queue they can be sent when the RCN is in a TX suspend state.
- * enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_node_context_suspended_start_task_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- scic_sds_remote_node_context_resume(sci_rnc, NULL, NULL);
-
- return SCI_SUCCESS;
-}
-
-/**
- *
- * @sci_rnc: The remote node context which is to receive the task request.
- * @sci_req: The task request to be transmitted to to the remote target
- * device.
- *
- * This method will report a success or failure attempt to start a new task
- * request to the hardware. Since all task requests are sent on the high
- * priority queue they can be sent when the RCN is in a TX suspend state.
- * enum sci_status SCI_SUCCESS
- */
-static enum sci_status scic_sds_remote_node_context_await_suspension_state_start_task_handler(
- struct scic_sds_remote_node_context *sci_rnc,
- struct scic_sds_request *sci_req)
-{
- return SCI_SUCCESS;
-}
-
-static struct scic_sds_remote_node_context_handlers scic_sds_remote_node_context_state_handler_table[] = {
- [SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_POSTING_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_success_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_ready_state_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_success_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_suspended_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_suspended_start_task_handler,
- },
- [SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE] = {
- .start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
- .start_task_handler = scic_sds_remote_node_context_await_suspension_state_start_task_handler,
- }
-};
-
-/*
- * *****************************************************************************
- * * REMOTE NODE CONTEXT PRIVATE METHODS
- * ***************************************************************************** */
-
/**
*
*
@@ -415,80 +266,34 @@ static void scic_sds_remote_node_context_invalidate_context_buffer(
SCU_CONTEXT_COMMAND_POST_RNC_INVALIDATE);
}
-/*
- * *****************************************************************************
- * * REMOTE NODE CONTEXT STATE ENTER AND EXIT METHODS
- * ***************************************************************************** */
-
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_initial_state_enter(void *object)
{
struct scic_sds_remote_node_context *rnc = object;
+ struct sci_base_state_machine *sm = &rnc->state_machine;
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE
- );
-
- /*
- * Check to see if we have gotten back to the initial state because someone
- * requested to destroy the remote node context object. */
- if (
- rnc->state_machine.previous_state_id
- == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE
- ) {
+ /* Check to see if we have gotten back to the initial state because
+ * someone requested to destroy the remote node context object.
+ */
+ if (sm->previous_state_id == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE) {
rnc->destination_state = SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_UNSPECIFIED;
-
scic_sds_remote_node_context_notify_user(rnc);
}
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_posting_state_enter(void *object)
{
struct scic_sds_remote_node_context *sci_rnc = object;
- SET_STATE_HANDLER(
- sci_rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_POSTING_STATE
- );
-
scic_sds_remote_node_context_validate_context_buffer(sci_rnc);
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_invalidating_state_enter(void *object)
{
struct scic_sds_remote_node_context *rnc = object;
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE
- );
-
scic_sds_remote_node_context_invalidate_context_buffer(rnc);
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_resuming_state_enter(void *object)
{
struct scic_sds_remote_node_context *rnc = object;
@@ -498,12 +303,6 @@ static void scic_sds_remote_node_context_resuming_state_enter(void *object)
sci_dev = rnc_to_dev(rnc);
dev = sci_dev_to_domain(sci_dev);
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE
- );
-
/*
* For direct attached SATA devices we need to clear the TLCR
* NCQ to TCi tag mapping on the phy and in cases where we
@@ -518,84 +317,31 @@ static void scic_sds_remote_node_context_resuming_state_enter(void *object)
scic_sds_remote_device_post_request(sci_dev, SCU_CONTEXT_COMMAND_POST_RNC_RESUME);
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_ready_state_enter(void *object)
{
struct scic_sds_remote_node_context *rnc = object;
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE
- );
-
rnc->destination_state = SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_UNSPECIFIED;
- if (rnc->user_callback != NULL) {
+ if (rnc->user_callback)
scic_sds_remote_node_context_notify_user(rnc);
- }
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_tx_suspended_state_enter(void *object)
{
struct scic_sds_remote_node_context *rnc = object;
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE
- );
-
scic_sds_remote_node_context_continue_state_transitions(rnc);
}
-/**
- *
- *
- *
- */
static void scic_sds_remote_node_context_tx_rx_suspended_state_enter(
void *object)
{
struct scic_sds_remote_node_context *rnc = object;
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE
- );
-
scic_sds_remote_node_context_continue_state_transitions(rnc);
}
-/**
- *
- *
- *
- */
-static void scic_sds_remote_node_context_await_suspension_state_enter(
- void *object)
-{
- struct scic_sds_remote_node_context *rnc = object;
-
- SET_STATE_HANDLER(
- rnc,
- scic_sds_remote_node_context_state_handler_table,
- SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE
- );
-}
-
-/* --------------------------------------------------------------------------- */
-
static const struct sci_base_state scic_sds_remote_node_context_state_table[] = {
[SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE] = {
.enter_state = scic_sds_remote_node_context_initial_state_enter,
@@ -618,9 +364,7 @@ static const struct sci_base_state scic_sds_remote_node_context_state_table[] =
[SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE] = {
.enter_state = scic_sds_remote_node_context_tx_rx_suspended_state_enter,
},
- [SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE] = {
- .enter_state = scic_sds_remote_node_context_await_suspension_state_enter,
- },
+ [SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE] = { },
};
void scic_sds_remote_node_context_construct(struct scic_sds_remote_node_context *rnc,
@@ -875,3 +619,39 @@ enum sci_status scic_sds_remote_node_context_resume(struct scic_sds_remote_node_
return SCI_FAILURE_INVALID_STATE;
}
}
+
+enum sci_status scic_sds_remote_node_context_start_io(struct scic_sds_remote_node_context *sci_rnc,
+ struct scic_sds_request *sci_req)
+{
+ enum scis_sds_remote_node_context_states state;
+
+ state = sci_rnc->state_machine.current_state_id;
+ if (state != SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE) {
+ dev_warn(scirdev_to_dev(rnc_to_dev(sci_rnc)),
+ "%s: invalid state %d\n", __func__, state);
+ return SCI_FAILURE_REMOTE_DEVICE_RESET_REQUIRED;
+ }
+ return SCI_SUCCESS;
+}
+
+enum sci_status scic_sds_remote_node_context_start_task(struct scic_sds_remote_node_context *sci_rnc,
+ struct scic_sds_request *sci_req)
+{
+ enum scis_sds_remote_node_context_states state;
+
+ state = sci_rnc->state_machine.current_state_id;
+ switch (state) {
+ case SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE:
+ case SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE:
+ case SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE:
+ return SCI_SUCCESS;
+ case SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE:
+ case SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE:
+ scic_sds_remote_node_context_resume(sci_rnc, NULL, NULL);
+ return SCI_SUCCESS;
+ default:
+ dev_warn(scirdev_to_dev(rnc_to_dev(sci_rnc)),
+ "%s: invalid state %d\n", __func__, state);
+ return SCI_FAILURE_INVALID_STATE;
+ }
+}