diff options
author | Xiangliang Yu <yuxiangl@marvell.com> | 2011-09-29 03:35:15 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-02 14:18:01 -0400 |
commit | 40d3921f1dd4e1e53e10f064f0adf056f6e0f71a (patch) | |
tree | 53f08bedd0bc221149c656efb8760440e0a339e6 | |
parent | 3a4b7efe7fa8ce3822f6139cddce4bae24c9ffe6 (diff) |
[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>
-rw-r--r-- | drivers/scsi/mvsas/mv_94xx.c | 4 | ||||
-rw-r--r-- | drivers/scsi/mvsas/mv_defs.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c index 130d8036a2b5..7e423e5ad5e1 100644 --- 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) | |||
510 | tmp |= CINT_PHY_MASK; | 510 | tmp |= CINT_PHY_MASK; |
511 | mw32(MVS_INT_MASK, tmp); | 511 | mw32(MVS_INT_MASK, tmp); |
512 | 512 | ||
513 | tmp = mvs_cr32(mvi, CMD_LINK_TIMER); | ||
514 | tmp |= 0xFFFF0000; | ||
515 | mvs_cw32(mvi, CMD_LINK_TIMER, tmp); | ||
516 | |||
513 | /* tune STP performance */ | 517 | /* tune STP performance */ |
514 | tmp = 0x003F003F; | 518 | tmp = 0x003F003F; |
515 | mvs_cw32(mvi, CMD_PL_TIMER, tmp); | 519 | mvs_cw32(mvi, CMD_PL_TIMER, tmp); |
diff --git a/drivers/scsi/mvsas/mv_defs.h b/drivers/scsi/mvsas/mv_defs.h index 8e21482367d2..f5451940d289 100644 --- a/drivers/scsi/mvsas/mv_defs.h +++ b/drivers/scsi/mvsas/mv_defs.h | |||
@@ -388,6 +388,7 @@ enum sas_cmd_port_registers { | |||
388 | CMD_SL_MODE1 = 0x1C0, /* SL Mode 1 */ | 388 | CMD_SL_MODE1 = 0x1C0, /* SL Mode 1 */ |
389 | CMD_PND_FIFO_CTL1 = 0x1C4, /* Pending FIFO Control 1 */ | 389 | CMD_PND_FIFO_CTL1 = 0x1C4, /* Pending FIFO Control 1 */ |
390 | CMD_PORT_LAYER_TIMER1 = 0x1E0, /* Port Layer Timer 1 */ | 390 | CMD_PORT_LAYER_TIMER1 = 0x1E0, /* Port Layer Timer 1 */ |
391 | CMD_LINK_TIMER = 0x1E4, /* Link Timer */ | ||
391 | }; | 392 | }; |
392 | 393 | ||
393 | enum mvs_info_flags { | 394 | enum mvs_info_flags { |