[SCSI] mvsas: fixed wrong destination when hiting NAK for command frame

disable non data frame retry

Signed-off-by: Xiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c
index 8f32c7c567cfdf283bc3e0766576ea1cfab90973..ce4e970bcedfb2b42bd12745bb5235703c286808 100644 (file)
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/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);