| Message ID | 20220505184808.24049-3-sreekanth.reddy@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mpi3mr: Increase IO timeout value to 60s | expand |
Sreekanth, > Set each SCSI device's default IO timeout and default error handling > IO timeout to 60s. Applied to 5.19/scsi-staging, thanks!
On Fri, 6 May 2022 00:18:08 +0530, Sreekanth Reddy wrote: > Set each SCSI device's default IO timeout and > default error handling IO timeout to 60s. > > Applied to 5.19/scsi-queue, thanks! [1/1] mpi3mr: Increase IO timeout value to 60s https://git.kernel.org/mkp/scsi/c/1aa529d40025
diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 8612b66..584659e 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -124,6 +124,9 @@ extern atomic64_t event_counter; #define MPI3MR_WATCHDOG_INTERVAL 1000 /* in milli seconds */ +#define MPI3MR_SCMD_TIMEOUT (60 * HZ) +#define MPI3MR_EH_SCMD_TIMEOUT (60 * HZ) + /* Internal admin command state definitions*/ #define MPI3MR_CMD_NOTUSED 0x8000 #define MPI3MR_CMD_COMPLETE 0x0001 diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 5ba490c..f5c345d 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -3727,6 +3727,10 @@ static int mpi3mr_slave_configure(struct scsi_device *sdev) return -ENXIO; mpi3mr_change_queue_depth(sdev, tgt_dev->q_depth); + + sdev->eh_timeout = MPI3MR_EH_SCMD_TIMEOUT; + blk_queue_rq_timeout(sdev->request_queue, MPI3MR_SCMD_TIMEOUT); + switch (tgt_dev->dev_type) { case MPI3_DEVICE_DEVFORM_PCIE: /*The block layer hw sector size = 512*/
Set each SCSI device's default IO timeout and default error handling IO timeout to 60s. Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com> --- drivers/scsi/mpi3mr/mpi3mr.h | 3 +++ drivers/scsi/mpi3mr/mpi3mr_os.c | 4 ++++ 2 files changed, 7 insertions(+)