summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Skirvin <jeffrey.d.skirvin@intel.com>2011-06-20 14:09:31 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:50 -0700
commit9b917987fd16d0687afe550a02f68099419f5d43 (patch)
treec7fa80125750e2c624a271867eca5d3e61e25aae
parentfd0527ab15bfd96f04b084b1b2550f80cf151b60 (diff)
downloadlinux-sh-9b917987fd16d0687afe550a02f68099419f5d43.tar.gz
isci: Disable link layer hang detection
Some targets exceed the hang detect timer. Use the OS timeout to catch hung tasks. Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/scsi/isci/phy.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index 784c9a71333a..93a401dfbd30 100644
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -242,11 +242,8 @@ scic_sds_phy_link_layer_initialization(struct scic_sds_phy *sci_phy,
&sci_phy->link_layer_registers->maximum_arbitration_wait_timer_timeout);
}
- /*
- * Set the link layer hang detection to 500ms (0x1F4) from its default
- * value of 128ms. Max value is 511 ms.
- */
- writel(0x1F4, &sci_phy->link_layer_registers->link_layer_hang_detection_timeout);
+ /* Disable link layer hang detection, rely on the OS timeout for I/O timeouts. */
+ writel(0, &sci_phy->link_layer_registers->link_layer_hang_detection_timeout);
/* We can exit the initial state to the stopped state */
sci_change_state(&sci_phy->sm, SCI_PHY_STOPPED);