scsi: always assign block layer tags if enabled

Allow a driver to ask for block layer tags by setting .use_blk_tags in the
host template, in which case it will always see a valid value in
request->tag, similar to the behavior when using blk-mq.  This means even
SCSI "untagged" commands will now have a tag, which is especially useful
when using a host-wide tag map.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>

27 files changed, 76 insertions, 94 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 1b36fd3a6e62..497cbb1efd4b 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -327,6 +327,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         tpnt->slave_alloc = NCR_700_slave_alloc;
         tpnt->change_queue_depth = NCR_700_change_queue_depth;
         tpnt->change_queue_type = NCR_700_change_queue_type;
+        tpnt->use_blk_tags = 1;
 
         if(tpnt->name == NULL)
                 tpnt->name = "53c700";
@@ -902,7 +903,7 @@ process_message(struct Scsi_Host *host,	struct NCR_700_Host_Parameters *hostdata
                         NCR_700_set_tag_neg_state(SCp->device, NCR_700_FINISHED_TAG_NEGOTIATION);
                         hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));
                         SCp->device->tagged_supported = 0;
-                        scsi_deactivate_tcq(SCp->device, host->cmd_per_lun);
+                        scsi_adjust_queue_depth(SCp->device, 0, host->cmd_per_lun);
                 } else {
                         shost_printk(KERN_WARNING, host,
                                 "(%d:%d) Unexpected REJECT Message %s\n",
@@ -2049,8 +2050,7 @@ NCR_700_slave_configure(struct scsi_device *SDp)
 
         /* to do here: allocate memory; build a queue_full list */
         if(SDp->tagged_supported) {
-                scsi_set_tag_type(SDp, MSG_ORDERED_TAG);
-                scsi_activate_tcq(SDp, NCR_700_DEFAULT_TAGS);
+                scsi_adjust_queue_depth(SDp, MSG_ORDERED_TAG, NCR_700_DEFAULT_TAGS);
                 NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
         } else {
                 /* initialise to default depth */
@@ -2094,8 +2094,6 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
         struct NCR_700_Host_Parameters *hostdata = 
                 (struct NCR_700_Host_Parameters *)SDp->host->hostdata[0];
 
-        scsi_set_tag_type(SDp, tag_type);
-
         /* We have a global (per target) flag to track whether TCQ is
          * enabled, so we'll be turning it off for the entire target here.
          * our tag algorithm will fail if we mix tagged and untagged commands,
@@ -2106,12 +2104,12 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
         if (!tag_type) {
                 /* shift back to the default unqueued number of commands
                  * (the user can still raise this) */
-                scsi_deactivate_tcq(SDp, SDp->host->cmd_per_lun);
+                scsi_adjust_queue_depth(SDp, 0, SDp->host->cmd_per_lun);
                 hostdata->tag_negotiated &= ~(1 << sdev_id(SDp));
         } else {
                 /* Here, we cleared the negotiation flag above, so this
                  * will force the driver to renegotiate */
-                scsi_activate_tcq(SDp, SDp->queue_depth);
+                scsi_adjust_queue_depth(SDp, tag_type, SDp->queue_depth);
                 if (change_tag)
                         NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
         }
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index d3b6d68107ea..9fd6b5618b25 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -925,6 +925,7 @@ struct scsi_host_template aic79xx_driver_template = {
         .slave_configure        = ahd_linux_slave_configure,
         .target_alloc           = ahd_linux_target_alloc,
         .target_destroy         = ahd_linux_target_destroy,
+        .use_blk_tags           = 1,
 };
 
 /******************************** Bus DMA *************************************/
@@ -1468,12 +1469,12 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
 
         switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
         case AHD_DEV_Q_BASIC:
-                scsi_set_tag_type(sdev, MSG_SIMPLE_TASK);
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TASK,
+                                dev->openings + dev->active);
                 break;
         case AHD_DEV_Q_TAGGED:
-                scsi_set_tag_type(sdev, MSG_ORDERED_TASK);
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TASK,
+                                dev->openings + dev->active);
                 break;
         default:
                 /*
@@ -1482,7 +1483,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
                  * serially on the controller/device.  This should
                  * remove some latency.
                  */
