Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff717ab0 authored by Jeff Skirvin's avatar Jeff Skirvin Committed by Dan Williams
Browse files

isci: Move the reset delay after the remote node resumption. 



Delay after bringing up the RNC to allow for resumption latency.

Signed-off-by: default avatarJeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 7c78da31

drivers/scsi/isci/task.c

+3 −1
Original line number Diff line number Diff line
@@ -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) "