From 27a97ae60355f91336c1d420db1a9bc6444c0879 Mon Sep 17 00:00:00 2001
From: Xiangliang Yu <yuxiangl@marvell.com>
Date: Thu, 29 Sep 2011 00:35:15 -0700
Subject: [PATCH] --- yaml --- r: 271087 b: refs/heads/master c:
 40d3921f1dd4e1e53e10f064f0adf056f6e0f71a h: refs/heads/master i:   271085:
 d85e2b3ca7e3c0d3a2eea2934f8b5fb7e7d05742   271083:
 a60742a7a902c51ed09bb3a5580753bc68a2f4dc   271079:
 a3aabbd479108b0c02d403b3ba6b0136ea1b9bf3   271071:
 dc8add19d752ad18cde16b9a285baa0526d4cb24 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/mvsas/mv_94xx.c | 4 ++++
 trunk/drivers/scsi/mvsas/mv_defs.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 825b643cf7b6..2dc49d2879e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4b7efe7fa8ce3822f6139cddce4bae24c9ffe6
+refs/heads/master: 40d3921f1dd4e1e53e10f064f0adf056f6e0f71a
diff --git a/trunk/drivers/scsi/mvsas/mv_94xx.c b/trunk/drivers/scsi/mvsas/mv_94xx.c
index 130d8036a2b5..7e423e5ad5e1 100644
--- a/trunk/drivers/scsi/mvsas/mv_94xx.c
+++ b/trunk/drivers/scsi/mvsas/mv_94xx.c
@@ -510,6 +510,10 @@ static int __devinit mvs_94xx_init(struct mvs_info *mvi)
 	tmp |= CINT_PHY_MASK;
 	mw32(MVS_INT_MASK, tmp);
 
+	tmp = mvs_cr32(mvi, CMD_LINK_TIMER);
+	tmp |= 0xFFFF0000;
+	mvs_cw32(mvi, CMD_LINK_TIMER, tmp);
+
 	/* tune STP performance */
 	tmp = 0x003F003F;
 	mvs_cw32(mvi, CMD_PL_TIMER, tmp);
diff --git a/trunk/drivers/scsi/mvsas/mv_defs.h b/trunk/drivers/scsi/mvsas/mv_defs.h
index 8e21482367d2..f5451940d289 100644
--- a/trunk/drivers/scsi/mvsas/mv_defs.h
+++ b/trunk/drivers/scsi/mvsas/mv_defs.h
@@ -388,6 +388,7 @@ enum sas_cmd_port_registers {
 	CMD_SL_MODE1		= 0x1C0, /* SL Mode 1 */
 	CMD_PND_FIFO_CTL1	= 0x1C4, /* Pending FIFO Control 1 */
 	CMD_PORT_LAYER_TIMER1	= 0x1E0, /* Port Layer Timer 1 */
+	CMD_LINK_TIMER		= 0x1E4, /* Link Timer */
 };
 
 enum mvs_info_flags {