Skip to content

L
linux
Commit d9dcb4ba authored by Dan Williams's avatar Dan Williams
Browse files
Options

isci: unify isci_host and scic_sds_controller 

Remove the distinction between these two implementations and unify on
isci_host (local instances named ihost).  Hmmm, we had two
'oem_parameters' instances, one was unused... nice.
Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 78a6f06e
Show whitespace changes
Inline Side-by-side
Showing with 806 additions and 985 deletions
drivers/scsi/isci/host.c
View file @ d9dcb4ba
...@@ -181,35 +181,35 @@ void sci_change_state(struct sci_base_state_machine *sm, u32 next_state) ...@@ -181,35 +181,35 @@ void sci_change_state(struct sci_base_state_machine *sm, u32 next_state)
} }
static bool scic_sds_controller_completion_queue_has_entries( static bool scic_sds_controller_completion_queue_has_entries(
struct scic_sds_controller *scic) struct isci_host *ihost)
{ {
u32 get_value = scic->completion_queue_get; u32 get_value = ihost->completion_queue_get;
u32 get_index = get_value & SMU_COMPLETION_QUEUE_GET_POINTER_MASK; u32 get_index = get_value & SMU_COMPLETION_QUEUE_GET_POINTER_MASK;
if (NORMALIZE_GET_POINTER_CYCLE_BIT(get_value) == if (NORMALIZE_GET_POINTER_CYCLE_BIT(get_value) ==
COMPLETION_QUEUE_CYCLE_BIT(scic->completion_queue[get_index])) COMPLETION_QUEUE_CYCLE_BIT(ihost->completion_queue[get_index]))
return true; return true;
return false; return false;
} }
static bool scic_sds_controller_isr(struct scic_sds_controller *scic) static bool scic_sds_controller_isr(struct isci_host *ihost)
{ {
if (scic_sds_controller_completion_queue_has_entries(scic)) { if (scic_sds_controller_completion_queue_has_entries(ihost)) {
return true; return true;
} else { } else {
/* /*
* we have a spurious interrupt it could be that we have already * we have a spurious interrupt it could be that we have already
* emptied the completion queue from a previous interrupt */ * emptied the completion queue from a previous interrupt */
writel(SMU_ISR_COMPLETION, &scic->smu_registers->interrupt_status); writel(SMU_ISR_COMPLETION, &ihost->smu_registers->interrupt_status);
/* /*
* There is a race in the hardware that could cause us not to be notified * There is a race in the hardware that could cause us not to be notified
* of an interrupt completion if we do not take this step. We will mask * of an interrupt completion if we do not take this step. We will mask
* then unmask the interrupts so if there is another interrupt pending * then unmask the interrupts so if there is another interrupt pending
* the clearing of the interrupt source we get the next interrupt message. */ * the clearing of the interrupt source we get the next interrupt message. */
writel(0xFF000000, &scic->smu_registers->interrupt_mask); writel(0xFF000000, &ihost->smu_registers->interrupt_mask);
writel(0, &scic->smu_registers->interrupt_mask); writel(0, &ihost->smu_registers->interrupt_mask);
} }
return false; return false;
...@@ -219,18 +219,18 @@ irqreturn_t isci_msix_isr(int vec, void *data) ...@@ -219,18 +219,18 @@ irqreturn_t isci_msix_isr(int vec, void *data)
{ {
struct isci_host *ihost = data; struct isci_host *ihost = data;
if (scic_sds_controller_isr(&ihost->sci)) if (scic_sds_controller_isr(ihost))
tasklet_schedule(&ihost->completion_tasklet); tasklet_schedule(&ihost->completion_tasklet);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static bool scic_sds_controller_error_isr(struct scic_sds_controller *scic) static bool scic_sds_controller_error_isr(struct isci_host *ihost)
{ {
u32 interrupt_status; u32 interrupt_status;
interrupt_status = interrupt_status =
readl(&scic->smu_registers->interrupt_status); readl(&ihost->smu_registers->interrupt_status);
interrupt_status &= (SMU_ISR_QUEUE_ERROR | SMU_ISR_QUEUE_SUSPEND); interrupt_status &= (SMU_ISR_QUEUE_ERROR | SMU_ISR_QUEUE_SUSPEND);
if (interrupt_status != 0) { if (interrupt_status != 0) {
...@@ -246,28 +246,27 @@ static bool scic_sds_controller_error_isr(struct scic_sds_controller *scic) ...@@ -246,28 +246,27 @@ static bool scic_sds_controller_error_isr(struct scic_sds_controller *scic)
* then unmask the error interrupts so if there was another interrupt * then unmask the error interrupts so if there was another interrupt
* pending we will be notified. * pending we will be notified.
* Could we write the value of (SMU_ISR_QUEUE_ERROR | SMU_ISR_QUEUE_SUSPEND)? */ * Could we write the value of (SMU_ISR_QUEUE_ERROR | SMU_ISR_QUEUE_SUSPEND)? */
writel(0xff, &scic->smu_registers->interrupt_mask); writel(0xff, &ihost->smu_registers->interrupt_mask);
writel(0, &scic->smu_registers->interrupt_mask); writel(0, &ihost->smu_registers->interrupt_mask);
return false; return false;
} }
static void scic_sds_controller_task_completion(struct scic_sds_controller *scic, static void scic_sds_controller_task_completion(struct isci_host *ihost,
u32 completion_entry) u32 completion_entry)
{ {
u32 index = SCU_GET_COMPLETION_INDEX(completion_entry); u32 index = SCU_GET_COMPLETION_INDEX(completion_entry);
struct isci_host *ihost = scic_to_ihost(scic);
struct isci_request *ireq = ihost->reqs[index]; struct isci_request *ireq = ihost->reqs[index];
/* Make sure that we really want to process this IO request */ /* Make sure that we really want to process this IO request */
if (test_bit(IREQ_ACTIVE, &ireq->flags) && if (test_bit(IREQ_ACTIVE, &ireq->flags) &&
ireq->io_tag != SCI_CONTROLLER_INVALID_IO_TAG && ireq->io_tag != SCI_CONTROLLER_INVALID_IO_TAG &&
ISCI_TAG_SEQ(ireq->io_tag) == scic->io_request_sequence[index]) ISCI_TAG_SEQ(ireq->io_tag) == ihost->io_request_sequence[index])
/* Yep this is a valid io request pass it along to the io request handler */ /* Yep this is a valid io request pass it along to the io request handler */
scic_sds_io_request_tc_completion(ireq, completion_entry); scic_sds_io_request_tc_completion(ireq, completion_entry);
} }
static void scic_sds_controller_sdma_completion(struct scic_sds_controller *scic, static void scic_sds_controller_sdma_completion(struct isci_host *ihost,
u32 completion_entry) u32 completion_entry)
{ {
u32 index; u32 index;
...@@ -279,8 +278,8 @@ static void scic_sds_controller_sdma_completion(struct scic_sds_controller *scic ...@@ -279,8 +278,8 @@ static void scic_sds_controller_sdma_completion(struct scic_sds_controller *scic
switch (scu_get_command_request_type(completion_entry)) { switch (scu_get_command_request_type(completion_entry)) {
case SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC: case SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC:
case SCU_CONTEXT_COMMAND_REQUEST_TYPE_DUMP_TC: case SCU_CONTEXT_COMMAND_REQUEST_TYPE_DUMP_TC:
ireq = scic_to_ihost(scic)->reqs[index]; ireq = ihost->reqs[index];
dev_warn(scic_to_dev(scic), "%s: %x for io request %p\n", dev_warn(&ihost->pdev->dev, "%s: %x for io request %p\n",
__func__, completion_entry, ireq); __func__, completion_entry, ireq);
/* @todo For a post TC operation we need to fail the IO /* @todo For a post TC operation we need to fail the IO
* request * request
...@@ -289,27 +288,26 @@ static void scic_sds_controller_sdma_completion(struct scic_sds_controller *scic ...@@ -289,27 +288,26 @@ static void scic_sds_controller_sdma_completion(struct scic_sds_controller *scic
case SCU_CONTEXT_COMMAND_REQUEST_TYPE_DUMP_RNC: case SCU_CONTEXT_COMMAND_REQUEST_TYPE_DUMP_RNC:
case SCU_CONTEXT_COMMAND_REQUEST_TYPE_OTHER_RNC: case SCU_CONTEXT_COMMAND_REQUEST_TYPE_OTHER_RNC:
case SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_RNC: case SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_RNC:
idev = scic->device_table[index]; idev = ihost->device_table[index];
dev_warn(scic_to_dev(scic), "%s: %x for device %p\n", dev_warn(&ihost->pdev->dev, "%s: %x for device %p\n",
__func__, completion_entry, idev); __func__, completion_entry, idev);
/* @todo For a port RNC operation we need to fail the /* @todo For a port RNC operation we need to fail the
* device * device
*/ */
break; break;
default: default:
dev_warn(scic_to_dev(scic), "%s: unknown completion type %x\n", dev_warn(&ihost->pdev->dev, "%s: unknown completion type %x\n",
__func__, completion_entry); __func__, completion_entry);
break; break;
} }
} }
static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *scic, static void scic_sds_controller_unsolicited_frame(struct isci_host *ihost,
u32 completion_entry) u32 completion_entry)
{ {
u32 index; u32 index;
u32 frame_index; u32 frame_index;
struct isci_host *ihost = scic_to_ihost(scic);
struct scu_unsolicited_frame_header *frame_header; struct scu_unsolicited_frame_header *frame_header;
struct isci_phy *iphy; struct isci_phy *iphy;
struct isci_remote_device *idev; struct isci_remote_device *idev;
...@@ -318,15 +316,15 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc ...@@ -318,15 +316,15 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc
frame_index = SCU_GET_FRAME_INDEX(completion_entry); frame_index = SCU_GET_FRAME_INDEX(completion_entry);
frame_header = scic->uf_control.buffers.array[frame_index].header; frame_header = ihost->uf_control.buffers.array[frame_index].header;
scic->uf_control.buffers.array[frame_index].state = UNSOLICITED_FRAME_IN_USE; ihost->uf_control.buffers.array[frame_index].state = UNSOLICITED_FRAME_IN_USE;
if (SCU_GET_FRAME_ERROR(completion_entry)) { if (SCU_GET_FRAME_ERROR(completion_entry)) {
/* /*
* / @todo If the IAF frame or SIGNATURE FIS frame has an error will * / @todo If the IAF frame or SIGNATURE FIS frame has an error will
* / this cause a problem? We expect the phy initialization will * / this cause a problem? We expect the phy initialization will
* / fail if there is an error in the frame. */ * / fail if there is an error in the frame. */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return; return;
} }
...@@ -347,15 +345,15 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc ...@@ -347,15 +345,15 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc
iphy = &ihost->phys[index]; iphy = &ihost->phys[index];
result = scic_sds_phy_frame_handler(iphy, frame_index); result = scic_sds_phy_frame_handler(iphy, frame_index);
} else { } else {
if (index < scic->remote_node_entries) if (index < ihost->remote_node_entries)
idev = scic->device_table[index]; idev = ihost->device_table[index];
else else
idev = NULL; idev = NULL;
if (idev != NULL) if (idev != NULL)
result = scic_sds_remote_device_frame_handler(idev, frame_index); result = scic_sds_remote_device_frame_handler(idev, frame_index);
else else
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
} }
} }
...@@ -366,10 +364,9 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc ...@@ -366,10 +364,9 @@ static void scic_sds_controller_unsolicited_frame(struct scic_sds_controller *sc
} }
} }
static void scic_sds_controller_event_completion(struct scic_sds_controller *scic, static void scic_sds_controller_event_completion(struct isci_host *ihost,
u32 completion_entry) u32 completion_entry)
{ {
struct isci_host *ihost = scic_to_ihost(scic);
struct isci_remote_device *idev; struct isci_remote_device *idev;
struct isci_request *ireq; struct isci_request *ireq;
struct isci_phy *iphy; struct isci_phy *iphy;
...@@ -380,11 +377,11 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci ...@@ -380,11 +377,11 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci
switch (scu_get_event_type(completion_entry)) { switch (scu_get_event_type(completion_entry)) {
case SCU_EVENT_TYPE_SMU_COMMAND_ERROR: case SCU_EVENT_TYPE_SMU_COMMAND_ERROR:
/* / @todo The driver did something wrong and we need to fix the condtion. */ /* / @todo The driver did something wrong and we need to fix the condtion. */
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p received SMU command error " "%s: SCIC Controller 0x%p received SMU command error "
"0x%x\n", "0x%x\n",
__func__, __func__,
scic, ihost,
completion_entry); completion_entry);
break; break;
...@@ -394,11 +391,11 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci ...@@ -394,11 +391,11 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci
/* /*
* / @todo This is a hardware failure and its likely that we want to * / @todo This is a hardware failure and its likely that we want to
* / reset the controller. */ * / reset the controller. */
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p received fatal controller " "%s: SCIC Controller 0x%p received fatal controller "
"event 0x%x\n", "event 0x%x\n",
__func__, __func__,
scic, ihost,
completion_entry); completion_entry);
break; break;
...@@ -415,27 +412,27 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci ...@@ -415,27 +412,27 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci
if (ireq != NULL) if (ireq != NULL)
scic_sds_io_request_event_handler(ireq, completion_entry); scic_sds_io_request_event_handler(ireq, completion_entry);
else else
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p received " "%s: SCIC Controller 0x%p received "
"event 0x%x for io request object " "event 0x%x for io request object "
"that doesnt exist.\n", "that doesnt exist.\n",
__func__, __func__,
scic, ihost,
completion_entry); completion_entry);
break; break;
case SCU_EVENT_SPECIFIC_IT_NEXUS_TIMEOUT: case SCU_EVENT_SPECIFIC_IT_NEXUS_TIMEOUT:
idev = scic->device_table[index]; idev = ihost->device_table[index];
if (idev != NULL) if (idev != NULL)
scic_sds_remote_device_event_handler(idev, completion_entry); scic_sds_remote_device_event_handler(idev, completion_entry);
else else
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p received " "%s: SCIC Controller 0x%p received "
"event 0x%x for remote device object " "event 0x%x for remote device object "
"that doesnt exist.\n", "that doesnt exist.\n",
__func__, __func__,
scic, ihost,
completion_entry); completion_entry);
break; break;
...@@ -459,25 +456,25 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci ...@@ -459,25 +456,25 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci
case SCU_EVENT_TYPE_RNC_SUSPEND_TX: case SCU_EVENT_TYPE_RNC_SUSPEND_TX:
case SCU_EVENT_TYPE_RNC_SUSPEND_TX_RX: case SCU_EVENT_TYPE_RNC_SUSPEND_TX_RX:
case SCU_EVENT_TYPE_RNC_OPS_MISC: case SCU_EVENT_TYPE_RNC_OPS_MISC:
if (index < scic->remote_node_entries) { if (index < ihost->remote_node_entries) {
idev = scic->device_table[index]; idev = ihost->device_table[index];
if (idev != NULL) if (idev != NULL)
scic_sds_remote_device_event_handler(idev, completion_entry); scic_sds_remote_device_event_handler(idev, completion_entry);
} else } else
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p received event 0x%x " "%s: SCIC Controller 0x%p received event 0x%x "
"for remote device object 0x%0x that doesnt " "for remote device object 0x%0x that doesnt "
"exist.\n", "exist.\n",
__func__, __func__,
scic, ihost,
completion_entry, completion_entry,
index); index);
break; break;
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC Controller received unknown event code %x\n", "%s: SCIC Controller received unknown event code %x\n",
__func__, __func__,
completion_entry); completion_entry);
...@@ -485,7 +482,7 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci ...@@ -485,7 +482,7 @@ static void scic_sds_controller_event_completion(struct scic_sds_controller *sci
} }
} }
static void scic_sds_controller_process_completions(struct scic_sds_controller *scic) static void scic_sds_controller_process_completions(struct isci_host *ihost)
{ {
u32 completion_count = 0; u32 completion_count = 0;
u32 completion_entry; u32 completion_entry;
...@@ -494,47 +491,47 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller * ...@@ -494,47 +491,47 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller *
u32 event_get; u32 event_get;
u32 event_cycle; u32 event_cycle;
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: completion queue begining get:0x%08x\n", "%s: completion queue begining get:0x%08x\n",
__func__, __func__,
scic->completion_queue_get); ihost->completion_queue_get);
/* Get the component parts of the completion queue */ /* Get the component parts of the completion queue */
get_index = NORMALIZE_GET_POINTER(scic->completion_queue_get); get_index = NORMALIZE_GET_POINTER(ihost->completion_queue_get);
get_cycle = SMU_CQGR_CYCLE_BIT & scic->completion_queue_get; get_cycle = SMU_CQGR_CYCLE_BIT & ihost->completion_queue_get;
event_get = NORMALIZE_EVENT_POINTER(scic->completion_queue_get); event_get = NORMALIZE_EVENT_POINTER(ihost->completion_queue_get);
event_cycle = SMU_CQGR_EVENT_CYCLE_BIT & scic->completion_queue_get; event_cycle = SMU_CQGR_EVENT_CYCLE_BIT & ihost->completion_queue_get;
while ( while (
NORMALIZE_GET_POINTER_CYCLE_BIT(get_cycle) NORMALIZE_GET_POINTER_CYCLE_BIT(get_cycle)
== COMPLETION_QUEUE_CYCLE_BIT(scic->completion_queue[get_index]) == COMPLETION_QUEUE_CYCLE_BIT(ihost->completion_queue[get_index])
) { ) {
completion_count++; completion_count++;
completion_entry = scic->completion_queue[get_index]; completion_entry = ihost->completion_queue[get_index];
/* increment the get pointer and check for rollover to toggle the cycle bit */ /* increment the get pointer and check for rollover to toggle the cycle bit */
get_cycle ^= ((get_index+1) & SCU_MAX_COMPLETION_QUEUE_ENTRIES) << get_cycle ^= ((get_index+1) & SCU_MAX_COMPLETION_QUEUE_ENTRIES) <<
(SMU_COMPLETION_QUEUE_GET_CYCLE_BIT_SHIFT - SCU_MAX_COMPLETION_QUEUE_SHIFT); (SMU_COMPLETION_QUEUE_GET_CYCLE_BIT_SHIFT - SCU_MAX_COMPLETION_QUEUE_SHIFT);
get_index = (get_index+1) & (SCU_MAX_COMPLETION_QUEUE_ENTRIES-1); get_index = (get_index+1) & (SCU_MAX_COMPLETION_QUEUE_ENTRIES-1);
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: completion queue entry:0x%08x\n", "%s: completion queue entry:0x%08x\n",
__func__, __func__,
completion_entry); completion_entry);
switch (SCU_GET_COMPLETION_TYPE(completion_entry)) { switch (SCU_GET_COMPLETION_TYPE(completion_entry)) {
case SCU_COMPLETION_TYPE_TASK: case SCU_COMPLETION_TYPE_TASK:
scic_sds_controller_task_completion(scic, completion_entry); scic_sds_controller_task_completion(ihost, completion_entry);
break; break;
case SCU_COMPLETION_TYPE_SDMA: case SCU_COMPLETION_TYPE_SDMA:
scic_sds_controller_sdma_completion(scic, completion_entry); scic_sds_controller_sdma_completion(ihost, completion_entry);
break; break;
case SCU_COMPLETION_TYPE_UFI: case SCU_COMPLETION_TYPE_UFI:
scic_sds_controller_unsolicited_frame(scic, completion_entry); scic_sds_controller_unsolicited_frame(ihost, completion_entry);
break; break;
case SCU_COMPLETION_TYPE_EVENT: case SCU_COMPLETION_TYPE_EVENT:
...@@ -543,11 +540,11 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller * ...@@ -543,11 +540,11 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller *
(SMU_COMPLETION_QUEUE_GET_EVENT_CYCLE_BIT_SHIFT - SCU_MAX_EVENTS_SHIFT); (SMU_COMPLETION_QUEUE_GET_EVENT_CYCLE_BIT_SHIFT - SCU_MAX_EVENTS_SHIFT);
event_get = (event_get+1) & (SCU_MAX_EVENTS-1); event_get = (event_get+1) & (SCU_MAX_EVENTS-1);
scic_sds_controller_event_completion(scic, completion_entry); scic_sds_controller_event_completion(ihost, completion_entry);
break; break;
} }
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC Controller received unknown " "%s: SCIC Controller received unknown "
"completion type %x\n", "completion type %x\n",
__func__, __func__,
...@@ -558,7 +555,7 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller * ...@@ -558,7 +555,7 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller *
/* Update the get register if we completed one or more entries */ /* Update the get register if we completed one or more entries */
if (completion_count > 0) { if (completion_count > 0) {
scic->completion_queue_get = ihost->completion_queue_get =
SMU_CQGR_GEN_BIT(ENABLE) | SMU_CQGR_GEN_BIT(ENABLE) |
SMU_CQGR_GEN_BIT(EVENT_ENABLE) | SMU_CQGR_GEN_BIT(EVENT_ENABLE) |
event_cycle | event_cycle |
...@@ -566,35 +563,35 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller * ...@@ -566,35 +563,35 @@ static void scic_sds_controller_process_completions(struct scic_sds_controller *
get_cycle | get_cycle |
SMU_CQGR_GEN_VAL(POINTER, get_index); SMU_CQGR_GEN_VAL(POINTER, get_index);
writel(scic->completion_queue_get, writel(ihost->completion_queue_get,
&scic->smu_registers->completion_queue_get); &ihost->smu_registers->completion_queue_get);
} }
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: completion queue ending get:0x%08x\n", "%s: completion queue ending get:0x%08x\n",
__func__, __func__,
scic->completion_queue_get); ihost->completion_queue_get);
} }
static void scic_sds_controller_error_handler(struct scic_sds_controller *scic) static void scic_sds_controller_error_handler(struct isci_host *ihost)
{ {
u32 interrupt_status; u32 interrupt_status;
interrupt_status = interrupt_status =
readl(&scic->smu_registers->interrupt_status); readl(&ihost->smu_registers->interrupt_status);
if ((interrupt_status & SMU_ISR_QUEUE_SUSPEND) && if ((interrupt_status & SMU_ISR_QUEUE_SUSPEND) &&
scic_sds_controller_completion_queue_has_entries(scic)) { scic_sds_controller_completion_queue_has_entries(ihost)) {
scic_sds_controller_process_completions(scic); scic_sds_controller_process_completions(ihost);
writel(SMU_ISR_QUEUE_SUSPEND, &scic->smu_registers->interrupt_status); writel(SMU_ISR_QUEUE_SUSPEND, &ihost->smu_registers->interrupt_status);
} else { } else {
dev_err(scic_to_dev(scic), "%s: status: %#x\n", __func__, dev_err(&ihost->pdev->dev, "%s: status: %#x\n", __func__,
interrupt_status); interrupt_status);
sci_change_state(&scic->sm, SCIC_FAILED); sci_change_state(&ihost->sm, SCIC_FAILED);
return; return;
} }
...@@ -602,22 +599,21 @@ static void scic_sds_controller_error_handler(struct scic_sds_controller *scic) ...@@ -602,22 +599,21 @@ static void scic_sds_controller_error_handler(struct scic_sds_controller *scic)
/* If we dont process any completions I am not sure that we want to do this. /* If we dont process any completions I am not sure that we want to do this.
* We are in the middle of a hardware fault and should probably be reset. * We are in the middle of a hardware fault and should probably be reset.
*/ */
writel(0, &scic->smu_registers->interrupt_mask); writel(0, &ihost->smu_registers->interrupt_mask);
} }
irqreturn_t isci_intx_isr(int vec, void *data) irqreturn_t isci_intx_isr(int vec, void *data)
{ {
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
struct isci_host *ihost = data; struct isci_host *ihost = data;
struct scic_sds_controller *scic = &ihost->sci;
if (scic_sds_controller_isr(scic)) { if (scic_sds_controller_isr(ihost)) {
writel(SMU_ISR_COMPLETION, &scic->smu_registers->interrupt_status); writel(SMU_ISR_COMPLETION, &ihost->smu_registers->interrupt_status);
tasklet_schedule(&ihost->completion_tasklet); tasklet_schedule(&ihost->completion_tasklet);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} else if (scic_sds_controller_error_isr(scic)) { } else if (scic_sds_controller_error_isr(ihost)) {
spin_lock(&ihost->scic_lock); spin_lock(&ihost->scic_lock);
scic_sds_controller_error_handler(scic); scic_sds_controller_error_handler(ihost);
spin_unlock(&ihost->scic_lock); spin_unlock(&ihost->scic_lock);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} }
...@@ -629,8 +625,8 @@ irqreturn_t isci_error_isr(int vec, void *data) ...@@ -629,8 +625,8 @@ irqreturn_t isci_error_isr(int vec, void *data)
{ {
struct isci_host *ihost = data; struct isci_host *ihost = data;
if (scic_sds_controller_error_isr(&ihost->sci)) if (scic_sds_controller_error_isr(ihost))
scic_sds_controller_error_handler(&ihost->sci); scic_sds_controller_error_handler(ihost);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -685,11 +681,10 @@ int isci_host_scan_finished(struct Scsi_Host *shost, unsigned long time) ...@@ -685,11 +681,10 @@ int isci_host_scan_finished(struct Scsi_Host *shost, unsigned long time)
* This method returns the number of milliseconds for the suggested start * This method returns the number of milliseconds for the suggested start
* operation timeout. * operation timeout.
*/ */
static u32 scic_controller_get_suggested_start_timeout( static u32 scic_controller_get_suggested_start_timeout(struct isci_host *ihost)
struct scic_sds_controller *sc)
{ {
/* Validate the user supplied parameters. */ /* Validate the user supplied parameters. */
if (sc == NULL) if (!ihost)
return 0; return 0;
/* /*
...@@ -711,35 +706,32 @@ static u32 scic_controller_get_suggested_start_timeout( ...@@ -711,35 +706,32 @@ static u32 scic_controller_get_suggested_start_timeout(
+ ((SCI_MAX_PHYS - 1) * SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL); + ((SCI_MAX_PHYS - 1) * SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL);
} }
static void scic_controller_enable_interrupts( static void scic_controller_enable_interrupts(struct isci_host *ihost)
struct scic_sds_controller *scic)
{ {
BUG_ON(scic->smu_registers == NULL); BUG_ON(ihost->smu_registers == NULL);
writel(0, &scic->smu_registers->interrupt_mask); writel(0, &ihost->smu_registers->interrupt_mask);
} }
void scic_controller_disable_interrupts( void scic_controller_disable_interrupts(struct isci_host *ihost)
struct scic_sds_controller *scic)
{ {
BUG_ON(scic->smu_registers == NULL); BUG_ON(ihost->smu_registers == NULL);
writel(0xffffffff, &scic->smu_registers->interrupt_mask); writel(0xffffffff, &ihost->smu_registers->interrupt_mask);
} }
static void scic_sds_controller_enable_port_task_scheduler( static void scic_sds_controller_enable_port_task_scheduler(struct isci_host *ihost)
struct scic_sds_controller *scic)
{ {
u32 port_task_scheduler_value; u32 port_task_scheduler_value;
port_task_scheduler_value = port_task_scheduler_value =
readl(&scic->scu_registers->peg0.ptsg.control); readl(&ihost->scu_registers->peg0.ptsg.control);
port_task_scheduler_value |= port_task_scheduler_value |=
(SCU_PTSGCR_GEN_BIT(ETM_ENABLE) | (SCU_PTSGCR_GEN_BIT(ETM_ENABLE) |
SCU_PTSGCR_GEN_BIT(PTSG_ENABLE)); SCU_PTSGCR_GEN_BIT(PTSG_ENABLE));
writel(port_task_scheduler_value, writel(port_task_scheduler_value,
&scic->scu_registers->peg0.ptsg.control); &ihost->scu_registers->peg0.ptsg.control);
} }
static void scic_sds_controller_assign_task_entries(struct scic_sds_controller *scic) static void scic_sds_controller_assign_task_entries(struct isci_host *ihost)
{ {
u32 task_assignment; u32 task_assignment;
...@@ -749,32 +741,32 @@ static void scic_sds_controller_assign_task_entries(struct scic_sds_controller * ...@@ -749,32 +741,32 @@ static void scic_sds_controller_assign_task_entries(struct scic_sds_controller *
*/ */
task_assignment = task_assignment =
readl(&scic->smu_registers->task_context_assignment[0]); readl(&ihost->smu_registers->task_context_assignment[0]);
task_assignment |= (SMU_TCA_GEN_VAL(STARTING, 0)) | task_assignment |= (SMU_TCA_GEN_VAL(STARTING, 0)) |
(SMU_TCA_GEN_VAL(ENDING, scic->task_context_entries - 1)) | (SMU_TCA_GEN_VAL(ENDING, ihost->task_context_entries - 1)) |
(SMU_TCA_GEN_BIT(RANGE_CHECK_ENABLE)); (SMU_TCA_GEN_BIT(RANGE_CHECK_ENABLE));
writel(task_assignment, writel(task_assignment,
&scic->smu_registers->task_context_assignment[0]); &ihost->smu_registers->task_context_assignment[0]);
} }
static void scic_sds_controller_initialize_completion_queue(struct scic_sds_controller *scic) static void scic_sds_controller_initialize_completion_queue(struct isci_host *ihost)
{ {
u32 index; u32 index;
u32 completion_queue_control_value; u32 completion_queue_control_value;
u32 completion_queue_get_value; u32 completion_queue_get_value;
u32 completion_queue_put_value; u32 completion_queue_put_value;
scic->completion_queue_get = 0; ihost->completion_queue_get = 0;
completion_queue_control_value = completion_queue_control_value =
(SMU_CQC_QUEUE_LIMIT_SET(SCU_MAX_COMPLETION_QUEUE_ENTRIES - 1) | (SMU_CQC_QUEUE_LIMIT_SET(SCU_MAX_COMPLETION_QUEUE_ENTRIES - 1) |
SMU_CQC_EVENT_LIMIT_SET(SCU_MAX_EVENTS - 1)); SMU_CQC_EVENT_LIMIT_SET(SCU_MAX_EVENTS - 1));
writel(completion_queue_control_value, writel(completion_queue_control_value,
&scic->smu_registers->completion_queue_control); &ihost->smu_registers->completion_queue_control);
/* Set the completion queue get pointer and enable the queue */ /* Set the completion queue get pointer and enable the queue */
...@@ -786,7 +778,7 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont ...@@ -786,7 +778,7 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont
); );
writel(completion_queue_get_value, writel(completion_queue_get_value,
&scic->smu_registers->completion_queue_get); &ihost->smu_registers->completion_queue_get);
/* Set the completion queue put pointer */ /* Set the completion queue put pointer */
completion_queue_put_value = ( completion_queue_put_value = (
...@@ -795,7 +787,7 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont ...@@ -795,7 +787,7 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont
); );
writel(completion_queue_put_value, writel(completion_queue_put_value,
&scic->smu_registers->completion_queue_put); &ihost->smu_registers->completion_queue_put);
/* Initialize the cycle bit of the completion queue entries */ /* Initialize the cycle bit of the completion queue entries */
for (index = 0; index < SCU_MAX_COMPLETION_QUEUE_ENTRIES; index++) { for (index = 0; index < SCU_MAX_COMPLETION_QUEUE_ENTRIES; index++) {
...@@ -803,11 +795,11 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont ...@@ -803,11 +795,11 @@ static void scic_sds_controller_initialize_completion_queue(struct scic_sds_cont
* If get.cycle_bit != completion_queue.cycle_bit * If get.cycle_bit != completion_queue.cycle_bit
* its not a valid completion queue entry * its not a valid completion queue entry
* so at system start all entries are invalid */ * so at system start all entries are invalid */
scic->completion_queue[index] = 0x80000000; ihost->completion_queue[index] = 0x80000000;
} }
} }
static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_sds_controller *scic) static void scic_sds_controller_initialize_unsolicited_frame_queue(struct isci_host *ihost)
{ {
u32 frame_queue_control_value; u32 frame_queue_control_value;
u32 frame_queue_get_value; u32 frame_queue_get_value;
...@@ -818,7 +810,7 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s ...@@ -818,7 +810,7 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s
SCU_UFQC_GEN_VAL(QUEUE_SIZE, SCU_MAX_UNSOLICITED_FRAMES); SCU_UFQC_GEN_VAL(QUEUE_SIZE, SCU_MAX_UNSOLICITED_FRAMES);
writel(frame_queue_control_value, writel(frame_queue_control_value,
&scic->scu_registers->sdma.unsolicited_frame_queue_control); &ihost->scu_registers->sdma.unsolicited_frame_queue_control);
/* Setup the get pointer for the unsolicited frame queue */ /* Setup the get pointer for the unsolicited frame queue */
frame_queue_get_value = ( frame_queue_get_value = (
...@@ -827,11 +819,11 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s ...@@ -827,11 +819,11 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s
); );
writel(frame_queue_get_value, writel(frame_queue_get_value,
&scic->scu_registers->sdma.unsolicited_frame_get_pointer); &ihost->scu_registers->sdma.unsolicited_frame_get_pointer);
/* Setup the put pointer for the unsolicited frame queue */ /* Setup the put pointer for the unsolicited frame queue */
frame_queue_put_value = SCU_UFQPP_GEN_VAL(POINTER, 0); frame_queue_put_value = SCU_UFQPP_GEN_VAL(POINTER, 0);
writel(frame_queue_put_value, writel(frame_queue_put_value,
&scic->scu_registers->sdma.unsolicited_frame_put_pointer); &ihost->scu_registers->sdma.unsolicited_frame_put_pointer);
} }
/** /**
...@@ -846,17 +838,16 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s ...@@ -846,17 +838,16 @@ static void scic_sds_controller_initialize_unsolicited_frame_queue(struct scic_s
* none. * none.
*/ */
static void scic_sds_controller_transition_to_ready( static void scic_sds_controller_transition_to_ready(
struct scic_sds_controller *scic, struct isci_host *ihost,
enum sci_status status) enum sci_status status)
{ {
struct isci_host *ihost = scic_to_ihost(scic);
if (scic->sm.current_state_id == SCIC_STARTING) { if (ihost->sm.current_state_id == SCIC_STARTING) {
/* /*
* We move into the ready state, because some of the phys/ports * We move into the ready state, because some of the phys/ports
* may be up and operational. * may be up and operational.
*/ */
sci_change_state(&scic->sm, SCIC_READY); sci_change_state(&ihost->sm, SCIC_READY);
isci_host_start_complete(ihost, status); isci_host_start_complete(ihost, status);
} }
...@@ -892,19 +883,18 @@ static bool is_phy_starting(struct isci_phy *iphy) ...@@ -892,19 +883,18 @@ static bool is_phy_starting(struct isci_phy *iphy)
* controller to the READY state and inform the user * controller to the READY state and inform the user
* (scic_cb_controller_start_complete()). * (scic_cb_controller_start_complete()).
*/ */
static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_controller *scic) static enum sci_status scic_sds_controller_start_next_phy(struct isci_host *ihost)
{ {
struct isci_host *ihost = scic_to_ihost(scic); struct scic_sds_oem_params *oem = &ihost->oem_parameters.sds1;
struct scic_sds_oem_params *oem = &scic->oem_parameters.sds1;
struct isci_phy *iphy; struct isci_phy *iphy;
enum sci_status status; enum sci_status status;
status = SCI_SUCCESS; status = SCI_SUCCESS;
if (scic->phy_startup_timer_pending) if (ihost->phy_startup_timer_pending)
return status; return status;
if (scic->next_phy_to_start >= SCI_MAX_PHYS) { if (ihost->next_phy_to_start >= SCI_MAX_PHYS) {
bool is_controller_start_complete = true; bool is_controller_start_complete = true;
u32 state; u32 state;
u8 index; u8 index;
...@@ -934,16 +924,16 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro ...@@ -934,16 +924,16 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
* The controller has successfully finished the start process. * The controller has successfully finished the start process.
* Inform the SCI Core user and transition to the READY state. */ * Inform the SCI Core user and transition to the READY state. */
if (is_controller_start_complete == true) { if (is_controller_start_complete == true) {
scic_sds_controller_transition_to_ready(scic, SCI_SUCCESS); scic_sds_controller_transition_to_ready(ihost, SCI_SUCCESS);
sci_del_timer(&scic->phy_timer); sci_del_timer(&ihost->phy_timer);
scic->phy_startup_timer_pending = false; ihost->phy_startup_timer_pending = false;
} }
} else { } else {
iphy = &ihost->phys[scic->next_phy_to_start]; iphy = &ihost->phys[ihost->next_phy_to_start];
if (oem->controller.mode_type == SCIC_PORT_MANUAL_CONFIGURATION_MODE) { if (oem->controller.mode_type == SCIC_PORT_MANUAL_CONFIGURATION_MODE) {
if (phy_get_non_dummy_port(iphy) == NULL) { if (phy_get_non_dummy_port(iphy) == NULL) {
scic->next_phy_to_start++; ihost->next_phy_to_start++;
/* Caution recursion ahead be forwarned /* Caution recursion ahead be forwarned
* *
...@@ -954,27 +944,27 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro ...@@ -954,27 +944,27 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
* incorrectly for the PORT or it was never * incorrectly for the PORT or it was never
* assigned to a PORT * assigned to a PORT
*/ */
return scic_sds_controller_start_next_phy(scic); return scic_sds_controller_start_next_phy(ihost);
} }
} }
status = scic_sds_phy_start(iphy); status = scic_sds_phy_start(iphy);
if (status == SCI_SUCCESS) { if (status == SCI_SUCCESS) {
sci_mod_timer(&scic->phy_timer, sci_mod_timer(&ihost->phy_timer,
SCIC_SDS_CONTROLLER_PHY_START_TIMEOUT); SCIC_SDS_CONTROLLER_PHY_START_TIMEOUT);
scic->phy_startup_timer_pending = true; ihost->phy_startup_timer_pending = true;
} else { } else {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: Controller stop operation failed " "%s: Controller stop operation failed "
"to stop phy %d because of status " "to stop phy %d because of status "
"%d.\n", "%d.\n",
__func__, __func__,
ihost->phys[scic->next_phy_to_start].phy_index, ihost->phys[ihost->next_phy_to_start].phy_index,
status); status);
} }
scic->next_phy_to_start++; ihost->next_phy_to_start++;
} }
return status; return status;
...@@ -983,8 +973,7 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro ...@@ -983,8 +973,7 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
static void phy_startup_timeout(unsigned long data) static void phy_startup_timeout(unsigned long data)
{ {
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct scic_sds_controller *scic = container_of(tmr, typeof(*scic), phy_timer); struct isci_host *ihost = container_of(tmr, typeof(*ihost), phy_timer);
struct isci_host *ihost = scic_to_ihost(scic);
unsigned long flags; unsigned long flags;
enum sci_status status; enum sci_status status;
...@@ -993,10 +982,10 @@ static void phy_startup_timeout(unsigned long data) ...@@ -993,10 +982,10 @@ static void phy_startup_timeout(unsigned long data)
if (tmr->cancel) if (tmr->cancel)
goto done; goto done;
scic->phy_startup_timer_pending = false; ihost->phy_startup_timer_pending = false;
do { do {
status = scic_sds_controller_start_next_phy(scic); status = scic_sds_controller_start_next_phy(ihost);
} while (status != SCI_SUCCESS); } while (status != SCI_SUCCESS);
done: done:
...@@ -1008,15 +997,14 @@ static u16 isci_tci_active(struct isci_host *ihost) ...@@ -1008,15 +997,14 @@ static u16 isci_tci_active(struct isci_host *ihost)
return CIRC_CNT(ihost->tci_head, ihost->tci_tail, SCI_MAX_IO_REQUESTS); return CIRC_CNT(ihost->tci_head, ihost->tci_tail, SCI_MAX_IO_REQUESTS);
} }
static enum sci_status scic_controller_start(struct scic_sds_controller *scic, static enum sci_status scic_controller_start(struct isci_host *ihost,
u32 timeout) u32 timeout)
{ {
struct isci_host *ihost = scic_to_ihost(scic);
enum sci_status result; enum sci_status result;
u16 index; u16 index;
if (scic->sm.current_state_id != SCIC_INITIALIZED) { if (ihost->sm.current_state_id != SCIC_INITIALIZED) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"SCIC Controller start operation requested in " "SCIC Controller start operation requested in "
"invalid state\n"); "invalid state\n");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
...@@ -1026,34 +1014,34 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic, ...@@ -1026,34 +1014,34 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic,
BUILD_BUG_ON(SCI_MAX_IO_REQUESTS > 1 << sizeof(ihost->tci_pool[0]) * 8); BUILD_BUG_ON(SCI_MAX_IO_REQUESTS > 1 << sizeof(ihost->tci_pool[0]) * 8);
ihost->tci_head = 0; ihost->tci_head = 0;
ihost->tci_tail = 0; ihost->tci_tail = 0;
for (index = 0; index < scic->task_context_entries; index++) for (index = 0; index < ihost->task_context_entries; index++)
isci_tci_free(ihost, index); isci_tci_free(ihost, index);
/* Build the RNi free pool */ /* Build the RNi free pool */
scic_sds_remote_node_table_initialize( scic_sds_remote_node_table_initialize(
&scic->available_remote_nodes, &ihost->available_remote_nodes,
scic->remote_node_entries); ihost->remote_node_entries);
/* /*
* Before anything else lets make sure we will not be * Before anything else lets make sure we will not be
* interrupted by the hardware. * interrupted by the hardware.
*/ */
scic_controller_disable_interrupts(scic); scic_controller_disable_interrupts(ihost);
/* Enable the port task scheduler */ /* Enable the port task scheduler */
scic_sds_controller_enable_port_task_scheduler(scic); scic_sds_controller_enable_port_task_scheduler(ihost);
/* Assign all the task entries to scic physical function */ /* Assign all the task entries to ihost physical function */
scic_sds_controller_assign_task_entries(scic); scic_sds_controller_assign_task_entries(ihost);
/* Now initialize the completion queue */ /* Now initialize the completion queue */
scic_sds_controller_initialize_completion_queue(scic); scic_sds_controller_initialize_completion_queue(ihost);
/* Initialize the unsolicited frame queue for use */ /* Initialize the unsolicited frame queue for use */
scic_sds_controller_initialize_unsolicited_frame_queue(scic); scic_sds_controller_initialize_unsolicited_frame_queue(ihost);
/* Start all of the ports on this controller */ /* Start all of the ports on this controller */
for (index = 0; index < scic->logical_port_entries; index++) { for (index = 0; index < ihost->logical_port_entries; index++) {
struct isci_port *iport = &ihost->ports[index]; struct isci_port *iport = &ihost->ports[index];
result = scic_sds_port_start(iport); result = scic_sds_port_start(iport);
...@@ -1061,11 +1049,11 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic, ...@@ -1061,11 +1049,11 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic,
return result; return result;
} }
scic_sds_controller_start_next_phy(scic); scic_sds_controller_start_next_phy(ihost);
sci_mod_timer(&scic->timer, timeout); sci_mod_timer(&ihost->timer, timeout);
sci_change_state(&scic->sm, SCIC_STARTING); sci_change_state(&ihost->sm, SCIC_STARTING);
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1073,35 +1061,35 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic, ...@@ -1073,35 +1061,35 @@ static enum sci_status scic_controller_start(struct scic_sds_controller *scic,
void isci_host_scan_start(struct Scsi_Host *shost) void isci_host_scan_start(struct Scsi_Host *shost)
{ {
struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha; struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha;
unsigned long tmo = scic_controller_get_suggested_start_timeout(&ihost->sci); unsigned long tmo = scic_controller_get_suggested_start_timeout(ihost);
set_bit(IHOST_START_PENDING, &ihost->flags); set_bit(IHOST_START_PENDING, &ihost->flags);
spin_lock_irq(&ihost->scic_lock); spin_lock_irq(&ihost->scic_lock);
scic_controller_start(&ihost->sci, tmo); scic_controller_start(ihost, tmo);
scic_controller_enable_interrupts(&ihost->sci); scic_controller_enable_interrupts(ihost);
spin_unlock_irq(&ihost->scic_lock); spin_unlock_irq(&ihost->scic_lock);
} }
static void isci_host_stop_complete(struct isci_host *ihost, enum sci_status completion_status) static void isci_host_stop_complete(struct isci_host *ihost, enum sci_status completion_status)
{ {
isci_host_change_state(ihost, isci_stopped); isci_host_change_state(ihost, isci_stopped);
scic_controller_disable_interrupts(&ihost->sci); scic_controller_disable_interrupts(ihost);
clear_bit(IHOST_STOP_PENDING, &ihost->flags); clear_bit(IHOST_STOP_PENDING, &ihost->flags);
wake_up(&ihost->eventq); wake_up(&ihost->eventq);
} }
static void scic_sds_controller_completion_handler(struct scic_sds_controller *scic) static void scic_sds_controller_completion_handler(struct isci_host *ihost)
{ {
/* Empty out the completion queue */ /* Empty out the completion queue */
if (scic_sds_controller_completion_queue_has_entries(scic)) if (scic_sds_controller_completion_queue_has_entries(ihost))
scic_sds_controller_process_completions(scic); scic_sds_controller_process_completions(ihost);
/* Clear the interrupt and enable all interrupts again */ /* Clear the interrupt and enable all interrupts again */
writel(SMU_ISR_COMPLETION, &scic->smu_registers->interrupt_status); writel(SMU_ISR_COMPLETION, &ihost->smu_registers->interrupt_status);
/* Could we write the value of SMU_ISR_COMPLETION? */ /* Could we write the value of SMU_ISR_COMPLETION? */
writel(0xFF000000, &scic->smu_registers->interrupt_mask); writel(0xFF000000, &ihost->smu_registers->interrupt_mask);
writel(0, &scic->smu_registers->interrupt_mask); writel(0, &ihost->smu_registers->interrupt_mask);
} }
/** /**
...@@ -1114,7 +1102,7 @@ static void scic_sds_controller_completion_handler(struct scic_sds_controller *s ...@@ -1114,7 +1102,7 @@ static void scic_sds_controller_completion_handler(struct scic_sds_controller *s
*/ */
static void isci_host_completion_routine(unsigned long data) static void isci_host_completion_routine(unsigned long data)
{ {
struct isci_host *isci_host = (struct isci_host *)data; struct isci_host *ihost = (struct isci_host *)data;
struct list_head completed_request_list; struct list_head completed_request_list;
struct list_head errored_request_list; struct list_head errored_request_list;
struct list_head *current_position; struct list_head *current_position;
...@@ -1126,20 +1114,20 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1126,20 +1114,20 @@ static void isci_host_completion_routine(unsigned long data)
INIT_LIST_HEAD(&completed_request_list); INIT_LIST_HEAD(&completed_request_list);
INIT_LIST_HEAD(&errored_request_list); INIT_LIST_HEAD(&errored_request_list);
spin_lock_irq(&isci_host->scic_lock); spin_lock_irq(&ihost->scic_lock);
scic_sds_controller_completion_handler(&isci_host->sci); scic_sds_controller_completion_handler(ihost);
/* Take the lists of completed I/Os from the host. */ /* Take the lists of completed I/Os from the host. */
list_splice_init(&isci_host->requests_to_complete, list_splice_init(&ihost->requests_to_complete,
&completed_request_list); &completed_request_list);
/* Take the list of errored I/Os from the host. */ /* Take the list of errored I/Os from the host. */
list_splice_init(&isci_host->requests_to_errorback, list_splice_init(&ihost->requests_to_errorback,
&errored_request_list); &errored_request_list);
spin_unlock_irq(&isci_host->scic_lock); spin_unlock_irq(&ihost->scic_lock);
/* Process any completions in the lists. */ /* Process any completions in the lists. */
list_for_each_safe(current_position, next_position, list_for_each_safe(current_position, next_position,
...@@ -1150,7 +1138,7 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1150,7 +1138,7 @@ static void isci_host_completion_routine(unsigned long data)
task = isci_request_access_task(request); task = isci_request_access_task(request);
/* Normal notification (task_done) */ /* Normal notification (task_done) */
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: Normal - request/task = %p/%p\n", "%s: Normal - request/task = %p/%p\n",
__func__, __func__,
request, request,
...@@ -1169,9 +1157,9 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1169,9 +1157,9 @@ static void isci_host_completion_routine(unsigned long data)
} }
} }
spin_lock_irq(&isci_host->scic_lock); spin_lock_irq(&ihost->scic_lock);
isci_free_tag(isci_host, request->io_tag); isci_free_tag(ihost, request->io_tag);
spin_unlock_irq(&isci_host->scic_lock); spin_unlock_irq(&ihost->scic_lock);
} }
list_for_each_entry_safe(request, next_request, &errored_request_list, list_for_each_entry_safe(request, next_request, &errored_request_list,
completed_node) { completed_node) {
...@@ -1179,7 +1167,7 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1179,7 +1167,7 @@ static void isci_host_completion_routine(unsigned long data)
task = isci_request_access_task(request); task = isci_request_access_task(request);
/* Use sas_task_abort */ /* Use sas_task_abort */
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: Error - request/task = %p/%p\n", "%s: Error - request/task = %p/%p\n",
__func__, __func__,
request, request,
...@@ -1202,13 +1190,13 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1202,13 +1190,13 @@ static void isci_host_completion_routine(unsigned long data)
* it. * it.
*/ */
spin_lock_irq(&isci_host->scic_lock); spin_lock_irq(&ihost->scic_lock);
/* Remove the request from the remote device's list /* Remove the request from the remote device's list
* of pending requests. * of pending requests.
*/ */
list_del_init(&request->dev_node); list_del_init(&request->dev_node);
isci_free_tag(isci_host, request->io_tag); isci_free_tag(ihost, request->io_tag);
spin_unlock_irq(&isci_host->scic_lock); spin_unlock_irq(&ihost->scic_lock);
} }
} }
...@@ -1232,18 +1220,18 @@ static void isci_host_completion_routine(unsigned long data) ...@@ -1232,18 +1220,18 @@ static void isci_host_completion_routine(unsigned long data)
* controller is already in the STOPPED state. SCI_FAILURE_INVALID_STATE if the * controller is already in the STOPPED state. SCI_FAILURE_INVALID_STATE if the
* controller is not either in the STARTED or STOPPED states. * controller is not either in the STARTED or STOPPED states.
*/ */
static enum sci_status scic_controller_stop(struct scic_sds_controller *scic, static enum sci_status scic_controller_stop(struct isci_host *ihost,
u32 timeout) u32 timeout)
{ {
if (scic->sm.current_state_id != SCIC_READY) { if (ihost->sm.current_state_id != SCIC_READY) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"SCIC Controller stop operation requested in " "SCIC Controller stop operation requested in "
"invalid state\n"); "invalid state\n");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
sci_mod_timer(&scic->timer, timeout); sci_mod_timer(&ihost->timer, timeout);
sci_change_state(&scic->sm, SCIC_STOPPING); sci_change_state(&ihost->sm, SCIC_STOPPING);
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1259,9 +1247,9 @@ static enum sci_status scic_controller_stop(struct scic_sds_controller *scic, ...@@ -1259,9 +1247,9 @@ static enum sci_status scic_controller_stop(struct scic_sds_controller *scic,
* SCI_SUCCESS if the reset operation successfully started. SCI_FATAL_ERROR if * SCI_SUCCESS if the reset operation successfully started. SCI_FATAL_ERROR if
* the controller reset operation is unable to complete. * the controller reset operation is unable to complete.
*/ */
static enum sci_status scic_controller_reset(struct scic_sds_controller *scic) static enum sci_status scic_controller_reset(struct isci_host *ihost)
{ {
switch (scic->sm.current_state_id) { switch (ihost->sm.current_state_id) {
case SCIC_RESET: case SCIC_RESET:
case SCIC_READY: case SCIC_READY:
case SCIC_STOPPED: case SCIC_STOPPED:
...@@ -1270,10 +1258,10 @@ static enum sci_status scic_controller_reset(struct scic_sds_controller *scic) ...@@ -1270,10 +1258,10 @@ static enum sci_status scic_controller_reset(struct scic_sds_controller *scic)
* The reset operation is not a graceful cleanup, just * The reset operation is not a graceful cleanup, just
* perform the state transition. * perform the state transition.
*/ */
sci_change_state(&scic->sm, SCIC_RESETTING); sci_change_state(&ihost->sm, SCIC_RESETTING);
return SCI_SUCCESS; return SCI_SUCCESS;
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"SCIC Controller reset operation requested in " "SCIC Controller reset operation requested in "
"invalid state\n"); "invalid state\n");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
...@@ -1298,14 +1286,14 @@ void isci_host_deinit(struct isci_host *ihost) ...@@ -1298,14 +1286,14 @@ void isci_host_deinit(struct isci_host *ihost)
set_bit(IHOST_STOP_PENDING, &ihost->flags); set_bit(IHOST_STOP_PENDING, &ihost->flags);
spin_lock_irq(&ihost->scic_lock); spin_lock_irq(&ihost->scic_lock);
scic_controller_stop(&ihost->sci, SCIC_CONTROLLER_STOP_TIMEOUT); scic_controller_stop(ihost, SCIC_CONTROLLER_STOP_TIMEOUT);
spin_unlock_irq(&ihost->scic_lock); spin_unlock_irq(&ihost->scic_lock);
wait_for_stop(ihost); wait_for_stop(ihost);
scic_controller_reset(&ihost->sci); scic_controller_reset(ihost);
/* Cancel any/all outstanding port timers */ /* Cancel any/all outstanding port timers */
for (i = 0; i < ihost->sci.logical_port_entries; i++) { for (i = 0; i < ihost->logical_port_entries; i++) {
struct isci_port *iport = &ihost->ports[i]; struct isci_port *iport = &ihost->ports[i];
del_timer_sync(&iport->timer.timer); del_timer_sync(&iport->timer.timer);
} }
...@@ -1316,13 +1304,13 @@ void isci_host_deinit(struct isci_host *ihost) ...@@ -1316,13 +1304,13 @@ void isci_host_deinit(struct isci_host *ihost)
del_timer_sync(&iphy->sata_timer.timer); del_timer_sync(&iphy->sata_timer.timer);
} }
del_timer_sync(&ihost->sci.port_agent.timer.timer); del_timer_sync(&ihost->port_agent.timer.timer);
del_timer_sync(&ihost->sci.power_control.timer.timer); del_timer_sync(&ihost->power_control.timer.timer);
del_timer_sync(&ihost->sci.timer.timer); del_timer_sync(&ihost->timer.timer);
del_timer_sync(&ihost->sci.phy_timer.timer); del_timer_sync(&ihost->phy_timer.timer);
} }
static void __iomem *scu_base(struct isci_host *isci_host) static void __iomem *scu_base(struct isci_host *isci_host)
...@@ -1369,16 +1357,16 @@ static void isci_user_parameters_get( ...@@ -1369,16 +1357,16 @@ static void isci_user_parameters_get(
static void scic_sds_controller_initial_state_enter(struct sci_base_state_machine *sm) static void scic_sds_controller_initial_state_enter(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
sci_change_state(&scic->sm, SCIC_RESET); sci_change_state(&ihost->sm, SCIC_RESET);
} }
static inline void scic_sds_controller_starting_state_exit(struct sci_base_state_machine *sm) static inline void scic_sds_controller_starting_state_exit(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
sci_del_timer(&scic->timer); sci_del_timer(&ihost->timer);
} }
#define INTERRUPT_COALESCE_TIMEOUT_BASE_RANGE_LOWER_BOUND_NS 853 #define INTERRUPT_COALESCE_TIMEOUT_BASE_RANGE_LOWER_BOUND_NS 853
...@@ -1405,8 +1393,8 @@ static inline void scic_sds_controller_starting_state_exit(struct sci_base_state ...@@ -1405,8 +1393,8 @@ static inline void scic_sds_controller_starting_state_exit(struct sci_base_state
* SCI_SUCCESS The user successfully updated the interrutp coalescence. * SCI_SUCCESS The user successfully updated the interrutp coalescence.
* SCI_FAILURE_INVALID_PARAMETER_VALUE The user input value is out of range. * SCI_FAILURE_INVALID_PARAMETER_VALUE The user input value is out of range.
*/ */
static enum sci_status scic_controller_set_interrupt_coalescence( static enum sci_status
struct scic_sds_controller *scic_controller, scic_controller_set_interrupt_coalescence(struct isci_host *ihost,
u32 coalesce_number, u32 coalesce_number,
u32 coalesce_timeout) u32 coalesce_timeout)
{ {
...@@ -1491,11 +1479,11 @@ static enum sci_status scic_controller_set_interrupt_coalescence( ...@@ -1491,11 +1479,11 @@ static enum sci_status scic_controller_set_interrupt_coalescence(
writel(SMU_ICC_GEN_VAL(NUMBER, coalesce_number) | writel(SMU_ICC_GEN_VAL(NUMBER, coalesce_number) |
SMU_ICC_GEN_VAL(TIMER, timeout_encode), SMU_ICC_GEN_VAL(TIMER, timeout_encode),
&scic_controller->smu_registers->interrupt_coalesce_control); &ihost->smu_registers->interrupt_coalesce_control);
scic_controller->interrupt_coalesce_number = (u16)coalesce_number; ihost->interrupt_coalesce_number = (u16)coalesce_number;
scic_controller->interrupt_coalesce_timeout = coalesce_timeout / 100; ihost->interrupt_coalesce_timeout = coalesce_timeout / 100;
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1503,26 +1491,25 @@ static enum sci_status scic_controller_set_interrupt_coalescence( ...@@ -1503,26 +1491,25 @@ static enum sci_status scic_controller_set_interrupt_coalescence(
static void scic_sds_controller_ready_state_enter(struct sci_base_state_machine *sm) static void scic_sds_controller_ready_state_enter(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
/* set the default interrupt coalescence number and timeout value. */ /* set the default interrupt coalescence number and timeout value. */
scic_controller_set_interrupt_coalescence(scic, 0x10, 250); scic_controller_set_interrupt_coalescence(ihost, 0x10, 250);
} }
static void scic_sds_controller_ready_state_exit(struct sci_base_state_machine *sm) static void scic_sds_controller_ready_state_exit(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
/* disable interrupt coalescence. */ /* disable interrupt coalescence. */
scic_controller_set_interrupt_coalescence(scic, 0, 0); scic_controller_set_interrupt_coalescence(ihost, 0, 0);
} }
static enum sci_status scic_sds_controller_stop_phys(struct scic_sds_controller *scic) static enum sci_status scic_sds_controller_stop_phys(struct isci_host *ihost)
{ {
u32 index; u32 index;
enum sci_status status; enum sci_status status;
enum sci_status phy_status; enum sci_status phy_status;
struct isci_host *ihost = scic_to_ihost(scic);
status = SCI_SUCCESS; status = SCI_SUCCESS;
...@@ -1533,7 +1520,7 @@ static enum sci_status scic_sds_controller_stop_phys(struct scic_sds_controller ...@@ -1533,7 +1520,7 @@ static enum sci_status scic_sds_controller_stop_phys(struct scic_sds_controller
phy_status != SCI_FAILURE_INVALID_STATE) { phy_status != SCI_FAILURE_INVALID_STATE) {
status = SCI_FAILURE; status = SCI_FAILURE;
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: Controller stop operation failed to stop " "%s: Controller stop operation failed to stop "
"phy %d because of status %d.\n", "phy %d because of status %d.\n",
__func__, __func__,
...@@ -1544,14 +1531,13 @@ static enum sci_status scic_sds_controller_stop_phys(struct scic_sds_controller ...@@ -1544,14 +1531,13 @@ static enum sci_status scic_sds_controller_stop_phys(struct scic_sds_controller
return status; return status;
} }
static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller *scic) static enum sci_status scic_sds_controller_stop_ports(struct isci_host *ihost)
{ {
u32 index; u32 index;
enum sci_status port_status; enum sci_status port_status;
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
struct isci_host *ihost = scic_to_ihost(scic);
for (index = 0; index < scic->logical_port_entries; index++) { for (index = 0; index < ihost->logical_port_entries; index++) {
struct isci_port *iport = &ihost->ports[index]; struct isci_port *iport = &ihost->ports[index];
port_status = scic_sds_port_stop(iport); port_status = scic_sds_port_stop(iport);
...@@ -1560,7 +1546,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller ...@@ -1560,7 +1546,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller
(port_status != SCI_FAILURE_INVALID_STATE)) { (port_status != SCI_FAILURE_INVALID_STATE)) {
status = SCI_FAILURE; status = SCI_FAILURE;
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: Controller stop operation failed to " "%s: Controller stop operation failed to "
"stop port %d because of status %d.\n", "stop port %d because of status %d.\n",
__func__, __func__,
...@@ -1572,7 +1558,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller ...@@ -1572,7 +1558,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller
return status; return status;
} }
static enum sci_status scic_sds_controller_stop_devices(struct scic_sds_controller *scic) static enum sci_status scic_sds_controller_stop_devices(struct isci_host *ihost)
{ {
u32 index; u32 index;
enum sci_status status; enum sci_status status;
...@@ -1580,19 +1566,19 @@ static enum sci_status scic_sds_controller_stop_devices(struct scic_sds_controll ...@@ -1580,19 +1566,19 @@ static enum sci_status scic_sds_controller_stop_devices(struct scic_sds_controll
status = SCI_SUCCESS; status = SCI_SUCCESS;
for (index = 0; index < scic->remote_node_entries; index++) { for (index = 0; index < ihost->remote_node_entries; index++) {
if (scic->device_table[index] != NULL) { if (ihost->device_table[index] != NULL) {
/* / @todo What timeout value do we want to provide to this request? */ /* / @todo What timeout value do we want to provide to this request? */
device_status = scic_remote_device_stop(scic->device_table[index], 0); device_status = scic_remote_device_stop(ihost->device_table[index], 0);
if ((device_status != SCI_SUCCESS) && if ((device_status != SCI_SUCCESS) &&
(device_status != SCI_FAILURE_INVALID_STATE)) { (device_status != SCI_FAILURE_INVALID_STATE)) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: Controller stop operation failed " "%s: Controller stop operation failed "
"to stop device 0x%p because of " "to stop device 0x%p because of "
"status %d.\n", "status %d.\n",
__func__, __func__,
scic->device_table[index], device_status); ihost->device_table[index], device_status);
} }
} }
} }
...@@ -1602,19 +1588,19 @@ static enum sci_status scic_sds_controller_stop_devices(struct scic_sds_controll ...@@ -1602,19 +1588,19 @@ static enum sci_status scic_sds_controller_stop_devices(struct scic_sds_controll
static void scic_sds_controller_stopping_state_enter(struct sci_base_state_machine *sm) static void scic_sds_controller_stopping_state_enter(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
/* Stop all of the components for this controller */ /* Stop all of the components for this controller */
scic_sds_controller_stop_phys(scic); scic_sds_controller_stop_phys(ihost);
scic_sds_controller_stop_ports(scic); scic_sds_controller_stop_ports(ihost);
scic_sds_controller_stop_devices(scic); scic_sds_controller_stop_devices(ihost);
} }
static void scic_sds_controller_stopping_state_exit(struct sci_base_state_machine *sm) static void scic_sds_controller_stopping_state_exit(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
sci_del_timer(&scic->timer); sci_del_timer(&ihost->timer);
} }
...@@ -1623,30 +1609,30 @@ static void scic_sds_controller_stopping_state_exit(struct sci_base_state_machin ...@@ -1623,30 +1609,30 @@ static void scic_sds_controller_stopping_state_exit(struct sci_base_state_machin
* *
* This method will reset the controller hardware. * This method will reset the controller hardware.
*/ */
static void scic_sds_controller_reset_hardware(struct scic_sds_controller *scic) static void scic_sds_controller_reset_hardware(struct isci_host *ihost)
{ {
/* Disable interrupts so we dont take any spurious interrupts */ /* Disable interrupts so we dont take any spurious interrupts */
scic_controller_disable_interrupts(scic); scic_controller_disable_interrupts(ihost);
/* Reset the SCU */ /* Reset the SCU */
writel(0xFFFFFFFF, &scic->smu_registers->soft_reset_control); writel(0xFFFFFFFF, &ihost->smu_registers->soft_reset_control);
/* Delay for 1ms to before clearing the CQP and UFQPR. */ /* Delay for 1ms to before clearing the CQP and UFQPR. */
udelay(1000); udelay(1000);
/* The write to the CQGR clears the CQP */ /* The write to the CQGR clears the CQP */
writel(0x00000000, &scic->smu_registers->completion_queue_get); writel(0x00000000, &ihost->smu_registers->completion_queue_get);
/* The write to the UFQGP clears the UFQPR */ /* The write to the UFQGP clears the UFQPR */
writel(0, &scic->scu_registers->sdma.unsolicited_frame_get_pointer); writel(0, &ihost->scu_registers->sdma.unsolicited_frame_get_pointer);
} }
static void scic_sds_controller_resetting_state_enter(struct sci_base_state_machine *sm) static void scic_sds_controller_resetting_state_enter(struct sci_base_state_machine *sm)
{ {
struct scic_sds_controller *scic = container_of(sm, typeof(*scic), sm); struct isci_host *ihost = container_of(sm, typeof(*ihost), sm);
scic_sds_controller_reset_hardware(scic); scic_sds_controller_reset_hardware(ihost);
sci_change_state(&scic->sm, SCIC_RESET); sci_change_state(&ihost->sm, SCIC_RESET);
} }
static const struct sci_base_state scic_sds_controller_state_table[] = { static const struct sci_base_state scic_sds_controller_state_table[] = {
...@@ -1674,58 +1660,56 @@ static const struct sci_base_state scic_sds_controller_state_table[] = { ...@@ -1674,58 +1660,56 @@ static const struct sci_base_state scic_sds_controller_state_table[] = {
[SCIC_FAILED] = {} [SCIC_FAILED] = {}
}; };
static void scic_sds_controller_set_default_config_parameters(struct scic_sds_controller *scic) static void scic_sds_controller_set_default_config_parameters(struct isci_host *ihost)
{ {
/* these defaults are overridden by the platform / firmware */ /* these defaults are overridden by the platform / firmware */
struct isci_host *ihost = scic_to_ihost(scic);
u16 index; u16 index;
/* Default to APC mode. */ /* Default to APC mode. */
scic->oem_parameters.sds1.controller.mode_type = SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE; ihost->oem_parameters.sds1.controller.mode_type = SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE;
/* Default to APC mode. */ /* Default to APC mode. */
scic->oem_parameters.sds1.controller.max_concurrent_dev_spin_up = 1; ihost->oem_parameters.sds1.controller.max_concurrent_dev_spin_up = 1;
/* Default to no SSC operation. */ /* Default to no SSC operation. */
scic->oem_parameters.sds1.controller.do_enable_ssc = false; ihost->oem_parameters.sds1.controller.do_enable_ssc = false;
/* Initialize all of the port parameter information to narrow ports. */ /* Initialize all of the port parameter information to narrow ports. */
for (index = 0; index < SCI_MAX_PORTS; index++) { for (index = 0; index < SCI_MAX_PORTS; index++) {
scic->oem_parameters.sds1.ports[index].phy_mask = 0; ihost->oem_parameters.sds1.ports[index].phy_mask = 0;
} }
/* Initialize all of the phy parameter information. */ /* Initialize all of the phy parameter information. */
for (index = 0; index < SCI_MAX_PHYS; index++) { for (index = 0; index < SCI_MAX_PHYS; index++) {
/* Default to 6G (i.e. Gen 3) for now. */ /* Default to 6G (i.e. Gen 3) for now. */
scic->user_parameters.sds1.phys[index].max_speed_generation = 3; ihost->user_parameters.sds1.phys[index].max_speed_generation = 3;
/* the frequencies cannot be 0 */ /* the frequencies cannot be 0 */
scic->user_parameters.sds1.phys[index].align_insertion_frequency = 0x7f; ihost->user_parameters.sds1.phys[index].align_insertion_frequency = 0x7f;
scic->user_parameters.sds1.phys[index].in_connection_align_insertion_frequency = 0xff; ihost->user_parameters.sds1.phys[index].in_connection_align_insertion_frequency = 0xff;
scic->user_parameters.sds1.phys[index].notify_enable_spin_up_insertion_frequency = 0x33; ihost->user_parameters.sds1.phys[index].notify_enable_spin_up_insertion_frequency = 0x33;
/* /*
* Previous Vitesse based expanders had a arbitration issue that * Previous Vitesse based expanders had a arbitration issue that
* is worked around by having the upper 32-bits of SAS address * is worked around by having the upper 32-bits of SAS address
* with a value greater then the Vitesse company identifier. * with a value greater then the Vitesse company identifier.
* Hence, usage of 0x5FCFFFFF. */ * Hence, usage of 0x5FCFFFFF. */
scic->oem_parameters.sds1.phys[index].sas_address.low = 0x1 + ihost->id; ihost->oem_parameters.sds1.phys[index].sas_address.low = 0x1 + ihost->id;
scic->oem_parameters.sds1.phys[index].sas_address.high = 0x5FCFFFFF; ihost->oem_parameters.sds1.phys[index].sas_address.high = 0x5FCFFFFF;
} }
scic->user_parameters.sds1.stp_inactivity_timeout = 5; ihost->user_parameters.sds1.stp_inactivity_timeout = 5;
scic->user_parameters.sds1.ssp_inactivity_timeout = 5; ihost->user_parameters.sds1.ssp_inactivity_timeout = 5;
scic->user_parameters.sds1.stp_max_occupancy_timeout = 5; ihost->user_parameters.sds1.stp_max_occupancy_timeout = 5;
scic->user_parameters.sds1.ssp_max_occupancy_timeout = 20; ihost->user_parameters.sds1.ssp_max_occupancy_timeout = 20;
scic->user_parameters.sds1.no_outbound_task_timeout = 20; ihost->user_parameters.sds1.no_outbound_task_timeout = 20;
} }
static void controller_timeout(unsigned long data) static void controller_timeout(unsigned long data)
{ {
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct scic_sds_controller *scic = container_of(tmr, typeof(*scic), timer); struct isci_host *ihost = container_of(tmr, typeof(*ihost), timer);
struct isci_host *ihost = scic_to_ihost(scic); struct sci_base_state_machine *sm = &ihost->sm;
struct sci_base_state_machine *sm = &scic->sm;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
...@@ -1734,12 +1718,12 @@ static void controller_timeout(unsigned long data) ...@@ -1734,12 +1718,12 @@ static void controller_timeout(unsigned long data)
goto done; goto done;
if (sm->current_state_id == SCIC_STARTING) if (sm->current_state_id == SCIC_STARTING)
scic_sds_controller_transition_to_ready(scic, SCI_FAILURE_TIMEOUT); scic_sds_controller_transition_to_ready(ihost, SCI_FAILURE_TIMEOUT);
else if (sm->current_state_id == SCIC_STOPPING) { else if (sm->current_state_id == SCIC_STOPPING) {
sci_change_state(sm, SCIC_FAILED); sci_change_state(sm, SCIC_FAILED);
isci_host_stop_complete(ihost, SCI_FAILURE_TIMEOUT); isci_host_stop_complete(ihost, SCI_FAILURE_TIMEOUT);
} else /* / @todo Now what do we want to do in this case? */ } else /* / @todo Now what do we want to do in this case? */
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: Controller timer fired when controller was not " "%s: Controller timer fired when controller was not "
"in a state being timed.\n", "in a state being timed.\n",
__func__); __func__);
...@@ -1764,24 +1748,23 @@ static void controller_timeout(unsigned long data) ...@@ -1764,24 +1748,23 @@ static void controller_timeout(unsigned long data)
* SCI_FAILURE_UNSUPPORTED_INIT_DATA_VERSION This value is returned if the * SCI_FAILURE_UNSUPPORTED_INIT_DATA_VERSION This value is returned if the
* controller does not support the supplied initialization data version. * controller does not support the supplied initialization data version.
*/ */
static enum sci_status scic_controller_construct(struct scic_sds_controller *scic, static enum sci_status scic_controller_construct(struct isci_host *ihost,
void __iomem *scu_base, void __iomem *scu_base,
void __iomem *smu_base) void __iomem *smu_base)
{ {
struct isci_host *ihost = scic_to_ihost(scic);
u8 i; u8 i;
sci_init_sm(&scic->sm, scic_sds_controller_state_table, SCIC_INITIAL); sci_init_sm(&ihost->sm, scic_sds_controller_state_table, SCIC_INITIAL);
scic->scu_registers = scu_base; ihost->scu_registers = scu_base;
scic->smu_registers = smu_base; ihost->smu_registers = smu_base;
scic_sds_port_configuration_agent_construct(&scic->port_agent); scic_sds_port_configuration_agent_construct(&ihost->port_agent);
/* Construct the ports for this controller */ /* Construct the ports for this controller */
for (i = 0; i < SCI_MAX_PORTS; i++) for (i = 0; i < SCI_MAX_PORTS; i++)
scic_sds_port_construct(&ihost->ports[i], i, scic); scic_sds_port_construct(&ihost->ports[i], i, ihost);
scic_sds_port_construct(&ihost->ports[i], SCIC_SDS_DUMMY_PORT, scic); scic_sds_port_construct(&ihost->ports[i], SCIC_SDS_DUMMY_PORT, ihost);
/* Construct the phys for this controller */ /* Construct the phys for this controller */
for (i = 0; i < SCI_MAX_PHYS; i++) { for (i = 0; i < SCI_MAX_PHYS; i++) {
...@@ -1790,14 +1773,14 @@ static enum sci_status scic_controller_construct(struct scic_sds_controller *sci ...@@ -1790,14 +1773,14 @@ static enum sci_status scic_controller_construct(struct scic_sds_controller *sci
&ihost->ports[SCI_MAX_PORTS], i); &ihost->ports[SCI_MAX_PORTS], i);
} }
scic->invalid_phy_mask = 0; ihost->invalid_phy_mask = 0;
sci_init_timer(&scic->timer, controller_timeout); sci_init_timer(&ihost->timer, controller_timeout);
/* Initialize the User and OEM parameters to default values. */ /* Initialize the User and OEM parameters to default values. */
scic_sds_controller_set_default_config_parameters(scic); scic_sds_controller_set_default_config_parameters(ihost);
return scic_controller_reset(scic); return scic_controller_reset(ihost);
} }
int scic_oem_parameters_validate(struct scic_sds_oem_params *oem) int scic_oem_parameters_validate(struct scic_sds_oem_params *oem)
...@@ -1834,10 +1817,10 @@ int scic_oem_parameters_validate(struct scic_sds_oem_params *oem) ...@@ -1834,10 +1817,10 @@ int scic_oem_parameters_validate(struct scic_sds_oem_params *oem)
return 0; return 0;
} }
static enum sci_status scic_oem_parameters_set(struct scic_sds_controller *scic, static enum sci_status scic_oem_parameters_set(struct isci_host *ihost,
union scic_oem_parameters *scic_parms) union scic_oem_parameters *scic_parms)
{ {
u32 state = scic->sm.current_state_id; u32 state = ihost->sm.current_state_id;
if (state == SCIC_RESET || if (state == SCIC_RESET ||
state == SCIC_INITIALIZING || state == SCIC_INITIALIZING ||
...@@ -1845,7 +1828,7 @@ static enum sci_status scic_oem_parameters_set(struct scic_sds_controller *scic, ...@@ -1845,7 +1828,7 @@ static enum sci_status scic_oem_parameters_set(struct scic_sds_controller *scic,
if (scic_oem_parameters_validate(&scic_parms->sds1)) if (scic_oem_parameters_validate(&scic_parms->sds1))
return SCI_FAILURE_INVALID_PARAMETER_VALUE; return SCI_FAILURE_INVALID_PARAMETER_VALUE;
scic->oem_parameters.sds1 = scic_parms->sds1; ihost->oem_parameters.sds1 = scic_parms->sds1;
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1854,17 +1837,16 @@ static enum sci_status scic_oem_parameters_set(struct scic_sds_controller *scic, ...@@ -1854,17 +1837,16 @@ static enum sci_status scic_oem_parameters_set(struct scic_sds_controller *scic,
} }
void scic_oem_parameters_get( void scic_oem_parameters_get(
struct scic_sds_controller *scic, struct isci_host *ihost,
union scic_oem_parameters *scic_parms) union scic_oem_parameters *scic_parms)
{ {
memcpy(scic_parms, (&scic->oem_parameters), sizeof(*scic_parms)); memcpy(scic_parms, (&ihost->oem_parameters), sizeof(*scic_parms));
} }
static void power_control_timeout(unsigned long data) static void power_control_timeout(unsigned long data)
{ {
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct scic_sds_controller *scic = container_of(tmr, typeof(*scic), power_control.timer); struct isci_host *ihost = container_of(tmr, typeof(*ihost), power_control.timer);
struct isci_host *ihost = scic_to_ihost(scic);
struct isci_phy *iphy; struct isci_phy *iphy;
unsigned long flags; unsigned long flags;
u8 i; u8 i;
...@@ -1874,29 +1856,29 @@ static void power_control_timeout(unsigned long data) ...@@ -1874,29 +1856,29 @@ static void power_control_timeout(unsigned long data)
if (tmr->cancel) if (tmr->cancel)
goto done; goto done;
scic->power_control.phys_granted_power = 0; ihost->power_control.phys_granted_power = 0;
if (scic->power_control.phys_waiting == 0) { if (ihost->power_control.phys_waiting == 0) {
scic->power_control.timer_started = false; ihost->power_control.timer_started = false;
goto done; goto done;
} }
for (i = 0; i < SCI_MAX_PHYS; i++) { for (i = 0; i < SCI_MAX_PHYS; i++) {
if (scic->power_control.phys_waiting == 0) if (ihost->power_control.phys_waiting == 0)
break; break;
iphy = scic->power_control.requesters[i]; iphy = ihost->power_control.requesters[i];
if (iphy == NULL) if (iphy == NULL)
continue; continue;
if (scic->power_control.phys_granted_power >= if (ihost->power_control.phys_granted_power >=
scic->oem_parameters.sds1.controller.max_concurrent_dev_spin_up) ihost->oem_parameters.sds1.controller.max_concurrent_dev_spin_up)
break; break;
scic->power_control.requesters[i] = NULL; ihost->power_control.requesters[i] = NULL;
scic->power_control.phys_waiting--; ihost->power_control.phys_waiting--;
scic->power_control.phys_granted_power++; ihost->power_control.phys_granted_power++;
scic_sds_phy_consume_power_handler(iphy); scic_sds_phy_consume_power_handler(iphy);
} }
...@@ -1905,7 +1887,7 @@ static void power_control_timeout(unsigned long data) ...@@ -1905,7 +1887,7 @@ static void power_control_timeout(unsigned long data)
* timer in case another phy becomes ready. * timer in case another phy becomes ready.
*/ */
sci_mod_timer(tmr, SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL); sci_mod_timer(tmr, SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL);
scic->power_control.timer_started = true; ihost->power_control.timer_started = true;
done: done:
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
...@@ -1918,31 +1900,31 @@ static void power_control_timeout(unsigned long data) ...@@ -1918,31 +1900,31 @@ static void power_control_timeout(unsigned long data)
* *
*/ */
void scic_sds_controller_power_control_queue_insert( void scic_sds_controller_power_control_queue_insert(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_phy *iphy) struct isci_phy *iphy)
{ {
BUG_ON(iphy == NULL); BUG_ON(iphy == NULL);
if (scic->power_control.phys_granted_power < if (ihost->power_control.phys_granted_power <
scic->oem_parameters.sds1.controller.max_concurrent_dev_spin_up) { ihost->oem_parameters.sds1.controller.max_concurrent_dev_spin_up) {
scic->power_control.phys_granted_power++; ihost->power_control.phys_granted_power++;
scic_sds_phy_consume_power_handler(iphy); scic_sds_phy_consume_power_handler(iphy);
/* /*
* stop and start the power_control timer. When the timer fires, the * stop and start the power_control timer. When the timer fires, the
* no_of_phys_granted_power will be set to 0 * no_of_phys_granted_power will be set to 0
*/ */
if (scic->power_control.timer_started) if (ihost->power_control.timer_started)
sci_del_timer(&scic->power_control.timer); sci_del_timer(&ihost->power_control.timer);
sci_mod_timer(&scic->power_control.timer, sci_mod_timer(&ihost->power_control.timer,
SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL); SCIC_SDS_CONTROLLER_POWER_CONTROL_INTERVAL);
scic->power_control.timer_started = true; ihost->power_control.timer_started = true;
} else { } else {
/* Add the phy in the waiting list */ /* Add the phy in the waiting list */
scic->power_control.requesters[iphy->phy_index] = iphy; ihost->power_control.requesters[iphy->phy_index] = iphy;
scic->power_control.phys_waiting++; ihost->power_control.phys_waiting++;
} }
} }
...@@ -1953,16 +1935,16 @@ void scic_sds_controller_power_control_queue_insert( ...@@ -1953,16 +1935,16 @@ void scic_sds_controller_power_control_queue_insert(
* *
*/ */
void scic_sds_controller_power_control_queue_remove( void scic_sds_controller_power_control_queue_remove(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_phy *iphy) struct isci_phy *iphy)
{ {
BUG_ON(iphy == NULL); BUG_ON(iphy == NULL);
if (scic->power_control.requesters[iphy->phy_index] != NULL) { if (ihost->power_control.requesters[iphy->phy_index] != NULL) {
scic->power_control.phys_waiting--; ihost->power_control.phys_waiting--;
} }
scic->power_control.requesters[iphy->phy_index] = NULL; ihost->power_control.requesters[iphy->phy_index] = NULL;
} }
#define AFE_REGISTER_WRITE_DELAY 10 #define AFE_REGISTER_WRITE_DELAY 10
...@@ -1970,50 +1952,50 @@ void scic_sds_controller_power_control_queue_remove( ...@@ -1970,50 +1952,50 @@ void scic_sds_controller_power_control_queue_remove(
/* Initialize the AFE for this phy index. We need to read the AFE setup from /* Initialize the AFE for this phy index. We need to read the AFE setup from
* the OEM parameters * the OEM parameters
*/ */
static void scic_sds_controller_afe_initialization(struct scic_sds_controller *scic) static void scic_sds_controller_afe_initialization(struct isci_host *ihost)
{ {
const struct scic_sds_oem_params *oem = &scic->oem_parameters.sds1; const struct scic_sds_oem_params *oem = &ihost->oem_parameters.sds1;
u32 afe_status; u32 afe_status;
u32 phy_id; u32 phy_id;
/* Clear DFX Status registers */ /* Clear DFX Status registers */
writel(0x0081000f, &scic->scu_registers->afe.afe_dfx_master_control0); writel(0x0081000f, &ihost->scu_registers->afe.afe_dfx_master_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
if (is_b0()) { if (is_b0()) {
/* PM Rx Equalization Save, PM SPhy Rx Acknowledgement /* PM Rx Equalization Save, PM SPhy Rx Acknowledgement
* Timer, PM Stagger Timer */ * Timer, PM Stagger Timer */
writel(0x0007BFFF, &scic->scu_registers->afe.afe_pmsn_master_control2); writel(0x0007BFFF, &ihost->scu_registers->afe.afe_pmsn_master_control2);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
/* Configure bias currents to normal */ /* Configure bias currents to normal */
if (is_a0()) if (is_a0())
writel(0x00005500, &scic->scu_registers->afe.afe_bias_control); writel(0x00005500, &ihost->scu_registers->afe.afe_bias_control);
else if (is_a2()) else if (is_a2())
writel(0x00005A00, &scic->scu_registers->afe.afe_bias_control); writel(0x00005A00, &ihost->scu_registers->afe.afe_bias_control);
else if (is_b0() || is_c0()) else if (is_b0() || is_c0())
writel(0x00005F00, &scic->scu_registers->afe.afe_bias_control); writel(0x00005F00, &ihost->scu_registers->afe.afe_bias_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* Enable PLL */ /* Enable PLL */
if (is_b0() || is_c0()) if (is_b0() || is_c0())
writel(0x80040A08, &scic->scu_registers->afe.afe_pll_control0); writel(0x80040A08, &ihost->scu_registers->afe.afe_pll_control0);
else else
writel(0x80040908, &scic->scu_registers->afe.afe_pll_control0); writel(0x80040908, &ihost->scu_registers->afe.afe_pll_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* Wait for the PLL to lock */ /* Wait for the PLL to lock */
do { do {
afe_status = readl(&scic->scu_registers->afe.afe_common_block_status); afe_status = readl(&ihost->scu_registers->afe.afe_common_block_status);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} while ((afe_status & 0x00001000) == 0); } while ((afe_status & 0x00001000) == 0);
if (is_a0() || is_a2()) { if (is_a0() || is_a2()) {
/* Shorten SAS SNW lock time (RxLock timer value from 76 us to 50 us) */ /* Shorten SAS SNW lock time (RxLock timer value from 76 us to 50 us) */
writel(0x7bcc96ad, &scic->scu_registers->afe.afe_pmsn_master_control0); writel(0x7bcc96ad, &ihost->scu_registers->afe.afe_pmsn_master_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
...@@ -2022,26 +2004,26 @@ static void scic_sds_controller_afe_initialization(struct scic_sds_controller *s ...@@ -2022,26 +2004,26 @@ static void scic_sds_controller_afe_initialization(struct scic_sds_controller *s
if (is_b0()) { if (is_b0()) {
/* Configure transmitter SSC parameters */ /* Configure transmitter SSC parameters */
writel(0x00030000, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control); writel(0x00030000, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} else if (is_c0()) { } else if (is_c0()) {
/* Configure transmitter SSC parameters */ /* Configure transmitter SSC parameters */
writel(0x0003000, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control); writel(0x0003000, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* /*
* All defaults, except the Receive Word Alignament/Comma Detect * All defaults, except the Receive Word Alignament/Comma Detect
* Enable....(0xe800) */ * Enable....(0xe800) */
writel(0x00004500, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0); writel(0x00004500, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} else { } else {
/* /*
* All defaults, except the Receive Word Alignament/Comma Detect * All defaults, except the Receive Word Alignament/Comma Detect
* Enable....(0xe800) */ * Enable....(0xe800) */
writel(0x00004512, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0); writel(0x00004512, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(0x0050100F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control1); writel(0x0050100F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control1);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
...@@ -2049,106 +2031,105 @@ static void scic_sds_controller_afe_initialization(struct scic_sds_controller *s ...@@ -2049,106 +2031,105 @@ static void scic_sds_controller_afe_initialization(struct scic_sds_controller *s
* Power up TX and RX out from power down (PWRDNTX and PWRDNRX) * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)
* & increase TX int & ext bias 20%....(0xe85c) */ * & increase TX int & ext bias 20%....(0xe85c) */
if (is_a0()) if (is_a0())
writel(0x000003D4, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000003D4, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
else if (is_a2()) else if (is_a2())
writel(0x000003F0, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000003F0, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
else if (is_b0()) { else if (is_b0()) {
/* Power down TX and RX (PWRDNTX and PWRDNRX) */ /* Power down TX and RX (PWRDNTX and PWRDNRX) */
writel(0x000003D7, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000003D7, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* /*
* Power up TX and RX out from power down (PWRDNTX and PWRDNRX) * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)
* & increase TX int & ext bias 20%....(0xe85c) */ * & increase TX int & ext bias 20%....(0xe85c) */
writel(0x000003D4, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000003D4, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
} else { } else {
writel(0x000001E7, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000001E7, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* /*
* Power up TX and RX out from power down (PWRDNTX and PWRDNRX) * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)
* & increase TX int & ext bias 20%....(0xe85c) */ * & increase TX int & ext bias 20%....(0xe85c) */
writel(0x000001E4, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control); writel(0x000001E4, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_channel_control);
} }
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
if (is_a0() || is_a2()) { if (is_a0() || is_a2()) {
/* Enable TX equalization (0xe824) */ /* Enable TX equalization (0xe824) */
writel(0x00040000, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control); writel(0x00040000, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
/* /*
* RDPI=0x0(RX Power On), RXOOBDETPDNC=0x0, TPD=0x0(TX Power On), * RDPI=0x0(RX Power On), RXOOBDETPDNC=0x0, TPD=0x0(TX Power On),
* RDD=0x0(RX Detect Enabled) ....(0xe800) */ * RDD=0x0(RX Detect Enabled) ....(0xe800) */
writel(0x00004100, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0); writel(0x00004100, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* Leave DFE/FFE on */ /* Leave DFE/FFE on */
if (is_a0()) if (is_a0())
writel(0x3F09983F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0); writel(0x3F09983F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);
else if (is_a2()) else if (is_a2())
writel(0x3F11103F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0); writel(0x3F11103F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);
else if (is_b0()) { else if (is_b0()) {
writel(0x3F11103F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0); writel(0x3F11103F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* Enable TX equalization (0xe824) */ /* Enable TX equalization (0xe824) */
writel(0x00040000, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control); writel(0x00040000, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control);
} else { } else {
writel(0x0140DF0F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control1); writel(0x0140DF0F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control1);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(0x3F6F103F, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0); writel(0x3F6F103F, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
/* Enable TX equalization (0xe824) */ /* Enable TX equalization (0xe824) */
writel(0x00040000, &scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control); writel(0x00040000, &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_control);
} }
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(oem_phy->afe_tx_amp_control0, writel(oem_phy->afe_tx_amp_control0,
&scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control0); &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(oem_phy->afe_tx_amp_control1, writel(oem_phy->afe_tx_amp_control1,
&scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control1); &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control1);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(oem_phy->afe_tx_amp_control2, writel(oem_phy->afe_tx_amp_control2,
&scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control2); &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control2);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
writel(oem_phy->afe_tx_amp_control3, writel(oem_phy->afe_tx_amp_control3,
&scic->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control3); &ihost->scu_registers->afe.scu_afe_xcvr[phy_id].afe_tx_amp_control3);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
/* Transfer control to the PEs */ /* Transfer control to the PEs */
writel(0x00010f00, &scic->scu_registers->afe.afe_dfx_master_control0); writel(0x00010f00, &ihost->scu_registers->afe.afe_dfx_master_control0);
udelay(AFE_REGISTER_WRITE_DELAY); udelay(AFE_REGISTER_WRITE_DELAY);
} }
static void scic_sds_controller_initialize_power_control(struct scic_sds_controller *scic) static void scic_sds_controller_initialize_power_control(struct isci_host *ihost)
{ {
sci_init_timer(&scic->power_control.timer, power_control_timeout); sci_init_timer(&ihost->power_control.timer, power_control_timeout);
memset(scic->power_control.requesters, 0, memset(ihost->power_control.requesters, 0,
sizeof(scic->power_control.requesters)); sizeof(ihost->power_control.requesters));
scic->power_control.phys_waiting = 0; ihost->power_control.phys_waiting = 0;
scic->power_control.phys_granted_power = 0; ihost->power_control.phys_granted_power = 0;
} }
static enum sci_status scic_controller_initialize(struct scic_sds_controller *scic) static enum sci_status scic_controller_initialize(struct isci_host *ihost)
{ {
struct sci_base_state_machine *sm = &scic->sm; struct sci_base_state_machine *sm = &ihost->sm;
struct isci_host *ihost = scic_to_ihost(scic);
enum sci_status result = SCI_FAILURE; enum sci_status result = SCI_FAILURE;
unsigned long i, state, val; unsigned long i, state, val;
if (scic->sm.current_state_id != SCIC_RESET) { if (ihost->sm.current_state_id != SCIC_RESET) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"SCIC Controller initialize operation requested " "SCIC Controller initialize operation requested "
"in invalid state\n"); "in invalid state\n");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
...@@ -2156,23 +2137,23 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc ...@@ -2156,23 +2137,23 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc
sci_change_state(sm, SCIC_INITIALIZING); sci_change_state(sm, SCIC_INITIALIZING);
sci_init_timer(&scic->phy_timer, phy_startup_timeout); sci_init_timer(&ihost->phy_timer, phy_startup_timeout);
scic->next_phy_to_start = 0; ihost->next_phy_to_start = 0;
scic->phy_startup_timer_pending = false; ihost->phy_startup_timer_pending = false;
scic_sds_controller_initialize_power_control(scic); scic_sds_controller_initialize_power_control(ihost);
/* /*
* There is nothing to do here for B0 since we do not have to * There is nothing to do here for B0 since we do not have to
* program the AFE registers. * program the AFE registers.
* / @todo The AFE settings are supposed to be correct for the B0 but * / @todo The AFE settings are supposed to be correct for the B0 but
* / presently they seem to be wrong. */ * / presently they seem to be wrong. */
scic_sds_controller_afe_initialization(scic); scic_sds_controller_afe_initialization(ihost);
/* Take the hardware out of reset */ /* Take the hardware out of reset */
writel(0, &scic->smu_registers->soft_reset_control); writel(0, &ihost->smu_registers->soft_reset_control);
/* /*
* / @todo Provide meaningfull error code for hardware failure * / @todo Provide meaningfull error code for hardware failure
...@@ -2182,7 +2163,7 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc ...@@ -2182,7 +2163,7 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc
/* Loop until the hardware reports success */ /* Loop until the hardware reports success */
udelay(SCU_CONTEXT_RAM_INIT_STALL_TIME); udelay(SCU_CONTEXT_RAM_INIT_STALL_TIME);
status = readl(&scic->smu_registers->control_status); status = readl(&ihost->smu_registers->control_status);
if ((status & SCU_RAM_INIT_COMPLETED) == SCU_RAM_INIT_COMPLETED) if ((status & SCU_RAM_INIT_COMPLETED) == SCU_RAM_INIT_COMPLETED)
break; break;
...@@ -2193,32 +2174,32 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc ...@@ -2193,32 +2174,32 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc
/* /*
* Determine what are the actaul device capacities that the * Determine what are the actaul device capacities that the
* hardware will support */ * hardware will support */
val = readl(&scic->smu_registers->device_context_capacity); val = readl(&ihost->smu_registers->device_context_capacity);
/* Record the smaller of the two capacity values */ /* Record the smaller of the two capacity values */
scic->logical_port_entries = min(smu_max_ports(val), SCI_MAX_PORTS); ihost->logical_port_entries = min(smu_max_ports(val), SCI_MAX_PORTS);
scic->task_context_entries = min(smu_max_task_contexts(val), SCI_MAX_IO_REQUESTS); ihost->task_context_entries = min(smu_max_task_contexts(val), SCI_MAX_IO_REQUESTS);
scic->remote_node_entries = min(smu_max_rncs(val), SCI_MAX_REMOTE_DEVICES); ihost->remote_node_entries = min(smu_max_rncs(val), SCI_MAX_REMOTE_DEVICES);
/* /*
* Make all PEs that are unassigned match up with the * Make all PEs that are unassigned match up with the
* logical ports * logical ports
*/ */
for (i = 0; i < scic->logical_port_entries; i++) { for (i = 0; i < ihost->logical_port_entries; i++) {
struct scu_port_task_scheduler_group_registers __iomem struct scu_port_task_scheduler_group_registers __iomem
*ptsg = &scic->scu_registers->peg0.ptsg; *ptsg = &ihost->scu_registers->peg0.ptsg;
writel(i, &ptsg->protocol_engine[i]); writel(i, &ptsg->protocol_engine[i]);
} }
/* Initialize hardware PCI Relaxed ordering in DMA engines */ /* Initialize hardware PCI Relaxed ordering in DMA engines */
val = readl(&scic->scu_registers->sdma.pdma_configuration); val = readl(&ihost->scu_registers->sdma.pdma_configuration);
val |= SCU_PDMACR_GEN_BIT(PCI_RELAXED_ORDERING_ENABLE); val |= SCU_PDMACR_GEN_BIT(PCI_RELAXED_ORDERING_ENABLE);
writel(val, &scic->scu_registers->sdma.pdma_configuration); writel(val, &ihost->scu_registers->sdma.pdma_configuration);
val = readl(&scic->scu_registers->sdma.cdma_configuration); val = readl(&ihost->scu_registers->sdma.cdma_configuration);
val |= SCU_CDMACR_GEN_BIT(PCI_RELAXED_ORDERING_ENABLE); val |= SCU_CDMACR_GEN_BIT(PCI_RELAXED_ORDERING_ENABLE);
writel(val, &scic->scu_registers->sdma.cdma_configuration); writel(val, &ihost->scu_registers->sdma.cdma_configuration);
/* /*
* Initialize the PHYs before the PORTs because the PHY registers * Initialize the PHYs before the PORTs because the PHY registers
...@@ -2226,23 +2207,23 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc ...@@ -2226,23 +2207,23 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc
*/ */
for (i = 0; i < SCI_MAX_PHYS; i++) { for (i = 0; i < SCI_MAX_PHYS; i++) {
result = scic_sds_phy_initialize(&ihost->phys[i], result = scic_sds_phy_initialize(&ihost->phys[i],
&scic->scu_registers->peg0.pe[i].tl, &ihost->scu_registers->peg0.pe[i].tl,
&scic->scu_registers->peg0.pe[i].ll); &ihost->scu_registers->peg0.pe[i].ll);
if (result != SCI_SUCCESS) if (result != SCI_SUCCESS)
goto out; goto out;
} }
for (i = 0; i < scic->logical_port_entries; i++) { for (i = 0; i < ihost->logical_port_entries; i++) {
result = scic_sds_port_initialize(&ihost->ports[i], result = scic_sds_port_initialize(&ihost->ports[i],
&scic->scu_registers->peg0.ptsg.port[i], &ihost->scu_registers->peg0.ptsg.port[i],
&scic->scu_registers->peg0.ptsg.protocol_engine, &ihost->scu_registers->peg0.ptsg.protocol_engine,
&scic->scu_registers->peg0.viit[i]); &ihost->scu_registers->peg0.viit[i]);
if (result != SCI_SUCCESS) if (result != SCI_SUCCESS)
goto out; goto out;
} }
result = scic_sds_port_configuration_agent_initialize(scic, &scic->port_agent); result = scic_sds_port_configuration_agent_initialize(ihost, &ihost->port_agent);
out: out:
/* Advance the controller state machine */ /* Advance the controller state machine */
...@@ -2256,10 +2237,10 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc ...@@ -2256,10 +2237,10 @@ static enum sci_status scic_controller_initialize(struct scic_sds_controller *sc
} }
static enum sci_status scic_user_parameters_set( static enum sci_status scic_user_parameters_set(
struct scic_sds_controller *scic, struct isci_host *ihost,
union scic_user_parameters *scic_parms) union scic_user_parameters *scic_parms)
{ {
u32 state = scic->sm.current_state_id; u32 state = ihost->sm.current_state_id;
if (state == SCIC_RESET || if (state == SCIC_RESET ||
state == SCIC_INITIALIZING || state == SCIC_INITIALIZING ||
...@@ -2301,7 +2282,7 @@ static enum sci_status scic_user_parameters_set( ...@@ -2301,7 +2282,7 @@ static enum sci_status scic_user_parameters_set(
(scic_parms->sds1.no_outbound_task_timeout == 0)) (scic_parms->sds1.no_outbound_task_timeout == 0))
return SCI_FAILURE_INVALID_PARAMETER_VALUE; return SCI_FAILURE_INVALID_PARAMETER_VALUE;
memcpy(&scic->user_parameters, scic_parms, sizeof(*scic_parms)); memcpy(&ihost->user_parameters, scic_parms, sizeof(*scic_parms));
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -2309,40 +2290,40 @@ static enum sci_status scic_user_parameters_set( ...@@ -2309,40 +2290,40 @@ static enum sci_status scic_user_parameters_set(
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
static int scic_controller_mem_init(struct scic_sds_controller *scic) static int scic_controller_mem_init(struct isci_host *ihost)
{ {
struct device *dev = scic_to_dev(scic); struct device *dev = &ihost->pdev->dev;
dma_addr_t dma; dma_addr_t dma;
size_t size; size_t size;
int err; int err;
size = SCU_MAX_COMPLETION_QUEUE_ENTRIES * sizeof(u32); size = SCU_MAX_COMPLETION_QUEUE_ENTRIES * sizeof(u32);
scic->completion_queue = dmam_alloc_coherent(dev, size, &dma, GFP_KERNEL); ihost->completion_queue = dmam_alloc_coherent(dev, size, &dma, GFP_KERNEL);
if (!scic->completion_queue) if (!ihost->completion_queue)
return -ENOMEM; return -ENOMEM;
writel(lower_32_bits(dma), &scic->smu_registers->completion_queue_lower); writel(lower_32_bits(dma), &ihost->smu_registers->completion_queue_lower);
writel(upper_32_bits(dma), &scic->smu_registers->completion_queue_upper); writel(upper_32_bits(dma), &ihost->smu_registers->completion_queue_upper);
size = scic->remote_node_entries * sizeof(union scu_remote_node_context); size = ihost->remote_node_entries * sizeof(union scu_remote_node_context);
scic->remote_node_context_table = dmam_alloc_coherent(dev, size, &dma, ihost->remote_node_context_table = dmam_alloc_coherent(dev, size, &dma,
GFP_KERNEL); GFP_KERNEL);
if (!scic->remote_node_context_table) if (!ihost->remote_node_context_table)
return -ENOMEM; return -ENOMEM;
writel(lower_32_bits(dma), &scic->smu_registers->remote_node_context_lower); writel(lower_32_bits(dma), &ihost->smu_registers->remote_node_context_lower);
writel(upper_32_bits(dma), &scic->smu_registers->remote_node_context_upper); writel(upper_32_bits(dma), &ihost->smu_registers->remote_node_context_upper);
size = scic->task_context_entries * sizeof(struct scu_task_context), size = ihost->task_context_entries * sizeof(struct scu_task_context),
scic->task_context_table = dmam_alloc_coherent(dev, size, &dma, GFP_KERNEL); ihost->task_context_table = dmam_alloc_coherent(dev, size, &dma, GFP_KERNEL);
if (!scic->task_context_table) if (!ihost->task_context_table)
return -ENOMEM; return -ENOMEM;
scic->task_context_dma = dma; ihost->task_context_dma = dma;
writel(lower_32_bits(dma), &scic->smu_registers->host_task_table_lower); writel(lower_32_bits(dma), &ihost->smu_registers->host_task_table_lower);
writel(upper_32_bits(dma), &scic->smu_registers->host_task_table_upper); writel(upper_32_bits(dma), &ihost->smu_registers->host_task_table_upper);
err = scic_sds_unsolicited_frame_control_construct(scic); err = scic_sds_unsolicited_frame_control_construct(ihost);
if (err) if (err)
return err; return err;
...@@ -2350,112 +2331,112 @@ static int scic_controller_mem_init(struct scic_sds_controller *scic) ...@@ -2350,112 +2331,112 @@ static int scic_controller_mem_init(struct scic_sds_controller *scic)
* Inform the silicon as to the location of the UF headers and * Inform the silicon as to the location of the UF headers and
* address table. * address table.
*/ */
writel(lower_32_bits(scic->uf_control.headers.physical_address), writel(lower_32_bits(ihost->uf_control.headers.physical_address),
&scic->scu_registers->sdma.uf_header_base_address_lower); &ihost->scu_registers->sdma.uf_header_base_address_lower);
writel(upper_32_bits(scic->uf_control.headers.physical_address), writel(upper_32_bits(ihost->uf_control.headers.physical_address),
&scic->scu_registers->sdma.uf_header_base_address_upper); &ihost->scu_registers->sdma.uf_header_base_address_upper);
writel(lower_32_bits(scic->uf_control.address_table.physical_address), writel(lower_32_bits(ihost->uf_control.address_table.physical_address),
&scic->scu_registers->sdma.uf_address_table_lower); &ihost->scu_registers->sdma.uf_address_table_lower);
writel(upper_32_bits(scic->uf_control.address_table.physical_address), writel(upper_32_bits(ihost->uf_control.address_table.physical_address),
&scic->scu_registers->sdma.uf_address_table_upper); &ihost->scu_registers->sdma.uf_address_table_upper);
return 0; return 0;
} }
int isci_host_init(struct isci_host *isci_host) int isci_host_init(struct isci_host *ihost)
{ {
int err = 0, i; int err = 0, i;
enum sci_status status; enum sci_status status;
union scic_oem_parameters oem; union scic_oem_parameters oem;
union scic_user_parameters scic_user_params; union scic_user_parameters scic_user_params;
struct isci_pci_info *pci_info = to_pci_info(isci_host->pdev); struct isci_pci_info *pci_info = to_pci_info(ihost->pdev);
spin_lock_init(&isci_host->state_lock); spin_lock_init(&ihost->state_lock);
spin_lock_init(&isci_host->scic_lock); spin_lock_init(&ihost->scic_lock);
init_waitqueue_head(&isci_host->eventq); init_waitqueue_head(&ihost->eventq);
isci_host_change_state(isci_host, isci_starting); isci_host_change_state(ihost, isci_starting);
status = scic_controller_construct(&isci_host->sci, scu_base(isci_host), status = scic_controller_construct(ihost, scu_base(ihost),
smu_base(isci_host)); smu_base(ihost));
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(&isci_host->pdev->dev, dev_err(&ihost->pdev->dev,
"%s: scic_controller_construct failed - status = %x\n", "%s: scic_controller_construct failed - status = %x\n",
__func__, __func__,
status); status);
return -ENODEV; return -ENODEV;
} }
isci_host->sas_ha.dev = &isci_host->pdev->dev; ihost->sas_ha.dev = &ihost->pdev->dev;
isci_host->sas_ha.lldd_ha = isci_host; ihost->sas_ha.lldd_ha = ihost;
/* /*
* grab initial values stored in the controller object for OEM and USER * grab initial values stored in the controller object for OEM and USER
* parameters * parameters
*/ */
isci_user_parameters_get(isci_host, &scic_user_params); isci_user_parameters_get(ihost, &scic_user_params);
status = scic_user_parameters_set(&isci_host->sci, status = scic_user_parameters_set(ihost,
&scic_user_params); &scic_user_params);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: scic_user_parameters_set failed\n", "%s: scic_user_parameters_set failed\n",
__func__); __func__);
return -ENODEV; return -ENODEV;
} }
scic_oem_parameters_get(&isci_host->sci, &oem); scic_oem_parameters_get(ihost, &oem);
/* grab any OEM parameters specified in orom */ /* grab any OEM parameters specified in orom */
if (pci_info->orom) { if (pci_info->orom) {
status = isci_parse_oem_parameters(&oem, status = isci_parse_oem_parameters(&oem,
pci_info->orom, pci_info->orom,
isci_host->id); ihost->id);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"parsing firmware oem parameters failed\n"); "parsing firmware oem parameters failed\n");
return -EINVAL; return -EINVAL;
} }
} }
status = scic_oem_parameters_set(&isci_host->sci, &oem); status = scic_oem_parameters_set(ihost, &oem);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: scic_oem_parameters_set failed\n", "%s: scic_oem_parameters_set failed\n",
__func__); __func__);
return -ENODEV; return -ENODEV;
} }
tasklet_init(&isci_host->completion_tasklet, tasklet_init(&ihost->completion_tasklet,
isci_host_completion_routine, (unsigned long)isci_host); isci_host_completion_routine, (unsigned long)ihost);
INIT_LIST_HEAD(&isci_host->requests_to_complete); INIT_LIST_HEAD(&ihost->requests_to_complete);
INIT_LIST_HEAD(&isci_host->requests_to_errorback); INIT_LIST_HEAD(&ihost->requests_to_errorback);
spin_lock_irq(&isci_host->scic_lock); spin_lock_irq(&ihost->scic_lock);
status = scic_controller_initialize(&isci_host->sci); status = scic_controller_initialize(ihost);
spin_unlock_irq(&isci_host->scic_lock); spin_unlock_irq(&ihost->scic_lock);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: scic_controller_initialize failed -" "%s: scic_controller_initialize failed -"
" status = 0x%x\n", " status = 0x%x\n",
__func__, status); __func__, status);
return -ENODEV; return -ENODEV;
} }
err = scic_controller_mem_init(&isci_host->sci); err = scic_controller_mem_init(ihost);
if (err) if (err)
return err; return err;
for (i = 0; i < SCI_MAX_PORTS; i++) for (i = 0; i < SCI_MAX_PORTS; i++)
isci_port_init(&isci_host->ports[i], isci_host, i); isci_port_init(&ihost->ports[i], ihost, i);
for (i = 0; i < SCI_MAX_PHYS; i++) for (i = 0; i < SCI_MAX_PHYS; i++)
isci_phy_init(&isci_host->phys[i], isci_host, i); isci_phy_init(&ihost->phys[i], ihost, i);
for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) { for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) {
struct isci_remote_device *idev = &isci_host->devices[i]; struct isci_remote_device *idev = &ihost->devices[i];
INIT_LIST_HEAD(&idev->reqs_in_process); INIT_LIST_HEAD(&idev->reqs_in_process);
INIT_LIST_HEAD(&idev->node); INIT_LIST_HEAD(&idev->node);
...@@ -2465,63 +2446,62 @@ int isci_host_init(struct isci_host *isci_host) ...@@ -2465,63 +2446,62 @@ int isci_host_init(struct isci_host *isci_host)
struct isci_request *ireq; struct isci_request *ireq;
dma_addr_t dma; dma_addr_t dma;
ireq = dmam_alloc_coherent(&isci_host->pdev->dev, ireq = dmam_alloc_coherent(&ihost->pdev->dev,
sizeof(struct isci_request), &dma, sizeof(struct isci_request), &dma,
GFP_KERNEL); GFP_KERNEL);
if (!ireq) if (!ireq)
return -ENOMEM; return -ENOMEM;
ireq->tc = &isci_host->sci.task_context_table[i]; ireq->tc = &ihost->task_context_table[i];
ireq->owning_controller = &isci_host->sci; ireq->owning_controller = ihost;
spin_lock_init(&ireq->state_lock); spin_lock_init(&ireq->state_lock);
ireq->request_daddr = dma; ireq->request_daddr = dma;
ireq->isci_host = isci_host; ireq->isci_host = ihost;
ihost->reqs[i] = ireq;
isci_host->reqs[i] = ireq;
} }
return 0; return 0;
} }
void scic_sds_controller_link_up(struct scic_sds_controller *scic, void scic_sds_controller_link_up(struct isci_host *ihost,
struct isci_port *iport, struct isci_phy *iphy) struct isci_port *iport, struct isci_phy *iphy)
{ {
switch (scic->sm.current_state_id) { switch (ihost->sm.current_state_id) {
case SCIC_STARTING: case SCIC_STARTING:
sci_del_timer(&scic->phy_timer); sci_del_timer(&ihost->phy_timer);
scic->phy_startup_timer_pending = false; ihost->phy_startup_timer_pending = false;
scic->port_agent.link_up_handler(scic, &scic->port_agent, ihost->port_agent.link_up_handler(ihost, &ihost->port_agent,
iport, iphy); iport, iphy);
scic_sds_controller_start_next_phy(scic); scic_sds_controller_start_next_phy(ihost);
break; break;
case SCIC_READY: case SCIC_READY:
scic->port_agent.link_up_handler(scic, &scic->port_agent, ihost->port_agent.link_up_handler(ihost, &ihost->port_agent,
iport, iphy); iport, iphy);
break; break;
default: default:
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: SCIC Controller linkup event from phy %d in " "%s: SCIC Controller linkup event from phy %d in "
"unexpected state %d\n", __func__, iphy->phy_index, "unexpected state %d\n", __func__, iphy->phy_index,
scic->sm.current_state_id); ihost->sm.current_state_id);
} }
} }
void scic_sds_controller_link_down(struct scic_sds_controller *scic, void scic_sds_controller_link_down(struct isci_host *ihost,
struct isci_port *iport, struct isci_phy *iphy) struct isci_port *iport, struct isci_phy *iphy)
{ {
switch (scic->sm.current_state_id) { switch (ihost->sm.current_state_id) {
case SCIC_STARTING: case SCIC_STARTING:
case SCIC_READY: case SCIC_READY:
scic->port_agent.link_down_handler(scic, &scic->port_agent, ihost->port_agent.link_down_handler(ihost, &ihost->port_agent,
iport, iphy); iport, iphy);
break; break;
default: default:
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: SCIC Controller linkdown event from phy %d in " "%s: SCIC Controller linkdown event from phy %d in "
"unexpected state %d\n", "unexpected state %d\n",
__func__, __func__,
iphy->phy_index, iphy->phy_index,
scic->sm.current_state_id); ihost->sm.current_state_id);
} }
} }
...@@ -2530,14 +2510,13 @@ void scic_sds_controller_link_down(struct scic_sds_controller *scic, ...@@ -2530,14 +2510,13 @@ void scic_sds_controller_link_down(struct scic_sds_controller *scic,
* controller are still in the stopping state. * controller are still in the stopping state.
* *
*/ */
static bool scic_sds_controller_has_remote_devices_stopping( static bool scic_sds_controller_has_remote_devices_stopping(struct isci_host *ihost)
struct scic_sds_controller *controller)
{ {
u32 index; u32 index;
for (index = 0; index < controller->remote_node_entries; index++) { for (index = 0; index < ihost->remote_node_entries; index++) {
if ((controller->device_table[index] != NULL) && if ((ihost->device_table[index] != NULL) &&
(controller->device_table[index]->sm.current_state_id == SCI_DEV_STOPPING)) (ihost->device_table[index]->sm.current_state_id == SCI_DEV_STOPPING))
return true; return true;
} }
...@@ -2548,20 +2527,20 @@ static bool scic_sds_controller_has_remote_devices_stopping( ...@@ -2548,20 +2527,20 @@ static bool scic_sds_controller_has_remote_devices_stopping(
* This method is called by the remote device to inform the controller * This method is called by the remote device to inform the controller
* object that the remote device has stopped. * object that the remote device has stopped.
*/ */
void scic_sds_controller_remote_device_stopped(struct scic_sds_controller *scic, void scic_sds_controller_remote_device_stopped(struct isci_host *ihost,
struct isci_remote_device *idev) struct isci_remote_device *idev)
{ {
if (scic->sm.current_state_id != SCIC_STOPPING) { if (ihost->sm.current_state_id != SCIC_STOPPING) {
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"SCIC Controller 0x%p remote device stopped event " "SCIC Controller 0x%p remote device stopped event "
"from device 0x%p in unexpected state %d\n", "from device 0x%p in unexpected state %d\n",
scic, idev, ihost, idev,
scic->sm.current_state_id); ihost->sm.current_state_id);
return; return;
} }
if (!scic_sds_controller_has_remote_devices_stopping(scic)) { if (!scic_sds_controller_has_remote_devices_stopping(ihost)) {
sci_change_state(&scic->sm, SCIC_STOPPED); sci_change_state(&ihost->sm, SCIC_STOPPED);
} }
} }
...@@ -2573,32 +2552,32 @@ void scic_sds_controller_remote_device_stopped(struct scic_sds_controller *scic, ...@@ -2573,32 +2552,32 @@ void scic_sds_controller_remote_device_stopped(struct scic_sds_controller *scic,
* *
*/ */
void scic_sds_controller_post_request( void scic_sds_controller_post_request(
struct scic_sds_controller *scic, struct isci_host *ihost,
u32 request) u32 request)
{ {
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: SCIC Controller 0x%p post request 0x%08x\n", "%s: SCIC Controller 0x%p post request 0x%08x\n",
__func__, __func__,
scic, ihost,
request); request);
writel(request, &scic->smu_registers->post_context_port); writel(request, &ihost->smu_registers->post_context_port);
} }
struct isci_request *scic_request_by_tag(struct scic_sds_controller *scic, u16 io_tag) struct isci_request *scic_request_by_tag(struct isci_host *ihost, u16 io_tag)
{ {
u16 task_index; u16 task_index;
u16 task_sequence; u16 task_sequence;
task_index = ISCI_TAG_TCI(io_tag); task_index = ISCI_TAG_TCI(io_tag);
if (task_index < scic->task_context_entries) { if (task_index < ihost->task_context_entries) {
struct isci_request *ireq = scic_to_ihost(scic)->reqs[task_index]; struct isci_request *ireq = ihost->reqs[task_index];
if (test_bit(IREQ_ACTIVE, &ireq->flags)) { if (test_bit(IREQ_ACTIVE, &ireq->flags)) {
task_sequence = ISCI_TAG_SEQ(io_tag); task_sequence = ISCI_TAG_SEQ(io_tag);
if (task_sequence == scic->io_request_sequence[task_index]) if (task_sequence == ihost->io_request_sequence[task_index])
return ireq; return ireq;
} }
} }
...@@ -2621,7 +2600,7 @@ struct isci_request *scic_request_by_tag(struct scic_sds_controller *scic, u16 i ...@@ -2621,7 +2600,7 @@ struct isci_request *scic_request_by_tag(struct scic_sds_controller *scic, u16 i
* node index available. * node index available.
*/ */
enum sci_status scic_sds_controller_allocate_remote_node_context( enum sci_status scic_sds_controller_allocate_remote_node_context(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 *node_id) u16 *node_id)
{ {
...@@ -2629,11 +2608,11 @@ enum sci_status scic_sds_controller_allocate_remote_node_context( ...@@ -2629,11 +2608,11 @@ enum sci_status scic_sds_controller_allocate_remote_node_context(
u32 remote_node_count = scic_sds_remote_device_node_count(idev); u32 remote_node_count = scic_sds_remote_device_node_count(idev);
node_index = scic_sds_remote_node_table_allocate_remote_node( node_index = scic_sds_remote_node_table_allocate_remote_node(
&scic->available_remote_nodes, remote_node_count &ihost->available_remote_nodes, remote_node_count
); );
if (node_index != SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX) { if (node_index != SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX) {
scic->device_table[node_index] = idev; ihost->device_table[node_index] = idev;
*node_id = node_index; *node_id = node_index;
...@@ -2653,17 +2632,17 @@ enum sci_status scic_sds_controller_allocate_remote_node_context( ...@@ -2653,17 +2632,17 @@ enum sci_status scic_sds_controller_allocate_remote_node_context(
* *
*/ */
void scic_sds_controller_free_remote_node_context( void scic_sds_controller_free_remote_node_context(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 node_id) u16 node_id)
{ {
u32 remote_node_count = scic_sds_remote_device_node_count(idev); u32 remote_node_count = scic_sds_remote_device_node_count(idev);
if (scic->device_table[node_id] == idev) { if (ihost->device_table[node_id] == idev) {
scic->device_table[node_id] = NULL; ihost->device_table[node_id] = NULL;
scic_sds_remote_node_table_release_remote_node_index( scic_sds_remote_node_table_release_remote_node_index(
&scic->available_remote_nodes, remote_node_count, node_id &ihost->available_remote_nodes, remote_node_count, node_id
); );
} }
} }
...@@ -2677,14 +2656,14 @@ void scic_sds_controller_free_remote_node_context( ...@@ -2677,14 +2656,14 @@ void scic_sds_controller_free_remote_node_context(
* union scu_remote_node_context* * union scu_remote_node_context*
*/ */
union scu_remote_node_context *scic_sds_controller_get_remote_node_context_buffer( union scu_remote_node_context *scic_sds_controller_get_remote_node_context_buffer(
struct scic_sds_controller *scic, struct isci_host *ihost,
u16 node_id u16 node_id
) { ) {
if ( if (
(node_id < scic->remote_node_entries) (node_id < ihost->remote_node_entries)
&& (scic->device_table[node_id] != NULL) && (ihost->device_table[node_id] != NULL)
) { ) {
return &scic->remote_node_context_table[node_id]; return &ihost->remote_node_context_table[node_id];
} }
return NULL; return NULL;
...@@ -2722,13 +2701,13 @@ void scic_sds_controller_copy_sata_response( ...@@ -2722,13 +2701,13 @@ void scic_sds_controller_copy_sata_response(
* *
*/ */
void scic_sds_controller_release_frame( void scic_sds_controller_release_frame(
struct scic_sds_controller *scic, struct isci_host *ihost,
u32 frame_index) u32 frame_index)
{ {
if (scic_sds_unsolicited_frame_control_release_frame( if (scic_sds_unsolicited_frame_control_release_frame(
&scic->uf_control, frame_index) == true) &ihost->uf_control, frame_index) == true)
writel(scic->uf_control.get, writel(ihost->uf_control.get,
&scic->scu_registers->sdma.unsolicited_frame_get_pointer); &ihost->scu_registers->sdma.unsolicited_frame_get_pointer);
} }
void isci_tci_free(struct isci_host *ihost, u16 tci) void isci_tci_free(struct isci_host *ihost, u16 tci)
...@@ -2757,7 +2736,7 @@ u16 isci_alloc_tag(struct isci_host *ihost) ...@@ -2757,7 +2736,7 @@ u16 isci_alloc_tag(struct isci_host *ihost)
{ {
if (isci_tci_space(ihost)) { if (isci_tci_space(ihost)) {
u16 tci = isci_tci_alloc(ihost); u16 tci = isci_tci_alloc(ihost);
u8 seq = ihost->sci.io_request_sequence[tci]; u8 seq = ihost->io_request_sequence[tci];
return ISCI_TAG(seq, tci); return ISCI_TAG(seq, tci);
} }
...@@ -2767,7 +2746,6 @@ u16 isci_alloc_tag(struct isci_host *ihost) ...@@ -2767,7 +2746,6 @@ u16 isci_alloc_tag(struct isci_host *ihost)
enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag) enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag)
{ {
struct scic_sds_controller *scic = &ihost->sci;
u16 tci = ISCI_TAG_TCI(io_tag); u16 tci = ISCI_TAG_TCI(io_tag);
u16 seq = ISCI_TAG_SEQ(io_tag); u16 seq = ISCI_TAG_SEQ(io_tag);
...@@ -2775,8 +2753,8 @@ enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag) ...@@ -2775,8 +2753,8 @@ enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag)
if (isci_tci_active(ihost) == 0) if (isci_tci_active(ihost) == 0)
return SCI_FAILURE_INVALID_IO_TAG; return SCI_FAILURE_INVALID_IO_TAG;
if (seq == scic->io_request_sequence[tci]) { if (seq == ihost->io_request_sequence[tci]) {
scic->io_request_sequence[tci] = (seq+1) & (SCI_MAX_SEQ-1); ihost->io_request_sequence[tci] = (seq+1) & (SCI_MAX_SEQ-1);
isci_tci_free(ihost, tci); isci_tci_free(ihost, tci);
...@@ -2797,23 +2775,23 @@ enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag) ...@@ -2797,23 +2775,23 @@ enum sci_status isci_free_tag(struct isci_host *ihost, u16 io_tag)
* @io_tag: This parameter specifies a previously allocated IO tag that the * @io_tag: This parameter specifies a previously allocated IO tag that the
* user desires to be utilized for this request. * user desires to be utilized for this request.
*/ */
enum sci_status scic_controller_start_io(struct scic_sds_controller *scic, enum sci_status scic_controller_start_io(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
enum sci_status status; enum sci_status status;
if (scic->sm.current_state_id != SCIC_READY) { if (ihost->sm.current_state_id != SCIC_READY) {
dev_warn(scic_to_dev(scic), "invalid state to start I/O"); dev_warn(&ihost->pdev->dev, "invalid state to start I/O");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
status = scic_sds_remote_device_start_io(scic, idev, ireq); status = scic_sds_remote_device_start_io(ihost, idev, ireq);
if (status != SCI_SUCCESS) if (status != SCI_SUCCESS)
return status; return status;
set_bit(IREQ_ACTIVE, &ireq->flags); set_bit(IREQ_ACTIVE, &ireq->flags);
scic_sds_controller_post_request(scic, scic_sds_request_get_post_context(ireq)); scic_sds_controller_post_request(ihost, scic_sds_request_get_post_context(ireq));
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -2834,14 +2812,14 @@ enum sci_status scic_controller_start_io(struct scic_sds_controller *scic, ...@@ -2834,14 +2812,14 @@ enum sci_status scic_controller_start_io(struct scic_sds_controller *scic,
* for the request. Determine the failure situations and return values. * for the request. Determine the failure situations and return values.
*/ */
enum sci_status scic_controller_terminate_request( enum sci_status scic_controller_terminate_request(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
enum sci_status status; enum sci_status status;
if (scic->sm.current_state_id != SCIC_READY) { if (ihost->sm.current_state_id != SCIC_READY) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"invalid state to terminate request\n"); "invalid state to terminate request\n");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
...@@ -2854,7 +2832,7 @@ enum sci_status scic_controller_terminate_request( ...@@ -2854,7 +2832,7 @@ enum sci_status scic_controller_terminate_request(
* Utilize the original post context command and or in the POST_TC_ABORT * Utilize the original post context command and or in the POST_TC_ABORT
* request sub-type. * request sub-type.
*/ */
scic_sds_controller_post_request(scic, scic_sds_controller_post_request(ihost,
scic_sds_request_get_post_context(ireq) | scic_sds_request_get_post_context(ireq) |
SCU_CONTEXT_COMMAND_REQUEST_POST_TC_ABORT); SCU_CONTEXT_COMMAND_REQUEST_POST_TC_ABORT);
return SCI_SUCCESS; return SCI_SUCCESS;
...@@ -2872,19 +2850,19 @@ enum sci_status scic_controller_terminate_request( ...@@ -2872,19 +2850,19 @@ enum sci_status scic_controller_terminate_request(
* @io_request: the handle to the io request object to complete. * @io_request: the handle to the io request object to complete.
*/ */
enum sci_status scic_controller_complete_io( enum sci_status scic_controller_complete_io(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
enum sci_status status; enum sci_status status;
u16 index; u16 index;
switch (scic->sm.current_state_id) { switch (ihost->sm.current_state_id) {
case SCIC_STOPPING: case SCIC_STOPPING:
/* XXX: Implement this function */ /* XXX: Implement this function */
return SCI_FAILURE; return SCI_FAILURE;
case SCIC_READY: case SCIC_READY:
status = scic_sds_remote_device_complete_io(scic, idev, ireq); status = scic_sds_remote_device_complete_io(ihost, idev, ireq);
if (status != SCI_SUCCESS) if (status != SCI_SUCCESS)
return status; return status;
...@@ -2892,7 +2870,7 @@ enum sci_status scic_controller_complete_io( ...@@ -2892,7 +2870,7 @@ enum sci_status scic_controller_complete_io(
clear_bit(IREQ_ACTIVE, &ireq->flags); clear_bit(IREQ_ACTIVE, &ireq->flags);
return SCI_SUCCESS; return SCI_SUCCESS;
default: default:
dev_warn(scic_to_dev(scic), "invalid state to complete I/O"); dev_warn(&ihost->pdev->dev, "invalid state to complete I/O");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
...@@ -2900,15 +2878,15 @@ enum sci_status scic_controller_complete_io( ...@@ -2900,15 +2878,15 @@ enum sci_status scic_controller_complete_io(
enum sci_status scic_controller_continue_io(struct isci_request *ireq) enum sci_status scic_controller_continue_io(struct isci_request *ireq)
{ {
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
if (scic->sm.current_state_id != SCIC_READY) { if (ihost->sm.current_state_id != SCIC_READY) {
dev_warn(scic_to_dev(scic), "invalid state to continue I/O"); dev_warn(&ihost->pdev->dev, "invalid state to continue I/O");
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
set_bit(IREQ_ACTIVE, &ireq->flags); set_bit(IREQ_ACTIVE, &ireq->flags);
scic_sds_controller_post_request(scic, scic_sds_request_get_post_context(ireq)); scic_sds_controller_post_request(ihost, scic_sds_request_get_post_context(ireq));
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -2922,21 +2900,21 @@ enum sci_status scic_controller_continue_io(struct isci_request *ireq) ...@@ -2922,21 +2900,21 @@ enum sci_status scic_controller_continue_io(struct isci_request *ireq)
* @task_request: the handle to the task request object to start. * @task_request: the handle to the task request object to start.
*/ */
enum sci_task_status scic_controller_start_task( enum sci_task_status scic_controller_start_task(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
enum sci_status status; enum sci_status status;
if (scic->sm.current_state_id != SCIC_READY) { if (ihost->sm.current_state_id != SCIC_READY) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC Controller starting task from invalid " "%s: SCIC Controller starting task from invalid "
"state\n", "state\n",
__func__); __func__);
return SCI_TASK_FAILURE_INVALID_STATE; return SCI_TASK_FAILURE_INVALID_STATE;
} }
status = scic_sds_remote_device_start_task(scic, idev, ireq); status = scic_sds_remote_device_start_task(ihost, idev, ireq);
switch (status) { switch (status) {
case SCI_FAILURE_RESET_DEVICE_PARTIAL_SUCCESS: case SCI_FAILURE_RESET_DEVICE_PARTIAL_SUCCESS:
set_bit(IREQ_ACTIVE, &ireq->flags); set_bit(IREQ_ACTIVE, &ireq->flags);
...@@ -2950,7 +2928,7 @@ enum sci_task_status scic_controller_start_task( ...@@ -2950,7 +2928,7 @@ enum sci_task_status scic_controller_start_task(
case SCI_SUCCESS: case SCI_SUCCESS:
set_bit(IREQ_ACTIVE, &ireq->flags); set_bit(IREQ_ACTIVE, &ireq->flags);
scic_sds_controller_post_request(scic, scic_sds_controller_post_request(ihost,
scic_sds_request_get_post_context(ireq)); scic_sds_request_get_post_context(ireq));
break; break;
default: default:
......
drivers/scsi/isci/host.h
View file @ d9dcb4ba
...@@ -106,7 +106,7 @@ struct scic_power_control { ...@@ -106,7 +106,7 @@ struct scic_power_control {
}; };
struct scic_sds_port_configuration_agent; struct scic_sds_port_configuration_agent;
typedef void (*port_config_fn)(struct scic_sds_controller *, typedef void (*port_config_fn)(struct isci_host *,
struct scic_sds_port_configuration_agent *, struct scic_sds_port_configuration_agent *,
struct isci_port *, struct isci_phy *); struct isci_port *, struct isci_phy *);
...@@ -124,171 +124,66 @@ struct scic_sds_port_configuration_agent { ...@@ -124,171 +124,66 @@ struct scic_sds_port_configuration_agent {
}; };
/** /**
* struct scic_sds_controller - * isci_host - primary host/controller object
* * @timer: timeout start/stop operations
* This structure represents the SCU controller object. * @device_table: rni (hw remote node index) to remote device lookup table
*/ * @available_remote_nodes: rni allocator
struct scic_sds_controller { * @power_control: manage device spin up
/** * @io_request_sequence: generation number for tci's (task contexts)
* This field contains the information for the base controller state * @task_context_table: hw task context table
* machine. * @remote_node_context_table: hw remote node context table
*/ * @completion_queue: hw-producer driver-consumer communication ring
struct sci_base_state_machine sm; * @completion_queue_get: tracks the driver 'head' of the ring to notify hw
* @logical_port_entries: min({driver|silicon}-supported-port-count)
* @remote_node_entries: min({driver|silicon}-supported-node-count)
* @task_context_entries: min({driver|silicon}-supported-task-count)
* @phy_timer: phy startup timer
* @invalid_phy_mask: if an invalid_link_up notification is reported a bit for
* the phy index is set so further notifications are not
* made. Once the phy reports link up and is made part of a
* port then this bit is cleared.
/**
* Timer for controller start/stop operations.
*/ */
struct isci_host {
struct sci_base_state_machine sm;
/* XXX can we time this externally */
struct sci_timer timer; struct sci_timer timer;
/* XXX drop reference module params directly */
/**
* This field contains the user parameters to be utilized for this
* core controller object.
*/
union scic_user_parameters user_parameters; union scic_user_parameters user_parameters;
/* XXX no need to be a union */
/**
* This field contains the OEM parameters to be utilized for this
* core controller object.
*/
union scic_oem_parameters oem_parameters; union scic_oem_parameters oem_parameters;
/**
* This field contains the port configuration agent for this controller.
*/
struct scic_sds_port_configuration_agent port_agent; struct scic_sds_port_configuration_agent port_agent;
/**
* This field is the array of device objects that are currently constructed
* for this controller object. This table is used as a fast lookup of device
* objects that need to handle device completion notifications from the
* hardware. The table is RNi based.
*/
struct isci_remote_device *device_table[SCI_MAX_REMOTE_DEVICES]; struct isci_remote_device *device_table[SCI_MAX_REMOTE_DEVICES];
/**
* This field is the free RNi data structure
*/
struct scic_remote_node_table available_remote_nodes; struct scic_remote_node_table available_remote_nodes;
/**
* This filed is the struct scic_power_control data used to controll when direct
* attached devices can consume power.
*/
struct scic_power_control power_control; struct scic_power_control power_control;
/* sequence number per tci */
u8 io_request_sequence[SCI_MAX_IO_REQUESTS]; u8 io_request_sequence[SCI_MAX_IO_REQUESTS];
/**
* This field is a pointer to the memory allocated by the driver for the task
* context table. This data is shared between the hardware and software.
*/
struct scu_task_context *task_context_table; struct scu_task_context *task_context_table;
dma_addr_t task_context_dma; dma_addr_t task_context_dma;
/**
* This field is a pointer to the memory allocated by the driver for the
* remote node context table. This table is shared between the hardware and
* software.
*/
union scu_remote_node_context *remote_node_context_table; union scu_remote_node_context *remote_node_context_table;
/**
* This field is a pointer to the completion queue. This memory is
* written to by the hardware and read by the software.
*/
u32 *completion_queue; u32 *completion_queue;
/**
* This field is the software copy of the completion queue get pointer. The
* controller object writes this value to the hardware after processing the
* completion entries.
*/
u32 completion_queue_get; u32 completion_queue_get;
/**
* This field is the minimum of the number of hardware supported port entries
* and the software requested port entries.
*/
u32 logical_port_entries; u32 logical_port_entries;
/**
* This field is the minimum number of devices supported by the hardware and
* the number of devices requested by the software.
*/
u32 remote_node_entries; u32 remote_node_entries;
/**
* This field is the minimum number of IO requests supported by the hardware
* and the number of IO requests requested by the software.
*/
u32 task_context_entries; u32 task_context_entries;
/**
* This object contains all of the unsolicited frame specific
* data utilized by the core controller.
*/
struct scic_sds_unsolicited_frame_control uf_control; struct scic_sds_unsolicited_frame_control uf_control;
/* Phy Startup Data */ /* phy startup */
/**
* Timer for controller phy request startup. On controller start the
* controller will start each PHY individually in order of phy index.
*/
struct sci_timer phy_timer; struct sci_timer phy_timer;
/* XXX kill */
/**
* This field is set when the phy_timer is running and is cleared when
* the phy_timer is stopped.
*/
bool phy_startup_timer_pending; bool phy_startup_timer_pending;
/**
* This field is the index of the next phy start. It is initialized to 0 and
* increments for each phy index that is started.
*/
u32 next_phy_to_start; u32 next_phy_to_start;
/**
* This field controlls the invalid link up notifications to the SCI_USER. If
* an invalid_link_up notification is reported a bit for the PHY index is set
* so further notifications are not made. Once the PHY object reports link up
* and is made part of a port then this bit for the PHY index is cleared.
*/
u8 invalid_phy_mask; u8 invalid_phy_mask;
/* /* TODO attempt dynamic interrupt coalescing scheme */
* This field saves the current interrupt coalescing number of the controller.
*/
u16 interrupt_coalesce_number; u16 interrupt_coalesce_number;
/*
* This field saves the current interrupt coalescing timeout value in microseconds.
*/
u32 interrupt_coalesce_timeout; u32 interrupt_coalesce_timeout;
/**
* This field is a pointer to the memory mapped register space for the
* struct smu_registers.
*/
struct smu_registers __iomem *smu_registers; struct smu_registers __iomem *smu_registers;
/**
* This field is a pointer to the memory mapped register space for the
* struct scu_registers.
*/
struct scu_registers __iomem *scu_registers; struct scu_registers __iomem *scu_registers;
};
struct isci_host {
struct scic_sds_controller sci;
u16 tci_head; u16 tci_head;
u16 tci_tail; u16 tci_tail;
u16 tci_pool[SCI_MAX_IO_REQUESTS]; u16 tci_pool[SCI_MAX_IO_REQUESTS];
union scic_oem_parameters oem_parameters;
int id; /* unique within a given pci device */ int id; /* unique within a given pci device */
struct isci_phy phys[SCI_MAX_PHYS]; struct isci_phy phys[SCI_MAX_PHYS];
struct isci_port ports[SCI_MAX_PORTS + 1]; /* includes dummy port */ struct isci_port ports[SCI_MAX_PORTS + 1]; /* includes dummy port */
...@@ -464,14 +359,6 @@ static inline struct isci_host *dev_to_ihost(struct domain_device *dev) ...@@ -464,14 +359,6 @@ static inline struct isci_host *dev_to_ihost(struct domain_device *dev)
return dev->port->ha->lldd_ha; return dev->port->ha->lldd_ha;
} }
static inline struct isci_host *scic_to_ihost(struct scic_sds_controller *scic)
{
/* XXX delete after merging scic_sds_contoller and isci_host */
struct isci_host *ihost = container_of(scic, typeof(*ihost), sci);
return ihost;
}
/** /**
* scic_sds_controller_get_protocol_engine_group() - * scic_sds_controller_get_protocol_engine_group() -
* *
...@@ -518,11 +405,6 @@ static inline int scic_sds_remote_device_node_count(struct isci_remote_device *i ...@@ -518,11 +405,6 @@ static inline int scic_sds_remote_device_node_count(struct isci_remote_device *i
#define scic_sds_controller_clear_invalid_phy(controller, phy) \ #define scic_sds_controller_clear_invalid_phy(controller, phy) \
((controller)->invalid_phy_mask &= ~(1 << (phy)->phy_index)) ((controller)->invalid_phy_mask &= ~(1 << (phy)->phy_index))
static inline struct device *scic_to_dev(struct scic_sds_controller *scic)
{
return &scic_to_ihost(scic)->pdev->dev;
}
static inline struct device *sciphy_to_dev(struct isci_phy *iphy) static inline struct device *sciphy_to_dev(struct isci_phy *iphy)
{ {
...@@ -578,54 +460,54 @@ static inline bool is_c0(void) ...@@ -578,54 +460,54 @@ static inline bool is_c0(void)
return isci_si_rev > ISCI_SI_REVB0; return isci_si_rev > ISCI_SI_REVB0;
} }
void scic_sds_controller_post_request(struct scic_sds_controller *scic, void scic_sds_controller_post_request(struct isci_host *ihost,
u32 request); u32 request);
void scic_sds_controller_release_frame(struct scic_sds_controller *scic, void scic_sds_controller_release_frame(struct isci_host *ihost,
u32 frame_index); u32 frame_index);
void scic_sds_controller_copy_sata_response(void *response_buffer, void scic_sds_controller_copy_sata_response(void *response_buffer,
void *frame_header, void *frame_header,
void *frame_buffer); void *frame_buffer);
enum sci_status scic_sds_controller_allocate_remote_node_context(struct scic_sds_controller *scic, enum sci_status scic_sds_controller_allocate_remote_node_context(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 *node_id); u16 *node_id);
void scic_sds_controller_free_remote_node_context( void scic_sds_controller_free_remote_node_context(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 node_id); u16 node_id);
union scu_remote_node_context *scic_sds_controller_get_remote_node_context_buffer( union scu_remote_node_context *scic_sds_controller_get_remote_node_context_buffer(
struct scic_sds_controller *scic, struct isci_host *ihost,
u16 node_id); u16 node_id);
struct isci_request *scic_request_by_tag(struct scic_sds_controller *scic, struct isci_request *scic_request_by_tag(struct isci_host *ihost,
u16 io_tag); u16 io_tag);
void scic_sds_controller_power_control_queue_insert( void scic_sds_controller_power_control_queue_insert(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_phy *iphy); struct isci_phy *iphy);
void scic_sds_controller_power_control_queue_remove( void scic_sds_controller_power_control_queue_remove(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_phy *iphy); struct isci_phy *iphy);
void scic_sds_controller_link_up( void scic_sds_controller_link_up(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy); struct isci_phy *iphy);
void scic_sds_controller_link_down( void scic_sds_controller_link_down(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy); struct isci_phy *iphy);
void scic_sds_controller_remote_device_stopped( void scic_sds_controller_remote_device_stopped(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev); struct isci_remote_device *idev);
void scic_sds_controller_copy_task_context( void scic_sds_controller_copy_task_context(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_request *ireq); struct isci_request *ireq);
void scic_sds_controller_register_setup(struct scic_sds_controller *scic); void scic_sds_controller_register_setup(struct isci_host *ihost);
enum sci_status scic_controller_continue_io(struct isci_request *ireq); enum sci_status scic_controller_continue_io(struct isci_request *ireq);
int isci_host_scan_finished(struct Scsi_Host *, unsigned long); int isci_host_scan_finished(struct Scsi_Host *, unsigned long);
...@@ -655,25 +537,25 @@ void isci_host_remote_device_start_complete( ...@@ -655,25 +537,25 @@ void isci_host_remote_device_start_complete(
enum sci_status); enum sci_status);
void scic_controller_disable_interrupts( void scic_controller_disable_interrupts(
struct scic_sds_controller *scic); struct isci_host *ihost);
enum sci_status scic_controller_start_io( enum sci_status scic_controller_start_io(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
enum sci_task_status scic_controller_start_task( enum sci_task_status scic_controller_start_task(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
enum sci_status scic_controller_terminate_request( enum sci_status scic_controller_terminate_request(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
enum sci_status scic_controller_complete_io( enum sci_status scic_controller_complete_io(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
...@@ -681,6 +563,6 @@ void scic_sds_port_configuration_agent_construct( ...@@ -681,6 +563,6 @@ void scic_sds_port_configuration_agent_construct(
struct scic_sds_port_configuration_agent *port_agent); struct scic_sds_port_configuration_agent *port_agent);
enum sci_status scic_sds_port_configuration_agent_initialize( enum sci_status scic_sds_port_configuration_agent_initialize(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent); struct scic_sds_port_configuration_agent *port_agent);
#endif #endif
drivers/scsi/isci/init.c
View file @ d9dcb4ba
...@@ -548,13 +548,13 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic ...@@ -548,13 +548,13 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
static void __devexit isci_pci_remove(struct pci_dev *pdev) static void __devexit isci_pci_remove(struct pci_dev *pdev)
{ {
struct isci_host *isci_host; struct isci_host *ihost;
int i; int i;
for_each_isci_host(i, isci_host, pdev) { for_each_isci_host(i, ihost, pdev) {
isci_unregister(isci_host); isci_unregister(ihost);
isci_host_deinit(isci_host); isci_host_deinit(ihost);
scic_controller_disable_interrupts(&isci_host->sci); scic_controller_disable_interrupts(ihost);
} }
} }
......
drivers/scsi/isci/phy.c
View file @ d9dcb4ba
...@@ -112,13 +112,13 @@ static enum sci_status ...@@ -112,13 +112,13 @@ static enum sci_status
scic_sds_phy_link_layer_initialization(struct isci_phy *iphy, scic_sds_phy_link_layer_initialization(struct isci_phy *iphy,
struct scu_link_layer_registers __iomem *link_layer_registers) struct scu_link_layer_registers __iomem *link_layer_registers)
{ {
struct scic_sds_controller *scic = struct isci_host *ihost =
iphy->owning_port->owning_controller; iphy->owning_port->owning_controller;
int phy_idx = iphy->phy_index; int phy_idx = iphy->phy_index;
struct sci_phy_user_params *phy_user = struct sci_phy_user_params *phy_user =
&scic->user_parameters.sds1.phys[phy_idx]; &ihost->user_parameters.sds1.phys[phy_idx];
struct sci_phy_oem_params *phy_oem = struct sci_phy_oem_params *phy_oem =
&scic->oem_parameters.sds1.phys[phy_idx]; &ihost->oem_parameters.sds1.phys[phy_idx];
u32 phy_configuration; u32 phy_configuration;
struct scic_phy_cap phy_cap; struct scic_phy_cap phy_cap;
u32 parity_check = 0; u32 parity_check = 0;
...@@ -169,7 +169,7 @@ scic_sds_phy_link_layer_initialization(struct isci_phy *iphy, ...@@ -169,7 +169,7 @@ scic_sds_phy_link_layer_initialization(struct isci_phy *iphy,
phy_cap.gen3_no_ssc = 1; phy_cap.gen3_no_ssc = 1;
phy_cap.gen2_no_ssc = 1; phy_cap.gen2_no_ssc = 1;
phy_cap.gen1_no_ssc = 1; phy_cap.gen1_no_ssc = 1;
if (scic->oem_parameters.sds1.controller.do_enable_ssc == true) { if (ihost->oem_parameters.sds1.controller.do_enable_ssc == true) {
phy_cap.gen3_ssc = 1; phy_cap.gen3_ssc = 1;
phy_cap.gen2_ssc = 1; phy_cap.gen2_ssc = 1;
phy_cap.gen1_ssc = 1; phy_cap.gen1_ssc = 1;
...@@ -216,7 +216,7 @@ scic_sds_phy_link_layer_initialization(struct isci_phy *iphy, ...@@ -216,7 +216,7 @@ scic_sds_phy_link_layer_initialization(struct isci_phy *iphy,
&iphy->link_layer_registers->afe_lookup_table_control); &iphy->link_layer_registers->afe_lookup_table_control);
llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT, llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT,
(u8)scic->user_parameters.sds1.no_outbound_task_timeout); (u8)ihost->user_parameters.sds1.no_outbound_task_timeout);
switch(phy_user->max_speed_generation) { switch(phy_user->max_speed_generation) {
case SCIC_SDS_PARM_GEN3_SPEED: case SCIC_SDS_PARM_GEN3_SPEED:
...@@ -255,7 +255,7 @@ static void phy_sata_timeout(unsigned long data) ...@@ -255,7 +255,7 @@ static void phy_sata_timeout(unsigned long data)
{ {
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct isci_phy *iphy = container_of(tmr, typeof(*iphy), sata_timer); struct isci_phy *iphy = container_of(tmr, typeof(*iphy), sata_timer);
struct isci_host *ihost = scic_to_ihost(iphy->owning_port->owning_controller); struct isci_host *ihost = iphy->owning_port->owning_controller;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
...@@ -890,7 +890,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy, ...@@ -890,7 +890,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy,
u32 frame_index) u32 frame_index)
{ {
enum scic_sds_phy_states state = iphy->sm.current_state_id; enum scic_sds_phy_states state = iphy->sm.current_state_id;
struct scic_sds_controller *scic = iphy->owning_port->owning_controller; struct isci_host *ihost = iphy->owning_port->owning_controller;
enum sci_status result; enum sci_status result;
unsigned long flags; unsigned long flags;
...@@ -899,7 +899,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy, ...@@ -899,7 +899,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy,
u32 *frame_words; u32 *frame_words;
struct sas_identify_frame iaf; struct sas_identify_frame iaf;
result = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, result = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_words); (void **)&frame_words);
...@@ -933,7 +933,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy, ...@@ -933,7 +933,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy,
"unexpected frame id %x\n", "unexpected frame id %x\n",
__func__, frame_index); __func__, frame_index);
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return result; return result;
} }
case SCI_PHY_SUB_AWAIT_SIG_FIS_UF: { case SCI_PHY_SUB_AWAIT_SIG_FIS_UF: {
...@@ -950,7 +950,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy, ...@@ -950,7 +950,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy,
if ((frame_header->fis_type == FIS_REGD2H) && if ((frame_header->fis_type == FIS_REGD2H) &&
!(frame_header->status & ATA_BUSY)) { !(frame_header->status & ATA_BUSY)) {
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&fis_frame_data); (void **)&fis_frame_data);
...@@ -971,7 +971,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy, ...@@ -971,7 +971,7 @@ enum sci_status scic_sds_phy_frame_handler(struct isci_phy *iphy,
__func__, frame_index); __func__, frame_index);
/* Regardless of the result we are done with this frame with it */ /* Regardless of the result we are done with this frame with it */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return result; return result;
} }
...@@ -994,33 +994,33 @@ static void scic_sds_phy_starting_initial_substate_enter(struct sci_base_state_m ...@@ -994,33 +994,33 @@ static void scic_sds_phy_starting_initial_substate_enter(struct sci_base_state_m
static void scic_sds_phy_starting_await_sas_power_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_phy_starting_await_sas_power_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm); struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm);
struct scic_sds_controller *scic = iphy->owning_port->owning_controller; struct isci_host *ihost = iphy->owning_port->owning_controller;
scic_sds_controller_power_control_queue_insert(scic, iphy); scic_sds_controller_power_control_queue_insert(ihost, iphy);
} }
static void scic_sds_phy_starting_await_sas_power_substate_exit(struct sci_base_state_machine *sm) static void scic_sds_phy_starting_await_sas_power_substate_exit(struct sci_base_state_machine *sm)
{ {
struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm); struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm);
struct scic_sds_controller *scic = iphy->owning_port->owning_controller; struct isci_host *ihost = iphy->owning_port->owning_controller;
scic_sds_controller_power_control_queue_remove(scic, iphy); scic_sds_controller_power_control_queue_remove(ihost, iphy);
} }
static void scic_sds_phy_starting_await_sata_power_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_phy_starting_await_sata_power_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm); struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm);
struct scic_sds_controller *scic = iphy->owning_port->owning_controller; struct isci_host *ihost = iphy->owning_port->owning_controller;
scic_sds_controller_power_control_queue_insert(scic, iphy); scic_sds_controller_power_control_queue_insert(ihost, iphy);
} }
static void scic_sds_phy_starting_await_sata_power_substate_exit(struct sci_base_state_machine *sm) static void scic_sds_phy_starting_await_sata_power_substate_exit(struct sci_base_state_machine *sm)
{ {
struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm); struct isci_phy *iphy = container_of(sm, typeof(*iphy), sm);
struct scic_sds_controller *scic = iphy->owning_port->owning_controller; struct isci_host *ihost = iphy->owning_port->owning_controller;
scic_sds_controller_power_control_queue_remove(scic, iphy); scic_sds_controller_power_control_queue_remove(ihost, iphy);
} }
static void scic_sds_phy_starting_await_sata_phy_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_phy_starting_await_sata_phy_substate_enter(struct sci_base_state_machine *sm)
...@@ -1313,7 +1313,7 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index) ...@@ -1313,7 +1313,7 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index)
u64 sci_sas_addr; u64 sci_sas_addr;
__be64 sas_addr; __be64 sas_addr;
scic_oem_parameters_get(&ihost->sci, &oem); scic_oem_parameters_get(ihost, &oem);
sci_sas_addr = oem.sds1.phys[index].sas_address.high; sci_sas_addr = oem.sds1.phys[index].sas_address.high;
sci_sas_addr <<= 32; sci_sas_addr <<= 32;
sci_sas_addr |= oem.sds1.phys[index].sas_address.low; sci_sas_addr |= oem.sds1.phys[index].sas_address.low;
......
drivers/scsi/isci/port.c
View file @ d9dcb4ba
...@@ -365,11 +365,11 @@ static void isci_port_not_ready(struct isci_host *isci_host, struct isci_port *i ...@@ -365,11 +365,11 @@ static void isci_port_not_ready(struct isci_host *isci_host, struct isci_port *i
"%s: isci_port = %p\n", __func__, isci_port); "%s: isci_port = %p\n", __func__, isci_port);
} }
static void isci_port_stop_complete(struct scic_sds_controller *scic, static void isci_port_stop_complete(struct isci_host *ihost,
struct isci_port *iport, struct isci_port *iport,
enum sci_status completion_status) enum sci_status completion_status)
{ {
dev_dbg(&scic_to_ihost(scic)->pdev->dev, "Port stop complete\n"); dev_dbg(&ihost->pdev->dev, "Port stop complete\n");
} }
/** /**
...@@ -541,8 +541,7 @@ static enum sci_status scic_sds_port_clear_phy(struct isci_port *iport, ...@@ -541,8 +541,7 @@ static enum sci_status scic_sds_port_clear_phy(struct isci_port *iport,
/* Make sure that this phy is part of this port */ /* Make sure that this phy is part of this port */
if (iport->phy_table[iphy->phy_index] == iphy && if (iport->phy_table[iphy->phy_index] == iphy &&
phy_get_non_dummy_port(iphy) == iport) { phy_get_non_dummy_port(iphy) == iport) {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
/* Yep it is assigned to this port so remove it */ /* Yep it is assigned to this port so remove it */
scic_sds_phy_set_port(iphy, &ihost->ports[SCI_MAX_PORTS]); scic_sds_phy_set_port(iphy, &ihost->ports[SCI_MAX_PORTS]);
...@@ -654,10 +653,10 @@ static void scic_sds_port_construct_dummy_rnc(struct isci_port *iport, u16 rni) ...@@ -654,10 +653,10 @@ static void scic_sds_port_construct_dummy_rnc(struct isci_port *iport, u16 rni)
*/ */
static void scic_sds_port_construct_dummy_task(struct isci_port *iport, u16 tag) static void scic_sds_port_construct_dummy_task(struct isci_port *iport, u16 tag)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct scu_task_context *task_context; struct scu_task_context *task_context;
task_context = &scic->task_context_table[ISCI_TAG_TCI(tag)]; task_context = &ihost->task_context_table[ISCI_TAG_TCI(tag)];
memset(task_context, 0, sizeof(struct scu_task_context)); memset(task_context, 0, sizeof(struct scu_task_context));
task_context->initiator_request = 1; task_context->initiator_request = 1;
...@@ -674,13 +673,13 @@ static void scic_sds_port_construct_dummy_task(struct isci_port *iport, u16 tag) ...@@ -674,13 +673,13 @@ static void scic_sds_port_construct_dummy_task(struct isci_port *iport, u16 tag)
static void scic_sds_port_destroy_dummy_resources(struct isci_port *iport) static void scic_sds_port_destroy_dummy_resources(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
if (iport->reserved_tag != SCI_CONTROLLER_INVALID_IO_TAG) if (iport->reserved_tag != SCI_CONTROLLER_INVALID_IO_TAG)
isci_free_tag(scic_to_ihost(scic), iport->reserved_tag); isci_free_tag(ihost, iport->reserved_tag);
if (iport->reserved_rni != SCU_DUMMY_INDEX) if (iport->reserved_rni != SCU_DUMMY_INDEX)
scic_sds_remote_node_table_release_remote_node_index(&scic->available_remote_nodes, scic_sds_remote_node_table_release_remote_node_index(&ihost->available_remote_nodes,
1, iport->reserved_rni); 1, iport->reserved_rni);
iport->reserved_rni = SCU_DUMMY_INDEX; iport->reserved_rni = SCU_DUMMY_INDEX;
...@@ -749,15 +748,14 @@ static void scic_sds_port_activate_phy(struct isci_port *iport, ...@@ -749,15 +748,14 @@ static void scic_sds_port_activate_phy(struct isci_port *iport,
struct isci_phy *iphy, struct isci_phy *iphy,
bool do_notify_user) bool do_notify_user)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
if (iphy->protocol != SCIC_SDS_PHY_PROTOCOL_SATA) if (iphy->protocol != SCIC_SDS_PHY_PROTOCOL_SATA)
scic_sds_phy_resume(iphy); scic_sds_phy_resume(iphy);
iport->active_phy_mask |= 1 << iphy->phy_index; iport->active_phy_mask |= 1 << iphy->phy_index;
scic_sds_controller_clear_invalid_phy(scic, iphy); scic_sds_controller_clear_invalid_phy(ihost, iphy);
if (do_notify_user == true) if (do_notify_user == true)
isci_port_link_up(ihost, iport, iphy); isci_port_link_up(ihost, iport, iphy);
...@@ -767,8 +765,7 @@ void scic_sds_port_deactivate_phy(struct isci_port *iport, ...@@ -767,8 +765,7 @@ void scic_sds_port_deactivate_phy(struct isci_port *iport,
struct isci_phy *iphy, struct isci_phy *iphy,
bool do_notify_user) bool do_notify_user)
{ {
struct scic_sds_controller *scic = scic_sds_port_get_controller(iport); struct isci_host *ihost = scic_sds_port_get_controller(iport);
struct isci_host *ihost = scic_to_ihost(scic);
iport->active_phy_mask &= ~(1 << iphy->phy_index); iport->active_phy_mask &= ~(1 << iphy->phy_index);
...@@ -793,16 +790,16 @@ void scic_sds_port_deactivate_phy(struct isci_port *iport, ...@@ -793,16 +790,16 @@ void scic_sds_port_deactivate_phy(struct isci_port *iport,
static void scic_sds_port_invalid_link_up(struct isci_port *iport, static void scic_sds_port_invalid_link_up(struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
/* /*
* Check to see if we have alreay reported this link as bad and if * Check to see if we have alreay reported this link as bad and if
* not go ahead and tell the SCI_USER that we have discovered an * not go ahead and tell the SCI_USER that we have discovered an
* invalid link. * invalid link.
*/ */
if ((scic->invalid_phy_mask & (1 << iphy->phy_index)) == 0) { if ((ihost->invalid_phy_mask & (1 << iphy->phy_index)) == 0) {
scic_sds_controller_set_invalid_phy(scic, iphy); scic_sds_controller_set_invalid_phy(ihost, iphy);
dev_warn(&scic_to_ihost(scic)->pdev->dev, "Invalid link up!\n"); dev_warn(&ihost->pdev->dev, "Invalid link up!\n");
} }
} }
...@@ -931,7 +928,7 @@ static void port_timeout(unsigned long data) ...@@ -931,7 +928,7 @@ static void port_timeout(unsigned long data)
{ {
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct isci_port *iport = container_of(tmr, typeof(*iport), timer); struct isci_port *iport = container_of(tmr, typeof(*iport), timer);
struct isci_host *ihost = scic_to_ihost(iport->owning_controller); struct isci_host *ihost = iport->owning_controller;
unsigned long flags; unsigned long flags;
u32 current_state; u32 current_state;
...@@ -1041,19 +1038,19 @@ static void scic_sds_port_suspend_port_task_scheduler(struct isci_port *iport) ...@@ -1041,19 +1038,19 @@ static void scic_sds_port_suspend_port_task_scheduler(struct isci_port *iport)
*/ */
static void scic_sds_port_post_dummy_request(struct isci_port *iport) static void scic_sds_port_post_dummy_request(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
u16 tag = iport->reserved_tag; u16 tag = iport->reserved_tag;
struct scu_task_context *tc; struct scu_task_context *tc;
u32 command; u32 command;
tc = &scic->task_context_table[ISCI_TAG_TCI(tag)]; tc = &ihost->task_context_table[ISCI_TAG_TCI(tag)];
tc->abort = 0; tc->abort = 0;
command = SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC | command = SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
iport->physical_port_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | iport->physical_port_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT |
ISCI_TAG_TCI(tag); ISCI_TAG_TCI(tag);
scic_sds_controller_post_request(scic, command); scic_sds_controller_post_request(ihost, command);
} }
/** /**
...@@ -1065,19 +1062,19 @@ static void scic_sds_port_post_dummy_request(struct isci_port *iport) ...@@ -1065,19 +1062,19 @@ static void scic_sds_port_post_dummy_request(struct isci_port *iport)
*/ */
static void scic_sds_port_abort_dummy_request(struct isci_port *iport) static void scic_sds_port_abort_dummy_request(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
u16 tag = iport->reserved_tag; u16 tag = iport->reserved_tag;
struct scu_task_context *tc; struct scu_task_context *tc;
u32 command; u32 command;
tc = &scic->task_context_table[ISCI_TAG_TCI(tag)]; tc = &ihost->task_context_table[ISCI_TAG_TCI(tag)];
tc->abort = 1; tc->abort = 1;
command = SCU_CONTEXT_COMMAND_REQUEST_POST_TC_ABORT | command = SCU_CONTEXT_COMMAND_REQUEST_POST_TC_ABORT |
iport->physical_port_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | iport->physical_port_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT |
ISCI_TAG_TCI(tag); ISCI_TAG_TCI(tag);
scic_sds_controller_post_request(scic, command); scic_sds_controller_post_request(ihost, command);
} }
/** /**
...@@ -1115,8 +1112,7 @@ static void scic_sds_port_ready_substate_operational_enter(struct sci_base_state ...@@ -1115,8 +1112,7 @@ static void scic_sds_port_ready_substate_operational_enter(struct sci_base_state
{ {
u32 index; u32 index;
struct isci_port *iport = container_of(sm, typeof(*iport), sm); struct isci_port *iport = container_of(sm, typeof(*iport), sm);
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
isci_port_ready(ihost, iport); isci_port_ready(ihost, iport);
...@@ -1141,13 +1137,13 @@ static void scic_sds_port_ready_substate_operational_enter(struct sci_base_state ...@@ -1141,13 +1137,13 @@ static void scic_sds_port_ready_substate_operational_enter(struct sci_base_state
static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport) static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
u8 phys_index = iport->physical_port_index; u8 phys_index = iport->physical_port_index;
union scu_remote_node_context *rnc; union scu_remote_node_context *rnc;
u16 rni = iport->reserved_rni; u16 rni = iport->reserved_rni;
u32 command; u32 command;
rnc = &scic->remote_node_context_table[rni]; rnc = &ihost->remote_node_context_table[rni];
rnc->ssp.is_valid = false; rnc->ssp.is_valid = false;
...@@ -1155,13 +1151,13 @@ static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport) ...@@ -1155,13 +1151,13 @@ static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport)
* controller and give it ample time to act before posting the rnc * controller and give it ample time to act before posting the rnc
* invalidate * invalidate
*/ */
readl(&scic->smu_registers->interrupt_status); /* flush */ readl(&ihost->smu_registers->interrupt_status); /* flush */
udelay(10); udelay(10);
command = SCU_CONTEXT_COMMAND_POST_RNC_INVALIDATE | command = SCU_CONTEXT_COMMAND_POST_RNC_INVALIDATE |
phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni; phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni;
scic_sds_controller_post_request(scic, command); scic_sds_controller_post_request(ihost, command);
} }
/** /**
...@@ -1175,8 +1171,7 @@ static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport) ...@@ -1175,8 +1171,7 @@ static void scic_sds_port_invalidate_dummy_remote_node(struct isci_port *iport)
static void scic_sds_port_ready_substate_operational_exit(struct sci_base_state_machine *sm) static void scic_sds_port_ready_substate_operational_exit(struct sci_base_state_machine *sm)
{ {
struct isci_port *iport = container_of(sm, typeof(*iport), sm); struct isci_port *iport = container_of(sm, typeof(*iport), sm);
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
/* /*
* Kill the dummy task for this port if it has not yet posted * Kill the dummy task for this port if it has not yet posted
...@@ -1194,8 +1189,7 @@ static void scic_sds_port_ready_substate_operational_exit(struct sci_base_state_ ...@@ -1194,8 +1189,7 @@ static void scic_sds_port_ready_substate_operational_exit(struct sci_base_state_
static void scic_sds_port_ready_substate_configuring_enter(struct sci_base_state_machine *sm) static void scic_sds_port_ready_substate_configuring_enter(struct sci_base_state_machine *sm)
{ {
struct isci_port *iport = container_of(sm, typeof(*iport), sm); struct isci_port *iport = container_of(sm, typeof(*iport), sm);
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
if (iport->active_phy_mask == 0) { if (iport->active_phy_mask == 0) {
isci_port_not_ready(ihost, iport); isci_port_not_ready(ihost, iport);
...@@ -1218,7 +1212,7 @@ static void scic_sds_port_ready_substate_configuring_exit(struct sci_base_state_ ...@@ -1218,7 +1212,7 @@ static void scic_sds_port_ready_substate_configuring_exit(struct sci_base_state_
enum sci_status scic_sds_port_start(struct isci_port *iport) enum sci_status scic_sds_port_start(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
enum scic_sds_port_states state; enum scic_sds_port_states state;
u32 phy_mask; u32 phy_mask;
...@@ -1241,7 +1235,7 @@ enum sci_status scic_sds_port_start(struct isci_port *iport) ...@@ -1241,7 +1235,7 @@ enum sci_status scic_sds_port_start(struct isci_port *iport)
if (iport->reserved_rni == SCU_DUMMY_INDEX) { if (iport->reserved_rni == SCU_DUMMY_INDEX) {
u16 rni = scic_sds_remote_node_table_allocate_remote_node( u16 rni = scic_sds_remote_node_table_allocate_remote_node(
&scic->available_remote_nodes, 1); &ihost->available_remote_nodes, 1);
if (rni != SCU_DUMMY_INDEX) if (rni != SCU_DUMMY_INDEX)
scic_sds_port_construct_dummy_rnc(iport, rni); scic_sds_port_construct_dummy_rnc(iport, rni);
...@@ -1251,7 +1245,6 @@ enum sci_status scic_sds_port_start(struct isci_port *iport) ...@@ -1251,7 +1245,6 @@ enum sci_status scic_sds_port_start(struct isci_port *iport)
} }
if (iport->reserved_tag == SCI_CONTROLLER_INVALID_IO_TAG) { if (iport->reserved_tag == SCI_CONTROLLER_INVALID_IO_TAG) {
struct isci_host *ihost = scic_to_ihost(scic);
u16 tag; u16 tag;
tag = isci_alloc_tag(ihost); tag = isci_alloc_tag(ihost);
...@@ -1634,30 +1627,30 @@ scic_sds_port_disable_port_task_scheduler(struct isci_port *iport) ...@@ -1634,30 +1627,30 @@ scic_sds_port_disable_port_task_scheduler(struct isci_port *iport)
static void scic_sds_port_post_dummy_remote_node(struct isci_port *iport) static void scic_sds_port_post_dummy_remote_node(struct isci_port *iport)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
u8 phys_index = iport->physical_port_index; u8 phys_index = iport->physical_port_index;
union scu_remote_node_context *rnc; union scu_remote_node_context *rnc;
u16 rni = iport->reserved_rni; u16 rni = iport->reserved_rni;
u32 command; u32 command;
rnc = &scic->remote_node_context_table[rni]; rnc = &ihost->remote_node_context_table[rni];
rnc->ssp.is_valid = true; rnc->ssp.is_valid = true;
command = SCU_CONTEXT_COMMAND_POST_RNC_32 | command = SCU_CONTEXT_COMMAND_POST_RNC_32 |
phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni; phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni;
scic_sds_controller_post_request(scic, command); scic_sds_controller_post_request(ihost, command);
/* ensure hardware has seen the post rnc command and give it /* ensure hardware has seen the post rnc command and give it
* ample time to act before sending the suspend * ample time to act before sending the suspend
*/ */
readl(&scic->smu_registers->interrupt_status); /* flush */ readl(&ihost->smu_registers->interrupt_status); /* flush */
udelay(10); udelay(10);
command = SCU_CONTEXT_COMMAND_POST_RNC_SUSPEND_TX_RX | command = SCU_CONTEXT_COMMAND_POST_RNC_SUSPEND_TX_RX |
phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni; phys_index << SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT | rni;
scic_sds_controller_post_request(scic, command); scic_sds_controller_post_request(ihost, command);
} }
static void scic_sds_port_stopped_state_enter(struct sci_base_state_machine *sm) static void scic_sds_port_stopped_state_enter(struct sci_base_state_machine *sm)
...@@ -1684,8 +1677,7 @@ static void scic_sds_port_stopped_state_exit(struct sci_base_state_machine *sm) ...@@ -1684,8 +1677,7 @@ static void scic_sds_port_stopped_state_exit(struct sci_base_state_machine *sm)
static void scic_sds_port_ready_state_enter(struct sci_base_state_machine *sm) static void scic_sds_port_ready_state_enter(struct sci_base_state_machine *sm)
{ {
struct isci_port *iport = container_of(sm, typeof(*iport), sm); struct isci_port *iport = container_of(sm, typeof(*iport), sm);
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
u32 prev_state; u32 prev_state;
prev_state = iport->sm.previous_state_id; prev_state = iport->sm.previous_state_id;
...@@ -1758,7 +1750,7 @@ static const struct sci_base_state scic_sds_port_state_table[] = { ...@@ -1758,7 +1750,7 @@ static const struct sci_base_state scic_sds_port_state_table[] = {
}; };
void scic_sds_port_construct(struct isci_port *iport, u8 index, void scic_sds_port_construct(struct isci_port *iport, u8 index,
struct scic_sds_controller *scic) struct isci_host *ihost)
{ {
sci_init_sm(&iport->sm, scic_sds_port_state_table, SCI_PORT_STOPPED); sci_init_sm(&iport->sm, scic_sds_port_state_table, SCI_PORT_STOPPED);
...@@ -1767,7 +1759,7 @@ void scic_sds_port_construct(struct isci_port *iport, u8 index, ...@@ -1767,7 +1759,7 @@ void scic_sds_port_construct(struct isci_port *iport, u8 index,
iport->active_phy_mask = 0; iport->active_phy_mask = 0;
iport->ready_exit = false; iport->ready_exit = false;
iport->owning_controller = scic; iport->owning_controller = ihost;
iport->started_request_count = 0; iport->started_request_count = 0;
iport->assigned_device_count = 0; iport->assigned_device_count = 0;
...@@ -1810,8 +1802,7 @@ void scic_sds_port_broadcast_change_received( ...@@ -1810,8 +1802,7 @@ void scic_sds_port_broadcast_change_received(
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
{ {
struct scic_sds_controller *scic = iport->owning_controller; struct isci_host *ihost = iport->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
/* notify the user. */ /* notify the user. */
isci_port_bc_change_received(ihost, iport, iphy); isci_port_bc_change_received(ihost, iport, iphy);
......
drivers/scsi/isci/port.h
View file @ d9dcb4ba
...@@ -115,7 +115,7 @@ struct isci_port { ...@@ -115,7 +115,7 @@ struct isci_port {
u32 assigned_device_count; u32 assigned_device_count;
u32 not_ready_reason; u32 not_ready_reason;
struct isci_phy *phy_table[SCI_MAX_PHYS]; struct isci_phy *phy_table[SCI_MAX_PHYS];
struct scic_sds_controller *owning_controller; struct isci_host *owning_controller;
struct sci_timer timer; struct sci_timer timer;
struct scu_port_task_scheduler_registers __iomem *port_task_scheduler_registers; struct scu_port_task_scheduler_registers __iomem *port_task_scheduler_registers;
/* XXX rework: only one register, no need to replicate per-port */ /* XXX rework: only one register, no need to replicate per-port */
...@@ -243,7 +243,7 @@ static inline void scic_sds_port_decrement_request_count(struct isci_port *iport ...@@ -243,7 +243,7 @@ static inline void scic_sds_port_decrement_request_count(struct isci_port *iport
void scic_sds_port_construct( void scic_sds_port_construct(
struct isci_port *iport, struct isci_port *iport,
u8 port_index, u8 port_index,
struct scic_sds_controller *scic); struct isci_host *ihost);
enum sci_status scic_sds_port_initialize( enum sci_status scic_sds_port_initialize(
struct isci_port *iport, struct isci_port *iport,
......
drivers/scsi/isci/port_config.c
View file @ d9dcb4ba
...@@ -113,7 +113,7 @@ static s32 sci_sas_address_compare( ...@@ -113,7 +113,7 @@ static s32 sci_sas_address_compare(
* NULL if there is no matching port for the phy. * NULL if there is no matching port for the phy.
*/ */
static struct isci_port *scic_sds_port_configuration_agent_find_port( static struct isci_port *scic_sds_port_configuration_agent_find_port(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct isci_phy *iphy) struct isci_phy *iphy)
{ {
u8 i; u8 i;
...@@ -130,8 +130,7 @@ static struct isci_port *scic_sds_port_configuration_agent_find_port( ...@@ -130,8 +130,7 @@ static struct isci_port *scic_sds_port_configuration_agent_find_port(
scic_sds_phy_get_sas_address(iphy, &phy_sas_address); scic_sds_phy_get_sas_address(iphy, &phy_sas_address);
scic_sds_phy_get_attached_sas_address(iphy, &phy_attached_device_address); scic_sds_phy_get_attached_sas_address(iphy, &phy_attached_device_address);
for (i = 0; i < scic->logical_port_entries; i++) { for (i = 0; i < ihost->logical_port_entries; i++) {
struct isci_host *ihost = scic_to_ihost(scic);
struct isci_port *iport = &ihost->ports[i]; struct isci_port *iport = &ihost->ports[i];
scic_sds_port_get_sas_address(iport, &port_sas_address); scic_sds_port_get_sas_address(iport, &port_sas_address);
...@@ -158,10 +157,9 @@ static struct isci_port *scic_sds_port_configuration_agent_find_port( ...@@ -158,10 +157,9 @@ static struct isci_port *scic_sds_port_configuration_agent_find_port(
* the port configuration is not valid for this port configuration agent. * the port configuration is not valid for this port configuration agent.
*/ */
static enum sci_status scic_sds_port_configuration_agent_validate_ports( static enum sci_status scic_sds_port_configuration_agent_validate_ports(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent) struct scic_sds_port_configuration_agent *port_agent)
{ {
struct isci_host *ihost = scic_to_ihost(controller);
struct sci_sas_address first_address; struct sci_sas_address first_address;
struct sci_sas_address second_address; struct sci_sas_address second_address;
...@@ -239,17 +237,11 @@ static enum sci_status scic_sds_port_configuration_agent_validate_ports( ...@@ -239,17 +237,11 @@ static enum sci_status scic_sds_port_configuration_agent_validate_ports(
* Manual port configuration agent routines * Manual port configuration agent routines
* ****************************************************************************** */ * ****************************************************************************** */
/** /* verify all of the phys in the same port are using the same SAS address */
* static enum sci_status
* scic_sds_mpc_agent_validate_phy_configuration(struct isci_host *ihost,
* This routine will verify that all of the phys in the same port are using the
* same SAS address.
*/
static enum sci_status scic_sds_mpc_agent_validate_phy_configuration(
struct scic_sds_controller *controller,
struct scic_sds_port_configuration_agent *port_agent) struct scic_sds_port_configuration_agent *port_agent)
{ {
struct isci_host *ihost = scic_to_ihost(controller);
u32 phy_mask; u32 phy_mask;
u32 assigned_phy_mask; u32 assigned_phy_mask;
struct sci_sas_address sas_address; struct sci_sas_address sas_address;
...@@ -262,7 +254,7 @@ static enum sci_status scic_sds_mpc_agent_validate_phy_configuration( ...@@ -262,7 +254,7 @@ static enum sci_status scic_sds_mpc_agent_validate_phy_configuration(
sas_address.low = 0; sas_address.low = 0;
for (port_index = 0; port_index < SCI_MAX_PORTS; port_index++) { for (port_index = 0; port_index < SCI_MAX_PORTS; port_index++) {
phy_mask = controller->oem_parameters.sds1.ports[port_index].phy_mask; phy_mask = ihost->oem_parameters.sds1.ports[port_index].phy_mask;
if (!phy_mask) if (!phy_mask)
continue; continue;
...@@ -324,7 +316,7 @@ static enum sci_status scic_sds_mpc_agent_validate_phy_configuration( ...@@ -324,7 +316,7 @@ static enum sci_status scic_sds_mpc_agent_validate_phy_configuration(
phy_index++; phy_index++;
} }
return scic_sds_port_configuration_agent_validate_ports(controller, port_agent); return scic_sds_port_configuration_agent_validate_ports(ihost, port_agent);
} }
static void mpc_agent_timeout(unsigned long data) static void mpc_agent_timeout(unsigned long data)
...@@ -332,14 +324,12 @@ static void mpc_agent_timeout(unsigned long data) ...@@ -332,14 +324,12 @@ static void mpc_agent_timeout(unsigned long data)
u8 index; u8 index;
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct scic_sds_port_configuration_agent *port_agent; struct scic_sds_port_configuration_agent *port_agent;
struct scic_sds_controller *scic;
struct isci_host *ihost; struct isci_host *ihost;
unsigned long flags; unsigned long flags;
u16 configure_phy_mask; u16 configure_phy_mask;
port_agent = container_of(tmr, typeof(*port_agent), timer); port_agent = container_of(tmr, typeof(*port_agent), timer);
scic = container_of(port_agent, typeof(*scic), port_agent); ihost = container_of(port_agent, typeof(*ihost), port_agent);
ihost = scic_to_ihost(scic);
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
...@@ -355,7 +345,7 @@ static void mpc_agent_timeout(unsigned long data) ...@@ -355,7 +345,7 @@ static void mpc_agent_timeout(unsigned long data)
struct isci_phy *iphy = &ihost->phys[index]; struct isci_phy *iphy = &ihost->phys[index];
if (configure_phy_mask & (1 << index)) { if (configure_phy_mask & (1 << index)) {
port_agent->link_up_handler(scic, port_agent, port_agent->link_up_handler(ihost, port_agent,
phy_get_non_dummy_port(iphy), phy_get_non_dummy_port(iphy),
iphy); iphy);
} }
...@@ -365,7 +355,7 @@ static void mpc_agent_timeout(unsigned long data) ...@@ -365,7 +355,7 @@ static void mpc_agent_timeout(unsigned long data)
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
} }
static void scic_sds_mpc_agent_link_up(struct scic_sds_controller *controller, static void scic_sds_mpc_agent_link_up(struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent, struct scic_sds_port_configuration_agent *port_agent,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
...@@ -401,7 +391,7 @@ static void scic_sds_mpc_agent_link_up(struct scic_sds_controller *controller, ...@@ -401,7 +391,7 @@ static void scic_sds_mpc_agent_link_up(struct scic_sds_controller *controller,
* link down notification from a phy that has no assocoated port? * link down notification from a phy that has no assocoated port?
*/ */
static void scic_sds_mpc_agent_link_down( static void scic_sds_mpc_agent_link_down(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent, struct scic_sds_port_configuration_agent *port_agent,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
...@@ -438,26 +428,17 @@ static void scic_sds_mpc_agent_link_down( ...@@ -438,26 +428,17 @@ static void scic_sds_mpc_agent_link_down(
} }
} }
/* /* verify phys are assigned a valid SAS address for automatic port
* ****************************************************************************** * configuration mode.
* Automatic port configuration agent routines
* ****************************************************************************** */
/**
*
*
* This routine will verify that the phys are assigned a valid SAS address for
* automatic port configuration mode.
*/ */
static enum sci_status scic_sds_apc_agent_validate_phy_configuration( static enum sci_status
struct scic_sds_controller *controller, scic_sds_apc_agent_validate_phy_configuration(struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent) struct scic_sds_port_configuration_agent *port_agent)
{ {
u8 phy_index; u8 phy_index;
u8 port_index; u8 port_index;
struct sci_sas_address sas_address; struct sci_sas_address sas_address;
struct sci_sas_address phy_assigned_address; struct sci_sas_address phy_assigned_address;
struct isci_host *ihost = scic_to_ihost(controller);
phy_index = 0; phy_index = 0;
...@@ -484,10 +465,10 @@ static enum sci_status scic_sds_apc_agent_validate_phy_configuration( ...@@ -484,10 +465,10 @@ static enum sci_status scic_sds_apc_agent_validate_phy_configuration(
} }
} }
return scic_sds_port_configuration_agent_validate_ports(controller, port_agent); return scic_sds_port_configuration_agent_validate_ports(ihost, port_agent);
} }
static void scic_sds_apc_agent_configure_ports(struct scic_sds_controller *controller, static void scic_sds_apc_agent_configure_ports(struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent, struct scic_sds_port_configuration_agent *port_agent,
struct isci_phy *iphy, struct isci_phy *iphy,
bool start_timer) bool start_timer)
...@@ -496,9 +477,8 @@ static void scic_sds_apc_agent_configure_ports(struct scic_sds_controller *contr ...@@ -496,9 +477,8 @@ static void scic_sds_apc_agent_configure_ports(struct scic_sds_controller *contr
enum sci_status status; enum sci_status status;
struct isci_port *iport; struct isci_port *iport;
enum SCIC_SDS_APC_ACTIVITY apc_activity = SCIC_SDS_APC_SKIP_PHY; enum SCIC_SDS_APC_ACTIVITY apc_activity = SCIC_SDS_APC_SKIP_PHY;
struct isci_host *ihost = scic_to_ihost(controller);
iport = scic_sds_port_configuration_agent_find_port(controller, iphy); iport = scic_sds_port_configuration_agent_find_port(ihost, iphy);
if (iport) { if (iport) {
if (scic_sds_port_is_valid_phy_assignment(iport, iphy->phy_index)) if (scic_sds_port_is_valid_phy_assignment(iport, iphy->phy_index))
...@@ -619,7 +599,7 @@ static void scic_sds_apc_agent_configure_ports(struct scic_sds_controller *contr ...@@ -619,7 +599,7 @@ static void scic_sds_apc_agent_configure_ports(struct scic_sds_controller *contr
* notifications. Is it possible to get a link down notification from a phy * notifications. Is it possible to get a link down notification from a phy
* that has no assocoated port? * that has no assocoated port?
*/ */
static void scic_sds_apc_agent_link_up(struct scic_sds_controller *scic, static void scic_sds_apc_agent_link_up(struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent, struct scic_sds_port_configuration_agent *port_agent,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
...@@ -629,7 +609,7 @@ static void scic_sds_apc_agent_link_up(struct scic_sds_controller *scic, ...@@ -629,7 +609,7 @@ static void scic_sds_apc_agent_link_up(struct scic_sds_controller *scic,
if (!iport) { if (!iport) {
/* the phy is not the part of this port */ /* the phy is not the part of this port */
port_agent->phy_ready_mask |= 1 << phy_index; port_agent->phy_ready_mask |= 1 << phy_index;
scic_sds_apc_agent_configure_ports(scic, port_agent, iphy, true); scic_sds_apc_agent_configure_ports(ihost, port_agent, iphy, true);
} else { } else {
/* the phy is already the part of the port */ /* the phy is already the part of the port */
u32 port_state = iport->sm.current_state_id; u32 port_state = iport->sm.current_state_id;
...@@ -658,7 +638,7 @@ static void scic_sds_apc_agent_link_up(struct scic_sds_controller *scic, ...@@ -658,7 +638,7 @@ static void scic_sds_apc_agent_link_up(struct scic_sds_controller *scic,
* port? * port?
*/ */
static void scic_sds_apc_agent_link_down( static void scic_sds_apc_agent_link_down(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent, struct scic_sds_port_configuration_agent *port_agent,
struct isci_port *iport, struct isci_port *iport,
struct isci_phy *iphy) struct isci_phy *iphy)
...@@ -683,14 +663,12 @@ static void apc_agent_timeout(unsigned long data) ...@@ -683,14 +663,12 @@ static void apc_agent_timeout(unsigned long data)
u32 index; u32 index;
struct sci_timer *tmr = (struct sci_timer *)data; struct sci_timer *tmr = (struct sci_timer *)data;
struct scic_sds_port_configuration_agent *port_agent; struct scic_sds_port_configuration_agent *port_agent;
struct scic_sds_controller *scic;
struct isci_host *ihost; struct isci_host *ihost;
unsigned long flags; unsigned long flags;
u16 configure_phy_mask; u16 configure_phy_mask;
port_agent = container_of(tmr, typeof(*port_agent), timer); port_agent = container_of(tmr, typeof(*port_agent), timer);
scic = container_of(port_agent, typeof(*scic), port_agent); ihost = container_of(port_agent, typeof(*ihost), port_agent);
ihost = scic_to_ihost(scic);
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
...@@ -708,7 +686,7 @@ static void apc_agent_timeout(unsigned long data) ...@@ -708,7 +686,7 @@ static void apc_agent_timeout(unsigned long data)
if ((configure_phy_mask & (1 << index)) == 0) if ((configure_phy_mask & (1 << index)) == 0)
continue; continue;
scic_sds_apc_agent_configure_ports(scic, port_agent, scic_sds_apc_agent_configure_ports(ihost, port_agent,
&ihost->phys[index], false); &ihost->phys[index], false);
} }
...@@ -748,17 +726,17 @@ void scic_sds_port_configuration_agent_construct( ...@@ -748,17 +726,17 @@ void scic_sds_port_configuration_agent_construct(
} }
enum sci_status scic_sds_port_configuration_agent_initialize( enum sci_status scic_sds_port_configuration_agent_initialize(
struct scic_sds_controller *scic, struct isci_host *ihost,
struct scic_sds_port_configuration_agent *port_agent) struct scic_sds_port_configuration_agent *port_agent)
{ {
enum sci_status status; enum sci_status status;
enum scic_port_configuration_mode mode; enum scic_port_configuration_mode mode;
mode = scic->oem_parameters.sds1.controller.mode_type; mode = ihost->oem_parameters.sds1.controller.mode_type;
if (mode == SCIC_PORT_MANUAL_CONFIGURATION_MODE) { if (mode == SCIC_PORT_MANUAL_CONFIGURATION_MODE) {
status = scic_sds_mpc_agent_validate_phy_configuration( status = scic_sds_mpc_agent_validate_phy_configuration(
scic, port_agent); ihost, port_agent);
port_agent->link_up_handler = scic_sds_mpc_agent_link_up; port_agent->link_up_handler = scic_sds_mpc_agent_link_up;
port_agent->link_down_handler = scic_sds_mpc_agent_link_down; port_agent->link_down_handler = scic_sds_mpc_agent_link_down;
...@@ -766,7 +744,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize( ...@@ -766,7 +744,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize(
sci_init_timer(&port_agent->timer, mpc_agent_timeout); sci_init_timer(&port_agent->timer, mpc_agent_timeout);
} else { } else {
status = scic_sds_apc_agent_validate_phy_configuration( status = scic_sds_apc_agent_validate_phy_configuration(
scic, port_agent); ihost, port_agent);
port_agent->link_up_handler = scic_sds_apc_agent_link_up; port_agent->link_up_handler = scic_sds_apc_agent_link_up;
port_agent->link_down_handler = scic_sds_apc_agent_link_down; port_agent->link_down_handler = scic_sds_apc_agent_link_down;
......
drivers/scsi/isci/probe_roms.h
View file @ d9dcb4ba
...@@ -165,7 +165,7 @@ struct scic_sds_oem_params; ...@@ -165,7 +165,7 @@ struct scic_sds_oem_params;
int scic_oem_parameters_validate(struct scic_sds_oem_params *oem); int scic_oem_parameters_validate(struct scic_sds_oem_params *oem);
union scic_oem_parameters; union scic_oem_parameters;
void scic_oem_parameters_get(struct scic_sds_controller *scic, void scic_oem_parameters_get(struct isci_host *ihost,
union scic_oem_parameters *oem); union scic_oem_parameters *oem);
struct isci_orom; struct isci_orom;
......
drivers/scsi/isci/remote_device.c
View file @ d9dcb4ba
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#include "task.h" #include "task.h"
/** /**
* 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 * the remote device is not ready. We mark the isci device as ready (not
* "ready_for_io") and signal the waiting proccess. * "ready_for_io") and signal the waiting proccess.
* @isci_host: This parameter specifies the isci host object. * @isci_host: This parameter specifies the isci host object.
...@@ -92,7 +92,7 @@ static void isci_remote_device_not_ready(struct isci_host *ihost, ...@@ -92,7 +92,7 @@ static void isci_remote_device_not_ready(struct isci_host *ihost,
"%s: isci_device = %p request = %p\n", "%s: isci_device = %p request = %p\n",
__func__, idev, ireq); __func__, idev, ireq);
scic_controller_terminate_request(&ihost->sci, scic_controller_terminate_request(ihost,
idev, idev,
ireq); ireq);
} }
...@@ -104,7 +104,7 @@ static void isci_remote_device_not_ready(struct isci_host *ihost, ...@@ -104,7 +104,7 @@ static void isci_remote_device_not_ready(struct isci_host *ihost,
} }
/** /**
* 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 * remote device is ready. We mark the isci device as ready and signal the
* waiting proccess. * waiting proccess.
* @ihost: our valid isci_host * @ihost: our valid isci_host
...@@ -135,8 +135,7 @@ static void rnc_destruct_done(void *_dev) ...@@ -135,8 +135,7 @@ static void rnc_destruct_done(void *_dev)
static enum sci_status scic_sds_remote_device_terminate_requests(struct isci_remote_device *idev) static enum sci_status scic_sds_remote_device_terminate_requests(struct isci_remote_device *idev)
{ {
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
u32 i; u32 i;
...@@ -148,7 +147,7 @@ static enum sci_status scic_sds_remote_device_terminate_requests(struct isci_rem ...@@ -148,7 +147,7 @@ static enum sci_status scic_sds_remote_device_terminate_requests(struct isci_rem
ireq->target_device != idev) ireq->target_device != idev)
continue; continue;
s = scic_controller_terminate_request(scic, idev, ireq); s = scic_controller_terminate_request(ihost, idev, ireq);
if (s != SCI_SUCCESS) if (s != SCI_SUCCESS)
status = s; status = s;
} }
...@@ -276,7 +275,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -276,7 +275,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
{ {
struct sci_base_state_machine *sm = &idev->sm; struct sci_base_state_machine *sm = &idev->sm;
enum scic_sds_remote_device_states state = sm->current_state_id; enum scic_sds_remote_device_states state = sm->current_state_id;
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
enum sci_status status; enum sci_status status;
switch (state) { switch (state) {
...@@ -290,7 +289,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -290,7 +289,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n", dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
__func__, state); __func__, state);
/* Return the frame back to the controller */ /* Return the frame back to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
case SCI_DEV_READY: case SCI_DEV_READY:
case SCI_STP_DEV_NCQ_ERROR: case SCI_STP_DEV_NCQ_ERROR:
...@@ -303,7 +302,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -303,7 +302,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
void *frame_header; void *frame_header;
ssize_t word_cnt; ssize_t word_cnt;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
&frame_header); &frame_header);
if (status != SCI_SUCCESS) if (status != SCI_SUCCESS)
...@@ -312,7 +311,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -312,7 +311,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
word_cnt = sizeof(hdr) / sizeof(u32); word_cnt = sizeof(hdr) / sizeof(u32);
sci_swab32_cpy(&hdr, frame_header, word_cnt); sci_swab32_cpy(&hdr, frame_header, word_cnt);
ireq = scic_request_by_tag(scic, be16_to_cpu(hdr.tag)); ireq = scic_request_by_tag(ihost, be16_to_cpu(hdr.tag));
if (ireq && ireq->target_device == idev) { if (ireq && ireq->target_device == idev) {
/* The IO request is now in charge of releasing the frame */ /* The IO request is now in charge of releasing the frame */
status = scic_sds_io_request_frame_handler(ireq, frame_index); status = scic_sds_io_request_frame_handler(ireq, frame_index);
...@@ -320,14 +319,14 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -320,14 +319,14 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
/* We could not map this tag to a valid IO /* We could not map this tag to a valid IO
* request Just toss the frame and continue * request Just toss the frame and continue
*/ */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
} }
break; break;
} }
case SCI_STP_DEV_NCQ: { case SCI_STP_DEV_NCQ: {
struct dev_to_host_fis *hdr; struct dev_to_host_fis *hdr;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&hdr); (void **)&hdr);
if (status != SCI_SUCCESS) if (status != SCI_SUCCESS)
...@@ -350,7 +349,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device * ...@@ -350,7 +349,7 @@ enum sci_status scic_sds_remote_device_frame_handler(struct isci_remote_device *
} else } else
status = SCI_FAILURE; status = SCI_FAILURE;
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
break; break;
} }
case SCI_STP_DEV_CMD: case SCI_STP_DEV_CMD:
...@@ -461,7 +460,7 @@ static void scic_sds_remote_device_start_request(struct isci_remote_device *idev ...@@ -461,7 +460,7 @@ static void scic_sds_remote_device_start_request(struct isci_remote_device *idev
} }
} }
enum sci_status scic_sds_remote_device_start_io(struct scic_sds_controller *scic, enum sci_status scic_sds_remote_device_start_io(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
...@@ -597,7 +596,7 @@ static enum sci_status common_complete_io(struct isci_port *iport, ...@@ -597,7 +596,7 @@ static enum sci_status common_complete_io(struct isci_port *iport,
return status; return status;
} }
enum sci_status scic_sds_remote_device_complete_io(struct scic_sds_controller *scic, enum sci_status scic_sds_remote_device_complete_io(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
...@@ -678,7 +677,7 @@ static void scic_sds_remote_device_continue_request(void *dev) ...@@ -678,7 +677,7 @@ static void scic_sds_remote_device_continue_request(void *dev)
scic_controller_continue_io(idev->working_request); scic_controller_continue_io(idev->working_request);
} }
enum sci_status scic_sds_remote_device_start_task(struct scic_sds_controller *scic, enum sci_status scic_sds_remote_device_start_task(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
...@@ -802,13 +801,13 @@ static void remote_device_resume_done(void *_dev) ...@@ -802,13 +801,13 @@ static void remote_device_resume_done(void *_dev)
static void scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(void *_dev) static void scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(void *_dev)
{ {
struct isci_remote_device *idev = _dev; struct isci_remote_device *idev = _dev;
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
/* For NCQ operation we do not issue a isci_remote_device_not_ready(). /* For NCQ operation we do not issue a isci_remote_device_not_ready().
* As a result, avoid sending the ready notification. * As a result, avoid sending the ready notification.
*/ */
if (idev->sm.previous_state_id != SCI_STP_DEV_NCQ) if (idev->sm.previous_state_id != SCI_STP_DEV_NCQ)
isci_remote_device_ready(scic_to_ihost(scic), idev); isci_remote_device_ready(ihost, idev);
} }
static void scic_sds_remote_device_initial_state_enter(struct sci_base_state_machine *sm) static void scic_sds_remote_device_initial_state_enter(struct sci_base_state_machine *sm)
...@@ -836,7 +835,7 @@ static enum sci_status scic_remote_device_destruct(struct isci_remote_device *id ...@@ -836,7 +835,7 @@ static enum sci_status scic_remote_device_destruct(struct isci_remote_device *id
{ {
struct sci_base_state_machine *sm = &idev->sm; struct sci_base_state_machine *sm = &idev->sm;
enum scic_sds_remote_device_states state = sm->current_state_id; enum scic_sds_remote_device_states state = sm->current_state_id;
struct scic_sds_controller *scic; struct isci_host *ihost;
if (state != SCI_DEV_STOPPED) { if (state != SCI_DEV_STOPPED) {
dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n", dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %d\n",
...@@ -844,8 +843,8 @@ static enum sci_status scic_remote_device_destruct(struct isci_remote_device *id ...@@ -844,8 +843,8 @@ static enum sci_status scic_remote_device_destruct(struct isci_remote_device *id
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
scic = idev->owning_port->owning_controller; ihost = idev->owning_port->owning_controller;
scic_sds_controller_free_remote_node_context(scic, idev, scic_sds_controller_free_remote_node_context(ihost, idev,
idev->rnc.remote_node_index); idev->rnc.remote_node_index);
idev->rnc.remote_node_index = SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX; idev->rnc.remote_node_index = SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX;
sci_change_state(sm, SCI_DEV_FINAL); sci_change_state(sm, SCI_DEV_FINAL);
...@@ -878,7 +877,7 @@ static void isci_remote_device_deconstruct(struct isci_host *ihost, struct isci_ ...@@ -878,7 +877,7 @@ static void isci_remote_device_deconstruct(struct isci_host *ihost, struct isci_
static void scic_sds_remote_device_stopped_state_enter(struct sci_base_state_machine *sm) static void scic_sds_remote_device_stopped_state_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
u32 prev_state; u32 prev_state;
/* If we are entering from the stopping state let the SCI User know that /* If we are entering from the stopping state let the SCI User know that
...@@ -886,16 +885,15 @@ static void scic_sds_remote_device_stopped_state_enter(struct sci_base_state_mac ...@@ -886,16 +885,15 @@ static void scic_sds_remote_device_stopped_state_enter(struct sci_base_state_mac
*/ */
prev_state = idev->sm.previous_state_id; prev_state = idev->sm.previous_state_id;
if (prev_state == SCI_DEV_STOPPING) if (prev_state == SCI_DEV_STOPPING)
isci_remote_device_deconstruct(scic_to_ihost(scic), idev); isci_remote_device_deconstruct(ihost, idev);
scic_sds_controller_remote_device_stopped(scic, idev); scic_sds_controller_remote_device_stopped(ihost, idev);
} }
static void scic_sds_remote_device_starting_state_enter(struct sci_base_state_machine *sm) static void scic_sds_remote_device_starting_state_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(idev); struct isci_host *ihost = scic_sds_remote_device_get_controller(idev);
struct isci_host *ihost = scic_to_ihost(scic);
isci_remote_device_not_ready(ihost, idev, isci_remote_device_not_ready(ihost, idev,
SCIC_REMOTE_DEVICE_NOT_READY_START_REQUESTED); SCIC_REMOTE_DEVICE_NOT_READY_START_REQUESTED);
...@@ -904,7 +902,7 @@ static void scic_sds_remote_device_starting_state_enter(struct sci_base_state_ma ...@@ -904,7 +902,7 @@ static void scic_sds_remote_device_starting_state_enter(struct sci_base_state_ma
static void scic_sds_remote_device_ready_state_enter(struct sci_base_state_machine *sm) static void scic_sds_remote_device_ready_state_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
struct domain_device *dev = idev->domain_dev; struct domain_device *dev = idev->domain_dev;
if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_SATA)) { if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_SATA)) {
...@@ -912,7 +910,7 @@ static void scic_sds_remote_device_ready_state_enter(struct sci_base_state_machi ...@@ -912,7 +910,7 @@ static void scic_sds_remote_device_ready_state_enter(struct sci_base_state_machi
} else if (dev_is_expander(dev)) { } else if (dev_is_expander(dev)) {
sci_change_state(&idev->sm, SCI_SMP_DEV_IDLE); sci_change_state(&idev->sm, SCI_SMP_DEV_IDLE);
} else } else
isci_remote_device_ready(scic_to_ihost(scic), idev); isci_remote_device_ready(ihost, idev);
} }
static void scic_sds_remote_device_ready_state_exit(struct sci_base_state_machine *sm) static void scic_sds_remote_device_ready_state_exit(struct sci_base_state_machine *sm)
...@@ -921,9 +919,9 @@ static void scic_sds_remote_device_ready_state_exit(struct sci_base_state_machin ...@@ -921,9 +919,9 @@ static void scic_sds_remote_device_ready_state_exit(struct sci_base_state_machin
struct domain_device *dev = idev->domain_dev; struct domain_device *dev = idev->domain_dev;
if (dev->dev_type == SAS_END_DEV) { if (dev->dev_type == SAS_END_DEV) {
struct scic_sds_controller *scic = idev->owning_port->owning_controller; struct isci_host *ihost = idev->owning_port->owning_controller;
isci_remote_device_not_ready(scic_to_ihost(scic), idev, isci_remote_device_not_ready(ihost, idev,
SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED); SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED);
} }
} }
...@@ -963,40 +961,40 @@ static void scic_sds_stp_remote_device_ready_idle_substate_enter(struct sci_base ...@@ -963,40 +961,40 @@ static void scic_sds_stp_remote_device_ready_idle_substate_enter(struct sci_base
static void scic_sds_stp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_stp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(idev); struct isci_host *ihost = scic_sds_remote_device_get_controller(idev);
BUG_ON(idev->working_request == NULL); BUG_ON(idev->working_request == NULL);
isci_remote_device_not_ready(scic_to_ihost(scic), idev, isci_remote_device_not_ready(ihost, idev,
SCIC_REMOTE_DEVICE_NOT_READY_SATA_REQUEST_STARTED); SCIC_REMOTE_DEVICE_NOT_READY_SATA_REQUEST_STARTED);
} }
static void scic_sds_stp_remote_device_ready_ncq_error_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_stp_remote_device_ready_ncq_error_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(idev); struct isci_host *ihost = scic_sds_remote_device_get_controller(idev);
if (idev->not_ready_reason == SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED) if (idev->not_ready_reason == SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED)
isci_remote_device_not_ready(scic_to_ihost(scic), idev, isci_remote_device_not_ready(ihost, idev,
idev->not_ready_reason); idev->not_ready_reason);
} }
static void scic_sds_smp_remote_device_ready_idle_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_smp_remote_device_ready_idle_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(idev); struct isci_host *ihost = scic_sds_remote_device_get_controller(idev);
isci_remote_device_ready(scic_to_ihost(scic), idev); isci_remote_device_ready(ihost, idev);
} }
static void scic_sds_smp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm) static void scic_sds_smp_remote_device_ready_cmd_substate_enter(struct sci_base_state_machine *sm)
{ {
struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm); struct isci_remote_device *idev = container_of(sm, typeof(*idev), sm);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(idev); struct isci_host *ihost = scic_sds_remote_device_get_controller(idev);
BUG_ON(idev->working_request == NULL); BUG_ON(idev->working_request == NULL);
isci_remote_device_not_ready(scic_to_ihost(scic), idev, isci_remote_device_not_ready(ihost, idev,
SCIC_REMOTE_DEVICE_NOT_READY_SMP_REQUEST_STARTED); SCIC_REMOTE_DEVICE_NOT_READY_SMP_REQUEST_STARTED);
} }
...@@ -1303,7 +1301,7 @@ void isci_remote_device_release(struct kref *kref) ...@@ -1303,7 +1301,7 @@ void isci_remote_device_release(struct kref *kref)
* @isci_host: This parameter specifies the isci host object. * @isci_host: This parameter specifies the isci host object.
* @isci_device: This parameter specifies the remote device. * @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) enum sci_status isci_remote_device_stop(struct isci_host *ihost, struct isci_remote_device *idev)
{ {
......
drivers/scsi/isci/remote_device.h
View file @ d9dcb4ba
...@@ -402,17 +402,17 @@ enum sci_status scic_sds_remote_device_event_handler( ...@@ -402,17 +402,17 @@ enum sci_status scic_sds_remote_device_event_handler(
u32 event_code); u32 event_code);
enum sci_status scic_sds_remote_device_start_io( enum sci_status scic_sds_remote_device_start_io(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
enum sci_status scic_sds_remote_device_start_task( enum sci_status scic_sds_remote_device_start_task(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
enum sci_status scic_sds_remote_device_complete_io( enum sci_status scic_sds_remote_device_complete_io(
struct scic_sds_controller *controller, struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq); struct isci_request *ireq);
......
drivers/scsi/isci/remote_node_context.c
View file @ d9dcb4ba
...@@ -107,11 +107,11 @@ static void scic_sds_remote_node_context_construct_buffer( ...@@ -107,11 +107,11 @@ static void scic_sds_remote_node_context_construct_buffer(
struct domain_device *dev = idev->domain_dev; struct domain_device *dev = idev->domain_dev;
int rni = sci_rnc->remote_node_index; int rni = sci_rnc->remote_node_index;
union scu_remote_node_context *rnc; union scu_remote_node_context *rnc;
struct scic_sds_controller *scic; struct isci_host *ihost;
__le64 sas_addr; __le64 sas_addr;
scic = scic_sds_remote_device_get_controller(idev); ihost = scic_sds_remote_device_get_controller(idev);
rnc = scic_sds_controller_get_remote_node_context_buffer(scic, rni); rnc = scic_sds_controller_get_remote_node_context_buffer(ihost, rni);
memset(rnc, 0, sizeof(union scu_remote_node_context) memset(rnc, 0, sizeof(union scu_remote_node_context)
* scic_sds_remote_device_node_count(idev)); * scic_sds_remote_device_node_count(idev));
...@@ -135,14 +135,14 @@ static void scic_sds_remote_node_context_construct_buffer( ...@@ -135,14 +135,14 @@ static void scic_sds_remote_node_context_construct_buffer(
if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {
rnc->ssp.connection_occupancy_timeout = rnc->ssp.connection_occupancy_timeout =
scic->user_parameters.sds1.stp_max_occupancy_timeout; ihost->user_parameters.sds1.stp_max_occupancy_timeout;
rnc->ssp.connection_inactivity_timeout = rnc->ssp.connection_inactivity_timeout =
scic->user_parameters.sds1.stp_inactivity_timeout; ihost->user_parameters.sds1.stp_inactivity_timeout;
} else { } else {
rnc->ssp.connection_occupancy_timeout = rnc->ssp.connection_occupancy_timeout =
scic->user_parameters.sds1.ssp_max_occupancy_timeout; ihost->user_parameters.sds1.ssp_max_occupancy_timeout;
rnc->ssp.connection_inactivity_timeout = rnc->ssp.connection_inactivity_timeout =
scic->user_parameters.sds1.ssp_inactivity_timeout; ihost->user_parameters.sds1.ssp_inactivity_timeout;
} }
rnc->ssp.initial_arbitration_wait_time = 0; rnc->ssp.initial_arbitration_wait_time = 0;
......
drivers/scsi/isci/request.c
View file @ d9dcb4ba
...@@ -74,19 +74,19 @@ static struct scu_sgl_element_pair *to_sgl_element_pair(struct isci_request *ire ...@@ -74,19 +74,19 @@ static struct scu_sgl_element_pair *to_sgl_element_pair(struct isci_request *ire
return &ireq->sg_table[idx - 2]; return &ireq->sg_table[idx - 2];
} }
static dma_addr_t to_sgl_element_pair_dma(struct scic_sds_controller *scic, static dma_addr_t to_sgl_element_pair_dma(struct isci_host *ihost,
struct isci_request *ireq, u32 idx) struct isci_request *ireq, u32 idx)
{ {
u32 offset; u32 offset;
if (idx == 0) { if (idx == 0) {
offset = (void *) &ireq->tc->sgl_pair_ab - offset = (void *) &ireq->tc->sgl_pair_ab -
(void *) &scic->task_context_table[0]; (void *) &ihost->task_context_table[0];
return scic->task_context_dma + offset; return ihost->task_context_dma + offset;
} else if (idx == 1) { } else if (idx == 1) {
offset = (void *) &ireq->tc->sgl_pair_cd - offset = (void *) &ireq->tc->sgl_pair_cd -
(void *) &scic->task_context_table[0]; (void *) &ihost->task_context_table[0];
return scic->task_context_dma + offset; return ihost->task_context_dma + offset;
} }
return scic_io_request_get_dma_addr(ireq, &ireq->sg_table[idx - 2]); return scic_io_request_get_dma_addr(ireq, &ireq->sg_table[idx - 2]);
...@@ -102,8 +102,7 @@ static void init_sgl_element(struct scu_sgl_element *e, struct scatterlist *sg) ...@@ -102,8 +102,7 @@ static void init_sgl_element(struct scu_sgl_element *e, struct scatterlist *sg)
static void scic_sds_request_build_sgl(struct isci_request *ireq) static void scic_sds_request_build_sgl(struct isci_request *ireq)
{ {
struct isci_host *isci_host = ireq->isci_host; struct isci_host *ihost = ireq->isci_host;
struct scic_sds_controller *scic = &isci_host->sci;
struct sas_task *task = isci_request_access_task(ireq); struct sas_task *task = isci_request_access_task(ireq);
struct scatterlist *sg = NULL; struct scatterlist *sg = NULL;
dma_addr_t dma_addr; dma_addr_t dma_addr;
...@@ -125,7 +124,7 @@ static void scic_sds_request_build_sgl(struct isci_request *ireq) ...@@ -125,7 +124,7 @@ static void scic_sds_request_build_sgl(struct isci_request *ireq)
memset(&scu_sg->B, 0, sizeof(scu_sg->B)); memset(&scu_sg->B, 0, sizeof(scu_sg->B));
if (prev_sg) { if (prev_sg) {
dma_addr = to_sgl_element_pair_dma(scic, dma_addr = to_sgl_element_pair_dma(ihost,
ireq, ireq,
sg_idx); sg_idx);
...@@ -141,7 +140,7 @@ static void scic_sds_request_build_sgl(struct isci_request *ireq) ...@@ -141,7 +140,7 @@ static void scic_sds_request_build_sgl(struct isci_request *ireq)
} else { /* handle when no sg */ } else { /* handle when no sg */
scu_sg = to_sgl_element_pair(ireq, sg_idx); scu_sg = to_sgl_element_pair(ireq, sg_idx);
dma_addr = dma_map_single(&isci_host->pdev->dev, dma_addr = dma_map_single(&ihost->pdev->dev,
task->scatter, task->scatter,
task->total_xfer_len, task->total_xfer_len,
task->data_dir); task->data_dir);
...@@ -508,7 +507,7 @@ scic_io_request_construct_sata(struct isci_request *ireq, ...@@ -508,7 +507,7 @@ scic_io_request_construct_sata(struct isci_request *ireq,
scu_stp_raw_request_construct_task_context(ireq); scu_stp_raw_request_construct_task_context(ireq);
return SCI_SUCCESS; return SCI_SUCCESS;
} else { } else {
dev_err(scic_to_dev(ireq->owning_controller), dev_err(&ireq->owning_controller->pdev->dev,
"%s: Request 0x%p received un-handled SAT " "%s: Request 0x%p received un-handled SAT "
"management protocol 0x%x.\n", "management protocol 0x%x.\n",
__func__, ireq, tmf->tmf_code); __func__, ireq, tmf->tmf_code);
...@@ -518,7 +517,7 @@ scic_io_request_construct_sata(struct isci_request *ireq, ...@@ -518,7 +517,7 @@ scic_io_request_construct_sata(struct isci_request *ireq,
} }
if (!sas_protocol_ata(task->task_proto)) { if (!sas_protocol_ata(task->task_proto)) {
dev_err(scic_to_dev(ireq->owning_controller), dev_err(&ireq->owning_controller->pdev->dev,
"%s: Non-ATA protocol in SATA path: 0x%x\n", "%s: Non-ATA protocol in SATA path: 0x%x\n",
__func__, __func__,
task->task_proto); task->task_proto);
...@@ -616,7 +615,7 @@ enum sci_status scic_task_request_construct_sata(struct isci_request *ireq) ...@@ -616,7 +615,7 @@ enum sci_status scic_task_request_construct_sata(struct isci_request *ireq)
tmf->tmf_code == isci_tmf_sata_srst_low) { tmf->tmf_code == isci_tmf_sata_srst_low) {
scu_stp_raw_request_construct_task_context(ireq); scu_stp_raw_request_construct_task_context(ireq);
} else { } else {
dev_err(scic_to_dev(ireq->owning_controller), dev_err(&ireq->owning_controller->pdev->dev,
"%s: Request 0x%p received un-handled SAT " "%s: Request 0x%p received un-handled SAT "
"Protocol 0x%x.\n", "Protocol 0x%x.\n",
__func__, ireq, tmf->tmf_code); __func__, ireq, tmf->tmf_code);
...@@ -639,11 +638,11 @@ enum sci_status scic_task_request_construct_sata(struct isci_request *ireq) ...@@ -639,11 +638,11 @@ enum sci_status scic_task_request_construct_sata(struct isci_request *ireq)
#define SCU_TASK_CONTEXT_SRAM 0x200000 #define SCU_TASK_CONTEXT_SRAM 0x200000
static u32 sci_req_tx_bytes(struct isci_request *ireq) static u32 sci_req_tx_bytes(struct isci_request *ireq)
{ {
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
u32 ret_val = 0; u32 ret_val = 0;
if (readl(&scic->smu_registers->address_modifier) == 0) { if (readl(&ihost->smu_registers->address_modifier) == 0) {
void __iomem *scu_reg_base = scic->scu_registers; void __iomem *scu_reg_base = ihost->scu_registers;
/* get the bytes of data from the Address == BAR1 + 20002Ch + (256*TCi) where /* get the bytes of data from the Address == BAR1 + 20002Ch + (256*TCi) where
* BAR1 is the scu_registers * BAR1 is the scu_registers
...@@ -663,11 +662,11 @@ enum sci_status scic_sds_request_start(struct isci_request *ireq) ...@@ -663,11 +662,11 @@ enum sci_status scic_sds_request_start(struct isci_request *ireq)
{ {
enum sci_base_request_states state; enum sci_base_request_states state;
struct scu_task_context *tc = ireq->tc; struct scu_task_context *tc = ireq->tc;
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
state = ireq->sm.current_state_id; state = ireq->sm.current_state_id;
if (state != SCI_REQ_CONSTRUCTED) { if (state != SCI_REQ_CONSTRUCTED) {
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC IO Request requested to start while in wrong " "%s: SCIC IO Request requested to start while in wrong "
"state %d\n", __func__, state); "state %d\n", __func__, state);
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
...@@ -749,7 +748,7 @@ scic_sds_io_request_terminate(struct isci_request *ireq) ...@@ -749,7 +748,7 @@ scic_sds_io_request_terminate(struct isci_request *ireq)
return SCI_SUCCESS; return SCI_SUCCESS;
case SCI_REQ_COMPLETED: case SCI_REQ_COMPLETED:
default: default:
dev_warn(scic_to_dev(ireq->owning_controller), dev_warn(&ireq->owning_controller->pdev->dev,
"%s: SCIC IO Request requested to abort while in wrong " "%s: SCIC IO Request requested to abort while in wrong "
"state %d\n", "state %d\n",
__func__, __func__,
...@@ -763,7 +762,7 @@ scic_sds_io_request_terminate(struct isci_request *ireq) ...@@ -763,7 +762,7 @@ scic_sds_io_request_terminate(struct isci_request *ireq)
enum sci_status scic_sds_request_complete(struct isci_request *ireq) enum sci_status scic_sds_request_complete(struct isci_request *ireq)
{ {
enum sci_base_request_states state; enum sci_base_request_states state;
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
state = ireq->sm.current_state_id; state = ireq->sm.current_state_id;
if (WARN_ONCE(state != SCI_REQ_COMPLETED, if (WARN_ONCE(state != SCI_REQ_COMPLETED,
...@@ -771,7 +770,7 @@ enum sci_status scic_sds_request_complete(struct isci_request *ireq) ...@@ -771,7 +770,7 @@ enum sci_status scic_sds_request_complete(struct isci_request *ireq)
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
if (ireq->saved_rx_frame_index != SCU_INVALID_FRAME_INDEX) if (ireq->saved_rx_frame_index != SCU_INVALID_FRAME_INDEX)
scic_sds_controller_release_frame(scic, scic_sds_controller_release_frame(ihost,
ireq->saved_rx_frame_index); ireq->saved_rx_frame_index);
/* XXX can we just stop the machine and remove the 'final' state? */ /* XXX can we just stop the machine and remove the 'final' state? */
...@@ -783,12 +782,12 @@ enum sci_status scic_sds_io_request_event_handler(struct isci_request *ireq, ...@@ -783,12 +782,12 @@ enum sci_status scic_sds_io_request_event_handler(struct isci_request *ireq,
u32 event_code) u32 event_code)
{ {
enum sci_base_request_states state; enum sci_base_request_states state;
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
state = ireq->sm.current_state_id; state = ireq->sm.current_state_id;
if (state != SCI_REQ_STP_PIO_DATA_IN) { if (state != SCI_REQ_STP_PIO_DATA_IN) {
dev_warn(scic_to_dev(scic), "%s: (%x) in wrong state %d\n", dev_warn(&ihost->pdev->dev, "%s: (%x) in wrong state %d\n",
__func__, event_code, state); __func__, event_code, state);
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
...@@ -802,7 +801,7 @@ enum sci_status scic_sds_io_request_event_handler(struct isci_request *ireq, ...@@ -802,7 +801,7 @@ enum sci_status scic_sds_io_request_event_handler(struct isci_request *ireq,
sci_change_state(&ireq->sm, SCI_REQ_STP_PIO_WAIT_FRAME); sci_change_state(&ireq->sm, SCI_REQ_STP_PIO_WAIT_FRAME);
return SCI_SUCCESS; return SCI_SUCCESS;
default: default:
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: pio request unexpected event %#x\n", "%s: pio request unexpected event %#x\n",
__func__, event_code); __func__, event_code);
...@@ -1024,7 +1023,7 @@ static enum sci_status ssp_task_request_await_tc_event(struct isci_request *ireq ...@@ -1024,7 +1023,7 @@ static enum sci_status ssp_task_request_await_tc_event(struct isci_request *ireq
* There is a potential for receiving multiple task responses if * There is a potential for receiving multiple task responses if
* we decide to send the task IU again. * we decide to send the task IU again.
*/ */
dev_warn(scic_to_dev(ireq->owning_controller), dev_warn(&ireq->owning_controller->pdev->dev,
"%s: TaskRequest:0x%p CompletionCode:%x - " "%s: TaskRequest:0x%p CompletionCode:%x - "
"ACK/NAK timeout\n", __func__, ireq, "ACK/NAK timeout\n", __func__, ireq,
completion_code); completion_code);
...@@ -1073,7 +1072,7 @@ smp_request_await_response_tc_event(struct isci_request *ireq, ...@@ -1073,7 +1072,7 @@ smp_request_await_response_tc_event(struct isci_request *ireq,
* response within 2 ms. This causes our hardware break * response within 2 ms. This causes our hardware break
* the connection and set TC completion with one of * the connection and set TC completion with one of
* these SMP_XXX_XX_ERR status. For these type of error, * these SMP_XXX_XX_ERR status. For these type of error,
* we ask scic user to retry the request. * we ask ihost user to retry the request.
*/ */
scic_sds_request_set_status(ireq, SCU_TASK_DONE_SMP_RESP_TO_ERR, scic_sds_request_set_status(ireq, SCU_TASK_DONE_SMP_RESP_TO_ERR,
SCI_FAILURE_RETRY_REQUIRED); SCI_FAILURE_RETRY_REQUIRED);
...@@ -1451,18 +1450,18 @@ static void scic_sds_stp_request_udma_complete_request( ...@@ -1451,18 +1450,18 @@ static void scic_sds_stp_request_udma_complete_request(
static enum sci_status scic_sds_stp_request_udma_general_frame_handler(struct isci_request *ireq, static enum sci_status scic_sds_stp_request_udma_general_frame_handler(struct isci_request *ireq,
u32 frame_index) u32 frame_index)
{ {
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
struct dev_to_host_fis *frame_header; struct dev_to_host_fis *frame_header;
enum sci_status status; enum sci_status status;
u32 *frame_buffer; u32 *frame_buffer;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_header); (void **)&frame_header);
if ((status == SCI_SUCCESS) && if ((status == SCI_SUCCESS) &&
(frame_header->fis_type == FIS_REGD2H)) { (frame_header->fis_type == FIS_REGD2H)) {
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1471,7 +1470,7 @@ static enum sci_status scic_sds_stp_request_udma_general_frame_handler(struct is ...@@ -1471,7 +1470,7 @@ static enum sci_status scic_sds_stp_request_udma_general_frame_handler(struct is
frame_buffer); frame_buffer);
} }
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return status; return status;
} }
...@@ -1480,7 +1479,7 @@ enum sci_status ...@@ -1480,7 +1479,7 @@ enum sci_status
scic_sds_io_request_frame_handler(struct isci_request *ireq, scic_sds_io_request_frame_handler(struct isci_request *ireq,
u32 frame_index) u32 frame_index)
{ {
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
struct isci_stp_request *stp_req = &ireq->stp.req; struct isci_stp_request *stp_req = &ireq->stp.req;
enum sci_base_request_states state; enum sci_base_request_states state;
enum sci_status status; enum sci_status status;
...@@ -1492,7 +1491,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1492,7 +1491,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct ssp_frame_hdr ssp_hdr; struct ssp_frame_hdr ssp_hdr;
void *frame_header; void *frame_header;
scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
&frame_header); &frame_header);
...@@ -1503,7 +1502,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1503,7 +1502,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct ssp_response_iu *resp_iu; struct ssp_response_iu *resp_iu;
ssize_t word_cnt = SSP_RESP_IU_MAX_SIZE / sizeof(u32); ssize_t word_cnt = SSP_RESP_IU_MAX_SIZE / sizeof(u32);
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&resp_iu); (void **)&resp_iu);
...@@ -1522,7 +1521,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1522,7 +1521,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
SCI_SUCCESS); SCI_SUCCESS);
} else { } else {
/* not a response frame, why did it get forwarded? */ /* not a response frame, why did it get forwarded? */
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC IO Request 0x%p received unexpected " "%s: SCIC IO Request 0x%p received unexpected "
"frame %d type 0x%02x\n", __func__, ireq, "frame %d type 0x%02x\n", __func__, ireq,
frame_index, ssp_hdr.frame_type); frame_index, ssp_hdr.frame_type);
...@@ -1532,7 +1531,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1532,7 +1531,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
* In any case we are done with this frame buffer return it to * In any case we are done with this frame buffer return it to
* the controller * the controller
*/ */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1540,14 +1539,14 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1540,14 +1539,14 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
case SCI_REQ_TASK_WAIT_TC_RESP: case SCI_REQ_TASK_WAIT_TC_RESP:
scic_sds_io_request_copy_response(ireq); scic_sds_io_request_copy_response(ireq);
sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
scic_sds_controller_release_frame(scic,frame_index); scic_sds_controller_release_frame(ihost,frame_index);
return SCI_SUCCESS; return SCI_SUCCESS;
case SCI_REQ_SMP_WAIT_RESP: { case SCI_REQ_SMP_WAIT_RESP: {
struct smp_resp *rsp_hdr = &ireq->smp.rsp; struct smp_resp *rsp_hdr = &ireq->smp.rsp;
void *frame_header; void *frame_header;
scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
&frame_header); &frame_header);
...@@ -1558,7 +1557,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1558,7 +1557,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
if (rsp_hdr->frame_type == SMP_RESPONSE) { if (rsp_hdr->frame_type == SMP_RESPONSE) {
void *smp_resp; void *smp_resp;
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
&smp_resp); &smp_resp);
...@@ -1577,7 +1576,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1577,7 +1576,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
* This was not a response frame why did it get * This was not a response frame why did it get
* forwarded? * forwarded?
*/ */
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC SMP Request 0x%p received unexpected " "%s: SCIC SMP Request 0x%p received unexpected "
"frame %d type 0x%02x\n", "frame %d type 0x%02x\n",
__func__, __func__,
...@@ -1592,7 +1591,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1592,7 +1591,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
} }
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return SCI_SUCCESS; return SCI_SUCCESS;
} }
...@@ -1619,12 +1618,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1619,12 +1618,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct dev_to_host_fis *frame_header; struct dev_to_host_fis *frame_header;
u32 *frame_buffer; u32 *frame_buffer;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_header); (void **)&frame_header);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC IO Request 0x%p could not get frame " "%s: SCIC IO Request 0x%p could not get frame "
"header for frame index %d, status %x\n", "header for frame index %d, status %x\n",
__func__, __func__,
...@@ -1637,7 +1636,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1637,7 +1636,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
switch (frame_header->fis_type) { switch (frame_header->fis_type) {
case FIS_REGD2H: case FIS_REGD2H:
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1651,7 +1650,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1651,7 +1650,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
break; break;
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: IO Request:0x%p Frame Id:%d protocol " "%s: IO Request:0x%p Frame Id:%d protocol "
"violation occurred\n", __func__, stp_req, "violation occurred\n", __func__, stp_req,
frame_index); frame_index);
...@@ -1664,7 +1663,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1664,7 +1663,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
/* Frame has been decoded return it to the controller */ /* Frame has been decoded return it to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return status; return status;
} }
...@@ -1674,12 +1673,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1674,12 +1673,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct dev_to_host_fis *frame_header; struct dev_to_host_fis *frame_header;
u32 *frame_buffer; u32 *frame_buffer;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_header); (void **)&frame_header);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC IO Request 0x%p could not get frame " "%s: SCIC IO Request 0x%p could not get frame "
"header for frame index %d, status %x\n", "header for frame index %d, status %x\n",
__func__, stp_req, frame_index, status); __func__, stp_req, frame_index, status);
...@@ -1689,7 +1688,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1689,7 +1688,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
switch (frame_header->fis_type) { switch (frame_header->fis_type) {
case FIS_PIO_SETUP: case FIS_PIO_SETUP:
/* Get from the frame buffer the PIO Setup Data */ /* Get from the frame buffer the PIO Setup Data */
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1736,7 +1735,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1736,7 +1735,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
* FIS when it is still busy? Do nothing since * FIS when it is still busy? Do nothing since
* we are still in the right state. * we are still in the right state.
*/ */
dev_dbg(scic_to_dev(scic), dev_dbg(&ihost->pdev->dev,
"%s: SCIC PIO Request 0x%p received " "%s: SCIC PIO Request 0x%p received "
"D2H Register FIS with BSY status " "D2H Register FIS with BSY status "
"0x%x\n", "0x%x\n",
...@@ -1746,7 +1745,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1746,7 +1745,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
break; break;
} }
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1767,7 +1766,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1767,7 +1766,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
} }
/* Frame is decoded return it to the controller */ /* Frame is decoded return it to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return status; return status;
} }
...@@ -1776,12 +1775,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1776,12 +1775,12 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct dev_to_host_fis *frame_header; struct dev_to_host_fis *frame_header;
struct sata_fis_data *frame_buffer; struct sata_fis_data *frame_buffer;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_header); (void **)&frame_header);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC IO Request 0x%p could not get frame " "%s: SCIC IO Request 0x%p could not get frame "
"header for frame index %d, status %x\n", "header for frame index %d, status %x\n",
__func__, __func__,
...@@ -1792,7 +1791,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1792,7 +1791,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
} }
if (frame_header->fis_type != FIS_DATA) { if (frame_header->fis_type != FIS_DATA) {
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC PIO Request 0x%p received frame %d " "%s: SCIC PIO Request 0x%p received frame %d "
"with fis type 0x%02x when expecting a data " "with fis type 0x%02x when expecting a data "
"fis.\n", "fis.\n",
...@@ -1808,7 +1807,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1808,7 +1807,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
/* Frame is decoded return it to the controller */ /* Frame is decoded return it to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return status; return status;
} }
...@@ -1816,7 +1815,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1816,7 +1815,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
ireq->saved_rx_frame_index = frame_index; ireq->saved_rx_frame_index = frame_index;
stp_req->pio_len = 0; stp_req->pio_len = 0;
} else { } else {
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1824,7 +1823,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1824,7 +1823,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
(u8 *)frame_buffer); (u8 *)frame_buffer);
/* Frame is decoded return it to the controller */ /* Frame is decoded return it to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
} }
/* Check for the end of the transfer, are there more /* Check for the end of the transfer, are there more
...@@ -1849,11 +1848,11 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1849,11 +1848,11 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
struct dev_to_host_fis *frame_header; struct dev_to_host_fis *frame_header;
u32 *frame_buffer; u32 *frame_buffer;
status = scic_sds_unsolicited_frame_control_get_header(&scic->uf_control, status = scic_sds_unsolicited_frame_control_get_header(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_header); (void **)&frame_header);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(scic_to_dev(scic), dev_err(&ihost->pdev->dev,
"%s: SCIC IO Request 0x%p could not get frame " "%s: SCIC IO Request 0x%p could not get frame "
"header for frame index %d, status %x\n", "header for frame index %d, status %x\n",
__func__, __func__,
...@@ -1865,7 +1864,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1865,7 +1864,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
switch (frame_header->fis_type) { switch (frame_header->fis_type) {
case FIS_REGD2H: case FIS_REGD2H:
scic_sds_unsolicited_frame_control_get_buffer(&scic->uf_control, scic_sds_unsolicited_frame_control_get_buffer(&ihost->uf_control,
frame_index, frame_index,
(void **)&frame_buffer); (void **)&frame_buffer);
...@@ -1880,7 +1879,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1880,7 +1879,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
break; break;
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: IO Request:0x%p Frame Id:%d protocol " "%s: IO Request:0x%p Frame Id:%d protocol "
"violation occurred\n", "violation occurred\n",
__func__, __func__,
...@@ -1896,7 +1895,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1896,7 +1895,7 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); sci_change_state(&ireq->sm, SCI_REQ_COMPLETED);
/* Frame has been decoded return it to the controller */ /* Frame has been decoded return it to the controller */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return status; return status;
} }
...@@ -1905,18 +1904,18 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq, ...@@ -1905,18 +1904,18 @@ scic_sds_io_request_frame_handler(struct isci_request *ireq,
* TODO: Is it even possible to get an unsolicited frame in the * TODO: Is it even possible to get an unsolicited frame in the
* aborting state? * aborting state?
*/ */
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return SCI_SUCCESS; return SCI_SUCCESS;
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC IO Request given unexpected frame %x while " "%s: SCIC IO Request given unexpected frame %x while "
"in state %d\n", "in state %d\n",
__func__, __func__,
frame_index, frame_index,
state); state);
scic_sds_controller_release_frame(scic, frame_index); scic_sds_controller_release_frame(ihost, frame_index);
return SCI_FAILURE_INVALID_STATE; return SCI_FAILURE_INVALID_STATE;
} }
} }
...@@ -2042,7 +2041,7 @@ scic_sds_io_request_tc_completion(struct isci_request *ireq, ...@@ -2042,7 +2041,7 @@ scic_sds_io_request_tc_completion(struct isci_request *ireq,
u32 completion_code) u32 completion_code)
{ {
enum sci_base_request_states state; enum sci_base_request_states state;
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
state = ireq->sm.current_state_id; state = ireq->sm.current_state_id;
...@@ -2089,7 +2088,7 @@ scic_sds_io_request_tc_completion(struct isci_request *ireq, ...@@ -2089,7 +2088,7 @@ scic_sds_io_request_tc_completion(struct isci_request *ireq,
completion_code); completion_code);
default: default:
dev_warn(scic_to_dev(scic), dev_warn(&ihost->pdev->dev,
"%s: SCIC IO Request given task completion " "%s: SCIC IO Request given task completion "
"notification %x while in wrong state %d\n", "notification %x while in wrong state %d\n",
__func__, __func__,
...@@ -2480,7 +2479,7 @@ static void isci_task_save_for_upper_layer_completion( ...@@ -2480,7 +2479,7 @@ static void isci_task_save_for_upper_layer_completion(
} }
} }
static void isci_request_io_request_complete(struct isci_host *isci_host, static void isci_request_io_request_complete(struct isci_host *ihost,
struct isci_request *request, struct isci_request *request,
enum sci_io_status completion_status) enum sci_io_status completion_status)
{ {
...@@ -2495,7 +2494,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2495,7 +2494,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
enum isci_completion_selection complete_to_host enum isci_completion_selection complete_to_host
= isci_perform_normal_io_completion; = isci_perform_normal_io_completion;
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: request = %p, task = %p,\n" "%s: request = %p, task = %p,\n"
"task->data_dir = %d completion_status = 0x%x\n", "task->data_dir = %d completion_status = 0x%x\n",
__func__, __func__,
...@@ -2616,7 +2615,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2616,7 +2615,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
switch (completion_status) { switch (completion_status) {
case SCI_IO_FAILURE_RESPONSE_VALID: case SCI_IO_FAILURE_RESPONSE_VALID:
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: SCI_IO_FAILURE_RESPONSE_VALID (%p/%p)\n", "%s: SCI_IO_FAILURE_RESPONSE_VALID (%p/%p)\n",
__func__, __func__,
request, request,
...@@ -2631,17 +2630,17 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2631,17 +2630,17 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
/* crack the iu response buffer. */ /* crack the iu response buffer. */
resp_iu = &request->ssp.rsp; resp_iu = &request->ssp.rsp;
isci_request_process_response_iu(task, resp_iu, isci_request_process_response_iu(task, resp_iu,
&isci_host->pdev->dev); &ihost->pdev->dev);
} else if (SAS_PROTOCOL_SMP == task->task_proto) { } else if (SAS_PROTOCOL_SMP == task->task_proto) {
dev_err(&isci_host->pdev->dev, dev_err(&ihost->pdev->dev,
"%s: SCI_IO_FAILURE_RESPONSE_VALID: " "%s: SCI_IO_FAILURE_RESPONSE_VALID: "
"SAS_PROTOCOL_SMP protocol\n", "SAS_PROTOCOL_SMP protocol\n",
__func__); __func__);
} else } else
dev_err(&isci_host->pdev->dev, dev_err(&ihost->pdev->dev,
"%s: unknown protocol\n", __func__); "%s: unknown protocol\n", __func__);
/* use the task status set in the task struct by the /* use the task status set in the task struct by the
...@@ -2662,7 +2661,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2662,7 +2661,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
if (task->task_proto == SAS_PROTOCOL_SMP) { if (task->task_proto == SAS_PROTOCOL_SMP) {
void *rsp = &request->smp.rsp; void *rsp = &request->smp.rsp;
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: SMP protocol completion\n", "%s: SMP protocol completion\n",
__func__); __func__);
...@@ -2687,20 +2686,20 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2687,20 +2686,20 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
if (task->task_status.residual != 0) if (task->task_status.residual != 0)
status = SAS_DATA_UNDERRUN; status = SAS_DATA_UNDERRUN;
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: SCI_IO_SUCCESS_IO_DONE_EARLY %d\n", "%s: SCI_IO_SUCCESS_IO_DONE_EARLY %d\n",
__func__, __func__,
status); status);
} else } else
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: SCI_IO_SUCCESS\n", "%s: SCI_IO_SUCCESS\n",
__func__); __func__);
break; break;
case SCI_IO_FAILURE_TERMINATED: case SCI_IO_FAILURE_TERMINATED:
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: SCI_IO_FAILURE_TERMINATED (%p/%p)\n", "%s: SCI_IO_FAILURE_TERMINATED (%p/%p)\n",
__func__, __func__,
request, request,
...@@ -2768,7 +2767,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2768,7 +2767,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
default: default:
/* Catch any otherwise unhandled error codes here. */ /* Catch any otherwise unhandled error codes here. */
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: invalid completion code: 0x%x - " "%s: invalid completion code: 0x%x - "
"isci_request = %p\n", "isci_request = %p\n",
__func__, completion_status, request); __func__, completion_status, request);
...@@ -2802,11 +2801,11 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2802,11 +2801,11 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
break; break;
if (task->num_scatter == 0) if (task->num_scatter == 0)
/* 0 indicates a single dma address */ /* 0 indicates a single dma address */
dma_unmap_single(&isci_host->pdev->dev, dma_unmap_single(&ihost->pdev->dev,
request->zero_scatter_daddr, request->zero_scatter_daddr,
task->total_xfer_len, task->data_dir); task->total_xfer_len, task->data_dir);
else /* unmap the sgl dma addresses */ else /* unmap the sgl dma addresses */
dma_unmap_sg(&isci_host->pdev->dev, task->scatter, dma_unmap_sg(&ihost->pdev->dev, task->scatter,
request->num_sg_entries, task->data_dir); request->num_sg_entries, task->data_dir);
break; break;
case SAS_PROTOCOL_SMP: { case SAS_PROTOCOL_SMP: {
...@@ -2814,7 +2813,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2814,7 +2813,7 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
struct smp_req *smp_req; struct smp_req *smp_req;
void *kaddr; void *kaddr;
dma_unmap_sg(&isci_host->pdev->dev, sg, 1, DMA_TO_DEVICE); dma_unmap_sg(&ihost->pdev->dev, sg, 1, DMA_TO_DEVICE);
/* need to swab it back in case the command buffer is re-used */ /* need to swab it back in case the command buffer is re-used */
kaddr = kmap_atomic(sg_page(sg), KM_IRQ0); kaddr = kmap_atomic(sg_page(sg), KM_IRQ0);
...@@ -2828,14 +2827,12 @@ static void isci_request_io_request_complete(struct isci_host *isci_host, ...@@ -2828,14 +2827,12 @@ static void isci_request_io_request_complete(struct isci_host *isci_host,
} }
/* Put the completed request on the correct list */ /* Put the completed request on the correct list */
isci_task_save_for_upper_layer_completion(isci_host, request, response, isci_task_save_for_upper_layer_completion(ihost, request, response,
status, complete_to_host status, complete_to_host
); );
/* complete the io request to the core. */ /* complete the io request to the core. */
scic_controller_complete_io(&isci_host->sci, scic_controller_complete_io(ihost, request->target_device, request);
request->target_device,
request);
isci_put_device(idev); isci_put_device(idev);
/* set terminated handle so it cannot be completed or /* set terminated handle so it cannot be completed or
...@@ -2885,8 +2882,7 @@ static void scic_sds_request_started_state_enter(struct sci_base_state_machine * ...@@ -2885,8 +2882,7 @@ static void scic_sds_request_started_state_enter(struct sci_base_state_machine *
static void scic_sds_request_completed_state_enter(struct sci_base_state_machine *sm) static void scic_sds_request_completed_state_enter(struct sci_base_state_machine *sm)
{ {
struct isci_request *ireq = container_of(sm, typeof(*ireq), sm); struct isci_request *ireq = container_of(sm, typeof(*ireq), sm);
struct scic_sds_controller *scic = ireq->owning_controller; struct isci_host *ihost = ireq->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);
/* Tell the SCI_USER that the IO request is complete */ /* Tell the SCI_USER that the IO request is complete */
if (!test_bit(IREQ_TMF, &ireq->flags)) if (!test_bit(IREQ_TMF, &ireq->flags))
...@@ -2985,7 +2981,7 @@ static const struct sci_base_state scic_sds_request_state_table[] = { ...@@ -2985,7 +2981,7 @@ static const struct sci_base_state scic_sds_request_state_table[] = {
}; };
static void static void
scic_sds_general_request_construct(struct scic_sds_controller *scic, scic_sds_general_request_construct(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
...@@ -3001,7 +2997,7 @@ scic_sds_general_request_construct(struct scic_sds_controller *scic, ...@@ -3001,7 +2997,7 @@ scic_sds_general_request_construct(struct scic_sds_controller *scic,
} }
static enum sci_status static enum sci_status
scic_io_request_construct(struct scic_sds_controller *scic, scic_io_request_construct(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *ireq) struct isci_request *ireq)
{ {
...@@ -3009,7 +3005,7 @@ scic_io_request_construct(struct scic_sds_controller *scic, ...@@ -3009,7 +3005,7 @@ scic_io_request_construct(struct scic_sds_controller *scic,
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
/* Build the common part of the request */ /* Build the common part of the request */
scic_sds_general_request_construct(scic, idev, ireq); scic_sds_general_request_construct(ihost, idev, ireq);
if (idev->rnc.remote_node_index == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX) if (idev->rnc.remote_node_index == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX)
return SCI_FAILURE_INVALID_REMOTE_DEVICE; return SCI_FAILURE_INVALID_REMOTE_DEVICE;
...@@ -3028,7 +3024,7 @@ scic_io_request_construct(struct scic_sds_controller *scic, ...@@ -3028,7 +3024,7 @@ scic_io_request_construct(struct scic_sds_controller *scic,
return status; return status;
} }
enum sci_status scic_task_request_construct(struct scic_sds_controller *scic, enum sci_status scic_task_request_construct(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 io_tag, struct isci_request *ireq) u16 io_tag, struct isci_request *ireq)
{ {
...@@ -3036,7 +3032,7 @@ enum sci_status scic_task_request_construct(struct scic_sds_controller *scic, ...@@ -3036,7 +3032,7 @@ enum sci_status scic_task_request_construct(struct scic_sds_controller *scic,
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
/* Build the common part of the request */ /* Build the common part of the request */
scic_sds_general_request_construct(scic, idev, ireq); scic_sds_general_request_construct(ihost, idev, ireq);
if (dev->dev_type == SAS_END_DEV || if (dev->dev_type == SAS_END_DEV ||
dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {
...@@ -3156,7 +3152,7 @@ scic_io_request_construct_smp(struct device *dev, ...@@ -3156,7 +3152,7 @@ scic_io_request_construct_smp(struct device *dev,
task_context->initiator_request = 1; task_context->initiator_request = 1;
task_context->connection_rate = idev->connection_rate; task_context->connection_rate = idev->connection_rate;
task_context->protocol_engine_index = task_context->protocol_engine_index =
scic_sds_controller_get_protocol_engine_group(scic); scic_sds_controller_get_protocol_engine_group(ihost);
task_context->logical_port_index = scic_sds_port_get_index(iport); task_context->logical_port_index = scic_sds_port_get_index(iport);
task_context->protocol_type = SCU_TASK_CONTEXT_PROTOCOL_SMP; task_context->protocol_type = SCU_TASK_CONTEXT_PROTOCOL_SMP;
task_context->abort = 0; task_context->abort = 0;
...@@ -3199,7 +3195,7 @@ scic_io_request_construct_smp(struct device *dev, ...@@ -3199,7 +3195,7 @@ scic_io_request_construct_smp(struct device *dev,
task_context->task_phase = 0; task_context->task_phase = 0;
ireq->post_context = (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC | ireq->post_context = (SCU_CONTEXT_COMMAND_REQUEST_TYPE_POST_TC |
(scic_sds_controller_get_protocol_engine_group(scic) << (scic_sds_controller_get_protocol_engine_group(ihost) <<
SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) | SCU_CONTEXT_COMMAND_PROTOCOL_ENGINE_GROUP_SHIFT) |
(scic_sds_port_get_index(iport) << (scic_sds_port_get_index(iport) <<
SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) | SCU_CONTEXT_COMMAND_LOGICAL_PORT_SHIFT) |
...@@ -3245,7 +3241,7 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq) ...@@ -3245,7 +3241,7 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq)
/** /**
* isci_io_request_build() - This function builds the io request object. * isci_io_request_build() - This function builds the io request object.
* @isci_host: This parameter specifies the ISCI host object * @ihost: This parameter specifies the ISCI host object
* @request: This parameter points to the isci_request object allocated in the * @request: This parameter points to the isci_request object allocated in the
* request construct function. * request construct function.
* @sci_device: This parameter is the handle for the sci core's remote device * @sci_device: This parameter is the handle for the sci core's remote device
...@@ -3253,14 +3249,14 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq) ...@@ -3253,14 +3249,14 @@ static enum sci_status isci_smp_request_build(struct isci_request *ireq)
* *
* SCI_SUCCESS on successfull completion, or specific failure code. * SCI_SUCCESS on successfull completion, or specific failure code.
*/ */
static enum sci_status isci_io_request_build(struct isci_host *isci_host, static enum sci_status isci_io_request_build(struct isci_host *ihost,
struct isci_request *request, struct isci_request *request,
struct isci_remote_device *idev) struct isci_remote_device *idev)
{ {
enum sci_status status = SCI_SUCCESS; enum sci_status status = SCI_SUCCESS;
struct sas_task *task = isci_request_access_task(request); struct sas_task *task = isci_request_access_task(request);
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: idev = 0x%p; request = %p, " "%s: idev = 0x%p; request = %p, "
"num_scatter = %d\n", "num_scatter = %d\n",
__func__, __func__,
...@@ -3277,7 +3273,7 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host, ...@@ -3277,7 +3273,7 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host,
!(SAS_PROTOCOL_SMP & task->task_proto)) { !(SAS_PROTOCOL_SMP & task->task_proto)) {
request->num_sg_entries = dma_map_sg( request->num_sg_entries = dma_map_sg(
&isci_host->pdev->dev, &ihost->pdev->dev,
task->scatter, task->scatter,
task->num_scatter, task->num_scatter,
task->data_dir task->data_dir
...@@ -3287,10 +3283,10 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host, ...@@ -3287,10 +3283,10 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host,
return SCI_FAILURE_INSUFFICIENT_RESOURCES; return SCI_FAILURE_INSUFFICIENT_RESOURCES;
} }
status = scic_io_request_construct(&isci_host->sci, idev, request); status = scic_io_request_construct(ihost, idev, request);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: failed request construct\n", "%s: failed request construct\n",
__func__); __func__);
return SCI_FAILURE; return SCI_FAILURE;
...@@ -3309,7 +3305,7 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host, ...@@ -3309,7 +3305,7 @@ static enum sci_status isci_io_request_build(struct isci_host *isci_host,
status = isci_request_stp_request_construct(request); status = isci_request_stp_request_construct(request);
break; break;
default: default:
dev_warn(&isci_host->pdev->dev, dev_warn(&ihost->pdev->dev,
"%s: unknown protocol\n", __func__); "%s: unknown protocol\n", __func__);
return SCI_FAILURE; return SCI_FAILURE;
} }
...@@ -3392,7 +3388,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide ...@@ -3392,7 +3388,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
* request was built that way (ie. * request was built that way (ie.
* ireq->is_task_management_request is false). * ireq->is_task_management_request is false).
*/ */
status = scic_controller_start_task(&ihost->sci, status = scic_controller_start_task(ihost,
idev, idev,
ireq); ireq);
} else { } else {
...@@ -3400,7 +3396,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide ...@@ -3400,7 +3396,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
} }
} else { } else {
/* send the request, let the core assign the IO TAG. */ /* send the request, let the core assign the IO TAG. */
status = scic_controller_start_io(&ihost->sci, idev, status = scic_controller_start_io(ihost, idev,
ireq); ireq);
} }
......
drivers/scsi/isci/request.h
View file @ d9dcb4ba
...@@ -145,7 +145,7 @@ struct isci_request { ...@@ -145,7 +145,7 @@ struct isci_request {
*/ */
struct completion *io_request_completion; struct completion *io_request_completion;
struct sci_base_state_machine sm; struct sci_base_state_machine sm;
struct scic_sds_controller *owning_controller; struct isci_host *owning_controller;
struct isci_remote_device *target_device; struct isci_remote_device *target_device;
u16 io_tag; u16 io_tag;
enum sci_request_protocol protocol; enum sci_request_protocol protocol;
...@@ -500,7 +500,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide ...@@ -500,7 +500,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
void isci_terminate_pending_requests(struct isci_host *ihost, void isci_terminate_pending_requests(struct isci_host *ihost,
struct isci_remote_device *idev); struct isci_remote_device *idev);
enum sci_status enum sci_status
scic_task_request_construct(struct scic_sds_controller *scic, scic_task_request_construct(struct isci_host *ihost,
struct isci_remote_device *idev, struct isci_remote_device *idev,
u16 io_tag, u16 io_tag,
struct isci_request *ireq); struct isci_request *ireq);
......
drivers/scsi/isci/task.c
View file @ d9dcb4ba
...@@ -257,7 +257,7 @@ static struct isci_request *isci_task_request_build(struct isci_host *ihost, ...@@ -257,7 +257,7 @@ static struct isci_request *isci_task_request_build(struct isci_host *ihost,
return NULL; return NULL;
/* let the core do it's construct. */ /* let the core do it's construct. */
status = scic_task_request_construct(&ihost->sci, idev, tag, status = scic_task_request_construct(ihost, idev, tag,
ireq); ireq);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
...@@ -332,7 +332,7 @@ int isci_task_execute_tmf(struct isci_host *ihost, ...@@ -332,7 +332,7 @@ int isci_task_execute_tmf(struct isci_host *ihost,
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
/* start the TMF io. */ /* start the TMF io. */
status = scic_controller_start_task(&ihost->sci, idev, ireq); status = scic_controller_start_task(ihost, idev, ireq);
if (status != SCI_TASK_SUCCESS) { if (status != SCI_TASK_SUCCESS) {
dev_warn(&ihost->pdev->dev, dev_warn(&ihost->pdev->dev,
...@@ -364,7 +364,7 @@ int isci_task_execute_tmf(struct isci_host *ihost, ...@@ -364,7 +364,7 @@ int isci_task_execute_tmf(struct isci_host *ihost,
if (tmf->cb_state_func != NULL) if (tmf->cb_state_func != NULL)
tmf->cb_state_func(isci_tmf_timed_out, tmf, tmf->cb_data); tmf->cb_state_func(isci_tmf_timed_out, tmf, tmf->cb_data);
scic_controller_terminate_request(&ihost->sci, scic_controller_terminate_request(ihost,
idev, idev,
ireq); ireq);
...@@ -514,13 +514,12 @@ static void isci_request_cleanup_completed_loiterer( ...@@ -514,13 +514,12 @@ static void isci_request_cleanup_completed_loiterer(
* request, and wait for it to complete. This function must only be called * request, and wait for it to complete. This function must only be called
* from a thread that can wait. Note that the request is terminated and * from a thread that can wait. Note that the request is terminated and
* completed (back to the host, if started there). * completed (back to the host, if started there).
* @isci_host: This SCU. * @ihost: This SCU.
* @idev: The target. * @idev: The target.
* @isci_request: The I/O request to be terminated. * @isci_request: The I/O request to be terminated.
* *
*/ */
static void isci_terminate_request_core( static void isci_terminate_request_core(struct isci_host *ihost,
struct isci_host *isci_host,
struct isci_remote_device *idev, struct isci_remote_device *idev,
struct isci_request *isci_request) struct isci_request *isci_request)
{ {
...@@ -533,11 +532,11 @@ static void isci_terminate_request_core( ...@@ -533,11 +532,11 @@ static void isci_terminate_request_core(
struct completion *io_request_completion; struct completion *io_request_completion;
struct sas_task *task; struct sas_task *task;
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: device = %p; request = %p\n", "%s: device = %p; request = %p\n",
__func__, idev, isci_request); __func__, idev, isci_request);
spin_lock_irqsave(&isci_host->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
io_request_completion = isci_request->io_request_completion; io_request_completion = isci_request->io_request_completion;
...@@ -557,12 +556,11 @@ static void isci_terminate_request_core( ...@@ -557,12 +556,11 @@ static void isci_terminate_request_core(
if (!test_bit(IREQ_TERMINATED, &isci_request->flags)) { if (!test_bit(IREQ_TERMINATED, &isci_request->flags)) {
was_terminated = true; was_terminated = true;
needs_cleanup_handling = true; needs_cleanup_handling = true;
status = scic_controller_terminate_request( status = scic_controller_terminate_request(ihost,
&isci_host->sci,
idev, idev,
isci_request); isci_request);
} }
spin_unlock_irqrestore(&isci_host->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
/* /*
* The only time the request to terminate will * The only time the request to terminate will
...@@ -570,7 +568,7 @@ static void isci_terminate_request_core( ...@@ -570,7 +568,7 @@ static void isci_terminate_request_core(
* being aborted. * being aborted.
*/ */
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
dev_err(&isci_host->pdev->dev, dev_err(&ihost->pdev->dev,
"%s: scic_controller_terminate_request" "%s: scic_controller_terminate_request"
" returned = 0x%x\n", " returned = 0x%x\n",
__func__, status); __func__, status);
...@@ -579,7 +577,7 @@ static void isci_terminate_request_core( ...@@ -579,7 +577,7 @@ static void isci_terminate_request_core(
} else { } else {
if (was_terminated) { if (was_terminated) {
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: before completion wait (%p/%p)\n", "%s: before completion wait (%p/%p)\n",
__func__, isci_request, io_request_completion); __func__, isci_request, io_request_completion);
...@@ -593,7 +591,7 @@ static void isci_terminate_request_core( ...@@ -593,7 +591,7 @@ static void isci_terminate_request_core(
if (!termination_completed) { if (!termination_completed) {
/* The request to terminate has timed out. */ /* The request to terminate has timed out. */
spin_lock_irqsave(&isci_host->scic_lock, spin_lock_irqsave(&ihost->scic_lock,
flags); flags);
/* Check for state changes. */ /* Check for state changes. */
...@@ -623,12 +621,12 @@ static void isci_terminate_request_core( ...@@ -623,12 +621,12 @@ static void isci_terminate_request_core(
} else } else
termination_completed = 1; termination_completed = 1;
spin_unlock_irqrestore(&isci_host->scic_lock, spin_unlock_irqrestore(&ihost->scic_lock,
flags); flags);
if (!termination_completed) { if (!termination_completed) {
dev_err(&isci_host->pdev->dev, dev_err(&ihost->pdev->dev,
"%s: *** Timeout waiting for " "%s: *** Timeout waiting for "
"termination(%p/%p)\n", "termination(%p/%p)\n",
__func__, io_request_completion, __func__, io_request_completion,
...@@ -642,7 +640,7 @@ static void isci_terminate_request_core( ...@@ -642,7 +640,7 @@ static void isci_terminate_request_core(
} }
} }
if (termination_completed) if (termination_completed)
dev_dbg(&isci_host->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: after completion wait (%p/%p)\n", "%s: after completion wait (%p/%p)\n",
__func__, isci_request, io_request_completion); __func__, isci_request, io_request_completion);
} }
...@@ -678,7 +676,7 @@ static void isci_terminate_request_core( ...@@ -678,7 +676,7 @@ static void isci_terminate_request_core(
} }
if (needs_cleanup_handling) if (needs_cleanup_handling)
isci_request_cleanup_completed_loiterer( isci_request_cleanup_completed_loiterer(
isci_host, idev, isci_request, task); ihost, idev, isci_request, task);
} }
} }
...@@ -1253,7 +1251,7 @@ isci_task_request_complete(struct isci_host *ihost, ...@@ -1253,7 +1251,7 @@ isci_task_request_complete(struct isci_host *ihost,
/* PRINT_TMF( ((struct isci_tmf *)request->task)); */ /* PRINT_TMF( ((struct isci_tmf *)request->task)); */
tmf_complete = tmf->complete; tmf_complete = tmf->complete;
scic_controller_complete_io(&ihost->sci, ireq->target_device, ireq); scic_controller_complete_io(ihost, ireq->target_device, ireq);
/* set the 'terminated' flag handle to make sure it cannot be terminated /* set the 'terminated' flag handle to make sure it cannot be terminated
* or completed again. * or completed again.
*/ */
......
drivers/scsi/isci/unsolicited_frame_control.c
View file @ d9dcb4ba
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
#include "unsolicited_frame_control.h" #include "unsolicited_frame_control.h"
#include "registers.h" #include "registers.h"
int scic_sds_unsolicited_frame_control_construct(struct scic_sds_controller *scic) int scic_sds_unsolicited_frame_control_construct(struct isci_host *ihost)
{ {
struct scic_sds_unsolicited_frame_control *uf_control = &scic->uf_control; struct scic_sds_unsolicited_frame_control *uf_control = &ihost->uf_control;
struct scic_sds_unsolicited_frame *uf; struct scic_sds_unsolicited_frame *uf;
u32 buf_len, header_len, i; u32 buf_len, header_len, i;
dma_addr_t dma; dma_addr_t dma;
...@@ -79,7 +79,7 @@ int scic_sds_unsolicited_frame_control_construct(struct scic_sds_controller *sci ...@@ -79,7 +79,7 @@ int scic_sds_unsolicited_frame_control_construct(struct scic_sds_controller *sci
* memory descriptor entry. The headers and address table will be * memory descriptor entry. The headers and address table will be
* placed after the buffers. * placed after the buffers.
*/ */
virt = dmam_alloc_coherent(scic_to_dev(scic), size, &dma, GFP_KERNEL); virt = dmam_alloc_coherent(&ihost->pdev->dev, size, &dma, GFP_KERNEL);
if (!virt) if (!virt)
return -ENOMEM; return -ENOMEM;
......
drivers/scsi/isci/unsolicited_frame_control.h
View file @ d9dcb4ba
...@@ -214,9 +214,9 @@ struct scic_sds_unsolicited_frame_control { ...@@ -214,9 +214,9 @@ struct scic_sds_unsolicited_frame_control {
}; };
struct scic_sds_controller; struct isci_host;
int scic_sds_unsolicited_frame_control_construct(struct scic_sds_controller *scic); int scic_sds_unsolicited_frame_control_construct(struct isci_host *ihost);
enum sci_status scic_sds_unsolicited_frame_control_get_header( enum sci_status scic_sds_unsolicited_frame_control_get_header(
struct scic_sds_unsolicited_frame_control *uf_control, struct scic_sds_unsolicited_frame_control *uf_control,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7