hpsa: Get queue depth from identify physical bmic for physical disks.

get drive queue depth to help avoid task set full conditions.

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Hannes Reinecke <hare@Suse.de>
Signed-off-by: Joe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 547e28b6efc441bc4e6a86d2fad049105ef108a7..d09333ad20b96b8b2321450219d2d12bf1db6e6c 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3464,29 +3464,22 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
                                ncurrent++;
                        break;
                case TYPE_DISK:
-                       if (h->hba_mode_enabled) {
-                               /* never use raid mapper in HBA mode */
-                               this_device->offload_enabled = 0;
-                               ncurrent++;
-                               break;
-                       } else if (h->acciopath_status) {
-                               if (i >= nphysicals) {
-                                       ncurrent++;
-                                       break;
-                               }
-                       } else {
-                               if (i < nphysicals)
-                                       break;
+                       if (i >= nphysicals) {
                                ncurrent++;
                                break;
                        }
-                       if (h->transMethod & CFGTBL_Trans_io_accel1 ||
-                               h->transMethod & CFGTBL_Trans_io_accel2) {
-                               hpsa_get_ioaccel_drive_info(h, this_device,
-                                                       lunaddrbytes, id_phys);
-                               atomic_set(&this_device->ioaccel_cmds_out, 0);
-                               ncurrent++;
-                       }
+
+                       if (h->hba_mode_enabled)
+                               /* never use raid mapper in HBA mode */
+                               this_device->offload_enabled = 0;
+                       else if (!(h->transMethod & CFGTBL_Trans_io_accel1 ||
+                               h->transMethod & CFGTBL_Trans_io_accel2))
+                               break;
+
+                       hpsa_get_ioaccel_drive_info(h, this_device,
+                                               lunaddrbytes, id_phys);
+                       atomic_set(&this_device->ioaccel_cmds_out, 0);
+                       ncurrent++;
                        break;
                case TYPE_TAPE:
                case TYPE_MEDIUM_CHANGER: