scsi: megaraid_sas: Limit device queue depth to controller queue depth

The driver currently assigns a pre-defined queue depth when the
firmware-provided device queue depth is greater than the controller queue
depth.

Use the controller queue depth if the reported target queue depth is too
large.

Link: https://lore.kernel.org/r/20200508083838.22778-2-chandrakanth.patil@broadcom.com
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Chandrakanth Patil <chandrakanth.patil@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index fb9c3ce..0066833 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1982,9 +1982,9 @@ static void megasas_set_fw_assisted_qd(struct scsi_device *sdev,
 
        if (is_target_prop) {
                tgt_device_qd = le32_to_cpu(instance->tgt_prop->device_qdepth);
-               if (tgt_device_qd &&
-                   (tgt_device_qd <= instance->host->can_queue))
-                       device_qd = tgt_device_qd;
+               if (tgt_device_qd)
+                       device_qd = min(instance->host->can_queue,
+                                       (int)tgt_device_qd);
        }
 
        if (instance->enable_sdev_max_qd && interface_type != UNKNOWN_DRIVE)