scsi: hpsa: correct queue depth for externals

- queue depth assignment not in correct place, had no effect.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 20b4e83d0529defc26b4d99c0b5cf4056e1764b7..5b0cc0ebb5e04e9f7ed689db53fb12c76e68a1f4 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2069,10 +2069,13 @@ static int hpsa_slave_configure(struct scsi_device *sdev)
        sd = sdev->hostdata;
        sdev->no_uld_attach = !sd || !sd->expose_device;
 
-       if (sd)
-               queue_depth = sd->queue_depth != 0 ?
-                       sd->queue_depth : sdev->host->can_queue;
-       else
+       if (sd) {
+               if (sd->external)
+                       queue_depth = EXTERNAL_QD;
+               else
+                       queue_depth = sd->queue_depth != 0 ?
+                                       sd->queue_depth : sdev->host->can_queue;
+       } else
                queue_depth = sdev->host->can_queue;
 
        scsi_change_queue_depth(sdev, queue_depth);
@@ -3915,6 +3918,9 @@ static int hpsa_update_device_info(struct ctlr_info *h,
                this_device->queue_depth = h->nr_cmds;
        }
 
+       if (this_device->external)
+               this_device->queue_depth = EXTERNAL_QD;
+
        if (is_OBDR_device) {
                /* See if this is a One-Button-Disaster-Recovery device
                 * by looking for "$DR-10" at offset 43 in inquiry data.
@@ -4123,14 +4129,6 @@ static void hpsa_get_ioaccel_drive_info(struct ctlr_info *h,
        int rc;
        struct ext_report_lun_entry *rle;
 
-       /*
-        * external targets don't support BMIC
-        */
-       if (dev->external) {
-               dev->queue_depth = 7;
-               return;
-       }
-
        rle = &rlep->LUN[rle_index];
 
        dev->ioaccel_handle = rle->ioaccel_handle;

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 5352664a9f151d8b0c6fd0f3d2af5d913add5e4e..61dd54aa4d5d3f1f88f25cab6d8053b2d1c5d933 100644 (file)
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -57,6 +57,7 @@ struct hpsa_sas_phy {
        bool added_to_port;
 };
 
+#define EXTERNAL_QD 7
 struct hpsa_scsi_dev_t {
        unsigned int devtype;
        int bus, target, lun;           /* as presented to the OS */