[SCSI] mvsas: fixed SMP request watchdog timeout issue.

set SMP link timeout value to maximum.

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 130d8036a2b5fa364b282b666dd902867891934f..7e423e5ad5e103e53e9df4868ebc3ffee0608e08 100644 (file)
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/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/drivers/scsi/mvsas/mv_defs.h b/drivers/scsi/mvsas/mv_defs.h
index 8e21482367d2bfb5d1bd74cbfd354d662e0a1ce0..f5451940d289c230904fb7b504832f3723488442 100644 (file)
--- a/drivers/scsi/mvsas/mv_defs.h
+++ b/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 {