Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 432b4c8b authored by Moore, Eric's avatar Moore, Eric Committed by James Bottomley
Browse files

[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: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d8e925dc

drivers/message/fusion/mptbase.c

+9 −6
Original line number Diff line number Diff line
@@ -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;

}