Commit 4f08b963 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Increase internal cmnds timeout to 60s 

 - Increase internal command timeout to 60 seconds.

 - Enable 16 device removal handshake processing in parallel in the device
   removal handshake infrastructure.

Link: https://lore.kernel.org/r/20211220141159.16117-9-sreekanth.reddy@broadcom.com


Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ba68779a

drivers/scsi/mpi3mr/mpi3mr.h

+4 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ extern int prot_mask; 
#define MPI3MR_HOSTTAG_IOCTLCMDS	2

#define MPI3MR_HOSTTAG_BLK_TMS		5



#define MPI3MR_NUM_DEVRMCMD		1

#define MPI3MR_NUM_DEVRMCMD		16

#define MPI3MR_HOSTTAG_DEVRMCMD_MIN	(MPI3MR_HOSTTAG_BLK_TMS + 1)

#define MPI3MR_HOSTTAG_DEVRMCMD_MAX	(MPI3MR_HOSTTAG_DEVRMCMD_MIN + \

						MPI3MR_NUM_DEVRMCMD - 1)
@@ -102,10 +102,10 @@ extern int prot_mask; 
#define MPI3MR_HOST_IOS_KDUMP		128



/* command/controller interaction timeout definitions in seconds */

#define MPI3MR_INTADMCMD_TIMEOUT		10

#define MPI3MR_INTADMCMD_TIMEOUT		60

#define MPI3MR_PORTENABLE_TIMEOUT		300

#define MPI3MR_ABORTTM_TIMEOUT			30

#define MPI3MR_RESETTM_TIMEOUT			30

#define MPI3MR_ABORTTM_TIMEOUT			60

#define MPI3MR_RESETTM_TIMEOUT			60

#define MPI3MR_RESET_HOST_IOWAIT_TIMEOUT	5

#define MPI3MR_TSUPDATE_INTERVAL		900

#define MPI3MR_DEFAULT_SHUTDOWN_TIME		120

drivers/scsi/mpi3mr/mpi3mr_os.c

+5 −2
Original line number Diff line number Diff line
@@ -877,9 +877,11 @@ static void mpi3mr_update_tgtdev(struct mpi3mr_ioc *mrioc, 
			    le32_to_cpu(pcieinf->maximum_data_transfer_size);

			tgtdev->dev_spec.pcie_inf.pgsz = pcieinf->page_size;

			tgtdev->dev_spec.pcie_inf.reset_to =

			    pcieinf->controller_reset_to;

			    max_t(u8, pcieinf->controller_reset_to,

			     MPI3MR_INTADMCMD_TIMEOUT);

			tgtdev->dev_spec.pcie_inf.abort_to =

			    pcieinf->nvme_abort_to;

			    max_t(u8, pcieinf->nvme_abort_to,

			    MPI3MR_INTADMCMD_TIMEOUT);

		}

		if (tgtdev->dev_spec.pcie_inf.mdts > (1024 * 1024))

			tgtdev->dev_spec.pcie_inf.mdts = (1024 * 1024);
@@ -3597,6 +3599,7 @@ static struct scsi_host_template mpi3mr_driver_template = { 
	 */

	.max_sectors			= 2048,

	.cmd_per_lun			= MPI3MR_MAX_CMDS_LUN,

	.max_segment_size		= 0xffffffff,

	.track_queue_depth		= 1,

	.cmd_size			= sizeof(struct scmd_priv),

};