diff options
| author | Don Brace <don.brace@microsemi.com> | 2020-07-24 23:25:08 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2020-07-29 04:34:52 +0200 |
| commit | 5759ff1131cd420aad7eae639719a473154b2e37 (patch) | |
| tree | 65a8a9fbad018f50e31bdfdec9fbf559ef3c7387 /drivers | |
| parent | scsi: target: tcmu: Make TMR notification optional (diff) | |
| download | linux-5759ff1131cd420aad7eae639719a473154b2e37.tar.xz linux-5759ff1131cd420aad7eae639719a473154b2e37.zip | |
scsi: hpsa: Correct ctrl queue depth
Need to set queue depth for controller devices.
Link: https://lore.kernel.org/r/159562590819.17915.12766718094041027754.stgit@brunhilda
Fixes: 30bda7848a23 ("scsi: hpsa: Increase controller error handling timeout")
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/hpsa.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 90c36d75bf92..91794a50b31f 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2145,20 +2145,21 @@ static int hpsa_slave_configure(struct scsi_device *sdev) if (sd) { sd->was_removed = 0; + queue_depth = sd->queue_depth != 0 ? + sd->queue_depth : sdev->host->can_queue; if (sd->external) { queue_depth = EXTERNAL_QD; sdev->eh_timeout = HPSA_EH_PTRAID_TIMEOUT; blk_queue_rq_timeout(sdev->request_queue, HPSA_EH_PTRAID_TIMEOUT); - } else if (is_hba_lunid(sd->scsi3addr)) { + } + if (is_hba_lunid(sd->scsi3addr)) { sdev->eh_timeout = CTLR_TIMEOUT; blk_queue_rq_timeout(sdev->request_queue, CTLR_TIMEOUT); - } else { - queue_depth = sd->queue_depth != 0 ? - sd->queue_depth : sdev->host->can_queue; } - } else + } else { queue_depth = sdev->host->can_queue; + } scsi_change_queue_depth(sdev, queue_depth); |