isci: Remove isci_device reqs_in_process and dev_node from isci_device.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

isci: Remove isci_device reqs_in_process and dev_node from isci_device.
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Jeff Skirvin · Dan Williams
1 parent 033751f664
Showing 6 changed files with 1 additions and 25 deletions Side-by-side Diff
drivers/scsi/isci/init.c
drivers/scsi/isci/remote_device.c
drivers/scsi/isci/remote_device.h
drivers/scsi/isci/request.c
drivers/scsi/isci/request.h
drivers/scsi/isci/task.c
@@ -569,7 +569,6 @@
 	for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) {
 		struct isci_remote_device *idev = &ihost->devices[i];
  
-		INIT_LIST_HEAD(&idev->reqs_in_process);
 		INIT_LIST_HEAD(&idev->node);
 	}
  
@@ -919,7 +919,7 @@
 	 * here should go through isci_remote_device_nuke_requests.
 	 * If we hit this condition, we will need a way to complete
 	 * io requests in process */
-	BUG_ON(!list_empty(&idev->reqs_in_process));
+	BUG_ON(idev->started_request_count > 0);
  
 	sci_remote_device_destruct(idev);
 	list_del_init(&idev->node);
@@ -1345,10 +1345,6 @@
 		dev_warn(&ihost->pdev->dev, "%s: failed\n", __func__);
 		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"))
 		return NULL;
  
@@ -90,7 +90,6 @@
 	struct isci_port *isci_port;
 	struct domain_device *domain_dev;
 	struct list_head node;
-	struct list_head reqs_in_process;
 	struct sci_base_state_machine sm;
 	u32 device_port_width;
 	enum sas_linkrate connection_rate;
@@ -2956,9 +2956,6 @@
 	/* Add to the completed list. */
 	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. */
 	sci_controller_complete_io(ihost, request->target_device, request);
  
@@ -3412,7 +3409,6 @@
 	ireq->flags = 0;
 	ireq->num_sg_entries = 0;
 	INIT_LIST_HEAD(&ireq->completed_node);
-	INIT_LIST_HEAD(&ireq->dev_node);
  
 	return ireq;
 }
  
  
@@ -3496,17 +3492,9 @@
 		spin_unlock_irqrestore(&ihost->scic_lock, flags);
 		return status;
 	}
-
 	/* Either I/O started OK, or the core has signaled that
 	 * 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) {
 		/* The request did not really start in the
 		 * hardware, so clear the request handle
@@ -96,8 +96,6 @@
 	struct isci_host *isci_host;
 	/* For use in the requests_to_{complete|abort} lists: */
 	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 zero_scatter_daddr;
 	unsigned int num_sg_entries;
@@ -317,9 +317,6 @@
 		spin_unlock_irqrestore(&ihost->scic_lock, flags);
 		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. */
 	sci_remote_device_resume(idev, NULL, NULL);
  
@@ -721,7 +718,6 @@
 	set_bit(IREQ_TERMINATED, &ireq->flags);
  
 	isci_free_tag(ihost, ireq->io_tag);
-	list_del_init(&ireq->dev_node);
  
 	/* The task management part completes last. */
 	if (tmf_complete)
...	...	@@ -569,7 +569,6 @@
569	569	for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) {
570	570	struct isci_remote_device *idev = &ihost->devices[i];
571	571
572		- INIT_LIST_HEAD(&idev->reqs_in_process);
573	572	INIT_LIST_HEAD(&idev->node);
574	573	}
575	574
...	...	@@ -919,7 +919,7 @@
919	919	* here should go through isci_remote_device_nuke_requests.
920	920	* If we hit this condition, we will need a way to complete
921	921	* io requests in process */
922		- BUG_ON(!list_empty(&idev->reqs_in_process));
	922	+ BUG_ON(idev->started_request_count > 0);
923	923
924	924	sci_remote_device_destruct(idev);
925	925	list_del_init(&idev->node);
...	...	@@ -1345,10 +1345,6 @@
1345	1345	dev_warn(&ihost->pdev->dev, "%s: failed\n", __func__);
1346	1346	return NULL;
1347	1347	}
1348		-
1349		- if (WARN_ONCE(!list_empty(&idev->reqs_in_process), "found requests in process\n"))
1350		- return NULL;
1351		-
1352	1348	if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n"))
1353	1349	return NULL;
1354	1350
...	...	@@ -90,7 +90,6 @@
90	90	struct isci_port *isci_port;
91	91	struct domain_device *domain_dev;
92	92	struct list_head node;
93		- struct list_head reqs_in_process;
94	93	struct sci_base_state_machine sm;
95	94	u32 device_port_width;
96	95	enum sas_linkrate connection_rate;
...	...	@@ -2956,9 +2956,6 @@
2956	2956	/* Add to the completed list. */
2957	2957	list_add(&request->completed_node, &ihost->requests_to_complete);
2958	2958
2959		- /* Take the request off the device's pending request list. */
2960		- list_del_init(&request->dev_node);
2961		-
2962	2959	/* complete the io request to the core. */
2963	2960	sci_controller_complete_io(ihost, request->target_device, request);
2964	2961
...	...	@@ -3412,7 +3409,6 @@
3412	3409	ireq->flags = 0;
3413	3410	ireq->num_sg_entries = 0;
3414	3411	INIT_LIST_HEAD(&ireq->completed_node);
3415		- INIT_LIST_HEAD(&ireq->dev_node);
3416	3412
3417	3413	return ireq;
3418	3414	}
3419	3415
3420	3416
...	...	@@ -3496,17 +3492,9 @@
3496	3492	spin_unlock_irqrestore(&ihost->scic_lock, flags);
3497	3493	return status;
3498	3494	}
3499		-
3500	3495	/* Either I/O started OK, or the core has signaled that
3501	3496	* the device needs a target reset.
3502		- *
3503		- * In either case, hold onto the I/O for later.
3504		- *
3505		- * Update it's status and add it to the list in the
3506		- * remote device object.
3507	3497	*/
3508		- list_add(&ireq->dev_node, &idev->reqs_in_process);
3509		-
3510	3498	if (status != SCI_SUCCESS) {
3511	3499	/* The request did not really start in the
3512	3500	* hardware, so clear the request handle
...	...	@@ -96,8 +96,6 @@
96	96	struct isci_host *isci_host;
97	97	/* For use in the requests_to_{complete\|abort} lists: */
98	98	struct list_head completed_node;
99		- /* For use in the reqs_in_process list: */
100		- struct list_head dev_node;
101	99	dma_addr_t request_daddr;
102	100	dma_addr_t zero_scatter_daddr;
103	101	unsigned int num_sg_entries;
...	...	@@ -317,9 +317,6 @@
317	317	spin_unlock_irqrestore(&ihost->scic_lock, flags);
318	318	goto err_tci;
319	319	}
320		- /* add the request to the remote device request list. */
321		- list_add(&ireq->dev_node, &idev->reqs_in_process);
322		-
323	320	/* The RNC must be unsuspended before the TMF can get a response. */
324	321	sci_remote_device_resume(idev, NULL, NULL);
325	322
...	...	@@ -721,7 +718,6 @@
721	718	set_bit(IREQ_TERMINATED, &ireq->flags);
722	719
723	720	isci_free_tag(ihost, ireq->io_tag);
724		- list_del_init(&ireq->dev_node);
725	721
726	722	/* The task management part completes last. */
727	723	if (tmf_complete)