-                scsi_deactivate_tcq(sdev, 1);
+                scsi_adjust_queue_depth(sdev, 0, 1);
                 break;
         }
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 33a5f959e86a..f18b6d69d3fb 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -812,6 +812,7 @@ struct scsi_host_template aic7xxx_driver_template = {
         .slave_configure        = ahc_linux_slave_configure,
         .target_alloc           = ahc_linux_target_alloc,
         .target_destroy         = ahc_linux_target_destroy,
+        .use_blk_tags           = 1,
 };
 
 /**************************** Tasklet Handler *********************************/
@@ -1334,12 +1335,12 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
         }
         switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
         case AHC_DEV_Q_BASIC:
-                scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TASK,
+                                dev->openings + dev->active);
                 break;
         case AHC_DEV_Q_TAGGED:
-                scsi_set_tag_type(sdev, MSG_ORDERED_TAG);
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TASK,
+                                dev->openings + dev->active);
                 break;
         default:
                 /*
@@ -1348,7 +1349,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
                  * serially on the controller/device.  This should
                  * remove some latency.
                  */
-                scsi_deactivate_tcq(sdev, 2);
+                scsi_adjust_queue_depth(sdev, 0, 2);
                 break;
         }
 }
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index c56741fc4b99..579dc2f460c4 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -83,6 +83,7 @@ static struct scsi_host_template aic94xx_sht = {
         .eh_bus_reset_handler   = sas_eh_bus_reset_handler,
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
+        .use_blk_tags           = 1,
 };
 
 static int asd_map_memio(struct asd_ha_struct *asd_ha)
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 99280e89c289..d8e43c81d19b 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -776,11 +776,7 @@ bfad_thread_workq(struct bfad_s *bfad)
 static int
 bfad_im_slave_configure(struct scsi_device *sdev)
 {
-        if (sdev->tagged_supported)
-                scsi_activate_tcq(sdev, bfa_lun_queue_depth);
-        else
-                scsi_deactivate_tcq(sdev, bfa_lun_queue_depth);
-
+        scsi_adjust_queue_depth(sdev, 0, bfa_lun_queue_depth);
         return 0;
 }
 
