hpsa: correct ctrl queue depth

Commit Message

Don Brace July 24, 2020, 9:25 p.m. UTC

- need to set queue depth for controller devices.
 - corrects compiler warning in patch:
   hpsa-increase-ctlr-eh-timeout

Reviewed-by: Scott Teel <[e-mail]>
Signed-off-by: Don Brace <[e-mail]>
---
 drivers/scsi/hpsa.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Martin K. Petersen July 29, 2020, 4:10 a.m. UTC | #1

On Fri, 24 Jul 2020 16:25:08 -0500, Don Brace wrote:

>  - need to set queue depth for controller devices.
>  - corrects compiler warning in patch:
>    hpsa-increase-ctlr-eh-timeout

Applied to 5.9/scsi-queue, thanks!

[1/1] scsi: hpsa: Correct ctrl queue depth
      https://git.kernel.org/mkp/scsi/c/5759ff1131cd

Patch

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);