From 5d970a53a0842846e0925978774301c2b05529c1 Mon Sep 17 00:00:00 2001
From: Xiangliang Yu <yuxiangl@marvell.com>
Date: Thu, 29 Sep 2011 00:34:11 -0700
Subject: [PATCH] --- yaml --- r: 271084 b: refs/heads/master c:
 07f098e6f4a9a488605d6a3a13ce2805023a0384 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/scsi/mvsas/mv_94xx.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d599f706c63..158aa1b3fa57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 477f6d190bdebc9a3ec99e4bb396b981f747bf19
+refs/heads/master: 07f098e6f4a9a488605d6a3a13ce2805023a0384
diff --git a/trunk/drivers/scsi/mvsas/mv_94xx.c b/trunk/drivers/scsi/mvsas/mv_94xx.c
index 8f32c7c567cf..ce4e970bcedf 100644
--- a/trunk/drivers/scsi/mvsas/mv_94xx.c
+++ b/trunk/drivers/scsi/mvsas/mv_94xx.c
@@ -398,6 +398,16 @@ static int __devinit mvs_94xx_init(struct mvs_info *mvi)
 	/* init phys */
 	mvs_phy_hacks(mvi);
 
+	/* disable non data frame retry */
+	tmp = mvs_cr32(mvi, CMD_SAS_CTL1);
+	if ((revision == VANIR_A0_REV) ||
+		(revision == VANIR_B0_REV) ||
+		(revision == VANIR_C0_REV)) {
+		tmp &= ~0xffff;
+		tmp |= 0x007f;
+		mvs_cw32(mvi, CMD_SAS_CTL1, tmp);
+	}
+
 	/* set LED blink when IO*/
 	mw32(MVS_PA_VSR_ADDR, VSR_PHY_ACT_LED);
 	tmp = mr32(MVS_PA_VSR_PORT);