@@ -804,6 +800,7 @@ struct scsi_host_template bfad_im_scsi_host_template = {
         .shost_attrs = bfad_im_host_attrs,
         .max_sectors = BFAD_MAX_SECTORS,
         .vendor_id = BFA_PCI_VENDOR_ID_BROCADE,
+        .use_blk_tags = 1,
 };
 
 struct scsi_host_template bfad_im_vport_template = {
@@ -825,6 +822,7 @@ struct scsi_host_template bfad_im_vport_template = {
         .use_clustering = ENABLE_CLUSTERING,
         .shost_attrs = bfad_im_vport_attrs,
         .max_sectors = BFAD_MAX_SECTORS,
+        .use_blk_tags = 1,
 };
 
 bfa_status_t
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 3c6dc8abc776..cd2e61025926 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -2790,6 +2790,7 @@ static struct scsi_host_template bnx2fc_shost_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = BNX2FC_MAX_BDS_PER_CMD,
         .max_sectors            = 1024,
+        .use_blk_tags           = 1,
 };
 
 static struct libfc_function_template bnx2fc_libfc_fcn_templ = {
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 8231505cce0a..f73155db80a3 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2241,11 +2241,7 @@ csio_slave_alloc(struct scsi_device *sdev)
 static int
 csio_slave_configure(struct scsi_device *sdev)
 {
-        if (sdev->tagged_supported)
-                scsi_activate_tcq(sdev, csio_lun_qdepth);
-        else
-                scsi_deactivate_tcq(sdev, csio_lun_qdepth);
-
+        scsi_adjust_queue_depth(sdev, 0, csio_lun_qdepth);
         return 0;
 }
 
@@ -2290,6 +2286,7 @@ struct scsi_host_template csio_fcoe_shost_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .shost_attrs            = csio_fcoe_lport_attrs,
         .max_sectors            = CSIO_MAX_SECTOR_SIZE,
+        .use_blk_tags           = 1,
 };
 
 struct scsi_host_template csio_fcoe_shost_vport_template = {
@@ -2309,6 +2306,7 @@ struct scsi_host_template csio_fcoe_shost_vport_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .shost_attrs            = csio_fcoe_vport_attrs,
         .max_sectors            = CSIO_MAX_SECTOR_SIZE,
+        .use_blk_tags           = 1,
 };
 
 /*
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index be09c628d034..a020b09ba347 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -260,6 +260,7 @@ static struct scsi_host_template driver_template = {
         .change_queue_depth             = esas2r_change_queue_depth,
         .change_queue_type              = scsi_change_queue_type,
         .max_sectors                    = 0xFFFF,
+        .use_blk_tags                   = 1,
 };
 
 int sgl_page_size = 512;
@@ -1278,13 +1279,10 @@ int esas2r_slave_configure(struct scsi_device *dev)
         esas2r_log_dev(ESAS2R_LOG_INFO, &(dev->sdev_gendev),
                        "esas2r_slave_configure()");
 
-        if (dev->tagged_supported) {
-                scsi_set_tag_type(dev, MSG_SIMPLE_TAG);
-                scsi_activate_tcq(dev, cmd_per_lun);
-        } else {
-                scsi_set_tag_type(dev, 0);
-                scsi_deactivate_tcq(dev, cmd_per_lun);
-        }
+        if (dev->tagged_supported)
+                scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, cmd_per_lun);
+        else
+                scsi_adjust_queue_depth(dev, 0, cmd_per_lun);
 
         return 0;
 }
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index b23101b28bfa..66b6ce10b259 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2419,10 +2419,9 @@ static int esp_slave_configure(struct scsi_device *dev)
                 queue_depth = dev->host->cmd_per_lun;
 
         if (goal_tags) {
-                scsi_set_tag_type(dev, MSG_ORDERED_TAG);
-                scsi_activate_tcq(dev, queue_depth);
+                scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, queue_depth);
         } else {
-                scsi_deactivate_tcq(dev, queue_depth);
+                scsi_adjust_queue_depth(dev, 0, queue_depth);
         }
         tp->flags |= ESP_TGT_DISCONNECT;
 
@@ -2631,6 +2630,7 @@ struct scsi_host_template scsi_esp_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .max_sectors            = 0xffff,
         .skip_settle_delay      = 1,
+        .use_blk_tags           = 1,
 };
 EXPORT_SYMBOL(scsi_esp_template);
 
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 86956cc3448e..a3eeb6842499 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -288,6 +288,7 @@ static struct scsi_host_template fcoe_shost_template = {
         .use_clustering = ENABLE_CLUSTERING,
         .sg_tablesize = SG_ALL,
         .max_sectors = 0xffff,
+        .use_blk_tags = 1,
 };
 
 /**
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 8581ce662cf0..2a6c98b7d4db 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -100,7 +100,7 @@ static int fnic_slave_alloc(struct scsi_device *sdev)
         if (!rport || fc_remote_port_chkready(rport))
                 return -ENXIO;
 
-        scsi_activate_tcq(sdev, fnic_max_qdepth);
+        scsi_adjust_queue_depth(sdev, 0, fnic_max_qdepth);
         return 0;
 }
 
@@ -121,6 +121,7 @@ static struct scsi_host_template fnic_host_template = {
         .sg_tablesize = FNIC_MAX_SG_DESC_CNT,
         .max_sectors = 0xffff,
         .shost_attrs = fnic_attrs,
+        .use_blk_tags = 1,
 };
 
 static void
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index a964f8c85833..4723d89df5ac 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2888,11 +2888,11 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)
         if (sdev->type == TYPE_DISK)
                 sdev->allow_restart = 1;
 
-        if (sdev->tagged_supported) {
-                scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
-                scsi_activate_tcq(sdev, sdev->queue_depth);
-        } else
-                scsi_deactivate_tcq(sdev, sdev->queue_depth);
+        if (sdev->tagged_supported)
+                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG,
+                                sdev->queue_depth);
+        else
+                scsi_adjust_queue_depth(sdev, 0, sdev->queue_depth);
         spin_unlock_irqrestore(shost->host_lock, flags);
         return 0;
 }
@@ -3108,6 +3108,7 @@ static struct scsi_host_template driver_template = {
         .max_sectors = IBMVFC_MAX_SECTORS,
         .use_clustering = ENABLE_CLUSTERING,
         .shost_attrs = ibmvfc_attrs,
+        .use_blk_tags = 1,
 };
 
 /**
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 6b52feafa929..f84fcb9a6ed7 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6317,6 +6317,7 @@ static struct scsi_host_template driver_template = {
         .sdev_attrs = ipr_dev_attrs,
         .proc_name = IPR_NAME,
         .no_write_same = 1,
+        .use_blk_tags = 1,
 };
 
 /**
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 2e890b1e2526..897562056018 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -172,6 +172,7 @@ static struct scsi_host_template isci_sht = {
         .target_destroy                 = sas_target_destroy,
         .ioctl                          = sas_ioctl,
         .shost_attrs                    = isci_host_attrs,
+        .use_blk_tags                   = 1,
 };
 
 static struct sas_domain_function_template isci_transport_ops  = {
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index f3043ad1f35d..d4bb642f2681 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -2160,12 +2160,7 @@ int fc_slave_alloc(struct scsi_device *sdev)
         if (!rport || fc_remote_port_chkready(rport))
                 return -ENXIO;
 
-        if (sdev->tagged_supported)
-                scsi_activate_tcq(sdev, FC_FCP_DFLT_QUEUE_DEPTH);
-        else
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev),
-                                        FC_FCP_DFLT_QUEUE_DEPTH);
-
+        scsi_adjust_queue_depth(sdev, 0, FC_FCP_DFLT_QUEUE_DEPTH);
         return 0;
 }
 EXPORT_SYMBOL(fc_slave_alloc);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 24e477d2ea70..eee21a060d93 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -940,15 +940,13 @@ int sas_slave_configure(struct scsi_device *scsi_dev)
         sas_read_port_mode_page(scsi_dev);
 
         if (scsi_dev->tagged_supported) {
-                scsi_set_tag_type(scsi_dev, MSG_SIMPLE_TAG);
-                scsi_activate_tcq(scsi_dev, SAS_DEF_QD);
+                scsi_adjust_queue_depth(scsi_dev, MSG_SIMPLE_TAG, SAS_DEF_QD);
         } else {
                 SAS_DPRINTK("device %llx, LUN %llx doesn't support "
                             "TCQ\n", SAS_ADDR(dev->sas_addr),
                             scsi_dev->lun);
                 scsi_dev->tagged_supported = 0;
-                scsi_set_tag_type(scsi_dev, 0);
-                scsi_deactivate_tcq(scsi_dev, 1);
+                scsi_adjust_queue_depth(scsi_dev, 0, 1);
         }
 
         scsi_dev->allow_restart = 1;
@@ -991,10 +989,7 @@ int sas_change_queue_type(struct scsi_device *scsi_dev, int qt)
         if (!scsi_dev->tagged_supported)
                 return 0;
 
-        scsi_deactivate_tcq(scsi_dev, 1);
-
-        scsi_set_tag_type(scsi_dev, qt);
-        scsi_activate_tcq(scsi_dev, scsi_dev->queue_depth);
+        scsi_adjust_queue_depth(scsi_dev, qt, scsi_dev->queue_depth);
 
         return qt;
 }
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 4a150063fb4d..a24106a70968 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -5598,10 +5598,7 @@ lpfc_slave_configure(struct scsi_device *sdev)
         struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata;
         struct lpfc_hba   *phba = vport->phba;
 
-        if (sdev->tagged_supported)
-                scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth);
-        else
-                scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth);
+        scsi_adjust_queue_depth(sdev, 0, vport->cfg_lun_queue_depth);
 
         if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
                 lpfc_sli_handle_fast_ring_event(phba,
@@ -5986,6 +5983,7 @@ struct scsi_host_template lpfc_template = {
         .vendor_id              = LPFC_NL_VENDOR_ID,
         .change_queue_depth     = lpfc_change_queue_depth,
         .change_queue_type      = scsi_change_queue_type,
+        .use_blk_tags           = 1,
 };
 
 struct scsi_host_template lpfc_vport_template = {
@@ -6009,4 +6007,5 @@ struct scsi_host_template lpfc_vport_template = {
         .max_sectors            = 0xFFFF,
         .change_queue_depth     = lpfc_change_queue_depth,
         .change_queue_type      = scsi_change_queue_type,
+        .use_blk_tags           = 1,
 };
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index eacee48a955c..d3c1fa5e76fb 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -76,6 +76,7 @@ static struct scsi_host_template mvs_sht = {
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
         .shost_attrs            = mvst_host_attrs,
+        .use_blk_tags           = 1,
 };
 
 static struct sas_domain_function_template mvs_transport_ops = {
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 666bf5af06e2..3ff759a3b74d 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -89,6 +89,7 @@ static struct scsi_host_template pm8001_sht = {
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
         .shost_attrs            = pm8001_host_attrs,
+        .use_blk_tags           = 1,
 };
 
 /**
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index d5fb31fa388b..71f9f59b13c6 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -251,7 +251,6 @@ static int pmcraid_slave_configure(struct scsi_device *scsi_dev)
 
         if (scsi_dev->tagged_supported &&
             (RES_IS_GSCSI(res->cfg_entry) || RES_IS_VSET(res->cfg_entry))) {
-                scsi_activate_tcq(scsi_dev, scsi_dev->queue_depth);
                 scsi_adjust_queue_depth(scsi_dev, MSG_SIMPLE_TAG,
                                         scsi_dev->host->cmd_per_lun);
         } else {
@@ -4295,7 +4294,8 @@ static struct scsi_host_template pmcraid_host_template = {
         .cmd_per_lun = PMCRAID_MAX_CMD_PER_LUN,
         .use_clustering = ENABLE_CLUSTERING,
         .shost_attrs = pmcraid_host_attrs,
-        .proc_name = PMCRAID_DRIVER_NAME
+        .proc_name = PMCRAID_DRIVER_NAME,
+        .use_blk_tags = 1,
 };
 
 /*
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 1e34fcf68e77..eb0465305f8d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -269,6 +269,7 @@ struct scsi_host_template qla2xxx_driver_template = {
         .shost_attrs            = qla2x00_host_attrs,
 
         .supported_mode         = MODE_INITIATOR,
+        .use_blk_tags           = 1,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -1404,10 +1405,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
         if (IS_T10_PI_CAPABLE(vha->hw))
                 blk_queue_update_dma_alignment(sdev->request_queue, 0x7);
 
-        if (sdev->tagged_supported)
-                scsi_activate_tcq(sdev, req->max_q_depth);
-        else
-                scsi_deactivate_tcq(sdev, req->max_q_depth);
+        scsi_adjust_queue_depth(sdev, 0, req->max_q_depth);
         return 0;
 }
 
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 199fcf79a051..f3119c144e29 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -163,7 +163,6 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd);
 static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd);
 static int qla4xxx_slave_alloc(struct scsi_device *device);
 static int qla4xxx_slave_configure(struct scsi_device *device);
-static void qla4xxx_slave_destroy(struct scsi_device *sdev);
 static umode_t qla4_attr_is_visible(int param_type, int param);
 static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);
 static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
@@ -206,7 +205,6 @@ static struct scsi_host_template qla4xxx_driver_template = {
 
         .slave_configure        = qla4xxx_slave_configure,
         .slave_alloc            = qla4xxx_slave_alloc,
-        .slave_destroy          = qla4xxx_slave_destroy,
         .change_queue_depth     = qla4xxx_change_queue_depth,
 
         .this_id                = -1,
@@ -218,6 +216,7 @@ static struct scsi_host_template qla4xxx_driver_template = {
         .shost_attrs            = qla4xxx_host_attrs,
         .host_reset             = qla4xxx_host_reset,
         .vendor_id              = SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_QLOGIC,
+        .use_blk_tags           = 1,
 };
 
 static struct iscsi_transport qla4xxx_iscsi_transport = {
@@ -9065,7 +9064,7 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
         if (ql4xmaxqdepth != 0 && ql4xmaxqdepth <= 0xffffU)
                 queue_depth = ql4xmaxqdepth;
 
-        scsi_activate_tcq(sdev, queue_depth);
+        scsi_adjust_queue_depth(sdev, 0, queue_depth);
         return 0;
 }
 
@@ -9075,11 +9074,6 @@ static int qla4xxx_slave_configure(struct scsi_device *sdev)
         return 0;
 }
 
-static void qla4xxx_slave_destroy(struct scsi_device *sdev)
-{
-        scsi_deactivate_tcq(sdev, 1);
-}
-
 static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
                                       int reason)
 {
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 22c449e926fa..a3426f1bf0dd 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -864,16 +864,12 @@ EXPORT_SYMBOL(scsi_track_queue_full);
  */
 int scsi_change_queue_type(struct scsi_device *sdev, int tag_type)
 {
-        if (sdev->tagged_supported) {
-                scsi_set_tag_type(sdev, tag_type);
-                if (tag_type)
-                        scsi_activate_tcq(sdev, sdev->queue_depth);
-                else
-                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
-        } else
-                tag_type = 0;
+        if (!sdev->tagged_supported)
+                return 0;
 
+        scsi_adjust_queue_depth(sdev, tag_type, sdev->queue_depth);
         return tag_type;
+
 }
 EXPORT_SYMBOL(scsi_change_queue_type);
 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index b1aa1646012a..408891cb14ff 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -286,6 +286,12 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         }
         WARN_ON_ONCE(!blk_get_queue(sdev->request_queue));
         sdev->request_queue->queuedata = sdev;
