diff options
| author | Moore, Eric | 2006-01-17 02:53:11 +0100 |
|---|---|---|
| committer | James Bottomley | 2006-01-31 21:39:53 +0100 |
| commit | 432b4c8b443af1b60cef7fcf90e8179cd8924f0a (patch) | |
| tree | 4fe6d641cae28d401589b8ce0176bb8bd339f8e9 | |
| parent | [SCSI] fusion: spi bus reset when driver loads (diff) | |
| download | kernel-qcow2-linux-432b4c8b443af1b60cef7fcf90e8179cd8924f0a.tar.gz kernel-qcow2-linux-432b4c8b443af1b60cef7fcf90e8179cd8924f0a.tar.xz kernel-qcow2-linux-432b4c8b443af1b60cef7fcf90e8179cd8924f0a.zip | |
[SCSI] fusion: mptsas, increase discovery timout to 300 seconds
Increase the port enable timeout only for SAS from 30 to 300 seconds.
A customer request for the handling large topologies.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 2806662a9cf9..780e8be9066e 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -2770,13 +2770,16 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag) /* RAID FW may take a long time to enable */ - if ( (ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK) - > MPI_FW_HEADER_PID_PROD_TARGET_SCSI ) { - rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable, - reply_sz, (u16*)&reply_buf, 300 /*seconds*/, sleepFlag); + if (((ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK) + > MPI_FW_HEADER_PID_PROD_TARGET_SCSI) || + (ioc->bus_type == SAS)) { + rc = mpt_handshake_req_reply_wait(ioc, req_sz, + (u32*)&port_enable, reply_sz, (u16*)&reply_buf, + 300 /*seconds*/, sleepFlag); } else { - rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable, - reply_sz, (u16*)&reply_buf, 30 /*seconds*/, sleepFlag); + rc = mpt_handshake_req_reply_wait(ioc, req_sz, + (u32*)&port_enable, reply_sz, (u16*)&reply_buf, + 30 /*seconds*/, sleepFlag); } return rc; } |