dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

isci: Remove isci_device reqs_in_process and dev_node from isci_device.

Browse source 
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Jeff Skirvin 2012-03-08 22:41:57 -08:00 committed by Dan Williams
parent 033751f664
commit d6b2a0e4a0
6 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/isci/init.c
View file

@ -569,7 +569,6 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)
for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) { for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) {
struct isci_remote_device *idev = &ihost->devices[i]; struct isci_remote_device *idev = &ihost->devices[i];
INIT_LIST_HEAD(&idev->reqs_in_process);
INIT_LIST_HEAD(&idev->node); INIT_LIST_HEAD(&idev->node);
} }

6
drivers/scsi/isci/remote_device.c
View file

@ -919,7 +919,7 @@ static void isci_remote_device_deconstruct(struct isci_host *ihost, struct isci_
* here should go through isci_remote_device_nuke_requests. * here should go through isci_remote_device_nuke_requests.
* If we hit this condition, we will need a way to complete * If we hit this condition, we will need a way to complete
* io requests in process */ * io requests in process */
BUG_ON(!list_empty(&idev->reqs_in_process)); BUG_ON(idev->started_request_count > 0);
sci_remote_device_destruct(idev); sci_remote_device_destruct(idev);
list_del_init(&idev->node); list_del_init(&idev->node);
@ -1345,10 +1345,6 @@ isci_remote_device_alloc(struct isci_host *ihost, struct isci_port *iport)
dev_warn(&ihost->pdev->dev, "%s: failed\n", __func__); dev_warn(&ihost->pdev->dev, "%s: failed\n", __func__);
return NULL; return NULL;
} }
if (WARN_ONCE(!list_empty(&idev->reqs_in_process), "found requests in process\n"))
return NULL;
if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n")) if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n"))
return NULL; return NULL;

1
drivers/scsi/isci/remote_device.h
View file

@ -90,7 +90,6 @@ struct isci_remote_device {
struct isci_port *isci_port; struct isci_port *isci_port;
struct domain_device *domain_dev; struct domain_device *domain_dev;
struct list_head node; struct list_head node;
struct list_head reqs_in_process;
struct sci_base_state_machine sm; struct sci_base_state_machine sm;
u32 device_port_width; u32 device_port_width;
enum sas_linkrate connection_rate; enum sas_linkrate connection_rate;

12
drivers/scsi/isci/request.c
View file

@ -2956,9 +2956,6 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
/* Add to the completed list. */ /* Add to the completed list. */
list_add(&request->completed_node, &ihost->requests_to_complete); list_add(&request->completed_node, &ihost->requests_to_complete);
/* Take the request off the device's pending request list. */
list_del_init(&request->dev_node);
/* complete the io request to the core. */ /* complete the io request to the core. */
sci_controller_complete_io(ihost, request->target_device, request); sci_controller_complete_io(ihost, request->target_device, request);
@ -3412,7 +3409,6 @@ static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 t
ireq->flags = 0; ireq->flags = 0;
ireq->num_sg_entries = 0; ireq->num_sg_entries = 0;
INIT_LIST_HEAD(&ireq->completed_node); INIT_LIST_HEAD(&ireq->completed_node);
INIT_LIST_HEAD(&ireq->dev_node);
return ireq; return ireq;
} }
@ -3496,17 +3492,9 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
return status; return status;
} }
/* Either I/O started OK, or the core has signaled that /* Either I/O started OK, or the core has signaled that
* the device needs a target reset. * the device needs a target reset.
*
* In either case, hold onto the I/O for later.
*
* Update it's status and add it to the list in the
* remote device object.
*/ */
list_add(&ireq->dev_node, &idev->reqs_in_process);
if (status != SCI_SUCCESS) { if (status != SCI_SUCCESS) {
/* The request did not really start in the /* The request did not really start in the
* hardware, so clear the request handle * hardware, so clear the request handle

2
drivers/scsi/isci/request.h
View file

@ -96,8 +96,6 @@ struct isci_request {
struct isci_host *isci_host; struct isci_host *isci_host;
/* For use in the requests_to_{complete|abort} lists: */ /* For use in the requests_to_{complete|abort} lists: */
struct list_head completed_node; struct list_head completed_node;
/* For use in the reqs_in_process list: */
struct list_head dev_node;
dma_addr_t request_daddr; dma_addr_t request_daddr;
dma_addr_t zero_scatter_daddr; dma_addr_t zero_scatter_daddr;
unsigned int num_sg_entries; unsigned int num_sg_entries;

4
drivers/scsi/isci/task.c
View file

@ -317,9 +317,6 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
goto err_tci; goto err_tci;
} }
/* add the request to the remote device request list. */
list_add(&ireq->dev_node, &idev->reqs_in_process);
/* The RNC must be unsuspended before the TMF can get a response. */ /* The RNC must be unsuspended before the TMF can get a response. */
sci_remote_device_resume(idev, NULL, NULL); sci_remote_device_resume(idev, NULL, NULL);
@ -721,7 +718,6 @@ isci_task_request_complete(struct isci_host *ihost,
set_bit(IREQ_TERMINATED, &ireq->flags); set_bit(IREQ_TERMINATED, &ireq->flags);
isci_free_tag(ihost, ireq->io_tag); isci_free_tag(ihost, ireq->io_tag);
list_del_init(&ireq->dev_node);
/* The task management part completes last. */ /* The task management part completes last. */
if (tmf_complete) if (tmf_complete)