+
+        if (!shost_use_blk_mq(sdev->host) &&
+            (shost->bqt || shost->hostt->use_blk_tags)) {
+                blk_queue_init_tags(sdev->request_queue,
+                                    sdev->host->cmd_per_lun, shost->bqt);
+        }
         scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
 
         scsi_sysfs_device_initialize(sdev);
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 713af13b858e..b5eae4f6ba46 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -549,7 +549,7 @@ stex_slave_alloc(struct scsi_device *sdev)
         /* Cheat: usually extracted from Inquiry data */
         sdev->tagged_supported = 1;
 
-        scsi_activate_tcq(sdev, sdev->host->can_queue);
+        scsi_adjust_queue_depth(sdev, 0, sdev->host->can_queue);
 
         return 0;
 }
@@ -565,12 +565,6 @@ stex_slave_config(struct scsi_device *sdev)
         return 0;
 }
 
-static void
-stex_slave_destroy(struct scsi_device *sdev)
-{
-        scsi_deactivate_tcq(sdev, 1);
-}
-
 static int
 stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 {
@@ -1390,10 +1384,10 @@ static struct scsi_host_template driver_template = {
         .queuecommand                   = stex_queuecommand,
         .slave_alloc                    = stex_slave_alloc,
         .slave_configure                = stex_slave_config,
-        .slave_destroy                  = stex_slave_destroy,
         .eh_abort_handler               = stex_abort,
         .eh_host_reset_handler          = stex_reset,
         .this_id                        = -1,
+        .use_blk_tags                   = 1,
 };
 
 static struct pci_device_id stex_pci_tbl[] = {
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 547812437a7c..6369f9a282f1 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2187,7 +2187,7 @@ static int dc390_slave_configure(struct scsi_device *sdev)
         acb->scan_devices = 0;
         if (sdev->tagged_supported && (dcb->DevMode & TAG_QUEUEING_)) {
                 dcb->SyncMode |= EN_TAG_QUEUEING;
-                scsi_activate_tcq(sdev, acb->TagMaxNum);
+                scsi_adjust_queue_depth(sdev, 0, acb->TagMaxNum);
         }
 
         return 0;
@@ -2209,6 +2209,7 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 1,
         .use_clustering         = ENABLE_CLUSTERING,
         .max_sectors            = 0x4000, /* 8MiB = 16 * 1024 * 512 */
+        .use_blk_tags           = 1,
 };
 
 /***********************************************************************
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 9da319130da5..48c7f9e8f256 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2695,7 +2695,8 @@ static void ufshcd_set_queue_depth(struct scsi_device *sdev)
 
         dev_dbg(hba->dev, "%s: activate tcq with queue depth %d\n",
                         __func__, lun_qdepth);
-        scsi_activate_tcq(sdev, lun_qdepth);
+        if (sdev->tagged_supported)
+                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), lun_qdepth);
 }
 
 /*
@@ -2842,7 +2843,6 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev)
         struct ufs_hba *hba;
 
         hba = shost_priv(sdev->host);
-        scsi_deactivate_tcq(sdev, hba->nutrs);
         /* Drop the reference as it won't be needed anymore */
         if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN)
                 hba->sdev_ufs_device = NULL;
@@ -4235,6 +4235,7 @@ static struct scsi_host_template ufshcd_driver_template = {
         .cmd_per_lun            = UFSHCD_CMD_PER_LUN,
         .can_queue              = UFSHCD_CAN_QUEUE,
         .max_host_blocked       = 1,
+        .use_blk_tags           = 1,
 };
 
 static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,