Skip to content

Commit

Permalink
isci: Move the reset delay after the remote node resumption.
Browse files Browse the repository at this point in the history
Delay after bringing up the RNC to allow for resumption latency.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Jeff Skirvin authored and Dan Williams committed Jul 3, 2011
1 parent 7c78da3 commit ff717ab
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/scsi/isci/task.c
Original file line number Diff line number Diff line change
Expand Up @@ -1433,15 +1433,17 @@ static int isci_reset_device(struct domain_device *dev, int hard_reset)
isci_device_clear_reset_pending(ihost, idev);

rc = sas_phy_reset(phy, hard_reset);
msleep(2000); /* just like mvsas */

/* Terminate in-progress I/O now. */
isci_remote_device_nuke_requests(ihost, idev);

/* Since all pending TCs have been cleaned, resume the RNC. */
spin_lock_irqsave(&ihost->scic_lock, flags);
status = scic_remote_device_reset_complete(&idev->sci);
spin_unlock_irqrestore(&ihost->scic_lock, flags);

msleep(2000); /* just like mvsas */

if (status != SCI_SUCCESS) {
dev_warn(&ihost->pdev->dev,
"%s: scic_remote_device_reset_complete(%p) "
Expand Down

0 comments on commit ff717ab

Please sign in to comment.