redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

isci: Fix use of SATA soft reset state machine.

Browse source 
The driver SATA LUN reset function incorrectly sent an SRST deassert
FIS, which is unnecessary because the core initiates the entire SATA
soft reset state machine from the assert request.

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 2011-03-31 13:10:38 -07:00 committed by Dan Williams
parent ce4f75def3
commit 26e953bc6e
1 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/scsi/isci/sata.c
View file

@ -301,8 +301,8 @@ int isci_task_send_lu_reset_sata(
int ret = TMF_RESP_FUNC_FAILED;
unsigned long flags;
/* Send the initial SRST to the target */
#define ISCI_SRST_TIMEOUT_MS 20 /* 20 ms timeout. */
/* Send the soft reset to the target */
#define ISCI_SRST_TIMEOUT_MS 25000 /* 25 second timeout. */
isci_task_build_tmf(&tmf, isci_device, isci_tmf_sata_srst_high,
NULL, NULL
);
@ -319,38 +319,6 @@ int isci_task_send_lu_reset_sata(
/* Return the failure so that the LUN reset is escalated
* to a target reset.
*/
goto out;
}
/* Leave SRST high for a bit. */
#define ISCI_SRST_ASSERT_DELAY 100 /* usecs */
udelay(ISCI_SRST_ASSERT_DELAY);
/* Deassert SRST. */
isci_task_build_tmf(&tmf, isci_device, isci_tmf_sata_srst_low,
NULL, NULL
);
ret = isci_task_execute_tmf(isci_host, &tmf, ISCI_SRST_TIMEOUT_MS);
if (ret == TMF_RESP_FUNC_COMPLETE)
dev_dbg(&isci_host->pdev->dev,
"%s: SATA LUN reset passed (%p)\n",
__func__,
isci_device);
else
dev_warn(&isci_host->pdev->dev,
"%s: Deassert SRST failed (%p)=%x\n",
__func__,
isci_device,
ret);
out:
spin_lock_irqsave(&isci_host->scic_lock, flags);
/* Resume the device. */
scic_sds_remote_device_resume(to_sci_dev(isci_device));
spin_unlock_irqrestore(&isci_host->scic_lock, flags);
return ret;
}