137 files changed, 1562 insertions, 3085 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 2101e718670d..6b972b287795 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -827,10 +827,6 @@ but in the event of any barrier requests in the tag queue we need to ensure
 that requests are restarted in the order they were queue. This may happen
 if the driver needs to use blk_queue_invalidate_tags().
-Tagging also defines a new request flag, REQ_QUEUED. This is set whenever
-a request is currently tagged. You should not use this flag directly,
-blk_rq_tagged(rq) is the portable way to do so.
 3.3 I/O Submission
 The routine submit_bio() is used to submit a single io. Higher level i/o
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index d6a9bdeee7f2..bee7d86b9dcc 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -271,9 +271,9 @@ init_this_scsi_driver() ----+
                      slave_destroy() ***
 ------------------------------------------------------------
-The mid level invokes scsi_adjust_queue_depth() with tagged queuing off and
+The mid level invokes scsi_adjust_queue_depth() with "cmd_per_lun" for that
-"cmd_per_lun" for that host as the queue length. These settings can be
+host as the queue length. These settings can be overridden by a
-overridden by a slave_configure() supplied by the LLD.
+slave_configure() supplied by the LLD.
 *** For scsi devices that the mid level tries to scan but do not
    respond, a slave_alloc(), slave_destroy() pair is called.
@@ -366,13 +366,11 @@ is initialized. The functions below are listed alphabetically and their
 names all start with "scsi_".
 Summary:
-   scsi_activate_tcq - turn on tag command queueing
   scsi_add_device - creates new scsi device (lu) instance
   scsi_add_host - perform sysfs registration and set up transport class
   scsi_adjust_queue_depth - change the queue depth on a SCSI device
   scsi_bios_ptable - return copy of block device's partition table
   scsi_block_requests - prevent further commands being queued to given host
-   scsi_deactivate_tcq - turn off tag command queueing
   scsi_host_alloc - return a new scsi_host instance whose refcount==1
   scsi_host_get - increments Scsi_Host instance's refcount
   scsi_host_put - decrements Scsi_Host instance's refcount (free if 0)
@@ -390,24 +388,6 @@ Summary:
 Details:
 /**
- * scsi_activate_tcq - turn on tag command queueing ("ordered" task attribute)
- * @sdev:       device to turn on TCQ for
- * @depth:      queue depth
- *
- *      Returns nothing
- *
- *      Might block: no
- *
- *      Notes: Eventually, it is hoped depth would be the maximum depth
- *      the device could cope with and the real queue depth
- *      would be adjustable from 0 to depth.
- *
- *      Defined (inline) in: include/scsi/scsi_tcq.h
- **/
-void scsi_activate_tcq(struct scsi_device *sdev, int depth)
-/**
 * scsi_add_device - creates new scsi device (lu) instance
 * @shost:   pointer to scsi host instance
 * @channel: channel number (rarely other than 0)
@@ -458,9 +438,6 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
 /**
 * scsi_adjust_queue_depth - allow LLD to change queue depth on a SCSI device
 * @sdev:       pointer to SCSI device to change queue depth on
- * @tagged:     0 - no tagged queuing
- *              MSG_SIMPLE_TAG - simple tagged queuing
- *              MSG_ORDERED_TAG - ordered tagged queuing
 * @tags        Number of tags allowed if tagged queuing enabled,
 *              or number of commands the LLD can queue up
 *              in non-tagged mode (as per cmd_per_lun).
@@ -471,15 +448,12 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
 *
 *      Notes: Can be invoked any time on a SCSI device controlled by this
 *      LLD. [Specifically during and after slave_configure() and prior to
- *      slave_destroy().] Can safely be invoked from interrupt code. Actual
+ *      slave_destroy().] Can safely be invoked from interrupt code.
- *      queue depth change may be delayed until the next command is being
- *      processed. See also scsi_activate_tcq() and scsi_deactivate_tcq().
 *
 *      Defined in: drivers/scsi/scsi.c [see source code for more notes]
 *
 **/
-void scsi_adjust_queue_depth(struct scsi_device * sdev, int tagged, 
+void scsi_adjust_queue_depth(struct scsi_device *sdev, int tags)
-                             int tags)
 /**
@@ -515,20 +489,6 @@ void scsi_block_requests(struct Scsi_Host * shost)
 /**
- * scsi_deactivate_tcq - turn off tag command queueing
- * @sdev:       device to turn off TCQ for
- * @depth:      queue depth (stored in sdev)
- *
- *      Returns nothing
- *
- *      Might block: no
- *
- *      Defined (inline) in: include/scsi/scsi_tcq.h
- **/
-void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
-/**
 * scsi_host_alloc - create a scsi host adapter instance and perform basic
 *                   initialization.
 * @sht:        pointer to scsi host template
diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt
index f346abbdd6ff..0d5bdb153d3b 100644
--- a/Documentation/scsi/st.txt
+++ b/Documentation/scsi/st.txt
@@ -506,9 +506,11 @@ user does not request data that far.)
 DEBUGGING HINTS
-To enable debugging messages, edit st.c and #define DEBUG 1. As seen
+Debugging code is now compiled in by default but debugging is turned off
-above, debugging can be switched off with an ioctl if debugging is
+with the kernel module parameter debug_flag defaulting to 0.  Debugging
-compiled into the driver. The debugging output is not voluminous.
+can still be switched on and off with an ioctl.  To enable debug at
+module load time add debug_flag=1 to the module load options, the
+debugging output is not voluminous.
 If the tape seems to hang, I would be very interested to hear where
 the driver is waiting. With the command 'ps -l' you can see the state
diff --git a/block/blk-core.c b/block/blk-core.c
index 0421b53e6431..2e7424b42947 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1266,7 +1266,7 @@ void blk_requeue_request(struct request_queue *q, struct request *rq)
        blk_clear_rq_complete(rq);
        trace_block_rq_requeue(q, rq);
-        if (blk_rq_tagged(rq))
+        if (rq->cmd_flags & REQ_QUEUED)
                blk_queue_end_tag(q, rq);
        BUG_ON(blk_queued_rq(rq));
@@ -2554,7 +2554,7 @@ EXPORT_SYMBOL_GPL(blk_unprep_request);
 */
 void blk_finish_request(struct request *req, int error)
 {
-        if (blk_rq_tagged(req))
+        if (req->cmd_flags & REQ_QUEUED)
                blk_queue_end_tag(req->q, req);
        BUG_ON(blk_queued_rq(req));
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 8317175a3009..728b9a4d5f56 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -584,6 +584,34 @@ int blk_mq_tag_update_depth(struct blk_mq_tags *tags, unsigned int tdepth)
        return 0;
 }
+/**
+ * blk_mq_unique_tag() - return a tag that is unique queue-wide
+ * @rq: request for which to compute a unique tag
+ *
+ * The tag field in struct request is unique per hardware queue but not over
+ * all hardware queues. Hence this function that returns a tag with the
+ * hardware context index in the upper bits and the per hardware queue tag in
+ * the lower bits.
+ *
+ * Note: When called for a request that is queued on a non-multiqueue request
+ * queue, the hardware context index is set to zero.
+ */
+u32 blk_mq_unique_tag(struct request *rq)
+{
+        struct request_queue *q = rq->q;
+        struct blk_mq_hw_ctx *hctx;
+        int hwq = 0;
+        if (q->mq_ops) {
+                hctx = q->mq_ops->map_queue(q, rq->mq_ctx->cpu);
+                hwq = hctx->queue_num;
+        }
+        return (hwq << BLK_MQ_UNIQUE_TAG_BITS) |
+                (rq->tag & BLK_MQ_UNIQUE_TAG_MASK);
+}
+EXPORT_SYMBOL(blk_mq_unique_tag);
 ssize_t blk_mq_tag_sysfs_show(struct blk_mq_tags *tags, char *page)
 {
        char *orig_page = page;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1d016fc9a8b6..92ceef0d2ab9 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2049,6 +2049,8 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
 */
 int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
 {
+        BUILD_BUG_ON(BLK_MQ_MAX_DEPTH > 1 << BLK_MQ_UNIQUE_TAG_BITS);
        if (!set->nr_hw_queues)
                return -EINVAL;
        if (!set->queue_depth)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index b0c2a616c8f9..28163fad3c5d 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -142,7 +142,7 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
        __set_bit(GPCMD_VERIFY_10, filter->read_ok);
        __set_bit(VERIFY_16, filter->read_ok);
        __set_bit(REPORT_LUNS, filter->read_ok);
-        __set_bit(SERVICE_ACTION_IN, filter->read_ok);
+        __set_bit(SERVICE_ACTION_IN_16, filter->read_ok);
        __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok);
        __set_bit(MAINTENANCE_IN, filter->read_ok);
        __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 0586f66d70fa..fc6a60abe518 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1164,7 +1164,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
                depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
                depth = min(ATA_MAX_QUEUE - 1, depth);
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
+                scsi_adjust_queue_depth(sdev, depth);
        }
        blk_queue_flush_queueable(q, false);
@@ -1282,7 +1282,7 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
        if (sdev->queue_depth == queue_depth)
                return -EINVAL;
-        scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 }
@@ -3570,7 +3570,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)
                ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);
                break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16)
                        ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap);
                else
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index a4cd6d691c63..0b4b2775600e 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -329,7 +329,7 @@ INQUIRY_EVPD_BIT_MASK) ? 1 : 0)
 (GET_U32_FROM_CDB(cdb, READ_CAP_16_CDB_ALLOC_LENGTH_OFFSET))
 #define IS_READ_CAP_16(cdb)                                     \
-((cdb[0] == SERVICE_ACTION_IN && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0)
+((cdb[0] == SERVICE_ACTION_IN_16 && cdb[1] == SAI_READ_CAPACITY_16) ? 1 : 0)
 /* Request Sense Helper Macros */
 #define GET_REQUEST_SENSE_ALLOC_LENGTH(cdb)                     \
@@ -2947,7 +2947,7 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr)
        case READ_CAPACITY:
                retcode = nvme_trans_read_capacity(ns, hdr, cmd);
                break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if (IS_READ_CAP_16(cmd))
                        retcode = nvme_trans_read_capacity(ns, hdr, cmd);
                else
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 62d2a18e1b41..023a66f5ca14 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2259,28 +2259,6 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
 }
 /**
- * srp_change_queue_type - changing device queue tag type
- * @sdev: scsi device struct
- * @tag_type: requested tag type
- *
- * Returns queue tag type.
- */
-static int
-srp_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;
-        return tag_type;
-}
-/**
 * srp_change_queue_depth - setting device queue depth
 * @sdev: scsi device struct
 * @qdepth: requested queue depth
@@ -2300,7 +2278,7 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
                        max_depth = 1;
                if (qdepth > max_depth)
                        qdepth = max_depth;
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
        } else if (reason == SCSI_QDEPTH_QFULL)
                scsi_track_queue_full(sdev, qdepth);
        else
@@ -2600,7 +2578,7 @@ static struct scsi_host_template srp_template = {
        .info                           = srp_target_info,
        .queuecommand                   = srp_queuecommand,
        .change_queue_depth             = srp_change_queue_depth,
-        .change_queue_type              = srp_change_queue_type,
+        .change_queue_type              = scsi_change_queue_type,
        .eh_abort_handler               = srp_abort,
        .eh_device_reset_handler        = srp_reset_device,
        .eh_host_reset_handler          = srp_reset_host,
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 0707fa2c701b..5bdaae15a742 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1994,6 +1994,7 @@ static struct scsi_host_template mptsas_driver_template = {
        .cmd_per_lun                    = 7,
        .use_clustering                 = ENABLE_CLUSTERING,
        .shost_attrs                    = mptscsih_host_attrs,
+        .use_blk_tags                   = 1,
 };
 static int mptsas_get_linkerrors(struct sas_phy *phy)
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index e7dcb2583369..dee06d6f0b68 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2322,7 +2322,6 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        VirtTarget              *vtarget;
        struct scsi_target      *starget;
        int                     max_depth;
-        int                     tagged;
        MPT_ADAPTER             *ioc = hd->ioc;
        starget = scsi_target(sdev);
@@ -2347,12 +2346,8 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        if (qdepth > max_depth)
                qdepth = max_depth;
-        if (qdepth == 1)
-                tagged = 0;
-        else
-                tagged = MSG_SIMPLE_TAG;
-        scsi_adjust_queue_depth(sdev, tagged, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
@@ -2400,9 +2395,8 @@ mptscsih_slave_configure(struct scsi_device *sdev)
        mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,
                                    SCSI_QDEPTH_DEFAULT);
        dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                "tagged %d, simple %d, ordered %d\n",
+                "tagged %d, simple %d\n",
-                ioc->name,sdev->tagged_supported, sdev->simple_tags,
+                ioc->name,sdev->tagged_supported, sdev->simple_tags));
-                sdev->ordered_tags));
        blk_queue_dma_alignment (sdev->request_queue, 512 - 1);
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 2cf2bbc0b927..180a5442fd4b 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -187,6 +187,7 @@ void enclosure_unregister(struct enclosure_device *edev)
 EXPORT_SYMBOL_GPL(enclosure_unregister);
 #define ENCLOSURE_NAME_SIZE     64
+#define COMPONENT_NAME_SIZE     64
 static void enclosure_link_name(struct enclosure_component *cdev, char *name)
 {
@@ -246,6 +247,29 @@ static void enclosure_component_release(struct device *dev)
        put_device(dev->parent);
 }
+static struct enclosure_component *
+enclosure_component_find_by_name(struct enclosure_device *edev,
+                                const char *name)
+{
+        int i;
+        const char *cname;
+        struct enclosure_component *ecomp;
+        if (!edev || !name || !name[0])
+                return NULL;
+        for (i = 0; i < edev->components; i++) {
+                ecomp = &edev->component[i];
+                cname = dev_name(&ecomp->cdev);
+                if (ecomp->number != -1 &&
+                    cname && cname[0] &&
+                    !strcmp(cname, name))
+                        return ecomp;
+        }
+        return NULL;
+}
 static const struct attribute_group *enclosure_component_groups[];
 /**
@@ -269,7 +293,8 @@ enclosure_component_register(struct enclosure_device *edev,
 {
        struct enclosure_component *ecomp;
        struct device *cdev;
-        int err;
+        int err, i;
+        char newname[COMPONENT_NAME_SIZE];
        if (number >= edev->components)
                return ERR_PTR(-EINVAL);
@@ -283,9 +308,20 @@ enclosure_component_register(struct enclosure_device *edev,
        ecomp->number = number;
        cdev = &ecomp->cdev;
        cdev->parent = get_device(&edev->edev);
-        if (name && name[0])
-                dev_set_name(cdev, "%s", name);
+        if (name && name[0]) {
-        else
+                /* Some hardware (e.g. enclosure in RX300 S6) has components
+                 * with non unique names. Registering duplicates in sysfs
+                 * will lead to warnings during bootup. So make the names
+                 * unique by appending consecutive numbers -1, -2, ... */
+                i = 1;
+                snprintf(newname, COMPONENT_NAME_SIZE,
+                         "%s", name);
+                while (enclosure_component_find_by_name(edev, newname))
+                        snprintf(newname, COMPONENT_NAME_SIZE,
+                                 "%s-%i", name, i++);
+                dev_set_name(cdev, "%s", newname);
+        } else
                dev_set_name(cdev, "%u", number);
        cdev->release = enclosure_component_release;
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index b1d2024ed513..df2b541c8287 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -212,8 +212,6 @@ static inline
 void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,
                         u8 tm_flags)
 {
-        char tag[2];
        int_to_scsilun(scsi->device->lun, (struct scsi_lun *) &fcp->fc_lun);
        if (unlikely(tm_flags)) {
@@ -221,17 +219,7 @@ void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,
                return;
        }
-        if (scsi_populate_tag_msg(scsi, tag)) {
+        fcp->fc_pri_ta = FCP_PTA_SIMPLE;
-                switch (tag[0]) {
-                case MSG_ORDERED_TAG:
-                        fcp->fc_pri_ta |= FCP_PTA_ORDERED;
-                        break;
-                case MSG_SIMPLE_TAG:
-                        fcp->fc_pri_ta |= FCP_PTA_SIMPLE;
-                        break;
-                };
-        } else
-                fcp->fc_pri_ta = FCP_PTA_SIMPLE;
        if (scsi->sc_data_direction == DMA_FROM_DEVICE)
                fcp->fc_flags |= FCP_CFL_RDDATA;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 7b353647cb90..b5dfa51f396f 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -37,13 +37,13 @@ static int zfcp_scsi_change_queue_depth(struct scsi_device *sdev, int depth,
 {
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, depth);
                break;
        case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        default:
                return -EOPNOTSUPP;
@@ -66,9 +66,7 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdev)
 static int zfcp_scsi_slave_configure(struct scsi_device *sdp)
 {
        if (sdp->tagged_supported)
-                scsi_adjust_queue_depth(sdp, MSG_SIMPLE_TAG, default_depth);
+                scsi_adjust_queue_depth(sdp, default_depth);
-        else
-                scsi_adjust_queue_depth(sdp, 0, 1);
        return 0;
 }
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 0a7325361d29..02021f5ca866 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -198,7 +198,7 @@ static int twa_change_queue_depth(struct scsi_device *sdev, int queue_depth,
        if (queue_depth > TW_Q_LENGTH-2)
                queue_depth = TW_Q_LENGTH-2;
-        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 } /* End twa_change_queue_depth() */
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 6da6cec9a651..ac0c2544a470 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -200,7 +200,7 @@ static int twl_change_queue_depth(struct scsi_device *sdev, int queue_depth,
        if (queue_depth > TW_Q_LENGTH-2)
                queue_depth = TW_Q_LENGTH-2;
-        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 } /* End twl_change_queue_depth() */
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 752624e6bc00..1ec9ad92b6c3 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -532,7 +532,7 @@ static int tw_change_queue_depth(struct scsi_device *sdev, int queue_depth,
        if (queue_depth > TW_Q_LENGTH-2)
                queue_depth = TW_Q_LENGTH-2;
-        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 } /* End tw_change_queue_depth() */
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index fabd4be2c985..d7557b932113 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";
@@ -592,19 +593,14 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata,
        hostdata->cmd = NULL;
        if(SCp != NULL) {
-                struct NCR_700_command_slot *slot = 
+                struct NCR_700_command_slot *slot =
                        (struct NCR_700_command_slot *)SCp->host_scribble;
-                
                dma_unmap_single(hostdata->dev, slot->pCmd,
                                 MAX_COMMAND_SIZE, DMA_TO_DEVICE);
                if (slot->flags == NCR_700_FLAG_AUTOSENSE) {
                        char *cmnd = NCR_700_get_sense_cmnd(SCp->device);
-#ifdef NCR_700_DEBUG
-                        printk(" ORIGINAL CMD %p RETURNED %d, new return is %d sense is\n",
-                               SCp, SCp->cmnd[7], result);
-                        scsi_print_sense("53c700", SCp);
-#endif
                        dma_unmap_single(hostdata->dev, slot->dma_handle,
                                         SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE);
                        /* restore the old result if the request sense was
@@ -906,8 +902,10 @@ process_message(struct Scsi_Host *host,	struct NCR_700_Host_Parameters *hostdata
                        /* we're done negotiating */
                        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, host->cmd_per_lun);
+                        scsi_set_tag_type(SCp->device, 0);
                } else {
                        shost_printk(KERN_WARNING, host,
                                "(%d:%d) Unexpected REJECT Message %s\n",
@@ -1432,7 +1430,7 @@ NCR_700_start_command(struct scsi_cmnd *SCp)
        if((hostdata->tag_negotiated & (1<<scmd_id(SCp)))
           && (slot->tag != SCSI_NO_TAG && SCp->cmnd[0] != REQUEST_SENSE &&
               slot->flags != NCR_700_FLAG_AUTOSENSE)) {
-                count += scsi_populate_tag_msg(SCp, &hostdata->msgout[count]);
+                count += spi_populate_tag_msg(&hostdata->msgout[count], SCp);
        }
        if(hostdata->fast &&
@@ -1772,7 +1770,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
         */
        if(NCR_700_get_depth(SCp->device) != 0
           && (!(hostdata->tag_negotiated & (1<<scmd_id(SCp)))
-               || !blk_rq_tagged(SCp->request))) {
+               || !(SCp->flags & SCMD_TAGGED))) {
                CDEBUG(KERN_ERR, SCp, "has non zero depth %d\n",
                       NCR_700_get_depth(SCp->device));
                return SCSI_MLQUEUE_DEVICE_BUSY;
@@ -1800,7 +1798,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
        printk("53c700: scsi%d, command ", SCp->device->host->host_no);
        scsi_print_command(SCp);
 #endif
-        if(blk_rq_tagged(SCp->request)
+        if ((SCp->flags & SCMD_TAGGED)
           && (hostdata->tag_negotiated &(1<<scmd_id(SCp))) == 0
           && NCR_700_get_tag_neg_state(SCp->device) == NCR_700_START_TAG_NEGOTIATION) {
                scmd_printk(KERN_ERR, SCp, "Enabling Tag Command Queuing\n");
@@ -1814,7 +1812,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
         *
         * FIXME: This will royally screw up on multiple LUN devices
         * */
-        if(!blk_rq_tagged(SCp->request)
+        if (!(SCp->flags & SCMD_TAGGED)
           && (hostdata->tag_negotiated &(1<<scmd_id(SCp)))) {
                scmd_printk(KERN_INFO, SCp, "Disabling Tag Command Queuing\n");
                hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));
@@ -1911,9 +1909,7 @@ NCR_700_abort(struct scsi_cmnd * SCp)
 {
        struct NCR_700_command_slot *slot;
-        scmd_printk(KERN_INFO, SCp,
+        scmd_printk(KERN_INFO, SCp, "abort command\n");
-                "New error handler wants to abort command\n\t");
-        scsi_print_command(SCp);
        slot = (struct NCR_700_command_slot *)SCp->host_scribble;
@@ -2056,13 +2052,10 @@ 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_adjust_queue_depth(SDp, NCR_700_DEFAULT_TAGS);
-                scsi_activate_tcq(SDp, NCR_700_DEFAULT_TAGS);
                NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
-        } else {
-                /* initialise to default depth */
-                scsi_adjust_queue_depth(SDp, 0, SDp->host->cmd_per_lun);
        }
        if(hostdata->fast) {
                /* Find the correct offset and period via domain validation */
                if (!spi_initial_dv(SDp->sdev_target))
@@ -2090,7 +2083,7 @@ NCR_700_change_queue_depth(struct scsi_device *SDp, int depth, int reason)
        if (depth > NCR_700_MAX_TAGS)
                depth = NCR_700_MAX_TAGS;
-        scsi_adjust_queue_depth(SDp, scsi_get_tag_type(SDp), depth);
+        scsi_adjust_queue_depth(SDp, depth);
        return depth;
 }
@@ -2101,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,
@@ -2110,15 +2101,16 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
        if (change_tag)
                scsi_target_quiesce(SDp->sdev_target);
+        scsi_set_tag_type(SDp, 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, 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, SDp->queue_depth);
                if (change_tag)
                        NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);
        }
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 64c75143c89a..5aa476b6b8a8 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2327,12 +2327,12 @@ static int blogic_slaveconfig(struct scsi_device *dev)
                if (qdepth == 0)
                        qdepth = BLOGIC_MAX_AUTO_TAG_DEPTH;
                adapter->qdepth[tgt_id] = qdepth;
-                scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, qdepth);
+                scsi_adjust_queue_depth(dev, qdepth);
        } else {
                adapter->tagq_ok &= ~(1 << tgt_id);
                qdepth = adapter->untag_qdepth;
                adapter->qdepth[tgt_id] = qdepth;
-                scsi_adjust_queue_depth(dev, 0, qdepth);
+                scsi_adjust_queue_depth(dev, qdepth);
        }
        qdepth = 0;
        for (tgt_id = 0; tgt_id < adapter->maxdev; tgt_id++)
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 45da3c823322..296c6f53605a 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2647,14 +2647,14 @@ static void NCR5380_dma_complete(NCR5380_instance * instance) {
 *
 * Purpose : abort a command
 *
- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the 
+ * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the
- *      host byte of the result field to, if zero DID_ABORTED is 
+ *      host byte of the result field to, if zero DID_ABORTED is
 *      used.
 *
- * Returns : 0 - success, -1 on failure.
+ * Returns : SUCCESS - success, FAILED on failure.
 *
- *      XXX - there is no way to abort the command that is currently 
+ *      XXX - there is no way to abort the command that is currently
- *      connected, you have to wait for it to complete.  If this is 
+ *      connected, you have to wait for it to complete.  If this is
 *      a problem, we could implement longjmp() / setjmp(), setjmp()
 *      called where the loop started in NCR5380_main().
 *
@@ -2666,9 +2666,8 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
        struct Scsi_Host *instance = cmd->device->host;
        struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
        Scsi_Cmnd *tmp, **prev;
-        
-        printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no);
+        scmd_printk(KERN_WARNING, cmd, "aborting command\n");
-        scsi_print_command(cmd);
        NCR5380_print_status(instance);
@@ -2704,7 +2703,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
 * aborted flag and get back into our main loop.
 */
-                return 0;
+                return SUCCESS;
        }
 #endif
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 681434e2dfe9..b32e77db0c48 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -2181,7 +2181,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                          (fsa_dev_ptr[cid].sense_data.sense_key ==
                           NOT_READY)) {
                                switch (scsicmd->cmnd[0]) {
-                                case SERVICE_ACTION_IN:
+                                case SERVICE_ACTION_IN_16:
                                        if (!(dev->raw_io_interface) ||
                                            !(dev->raw_io_64) ||
                                            ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
@@ -2309,7 +2309,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data));
                return aac_get_container_name(scsicmd);
        }
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if (!(dev->raw_io_interface) ||
                    !(dev->raw_io_64) ||
                    ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index a759cb2d4b15..4c340d88c33d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -462,9 +462,9 @@ static int aac_slave_configure(struct scsi_device *sdev)
                        depth = 256;
                else if (depth < 2)
                        depth = 2;
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
+                scsi_adjust_queue_depth(sdev, depth);
        } else
-                scsi_adjust_queue_depth(sdev, 0, 1);
+                scsi_adjust_queue_depth(sdev, 1);
        return 0;
 }
@@ -504,9 +504,9 @@ static int aac_change_queue_depth(struct scsi_device *sdev, int depth,
                        depth = 256;
                else if (depth < 2)
                        depth = 2;
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
+                scsi_adjust_queue_depth(sdev, depth);
        } else
-                scsi_adjust_queue_depth(sdev, 0, 1);
+                scsi_adjust_queue_depth(sdev, 1);
        return sdev->queue_depth;
 }
@@ -555,7 +555,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd)
                AAC_DRIVERNAME,
                host->host_no, sdev_channel(dev), sdev_id(dev), dev->lun);
        switch (cmd->cmnd[0]) {
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if (!(aac->raw_io_interface) ||
                    !(aac->raw_io_64) ||
                    ((cmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 43761c1c46f0..ae4840e4c1c5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7706,7 +7706,7 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                                asc_dvc->cfg->can_tagged_qng |= tid_bit;
                                asc_dvc->use_tagged_qng |= tid_bit;
                        }
-                        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
+                        scsi_adjust_queue_depth(sdev, 
                                                asc_dvc->max_dvc_qng[sdev->id]);
                }
        } else {
@@ -7714,7 +7714,6 @@ advansys_narrow_slave_configure(struct scsi_device *sdev, ASC_DVC_VAR *asc_dvc)
                        asc_dvc->cfg->can_tagged_qng &= ~tid_bit;
                        asc_dvc->use_tagged_qng &= ~tid_bit;
                }
-                scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
        }
        if ((sdev->lun == 0) &&
@@ -7849,10 +7848,8 @@ advansys_wide_slave_configure(struct scsi_device *sdev, ADV_DVC_VAR *adv_dvc)
        }
        if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) {
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
+                scsi_adjust_queue_depth(sdev,
                                        adv_dvc->max_dvc_qng);
-        } else {
-                scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
        }
 }
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index e77b72f78006..2b960b326daf 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -230,7 +230,7 @@
 *
 *
 **************************************************************************
- 
 see Documentation/scsi/aha152x.txt for configuration details
 **************************************************************************/
@@ -279,45 +279,11 @@ static LIST_HEAD(aha152x_host_list);
 #error define AUTOCONF or SETUP0
 #endif
-#if defined(AHA152X_DEBUG)
-#define DEBUG_DEFAULT debug_eh
-#define DPRINTK(when,msgs...) \
-        do { if(HOSTDATA(shpnt)->debug & (when)) printk(msgs); } while(0)
-#define DO_LOCK(flags)  \
-        do { \
-                if(spin_is_locked(&QLOCK)) { \
-                        DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
-                } \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
-                spin_lock_irqsave(&QLOCK,flags); \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
-                QLOCKER=__func__; \
-                QLOCKERL=__LINE__; \
-        } while(0)
-#define DO_UNLOCK(flags)        \
-        do { \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
-                spin_unlock_irqrestore(&QLOCK,flags); \
-                DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
-                QLOCKER="(not locked)"; \
-                QLOCKERL=0; \
-        } while(0)
-#else
-#define DPRINTK(when,msgs...)
 #define DO_LOCK(flags)          spin_lock_irqsave(&QLOCK,flags)
 #define DO_UNLOCK(flags)        spin_unlock_irqrestore(&QLOCK,flags)
-#endif
 #define LEAD            "(scsi%d:%d:%d) "
-#define WARN_LEAD       KERN_WARNING    LEAD
 #define INFO_LEAD       KERN_INFO       LEAD
-#define NOTE_LEAD       KERN_NOTICE     LEAD
-#define ERR_LEAD        KERN_ERR        LEAD
-#define DEBUG_LEAD      KERN_DEBUG      LEAD
 #define CMDINFO(cmd) \
                        (cmd) ? ((cmd)->device->host->host_no) : -1, \
                        (cmd) ? ((cmd)->device->id & 0x0f) : -1, \
@@ -345,10 +311,10 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc)
 enum {
        not_issued      = 0x0001,       /* command not yet issued */
-        selecting       = 0x0002,       /* target is beeing selected */
+        selecting       = 0x0002,       /* target is being selected */
        identified      = 0x0004,       /* IDENTIFY was sent */
        disconnected    = 0x0008,       /* target disconnected */
-        completed       = 0x0010,       /* target sent COMMAND COMPLETE */ 
+        completed       = 0x0010,       /* target sent COMMAND COMPLETE */
        aborted         = 0x0020,       /* ABORT was sent */
        resetted        = 0x0040,       /* BUS DEVICE RESET was sent */
        spiordy         = 0x0080,       /* waiting for SPIORDY to raise */
@@ -396,7 +362,6 @@ static int exttrans[] = {0, 0};
 module_param_array(exttrans, int, NULL, 0);
 MODULE_PARM_DESC(exttrans,"use extended translation");
-#if !defined(AHA152X_DEBUG)
 static int aha152x[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
 module_param_array(aha152x, int, NULL, 0);
 MODULE_PARM_DESC(aha152x, "parameters for first controller");
@@ -404,19 +369,6 @@ MODULE_PARM_DESC(aha152x, "parameters for first controller");
 static int aha152x1[] = {0, 11, 7, 1, 1, 0, DELAY_DEFAULT, 0};
 module_param_array(aha152x1, int, NULL, 0);
 MODULE_PARM_DESC(aha152x1, "parameters for second controller");
-#else
-static int debug[] = {DEBUG_DEFAULT, DEBUG_DEFAULT};
-module_param_array(debug, int, NULL, 0);
-MODULE_PARM_DESC(debug, "flags for driver debugging");
-static int aha152x[]   = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
-module_param_array(aha152x, int, NULL, 0);
-MODULE_PARM_DESC(aha152x, "parameters for first controller");
-static int aha152x1[]  = {0, 11, 7, 1, 1, 1, DELAY_DEFAULT, 0, DEBUG_DEFAULT};
-module_param_array(aha152x1, int, NULL, 0);
-MODULE_PARM_DESC(aha152x1, "parameters for second controller");
-#endif /* !defined(AHA152X_DEBUG) */
 #endif /* MODULE */
 #ifdef __ISAPNP__
@@ -446,7 +398,7 @@ static struct scsi_host_template aha152x_driver_template;
 /*
 * internal states of the host
 *
- */ 
+ */
 enum aha152x_state {
        idle=0,
        unknown,
@@ -485,24 +437,16 @@ struct aha152x_hostdata {
        spinlock_t lock;
                /* host lock */
-#if defined(AHA152X_DEBUG)
-        const char *locker;
-                /* which function has the lock */
-        int lockerl;    /* where did it get it */
-        int debug;      /* current debugging setting */
-#endif
 #if defined(AHA152X_STAT)
-        int           total_commands;
+        int           total_commands;
        int           disconnections;
        int           busfree_without_any_action;
        int           busfree_without_old_command;
        int           busfree_without_new_command;
        int           busfree_without_done_command;
        int           busfree_with_check_condition;
-        int           count[maxstate];
+        int           count[maxstate];
-        int           count_trans[maxstate];
+        int           count_trans[maxstate];
        unsigned long time[maxstate];
 #endif
@@ -514,7 +458,7 @@ struct aha152x_hostdata {
        int delay;              /* reset out delay */
        int ext_trans;          /* extended translation enabled */
-        int swint;              /* software-interrupt was fired during detect() */
+        int swint;              /* software-interrupt was fired during detect() */
        int service;            /* bh needs to be run */
        int in_intr;            /* bh is running */
@@ -543,7 +487,7 @@ struct aha152x_hostdata {
        unsigned char msgi[256];
                /* received message bytes */
-        int msgo_i, msgo_len;   
+        int msgo_i, msgo_len;
                /* number of sent bytes and length of current messages */
        unsigned char msgo[256];
                /* pending messages */
@@ -689,7 +633,6 @@ static void aha152x_error(struct Scsi_Host *shpnt, char *msg);
 static void done(struct Scsi_Host *shpnt, int error);
 /* diagnostics */
-static void disp_ports(struct Scsi_Host *shpnt);
 static void show_command(Scsi_Cmnd * ptr);
 static void show_queues(struct Scsi_Host *shpnt);
 static void disp_enintr(struct Scsi_Host *shpnt);
@@ -812,10 +755,6 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
        DELAY       = setup->delay;
        EXT_TRANS   = setup->ext_trans;
-#if defined(AHA152X_DEBUG)
-        HOSTDATA(shpnt)->debug = setup->debug;
-#endif
        SETPORT(SCSIID, setup->scsiid << 4);
        shpnt->this_id = setup->scsiid;
@@ -941,31 +880,24 @@ void aha152x_release(struct Scsi_Host *shpnt)
 * setup controller to generate interrupts depending
 * on current state (lock has to be acquired)
 *
- */ 
+ */
 static int setup_expected_interrupts(struct Scsi_Host *shpnt)
 {
        if(CURRENT_SC) {
                CURRENT_SC->SCp.phase |= 1 << 16;
-        
                if(CURRENT_SC->SCp.phase & selecting) {
-                        DPRINTK(debug_intr, DEBUG_LEAD "expecting: (seldo) (seltimo) (seldi)\n", CMDINFO(CURRENT_SC));
                        SETPORT(SSTAT1, SELTO);
                        SETPORT(SIMODE0, ENSELDO | (DISCONNECTED_SC ? ENSELDI : 0));
                        SETPORT(SIMODE1, ENSELTIMO);
                } else {
-                        DPRINTK(debug_intr, DEBUG_LEAD "expecting: (phase change) (busfree) %s\n", CMDINFO(CURRENT_SC), CURRENT_SC->SCp.phase & spiordy ? "(spiordy)" : "");
                        SETPORT(SIMODE0, (CURRENT_SC->SCp.phase & spiordy) ? ENSPIORDY : 0);
-                        SETPORT(SIMODE1, ENPHASEMIS | ENSCSIRST | ENSCSIPERR | ENBUSFREE); 
+                        SETPORT(SIMODE1, ENPHASEMIS | ENSCSIRST | ENSCSIPERR | ENBUSFREE);
                }
        } else if(STATE==seldi) {
-                DPRINTK(debug_intr, DEBUG_LEAD "expecting: (phase change) (identify)\n", CMDINFO(CURRENT_SC));
                SETPORT(SIMODE0, 0);
-                SETPORT(SIMODE1, ENPHASEMIS | ENSCSIRST | ENSCSIPERR | ENBUSFREE); 
+                SETPORT(SIMODE1, ENPHASEMIS | ENSCSIRST | ENSCSIPERR | ENBUSFREE);
        } else {
-                DPRINTK(debug_intr, DEBUG_LEAD "expecting: %s %s\n",
-                        CMDINFO(CURRENT_SC),
-                        DISCONNECTED_SC ? "(reselection)" : "",
-                        ISSUE_SC ? "(busfree)" : "");
                SETPORT(SIMODE0, DISCONNECTED_SC ? ENSELDI : 0);
                SETPORT(SIMODE1, ENSCSIRST | ( (ISSUE_SC||DONE_SC) ? ENBUSFREE : 0));
        }
@@ -977,7 +909,7 @@ static int setup_expected_interrupts(struct Scsi_Host *shpnt)
 }
-/* 
+/*
 *  Queue a command and setup interrupts for a free bus.
 */
 static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
@@ -986,15 +918,6 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
        struct Scsi_Host *shpnt = SCpnt->device->host;
        unsigned long flags;
-#if defined(AHA152X_DEBUG)
-        if (HOSTDATA(shpnt)->debug & debug_queue) {
-                printk(INFO_LEAD "queue: %p; cmd_len=%d pieces=%d size=%u cmnd=",
-                       CMDINFO(SCpnt), SCpnt, SCpnt->cmd_len,
-                       scsi_sg_count(SCpnt), scsi_bufflen(SCpnt));
-                __scsi_print_command(SCpnt->cmnd);
-        }
-#endif
        SCpnt->scsi_done        = done;
        SCpnt->SCp.phase        = not_issued | phase;
        SCpnt->SCp.Status       = 0x1; /* Ilegal status by SCSI standard */
@@ -1004,13 +927,13 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
        if(SCpnt->SCp.phase & (resetting|check_condition)) {
                if (!SCpnt->host_scribble || SCSEM(SCpnt) || SCNEXT(SCpnt)) {
-                        printk(ERR_LEAD "cannot reuse command\n", CMDINFO(SCpnt));
+                        scmd_printk(KERN_ERR, SCpnt, "cannot reuse command\n");
                        return FAILED;
                }
        } else {
                SCpnt->host_scribble = kmalloc(sizeof(struct aha152x_scdata), GFP_ATOMIC);
                if(!SCpnt->host_scribble) {
-                        printk(ERR_LEAD "allocation failed\n", CMDINFO(SCpnt));
+                        scmd_printk(KERN_ERR, SCpnt, "allocation failed\n");
                        return FAILED;
                }
        }
@@ -1066,15 +989,6 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
 */
 static int aha152x_queue_lck(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
 {
-#if 0
-        if(*SCpnt->cmnd == REQUEST_SENSE) {
-                SCpnt->result = 0;
-                done(SCpnt);
-                return 0;
-        }
-#endif
        return aha152x_internal_queue(SCpnt, NULL, 0, done);
 }
@@ -1082,15 +996,10 @@ static DEF_SCSI_QCMD(aha152x_queue)
 /*
- *  
 *
 */
 static void reset_done(Scsi_Cmnd *SCpnt)
 {
-#if 0
-        struct Scsi_Host *shpnt = SCpnt->host;
-        DPRINTK(debug_eh, INFO_LEAD "reset_done called\n", CMDINFO(SCpnt));
-#endif
        if(SCSEM(SCpnt)) {
                complete(SCSEM(SCpnt));
        } else {
@@ -1108,20 +1017,11 @@ static int aha152x_abort(Scsi_Cmnd *SCpnt)
        Scsi_Cmnd *ptr;
        unsigned long flags;
-#if defined(AHA152X_DEBUG)
-        if(HOSTDATA(shpnt)->debug & debug_eh) {
-                printk(DEBUG_LEAD "abort(%p)", CMDINFO(SCpnt), SCpnt);
-                show_queues(shpnt);
-        }
-#endif
        DO_LOCK(flags);
        ptr=remove_SC(&ISSUE_SC, SCpnt);
        if(ptr) {
-                DPRINTK(debug_eh, DEBUG_LEAD "not yet issued - SUCCESS\n", CMDINFO(SCpnt));
                HOSTDATA(shpnt)->commands--;
                if (!HOSTDATA(shpnt)->commands)
                        SETPORT(PORTA, 0);
@@ -1131,7 +1031,7 @@ static int aha152x_abort(Scsi_Cmnd *SCpnt)
                SCpnt->host_scribble=NULL;
                return SUCCESS;
-        } 
+        }
        DO_UNLOCK(flags);
@@ -1142,7 +1042,8 @@ static int aha152x_abort(Scsi_Cmnd *SCpnt)
         *
         */
-        printk(ERR_LEAD "cannot abort running or disconnected command\n", CMDINFO(SCpnt));
+        scmd_printk(KERN_ERR, SCpnt,
+                    "cannot abort running or disconnected command\n");
        return FAILED;
 }
@@ -1160,15 +1061,8 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt)
        unsigned long flags;
        unsigned long timeleft;
-#if defined(AHA152X_DEBUG)
-        if(HOSTDATA(shpnt)->debug & debug_eh) {
-                printk(INFO_LEAD "aha152x_device_reset(%p)", CMDINFO(SCpnt), SCpnt);
-                show_queues(shpnt);
-        }
-#endif
        if(CURRENT_SC==SCpnt) {
-                printk(ERR_LEAD "cannot reset current device\n", CMDINFO(SCpnt));
+                scmd_printk(KERN_ERR, SCpnt, "cannot reset current device\n");
                return FAILED;
        }
@@ -1208,7 +1102,7 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt)
                } else if(disconnected) {
                        append_SC(&DISCONNECTED_SC, SCpnt);
                }
-        
                ret = FAILED;
        }
@@ -1227,12 +1121,12 @@ static void free_hard_reset_SCs(struct Scsi_Host *shpnt, Scsi_Cmnd **SCs)
                if(SCDATA(ptr)) {
                        next = SCNEXT(ptr);
                } else {
-                        printk(DEBUG_LEAD "queue corrupted at %p\n", CMDINFO(ptr), ptr);
+                        scmd_printk(KERN_DEBUG, ptr,
+                                    "queue corrupted at %p\n", ptr);
                        next = NULL;
                }
                if (!ptr->device->soft_reset) {
-                        DPRINTK(debug_eh, DEBUG_LEAD "disconnected command %p removed\n", CMDINFO(ptr), ptr);
                        remove_SC(SCs, ptr);
                        HOSTDATA(shpnt)->commands--;
                        kfree(ptr->host_scribble);
@@ -1253,25 +1147,14 @@ static int aha152x_bus_reset_host(struct Scsi_Host *shpnt)
        DO_LOCK(flags);
-#if defined(AHA152X_DEBUG)
-        if(HOSTDATA(shpnt)->debug & debug_eh) {
-                printk(KERN_DEBUG "scsi%d: bus reset", shpnt->host_no);
-                show_queues(shpnt);
-        }
-#endif
        free_hard_reset_SCs(shpnt, &ISSUE_SC);
        free_hard_reset_SCs(shpnt, &DISCONNECTED_SC);
-        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting bus\n", shpnt->host_no);
        SETPORT(SCSISEQ, SCSIRSTO);
        mdelay(256);
        SETPORT(SCSISEQ, 0);
        mdelay(DELAY);
-        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: bus resetted\n", shpnt->host_no);
        setup_expected_interrupts(shpnt);
        if(HOSTDATA(shpnt)->commands==0)
                SETPORT(PORTA, 0);
@@ -1333,11 +1216,7 @@ static void reset_ports(struct Scsi_Host *shpnt)
 */
 int aha152x_host_reset_host(struct Scsi_Host *shpnt)
 {
-        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: host reset\n", shpnt->host_no);
        aha152x_bus_reset_host(shpnt);
-        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting ports\n", shpnt->host_no);
        reset_ports(shpnt);
        return SUCCESS;
@@ -1345,7 +1224,7 @@ int aha152x_host_reset_host(struct Scsi_Host *shpnt)
 /*
 * Reset the host (bus and controller)
- * 
+ *
 */
 static int aha152x_host_reset(Scsi_Cmnd *SCpnt)
 {
@@ -1411,7 +1290,9 @@ static void done(struct Scsi_Host *shpnt, int error)
 {
        if (CURRENT_SC) {
                if(DONE_SC)
-                        printk(ERR_LEAD "there's already a completed command %p - will cause abort\n", CMDINFO(CURRENT_SC), DONE_SC);
+                        scmd_printk(KERN_ERR, CURRENT_SC,
+                                    "there's already a completed command %p "
+                                    "- will cause abort\n", DONE_SC);
                DONE_SC = CURRENT_SC;
                CURRENT_SC = NULL;
@@ -1466,7 +1347,7 @@ static irqreturn_t intr(int irqno, void *dev_id)
                return IRQ_NONE;
        if( TESTLO(DMASTAT, INTSTAT) )
-                return IRQ_NONE;        
+                return IRQ_NONE;
        /* no more interrupts from the controller, while we're busy.
           INTEN is restored by the BH handler */
@@ -1501,7 +1382,7 @@ static void busfree_run(struct Scsi_Host *shpnt)
        SETPORT(SXFRCTL0, CH1);
        SETPORT(SSTAT1, CLRBUSFREE);
-        
        if(CURRENT_SC) {
 #if defined(AHA152X_STAT)
                action++;
@@ -1513,19 +1394,13 @@ static void busfree_run(struct Scsi_Host *shpnt)
                        done(shpnt, (CURRENT_SC->SCp.Status & 0xff) | ((CURRENT_SC->SCp.Message & 0xff) << 8) | (DID_OK << 16));
                } else if(CURRENT_SC->SCp.phase & aborted) {
-                        DPRINTK(debug_eh, DEBUG_LEAD "ABORT sent\n", CMDINFO(CURRENT_SC));
                        done(shpnt, (CURRENT_SC->SCp.Status & 0xff) | ((CURRENT_SC->SCp.Message & 0xff) << 8) | (DID_ABORT << 16));
                } else if(CURRENT_SC->SCp.phase & resetted) {
-                        DPRINTK(debug_eh, DEBUG_LEAD "BUS DEVICE RESET sent\n", CMDINFO(CURRENT_SC));
                        done(shpnt, (CURRENT_SC->SCp.Status & 0xff) | ((CURRENT_SC->SCp.Message & 0xff) << 8) | (DID_RESET << 16));
                } else if(CURRENT_SC->SCp.phase & disconnected) {
                        /* target sent DISCONNECT */
-                        DPRINTK(debug_selection, DEBUG_LEAD "target disconnected at %d/%d\n",
-                                CMDINFO(CURRENT_SC),
-                                scsi_get_resid(CURRENT_SC),
-                                scsi_bufflen(CURRENT_SC));
 #if defined(AHA152X_STAT)
                        HOSTDATA(shpnt)->disconnections++;
 #endif
@@ -1553,13 +1428,6 @@ static void busfree_run(struct Scsi_Host *shpnt)
                        struct scsi_cmnd *cmd = HOSTDATA(shpnt)->done_SC;
                        struct aha152x_scdata *sc = SCDATA(cmd);
-#if 0
-                        if(HOSTDATA(shpnt)->debug & debug_eh) {
-                                printk(ERR_LEAD "received sense: ", CMDINFO(DONE_SC));
-                                scsi_print_sense("bh", DONE_SC);
-                        }
-#endif
                        scsi_eh_restore_cmnd(cmd, &sc->ses);
                        cmd->SCp.Status = SAM_STAT_CHECK_CONDITION;
@@ -1571,17 +1439,11 @@ static void busfree_run(struct Scsi_Host *shpnt)
 #if defined(AHA152X_STAT)
                        HOSTDATA(shpnt)->busfree_with_check_condition++;
 #endif
-#if 0
-                        DPRINTK(debug_eh, ERR_LEAD "CHECK CONDITION found\n", CMDINFO(DONE_SC));
-#endif
                        if(!(DONE_SC->SCp.phase & not_issued)) {
                                struct aha152x_scdata *sc;
                                Scsi_Cmnd *ptr = DONE_SC;
                                DONE_SC=NULL;
-#if 0
-                                DPRINTK(debug_eh, ERR_LEAD "requesting sense\n", CMDINFO(ptr));
-#endif
                                sc = SCDATA(ptr);
                                /* It was allocated in aha152x_internal_queue? */
@@ -1591,19 +1453,10 @@ static void busfree_run(struct Scsi_Host *shpnt)
                                DO_UNLOCK(flags);
                                aha152x_internal_queue(ptr, NULL, check_condition, ptr->scsi_done);
                                DO_LOCK(flags);
-#if 0
-                        } else {
-                                DPRINTK(debug_eh, ERR_LEAD "command not issued - CHECK CONDITION ignored\n", CMDINFO(DONE_SC));
-#endif
                        }
                }
                if(DONE_SC && DONE_SC->scsi_done) {
-#if defined(AHA152X_DEBUG)
-                        int hostno=DONE_SC->device->host->host_no;
-                        int id=DONE_SC->device->id & 0xf;
-                        int lun=((u8)DONE_SC->device->lun) & 0x7;
-#endif
                        Scsi_Cmnd *ptr = DONE_SC;
                        DONE_SC=NULL;
@@ -1618,9 +1471,7 @@ static void busfree_run(struct Scsi_Host *shpnt)
                        }
                        DO_UNLOCK(flags);
-                        DPRINTK(debug_done, DEBUG_LEAD "calling scsi_done(%p)\n", hostno, id, lun, ptr);
+                        ptr->scsi_done(ptr);
-                        ptr->scsi_done(ptr);
-                        DPRINTK(debug_done, DEBUG_LEAD "scsi_done(%p) returned\n", hostno, id, lun, ptr);
                        DO_LOCK(flags);
                }
@@ -1640,9 +1491,7 @@ static void busfree_run(struct Scsi_Host *shpnt)
 #if defined(AHA152X_STAT)
                action++;
 #endif
-                CURRENT_SC->SCp.phase |= selecting;
+                CURRENT_SC->SCp.phase |= selecting;
-                DPRINTK(debug_selection, DEBUG_LEAD "selecting target\n", CMDINFO(CURRENT_SC));
                /* clear selection timeout */
                SETPORT(SSTAT1, SELTO);
@@ -1674,18 +1523,19 @@ static void seldo_run(struct Scsi_Host *shpnt)
        SETPORT(SSTAT1, CLRBUSFREE);
        SETPORT(SSTAT1, CLRPHASECHG);
-        CURRENT_SC->SCp.phase &= ~(selecting|not_issued);
+        CURRENT_SC->SCp.phase &= ~(selecting|not_issued);
        SETPORT(SCSISEQ, 0);
        if (TESTLO(SSTAT0, SELDO)) {
-                printk(ERR_LEAD "aha152x: passing bus free condition\n", CMDINFO(CURRENT_SC));
+                scmd_printk(KERN_ERR, CURRENT_SC,
+                            "aha152x: passing bus free condition\n");
                done(shpnt, DID_NO_CONNECT << 16);
                return;
        }
        SETPORT(SSTAT0, CLRSELDO);
-        
        ADDMSGO(IDENTIFY(RECONNECT, CURRENT_SC->device->lun));
        if (CURRENT_SC->SCp.phase & aborting) {
@@ -1693,7 +1543,7 @@ static void seldo_run(struct Scsi_Host *shpnt)
        } else if (CURRENT_SC->SCp.phase & resetting) {
                ADDMSGO(BUS_DEVICE_RESET);
        } else if (SYNCNEG==0 && SYNCHRONOUS) {
-                CURRENT_SC->SCp.phase |= syncneg;
+                CURRENT_SC->SCp.phase |= syncneg;
                MSGOLEN += spi_populate_sync_msg(&MSGO(MSGOLEN), 50, 8);
                SYNCNEG=1;              /* negotiation in progress */
        }
@@ -1708,29 +1558,21 @@ static void seldo_run(struct Scsi_Host *shpnt)
 */
 static void selto_run(struct Scsi_Host *shpnt)
 {
-        SETPORT(SCSISEQ, 0);            
+        SETPORT(SCSISEQ, 0);
        SETPORT(SSTAT1, CLRSELTIMO);
-        DPRINTK(debug_selection, DEBUG_LEAD "selection timeout\n", CMDINFO(CURRENT_SC));
+        if (!CURRENT_SC)
-        if(!CURRENT_SC) {
-                DPRINTK(debug_selection, DEBUG_LEAD "!CURRENT_SC\n", CMDINFO(CURRENT_SC));
                return;
-        }
-        CURRENT_SC->SCp.phase &= ~selecting;
+        CURRENT_SC->SCp.phase &= ~selecting;
-        if (CURRENT_SC->SCp.phase & aborted) {
+        if (CURRENT_SC->SCp.phase & aborted)
-                DPRINTK(debug_selection, DEBUG_LEAD "aborted\n", CMDINFO(CURRENT_SC));
                done(shpnt, DID_ABORT << 16);
-        } else if (TESTLO(SSTAT0, SELINGO)) {
+        else if (TESTLO(SSTAT0, SELINGO))
-                DPRINTK(debug_selection, DEBUG_LEAD "arbitration not won\n", CMDINFO(CURRENT_SC));
                done(shpnt, DID_BUS_BUSY << 16);
-        } else {
+        else
                /* ARBITRATION won, but SELECTION failed */
-                DPRINTK(debug_selection, DEBUG_LEAD "selection failed\n", CMDINFO(CURRENT_SC));
                done(shpnt, DID_NO_CONNECT << 16);
-        }
 }
 /*
@@ -1753,9 +1595,8 @@ static void seldi_run(struct Scsi_Host *shpnt)
        if(CURRENT_SC) {
                if(!(CURRENT_SC->SCp.phase & not_issued))
-                        printk(ERR_LEAD "command should not have been issued yet\n", CMDINFO(CURRENT_SC));
+                        scmd_printk(KERN_ERR, CURRENT_SC,
+                                    "command should not have been issued yet\n");
-                DPRINTK(debug_selection, ERR_LEAD "command requeued - reselection\n", CMDINFO(CURRENT_SC));
                DO_LOCK(flags);
                append_SC(&ISSUE_SC, CURRENT_SC);
@@ -1764,17 +1605,16 @@ static void seldi_run(struct Scsi_Host *shpnt)
                CURRENT_SC = NULL;
        }
-        if(!DISCONNECTED_SC) {
+        if (!DISCONNECTED_SC)
-                DPRINTK(debug_selection, DEBUG_LEAD "unexpected SELDI ", CMDINFO(CURRENT_SC));
                return;
-        }
        RECONN_TARGET=-1;
        selid = GETPORT(SELID) & ~(1 << shpnt->this_id);
        if (selid==0) {
-                printk("aha152x%d: target id unknown (%02x)\n", HOSTNO, selid);
+                shost_printk(KERN_INFO, shpnt,
+                             "target id unknown (%02x)\n", selid);
                return;
        }
@@ -1782,8 +1622,8 @@ static void seldi_run(struct Scsi_Host *shpnt)
                ;
        if(selid & ~(1 << target)) {
-                printk("aha152x%d: multiple targets reconnected (%02x)\n",
+                shost_printk(KERN_INFO, shpnt,
-                       HOSTNO, selid);
+                             "multiple targets reconnected (%02x)\n", selid);
        }
@@ -1793,7 +1633,6 @@ static void seldi_run(struct Scsi_Host *shpnt)
        SETRATE(HOSTDATA(shpnt)->syncrate[target]);
        RECONN_TARGET=target;
-        DPRINTK(debug_selection, DEBUG_LEAD "target %d reselected (%02x).\n", CMDINFO(CURRENT_SC), target, selid);
 }
 /*
@@ -1817,31 +1656,24 @@ static void msgi_run(struct Scsi_Host *shpnt)
                if(sstat1 & (PHASECHG|PHASEMIS|BUSFREE) || !(sstat1 & REQINIT))
                        return;
-                if(TESTLO(SSTAT0,SPIORDY)) {
+                if (TESTLO(SSTAT0, SPIORDY))
-                        DPRINTK(debug_msgi, DEBUG_LEAD "!SPIORDY\n", CMDINFO(CURRENT_SC));
                        return;
-                }       
                ADDMSGI(GETPORT(SCSIDAT));
-#if defined(AHA152X_DEBUG)
-                if (HOSTDATA(shpnt)->debug & debug_msgi) {
-                        printk(INFO_LEAD "inbound message %02x ", CMDINFO(CURRENT_SC), MSGI(0));
-                        spi_print_msg(&MSGI(0));
-                        printk("\n");
-                }
-#endif
                if(!CURRENT_SC) {
                        if(LASTSTATE!=seldi) {
-                                printk(KERN_ERR "aha152x%d: message in w/o current command not after reselection\n", HOSTNO);
+                                shost_printk(KERN_ERR, shpnt,
+                                             "message in w/o current command"
+                                             " not after reselection\n");
                        }
                        /*
-                         * Handle reselection
+                         * Handle reselection
-                         */
+                         */
                        if(!(MSGI(0) & IDENTIFY_BASE)) {
-                                printk(KERN_ERR "aha152x%d: target didn't identify after reselection\n", HOSTNO);
+                                shost_printk(KERN_ERR, shpnt,
+                                             "target didn't identify after reselection\n");
                                continue;
                        }
@@ -1849,12 +1681,13 @@ static void msgi_run(struct Scsi_Host *shpnt)
                        if (!CURRENT_SC) {
                                show_queues(shpnt);
-                                printk(KERN_ERR "aha152x%d: no disconnected command for target %d/%d\n", HOSTNO, RECONN_TARGET, MSGI(0) & 0x3f);
+                                shost_printk(KERN_ERR, shpnt,
+                                             "no disconnected command"
+                                             " for target %d/%d\n",
+                                             RECONN_TARGET, MSGI(0) & 0x3f);
                                continue;
                        }
-                        DPRINTK(debug_msgi, DEBUG_LEAD "target reconnected\n", CMDINFO(CURRENT_SC));
                        CURRENT_SC->SCp.Message = MSGI(0);
                        CURRENT_SC->SCp.phase &= ~disconnected;
@@ -1862,31 +1695,32 @@ static void msgi_run(struct Scsi_Host *shpnt)
                        /* next message if any */
                        continue;
-                } 
+                }
                CURRENT_SC->SCp.Message = MSGI(0);
                switch (MSGI(0)) {
                case DISCONNECT:
                        if (!RECONNECT)
-                                printk(WARN_LEAD "target was not allowed to disconnect\n", CMDINFO(CURRENT_SC));
+                                scmd_printk(KERN_WARNING, CURRENT_SC,
+                                            "target was not allowed to disconnect\n");
                        CURRENT_SC->SCp.phase |= disconnected;
                        break;
                case COMMAND_COMPLETE:
-                        if(CURRENT_SC->SCp.phase & completed)
-                                DPRINTK(debug_msgi, DEBUG_LEAD "again COMMAND COMPLETE\n", CMDINFO(CURRENT_SC));
                        CURRENT_SC->SCp.phase |= completed;
                        break;
                case MESSAGE_REJECT:
                        if (SYNCNEG==1) {
-                                printk(INFO_LEAD "Synchronous Data Transfer Request was rejected\n", CMDINFO(CURRENT_SC));
+                                scmd_printk(KERN_INFO, CURRENT_SC,
+                                            "Synchronous Data Transfer Request"
+                                            " was rejected\n");
                                SYNCNEG=2;      /* negotiation completed */
                        } else
-                                printk(INFO_LEAD "inbound message (MESSAGE REJECT)\n", CMDINFO(CURRENT_SC));
+                                scmd_printk(KERN_INFO, CURRENT_SC,
+                                            "inbound message (MESSAGE REJECT)\n");
                        break;
                case SAVE_POINTERS:
@@ -1907,7 +1741,8 @@ static void msgi_run(struct Scsi_Host *shpnt)
                                        long ticks;
                                        if (MSGI(1) != 3) {
-                                                printk(ERR_LEAD "SDTR message length!=3\n", CMDINFO(CURRENT_SC));
+                                                scmd_printk(KERN_ERR, CURRENT_SC,
+                                                            "SDTR message length!=3\n");
                                                break;
                                        }
@@ -1924,10 +1759,12 @@ static void msgi_run(struct Scsi_Host *shpnt)
                                                /* negotiation in progress */
                                                if (ticks > 9 || MSGI(4) < 1 || MSGI(4) > 8) {
                                                        ADDMSGO(MESSAGE_REJECT);
-                                                        printk(INFO_LEAD "received Synchronous Data Transfer Request invalid - rejected\n", CMDINFO(CURRENT_SC));
+                                                        scmd_printk(KERN_INFO,
+                                                                    CURRENT_SC,
+                                                                    "received Synchronous Data Transfer Request invalid - rejected\n");
                                                        break;
                                                }
-                                                
                                                SYNCRATE |= ((ticks - 2) << 4) + MSGI(4);
                                        } else if (ticks <= 9 && MSGI(4) >= 1) {
                                                ADDMSGO(EXTENDED_MESSAGE);
@@ -1947,11 +1784,14 @@ static void msgi_run(struct Scsi_Host *shpnt)
                                                SYNCRATE |= ((ticks - 2) << 4) + MSGI(4);
                                        } else {
                                                /* requested SDTR is too slow, do it asynchronously */
-                                                printk(INFO_LEAD "Synchronous Data Transfer Request too slow - Rejecting\n", CMDINFO(CURRENT_SC));
+                                                scmd_printk(KERN_INFO,
+                                                            CURRENT_SC,
+                                                            "Synchronous Data Transfer Request too slow - Rejecting\n");
                                                ADDMSGO(MESSAGE_REJECT);
                                        }
-                                        SYNCNEG=2;              /* negotiation completed */
+                                        /* negotiation completed */
+                                        SYNCNEG=2;
                                        SETRATE(SYNCRATE);
                                }
                                break;
@@ -1985,12 +1825,12 @@ static void msgi_run(struct Scsi_Host *shpnt)
 static void msgi_end(struct Scsi_Host *shpnt)
 {
        if(MSGILEN>0)
-                printk(WARN_LEAD "target left before message completed (%d)\n", CMDINFO(CURRENT_SC), MSGILEN);
+                scmd_printk(KERN_WARNING, CURRENT_SC,
+                            "target left before message completed (%d)\n",
+                            MSGILEN);
-        if (MSGOLEN > 0 && !(GETPORT(SSTAT1) & BUSFREE)) {
+        if (MSGOLEN > 0 && !(GETPORT(SSTAT1) & BUSFREE))
-                DPRINTK(debug_msgi, DEBUG_LEAD "msgo pending\n", CMDINFO(CURRENT_SC));
                SETPORT(SCSISIG, P_MSGI | SIG_ATNO);
-        } 
 }
 /*
@@ -2003,21 +1843,12 @@ static void msgo_init(struct Scsi_Host *shpnt)
                if((CURRENT_SC->SCp.phase & syncneg) && SYNCNEG==2 && SYNCRATE==0) {
                        ADDMSGO(IDENTIFY(RECONNECT, CURRENT_SC->device->lun));
                } else {
-                        printk(INFO_LEAD "unexpected MESSAGE OUT phase; rejecting\n", CMDINFO(CURRENT_SC));
+                        scmd_printk(KERN_INFO, CURRENT_SC,
+                                    "unexpected MESSAGE OUT phase; rejecting\n");
                        ADDMSGO(MESSAGE_REJECT);
                }
        }
-#if defined(AHA152X_DEBUG)
-        if(HOSTDATA(shpnt)->debug & debug_msgo) {
-                int i;
-                printk(DEBUG_LEAD "messages( ", CMDINFO(CURRENT_SC));
-                for (i=0; i<MSGOLEN; i+=spi_print_msg(&MSGO(i)), printk(" "))
-                        ;
-                printk(")\n");
-        }
-#endif
 }
 /*
@@ -2026,16 +1857,9 @@ static void msgo_init(struct Scsi_Host *shpnt)
 */
 static void msgo_run(struct Scsi_Host *shpnt)
 {
-        if(MSGO_I==MSGOLEN)
-                DPRINTK(debug_msgo, DEBUG_LEAD "messages all sent (%d/%d)\n", CMDINFO(CURRENT_SC), MSGO_I, MSGOLEN);
        while(MSGO_I<MSGOLEN) {
-                DPRINTK(debug_msgo, DEBUG_LEAD "message byte %02x (%d/%d)\n", CMDINFO(CURRENT_SC), MSGO(MSGO_I), MSGO_I, MSGOLEN);
+                if (TESTLO(SSTAT0, SPIORDY))
-                if(TESTLO(SSTAT0, SPIORDY)) {
-                        DPRINTK(debug_msgo, DEBUG_LEAD "!SPIORDY\n", CMDINFO(CURRENT_SC));
                        return;
-                }
                if (MSGO_I==MSGOLEN-1) {
                        /* Leave MESSAGE OUT after transfer */
@@ -2059,36 +1883,33 @@ static void msgo_run(struct Scsi_Host *shpnt)
 static void msgo_end(struct Scsi_Host *shpnt)
 {
        if(MSGO_I<MSGOLEN) {
-                printk(ERR_LEAD "message sent incompletely (%d/%d)\n", CMDINFO(CURRENT_SC), MSGO_I, MSGOLEN);
+                scmd_printk(KERN_ERR, CURRENT_SC,
+                            "message sent incompletely (%d/%d)\n",
+                            MSGO_I, MSGOLEN);
                if(SYNCNEG==1) {
-                        printk(INFO_LEAD "Synchronous Data Transfer Request was rejected\n", CMDINFO(CURRENT_SC));
+                        scmd_printk(KERN_INFO, CURRENT_SC,
+                                    "Synchronous Data Transfer Request was rejected\n");
                        SYNCNEG=2;
                }
        }
-                
        MSGO_I  = 0;
        MSGOLEN = 0;
 }
-/* 
+/*
 * command phase
 *
 */
 static void cmd_init(struct Scsi_Host *shpnt)
 {
        if (CURRENT_SC->SCp.sent_command) {
-                printk(ERR_LEAD "command already sent\n", CMDINFO(CURRENT_SC));
+                scmd_printk(KERN_ERR, CURRENT_SC,
+                            "command already sent\n");
                done(shpnt, DID_ERROR << 16);
                return;
        }
-#if defined(AHA152X_DEBUG)
-        if (HOSTDATA(shpnt)->debug & debug_cmd) {
-                printk(DEBUG_LEAD "cmd_init: ", CMDINFO(CURRENT_SC));
-                __scsi_print_command(CURRENT_SC->cmnd);
-        }
-#endif
        CMD_I=0;
 }
@@ -2098,18 +1919,9 @@ static void cmd_init(struct Scsi_Host *shpnt)
 */
 static void cmd_run(struct Scsi_Host *shpnt)
 {
-        if(CMD_I==CURRENT_SC->cmd_len) {
-                DPRINTK(debug_cmd, DEBUG_LEAD "command already completely sent (%d/%d)", CMDINFO(CURRENT_SC), CMD_I, CURRENT_SC->cmd_len);
-                disp_ports(shpnt);
-        }
        while(CMD_I<CURRENT_SC->cmd_len) {
-                DPRINTK(debug_cmd, DEBUG_LEAD "command byte %02x (%d/%d)\n", CMDINFO(CURRENT_SC), CURRENT_SC->cmnd[CMD_I], CMD_I, CURRENT_SC->cmd_len);
+                if (TESTLO(SSTAT0, SPIORDY))
-                if(TESTLO(SSTAT0, SPIORDY)) {
-                        DPRINTK(debug_cmd, DEBUG_LEAD "!SPIORDY\n", CMDINFO(CURRENT_SC));
                        return;
-                }
                SETPORT(SCSIDAT, CURRENT_SC->cmnd[CMD_I++]);
        }
@@ -2118,7 +1930,9 @@ static void cmd_run(struct Scsi_Host *shpnt)
 static void cmd_end(struct Scsi_Host *shpnt)
 {
        if(CMD_I<CURRENT_SC->cmd_len)
-                printk(ERR_LEAD "command sent incompletely (%d/%d)\n", CMDINFO(CURRENT_SC), CMD_I, CURRENT_SC->cmd_len);
+                scmd_printk(KERN_ERR, CURRENT_SC,
+                            "command sent incompletely (%d/%d)\n",
+                            CMD_I, CURRENT_SC->cmd_len);
        else
                CURRENT_SC->SCp.sent_command++;
 }
@@ -2129,20 +1943,11 @@ static void cmd_end(struct Scsi_Host *shpnt)
 */
 static void status_run(struct Scsi_Host *shpnt)
 {
-        if(TESTLO(SSTAT0,SPIORDY)) {
+        if (TESTLO(SSTAT0, SPIORDY))
-                DPRINTK(debug_status, DEBUG_LEAD "!SPIORDY\n", CMDINFO(CURRENT_SC));
                return;
-        }
        CURRENT_SC->SCp.Status = GETPORT(SCSIDAT);
-#if defined(AHA152X_DEBUG)
-        if (HOSTDATA(shpnt)->debug & debug_status) {
-                printk(DEBUG_LEAD "inbound status %02x ", CMDINFO(CURRENT_SC), CURRENT_SC->SCp.Status);
-                scsi_print_status(CURRENT_SC->SCp.Status);
-                printk("\n");
-        }
-#endif
 }
 /*
@@ -2161,10 +1966,6 @@ static void datai_init(struct Scsi_Host *shpnt)
        SETPORT(SIMODE1, ENSCSIPERR | ENSCSIRST | ENPHASEMIS | ENBUSFREE);
        DATA_LEN=0;
-        DPRINTK(debug_datai,
-                DEBUG_LEAD "datai_init: request_bufflen=%d resid=%d\n",
-                CMDINFO(CURRENT_SC), scsi_bufflen(CURRENT_SC),
-                scsi_get_resid(CURRENT_SC));
 }
 static void datai_run(struct Scsi_Host *shpnt)
@@ -2186,8 +1987,7 @@ static void datai_run(struct Scsi_Host *shpnt)
                        barrier();
                if(TESTLO(DMASTAT, DFIFOFULL|INTSTAT)) {
-                        printk(ERR_LEAD "datai timeout", CMDINFO(CURRENT_SC));
+                        scmd_printk(KERN_ERR, CURRENT_SC, "datai timeout\n");
-                        disp_ports(shpnt);
                        break;
                }
@@ -2199,8 +1999,8 @@ static void datai_run(struct Scsi_Host *shpnt)
                                barrier();
                        if(TESTLO(SSTAT2, SEMPTY)) {
-                                printk(ERR_LEAD "datai sempty timeout", CMDINFO(CURRENT_SC));
+                                scmd_printk(KERN_ERR, CURRENT_SC,
-                                disp_ports(shpnt);
+                                            "datai sempty timeout");
                                break;
                        }
@@ -2209,48 +2009,49 @@ static void datai_run(struct Scsi_Host *shpnt)
                if(CURRENT_SC->SCp.this_residual>0) {
                        while(fifodata>0 && CURRENT_SC->SCp.this_residual>0) {
-                                data_count = fifodata>CURRENT_SC->SCp.this_residual ?
+                                data_count = fifodata > CURRENT_SC->SCp.this_residual ?
                                                CURRENT_SC->SCp.this_residual :
                                                fifodata;
                                fifodata -= data_count;
-                                if(data_count & 1) {
+                                if (data_count & 1) {
-                                        DPRINTK(debug_datai, DEBUG_LEAD "8bit\n", CMDINFO(CURRENT_SC));
+                                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
-                                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
+                                        *CURRENT_SC->SCp.ptr++ = GETPORT(DATAPORT);
-                                        *CURRENT_SC->SCp.ptr++ = GETPORT(DATAPORT);
+                                        CURRENT_SC->SCp.this_residual--;
-                                        CURRENT_SC->SCp.this_residual--;
+                                        DATA_LEN++;
-                                        DATA_LEN++;
+                                        SETPORT(DMACNTRL0, ENDMA);
-                                        SETPORT(DMACNTRL0, ENDMA);
+                                }
-                                }
-        
+                                if (data_count > 1) {
-                                if(data_count > 1) {
+                                        data_count >>= 1;
-                                        DPRINTK(debug_datai, DEBUG_LEAD "16bit(%d)\n", CMDINFO(CURRENT_SC), data_count);
+                                        insw(DATAPORT, CURRENT_SC->SCp.ptr, data_count);
-                                        data_count >>= 1;
+                                        CURRENT_SC->SCp.ptr += 2 * data_count;
-                                        insw(DATAPORT, CURRENT_SC->SCp.ptr, data_count);
+                                        CURRENT_SC->SCp.this_residual -= 2 * data_count;
-                                        CURRENT_SC->SCp.ptr           += 2 * data_count;
+                                        DATA_LEN += 2 * data_count;
-                                        CURRENT_SC->SCp.this_residual -= 2 * data_count;
+                                }
-                                        DATA_LEN                      += 2 * data_count;
-                                }
+                                if (CURRENT_SC->SCp.this_residual == 0 &&
-        
+                                    CURRENT_SC->SCp.buffers_residual > 0) {
-                                if(CURRENT_SC->SCp.this_residual==0 && CURRENT_SC->SCp.buffers_residual>0) {
+                                        /* advance to next buffer */
-                                        /* advance to next buffer */
+                                        CURRENT_SC->SCp.buffers_residual--;
-                                        CURRENT_SC->SCp.buffers_residual--;
+                                        CURRENT_SC->SCp.buffer++;
-                                        CURRENT_SC->SCp.buffer++;
+                                        CURRENT_SC->SCp.ptr           = SG_ADDRESS(CURRENT_SC->SCp.buffer);
-                                        CURRENT_SC->SCp.ptr           = SG_ADDRESS(CURRENT_SC->SCp.buffer);
+                                        CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length;
-                                        CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length;
+                                }
-                                } 
+                        }
-                        }
+                } else if (fifodata > 0) {
-                } else if(fifodata>0) { 
+                        scmd_printk(KERN_ERR, CURRENT_SC,
-                        printk(ERR_LEAD "no buffers left for %d(%d) bytes (data overrun!?)\n", CMDINFO(CURRENT_SC), fifodata, GETPORT(FIFOSTAT));
+                                    "no buffers left for %d(%d) bytes"
-                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
+                                    " (data overrun!?)\n",
+                                    fifodata, GETPORT(FIFOSTAT));
+                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
                        while(fifodata>0) {
                                int data;
                                data=GETPORT(DATAPORT);
-                                DPRINTK(debug_datai, DEBUG_LEAD "data=%02x\n", CMDINFO(CURRENT_SC), data);
                                fifodata--;
                                DATA_LEN++;
                        }
-                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
+                        SETPORT(DMACNTRL0, ENDMA|_8BIT);
                }
        }
@@ -2258,19 +2059,20 @@ static void datai_run(struct Scsi_Host *shpnt)
           TESTLO(DMASTAT, DFIFOEMP) ||
           TESTLO(SSTAT2, SEMPTY) ||
           GETPORT(FIFOSTAT)>0) {
-                /*
+                /*
                 * something went wrong, if there's something left in the fifos
                 * or the phase didn't change
                 */
-                printk(ERR_LEAD "fifos should be empty and phase should have changed\n", CMDINFO(CURRENT_SC));
+                scmd_printk(KERN_ERR, CURRENT_SC,
-                disp_ports(shpnt);
+                            "fifos should be empty and phase should have changed\n");
        }
        if(DATA_LEN!=GETSTCNT()) {
-                printk(ERR_LEAD
+                scmd_printk(KERN_ERR, CURRENT_SC,
-                       "manual transfer count differs from automatic (count=%d;stcnt=%d;diff=%d;fifostat=%d)",
+                            "manual transfer count differs from automatic "
-                       CMDINFO(CURRENT_SC), DATA_LEN, GETSTCNT(), GETSTCNT()-DATA_LEN, GETPORT(FIFOSTAT));
+                            "(count=%d;stcnt=%d;diff=%d;fifostat=%d)",
-                disp_ports(shpnt);
+                            DATA_LEN, GETSTCNT(), GETSTCNT()-DATA_LEN,
+                            GETPORT(FIFOSTAT));
                mdelay(10000);
        }
 }
@@ -2279,11 +2081,6 @@ static void datai_end(struct Scsi_Host *shpnt)
 {
        CMD_INC_RESID(CURRENT_SC, -GETSTCNT());
-        DPRINTK(debug_datai,
-                DEBUG_LEAD "datai_end: request_bufflen=%d resid=%d stcnt=%d\n",
-                CMDINFO(CURRENT_SC), scsi_bufflen(CURRENT_SC),
-                scsi_get_resid(CURRENT_SC), GETSTCNT());
        SETPORT(SXFRCTL0, CH1|CLRSTCNT);
        SETPORT(DMACNTRL0, 0);
 }
@@ -2304,11 +2101,6 @@ static void datao_init(struct Scsi_Host *shpnt)
        SETPORT(SIMODE1, ENSCSIPERR | ENSCSIRST | ENPHASEMIS | ENBUSFREE );
        DATA_LEN = scsi_get_resid(CURRENT_SC);
-        DPRINTK(debug_datao,
-                DEBUG_LEAD "datao_init: request_bufflen=%d; resid=%d\n",
-                CMDINFO(CURRENT_SC), scsi_bufflen(CURRENT_SC),
-                scsi_get_resid(CURRENT_SC));
 }
 static void datao_run(struct Scsi_Host *shpnt)
@@ -2323,8 +2115,9 @@ static void datao_run(struct Scsi_Host *shpnt)
                        data_count=CURRENT_SC->SCp.this_residual;
                if(TESTLO(DMASTAT, DFIFOEMP)) {
-                        printk(ERR_LEAD "datao fifo not empty (%d)", CMDINFO(CURRENT_SC), GETPORT(FIFOSTAT));
+                        scmd_printk(KERN_ERR, CURRENT_SC,
-                        disp_ports(shpnt);
+                                    "datao fifo not empty (%d)",
+                                    GETPORT(FIFOSTAT));
                        break;
                }
@@ -2342,7 +2135,7 @@ static void datao_run(struct Scsi_Host *shpnt)
                        CURRENT_SC->SCp.ptr           += 2 * data_count;
                        CURRENT_SC->SCp.this_residual -= 2 * data_count;
                        CMD_INC_RESID(CURRENT_SC, -2 * data_count);
-                }
+                }
                if(CURRENT_SC->SCp.this_residual==0 && CURRENT_SC->SCp.buffers_residual>0) {
                        /* advance to next buffer */
@@ -2357,8 +2150,7 @@ static void datao_run(struct Scsi_Host *shpnt)
                        barrier();
                if(TESTLO(DMASTAT, DFIFOEMP|INTSTAT)) {
-                        printk(ERR_LEAD "dataout timeout", CMDINFO(CURRENT_SC));
+                        scmd_printk(KERN_ERR, CURRENT_SC, "dataout timeout\n");
-                        disp_ports(shpnt);
                        break;
                }
        }
@@ -2368,35 +2160,23 @@ static void datao_end(struct Scsi_Host *shpnt)
 {
        if(TESTLO(DMASTAT, DFIFOEMP)) {
                int data_count = (DATA_LEN - scsi_get_resid(CURRENT_SC)) -
-                                                                    GETSTCNT();
+                        GETSTCNT();
-                DPRINTK(debug_datao, DEBUG_LEAD "datao: %d bytes to resend (%d written, %d transferred)\n",
-                        CMDINFO(CURRENT_SC),
-                        data_count,
-                        DATA_LEN - scsi_get_resid(CURRENT_SC),
-                        GETSTCNT());
                CMD_INC_RESID(CURRENT_SC, data_count);
                data_count -= CURRENT_SC->SCp.ptr -
-                                             SG_ADDRESS(CURRENT_SC->SCp.buffer);
+                        SG_ADDRESS(CURRENT_SC->SCp.buffer);
                while(data_count>0) {
                        CURRENT_SC->SCp.buffer--;
                        CURRENT_SC->SCp.buffers_residual++;
                        data_count -= CURRENT_SC->SCp.buffer->length;
                }
                CURRENT_SC->SCp.ptr = SG_ADDRESS(CURRENT_SC->SCp.buffer) -
-                                                                     data_count;
+                        data_count;
                CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length +
-                                                                     data_count;
+                        data_count;
        }
-        DPRINTK(debug_datao, DEBUG_LEAD "datao_end: request_bufflen=%d; resid=%d; stcnt=%d\n",
-                CMDINFO(CURRENT_SC),
-                scsi_bufflen(CURRENT_SC),
-                scsi_get_resid(CURRENT_SC),
-                GETSTCNT());
        SETPORT(SXFRCTL0, CH1|CLRCH1|CLRSTCNT);
        SETPORT(SXFRCTL0, CH1);
@@ -2420,7 +2200,7 @@ static int update_state(struct Scsi_Host *shpnt)
                STATE=rsti;
                SETPORT(SCSISEQ,0);
                SETPORT(SSTAT1,SCSIRSTI);
-        } else if(stat0 & SELDI && PREVSTATE==busfree) {
+        } else if (stat0 & SELDI && PREVSTATE == busfree) {
                STATE=seldi;
        } else if(stat0 & SELDO && CURRENT_SC && (CURRENT_SC->SCp.phase & selecting)) {
                STATE=seldo;
@@ -2445,8 +2225,7 @@ static int update_state(struct Scsi_Host *shpnt)
        }
        if((stat0 & SELDI) && STATE!=seldi && !dataphase) {
-                printk(INFO_LEAD "reselection missed?", CMDINFO(CURRENT_SC));
+                scmd_printk(KERN_INFO, CURRENT_SC, "reselection missed?");
-                disp_ports(shpnt);
        }
        if(STATE!=PREVSTATE) {
@@ -2464,7 +2243,7 @@ static int update_state(struct Scsi_Host *shpnt)
 */
 static void parerr_run(struct Scsi_Host *shpnt)
 {
-        printk(ERR_LEAD "parity error\n", CMDINFO(CURRENT_SC));
+        scmd_printk(KERN_ERR, CURRENT_SC, "parity error\n");
        done(shpnt, DID_PARITY << 16);
 }
@@ -2476,8 +2255,8 @@ static void rsti_run(struct Scsi_Host *shpnt)
 {
        Scsi_Cmnd *ptr;
-        printk(KERN_NOTICE "aha152x%d: scsi reset in\n", HOSTNO);
+        shost_printk(KERN_NOTICE, shpnt, "scsi reset in\n");
-        
        ptr=DISCONNECTED_SC;
        while(ptr) {
                Scsi_Cmnd *next = SCNEXT(ptr);
@@ -2539,8 +2318,6 @@ static void is_complete(struct Scsi_Host *shpnt)
                dataphase=update_state(shpnt);
-                DPRINTK(debug_phases, LEAD "start %s %s(%s)\n", CMDINFO(CURRENT_SC), states[STATE].name, states[PREVSTATE].name, states[LASTSTATE].name);
                /*
                 * end previous state
                 *
@@ -2567,9 +2344,9 @@ static void is_complete(struct Scsi_Host *shpnt)
                if(dataphase) {
                        SETPORT(SSTAT0, REQINIT);
                        SETPORT(SCSISIG, GETPORT(SCSISIG) & P_MASK);
-                        SETPORT(SSTAT1, PHASECHG);  
+                        SETPORT(SSTAT1, PHASECHG);
                }
-                
                /*
                 * enable SPIO mode if previous didn't use it
                 * and this one does
@@ -2581,14 +2358,14 @@ static void is_complete(struct Scsi_Host *shpnt)
                        if(CURRENT_SC)
                                CURRENT_SC->SCp.phase |= spiordy;
                }
-                
                /*
                 * initialize for new state
                 *
                 */
                if(PREVSTATE!=STATE && states[STATE].init)
                        states[STATE].init(shpnt);
-                
                /*
                 * handle current state
                 *
@@ -2596,8 +2373,9 @@ static void is_complete(struct Scsi_Host *shpnt)
                if(states[STATE].run)
                        states[STATE].run(shpnt);
                else
-                        printk(ERR_LEAD "unexpected state (%x)\n", CMDINFO(CURRENT_SC), STATE);
+                        scmd_printk(KERN_ERR, CURRENT_SC,
-                
+                                    "unexpected state (%x)\n", STATE);
                /*
                 * setup controller to interrupt on
                 * the next expected condition and
@@ -2613,7 +2391,6 @@ static void is_complete(struct Scsi_Host *shpnt)
                HOSTDATA(shpnt)->time[STATE] += jiffies-start;
 #endif
-                DPRINTK(debug_phases, LEAD "end %s %s(%s)\n", CMDINFO(CURRENT_SC), states[STATE].name, states[PREVSTATE].name, states[LASTSTATE].name);
        } while(pending);
        /*
@@ -2626,289 +2403,42 @@ static void is_complete(struct Scsi_Host *shpnt)
 }
-/* 
+/*
 * Dump the current driver status and panic
 */
 static void aha152x_error(struct Scsi_Host *shpnt, char *msg)
 {
-        printk(KERN_EMERG "\naha152x%d: %s\n", HOSTNO, msg);
+        shost_printk(KERN_EMERG, shpnt, "%s\n", msg);
        show_queues(shpnt);
        panic("aha152x panic\n");
 }
 /*
- * Display registers of AIC-6260
- */
-static void disp_ports(struct Scsi_Host *shpnt)
-{
-#if defined(AHA152X_DEBUG)
-        int s;
-        printk("\n%s: %s(%s) ",
-                CURRENT_SC ? "busy" : "waiting",
-                states[STATE].name,
-                states[PREVSTATE].name);
-        s = GETPORT(SCSISEQ);
-        printk("SCSISEQ( ");
-        if (s & TEMODEO)
-                printk("TARGET MODE ");
-        if (s & ENSELO)
-                printk("SELO ");
-        if (s & ENSELI)
-                printk("SELI ");
-        if (s & ENRESELI)
-                printk("RESELI ");
-        if (s & ENAUTOATNO)
-                printk("AUTOATNO ");
-        if (s & ENAUTOATNI)
-                printk("AUTOATNI ");
-        if (s & ENAUTOATNP)
-                printk("AUTOATNP ");
-        if (s & SCSIRSTO)
-                printk("SCSIRSTO ");
-        printk(");");
-        printk(" SCSISIG(");
-        s = GETPORT(SCSISIG);
-        switch (s & P_MASK) {
-        case P_DATAO:
-                printk("DATA OUT");
-                break;
-        case P_DATAI:
-                printk("DATA IN");
-                break;
-        case P_CMD:
-                printk("COMMAND");
-                break;
-        case P_STATUS:
-                printk("STATUS");
-                break;
-        case P_MSGO:
-                printk("MESSAGE OUT");
-                break;
-        case P_MSGI:
-                printk("MESSAGE IN");
-                break;
-        default:
-                printk("*invalid*");
-                break;
-        }
-        printk("); ");
-        printk("INTSTAT (%s); ", TESTHI(DMASTAT, INTSTAT) ? "hi" : "lo");
-        printk("SSTAT( ");
-        s = GETPORT(SSTAT0);
-        if (s & TARGET)
-                printk("TARGET ");
-        if (s & SELDO)
-                printk("SELDO ");
-        if (s & SELDI)
-                printk("SELDI ");
-        if (s & SELINGO)
-                printk("SELINGO ");
-        if (s & SWRAP)
-                printk("SWRAP ");
-        if (s & SDONE)
-                printk("SDONE ");
-        if (s & SPIORDY)
-                printk("SPIORDY ");
-        if (s & DMADONE)
-                printk("DMADONE ");
-        s = GETPORT(SSTAT1);
-        if (s & SELTO)
-                printk("SELTO ");
-        if (s & ATNTARG)
-                printk("ATNTARG ");
-        if (s & SCSIRSTI)
-                printk("SCSIRSTI ");
-        if (s & PHASEMIS)
-                printk("PHASEMIS ");
-        if (s & BUSFREE)
-                printk("BUSFREE ");
-        if (s & SCSIPERR)
-                printk("SCSIPERR ");
-        if (s & PHASECHG)
-                printk("PHASECHG ");
-        if (s & REQINIT)
-                printk("REQINIT ");
-        printk("); ");
-        printk("SSTAT( ");
-        s = GETPORT(SSTAT0) & GETPORT(SIMODE0);
-        if (s & TARGET)
-                printk("TARGET ");
-        if (s & SELDO)
-                printk("SELDO ");
-        if (s & SELDI)
-                printk("SELDI ");
-        if (s & SELINGO)
-                printk("SELINGO ");
-        if (s & SWRAP)
-                printk("SWRAP ");
-        if (s & SDONE)
-                printk("SDONE ");
-        if (s & SPIORDY)
-                printk("SPIORDY ");
-        if (s & DMADONE)
-                printk("DMADONE ");
-        s = GETPORT(SSTAT1) & GETPORT(SIMODE1);
-        if (s & SELTO)
-                printk("SELTO ");
-        if (s & ATNTARG)
-                printk("ATNTARG ");
-        if (s & SCSIRSTI)
-                printk("SCSIRSTI ");
-        if (s & PHASEMIS)
-                printk("PHASEMIS ");
-        if (s & BUSFREE)
-                printk("BUSFREE ");
-        if (s & SCSIPERR)
-                printk("SCSIPERR ");
-        if (s & PHASECHG)
-                printk("PHASECHG ");
-        if (s & REQINIT)
-                printk("REQINIT ");
-        printk("); ");
-        printk("SXFRCTL0( ");
-        s = GETPORT(SXFRCTL0);
-        if (s & SCSIEN)
-                printk("SCSIEN ");
-        if (s & DMAEN)
-                printk("DMAEN ");
-        if (s & CH1)
-                printk("CH1 ");
-        if (s & CLRSTCNT)
-                printk("CLRSTCNT ");
-        if (s & SPIOEN)
-                printk("SPIOEN ");
-        if (s & CLRCH1)
-                printk("CLRCH1 ");
-        printk("); ");
-        printk("SIGNAL( ");
-        s = GETPORT(SCSISIG);
-        if (s & SIG_ATNI)
-                printk("ATNI ");
-        if (s & SIG_SELI)
-                printk("SELI ");
-        if (s & SIG_BSYI)
-                printk("BSYI ");
-        if (s & SIG_REQI)
-                printk("REQI ");
-        if (s & SIG_ACKI)
-                printk("ACKI ");
-        printk("); ");
-        printk("SELID (%02x), ", GETPORT(SELID));
-        printk("STCNT (%d), ", GETSTCNT());
-        
-        printk("SSTAT2( ");
-        s = GETPORT(SSTAT2);
-        if (s & SOFFSET)
-                printk("SOFFSET ");
-        if (s & SEMPTY)
-                printk("SEMPTY ");
-        if (s & SFULL)
-                printk("SFULL ");
-        printk("); SFCNT (%d); ", s & (SFULL | SFCNT));
-        s = GETPORT(SSTAT3);
-        printk("SCSICNT (%d), OFFCNT(%d), ", (s & 0xf0) >> 4, s & 0x0f);
-        printk("SSTAT4( ");
-        s = GETPORT(SSTAT4);
-        if (s & SYNCERR)
-                printk("SYNCERR ");
-        if (s & FWERR)
-                printk("FWERR ");
-        if (s & FRERR)
-                printk("FRERR ");
-        printk("); ");
-        printk("DMACNTRL0( ");
-        s = GETPORT(DMACNTRL0);
-        printk("%s ", s & _8BIT ? "8BIT" : "16BIT");
-        printk("%s ", s & DMA ? "DMA" : "PIO");
-        printk("%s ", s & WRITE_READ ? "WRITE" : "READ");
-        if (s & ENDMA)
-                printk("ENDMA ");
-        if (s & INTEN)
-                printk("INTEN ");
-        if (s & RSTFIFO)
-                printk("RSTFIFO ");
-        if (s & SWINT)
-                printk("SWINT ");
-        printk("); ");
-        printk("DMASTAT( ");
-        s = GETPORT(DMASTAT);
-        if (s & ATDONE)
-                printk("ATDONE ");
-        if (s & WORDRDY)
-                printk("WORDRDY ");
-        if (s & DFIFOFULL)
-                printk("DFIFOFULL ");
-        if (s & DFIFOEMP)
-                printk("DFIFOEMP ");
-        printk(")\n");
-#endif
-}
-/*
 * display enabled interrupts
 */
 static void disp_enintr(struct Scsi_Host *shpnt)
 {
-        int s;
+        int s0, s1;
-        printk(KERN_DEBUG "enabled interrupts ( ");
+        s0 = GETPORT(SIMODE0);
+        s1 = GETPORT(SIMODE1);
-        s = GETPORT(SIMODE0);
-        if (s & ENSELDO)
+        shost_printk(KERN_DEBUG, shpnt,
-                printk("ENSELDO ");
+                     "enabled interrupts (%s%s%s%s%s%s%s%s%s%s%s%s%s%s)\n",
-        if (s & ENSELDI)
+                     (s0 & ENSELDO) ? "ENSELDO " : "",
-                printk("ENSELDI ");
+                     (s0 & ENSELDI) ? "ENSELDI " : "",
-        if (s & ENSELINGO)
+                     (s0 & ENSELINGO) ? "ENSELINGO " : "",
-                printk("ENSELINGO ");
+                     (s0 & ENSWRAP) ? "ENSWRAP " : "",
-        if (s & ENSWRAP)
+                     (s0 & ENSDONE) ? "ENSDONE " : "",
-                printk("ENSWRAP ");
+                     (s0 & ENSPIORDY) ? "ENSPIORDY " : "",
-        if (s & ENSDONE)
+                     (s0 & ENDMADONE) ? "ENDMADONE " : "",
-                printk("ENSDONE ");
+                     (s1 & ENSELTIMO) ? "ENSELTIMO " : "",
-        if (s & ENSPIORDY)
+                     (s1 & ENATNTARG) ? "ENATNTARG " : "",
-                printk("ENSPIORDY ");
+                     (s1 & ENPHASEMIS) ? "ENPHASEMIS " : "",
-        if (s & ENDMADONE)
+                     (s1 & ENBUSFREE) ? "ENBUSFREE " : "",
-                printk("ENDMADONE ");
+                     (s1 & ENSCSIPERR) ? "ENSCSIPERR " : "",
+                     (s1 & ENPHASECHG) ? "ENPHASECHG " : "",
-        s = GETPORT(SIMODE1);
+                     (s1 & ENREQINIT) ? "ENREQINIT " : "");
-        if (s & ENSELTIMO)
-                printk("ENSELTIMO ");
-        if (s & ENATNTARG)
-                printk("ENATNTARG ");
-        if (s & ENPHASEMIS)
-                printk("ENPHASEMIS ");
-        if (s & ENBUSFREE)
-                printk("ENBUSFREE ");
-        if (s & ENSCSIPERR)
-                printk("ENSCSIPERR ");
-        if (s & ENPHASECHG)
-                printk("ENPHASECHG ");
-        if (s & ENREQINIT)
-                printk("ENREQINIT ");
-        printk(")\n");
 }
 /*
@@ -2916,36 +2446,21 @@ static void disp_enintr(struct Scsi_Host *shpnt)
 */
 static void show_command(Scsi_Cmnd *ptr)
 {
-        scmd_printk(KERN_DEBUG, ptr, "%p: cmnd=(", ptr);
+        scsi_print_command(ptr);
+        scmd_printk(KERN_DEBUG, ptr,
-        __scsi_print_command(ptr->cmnd);
+                    "request_bufflen=%d; resid=%d; "
+                    "phase |%s%s%s%s%s%s%s%s%s; next=0x%p",
-        printk(KERN_DEBUG "); request_bufflen=%d; resid=%d; phase |",
+                    scsi_bufflen(ptr), scsi_get_resid(ptr),
-               scsi_bufflen(ptr), scsi_get_resid(ptr));
+                    (ptr->SCp.phase & not_issued) ? "not issued|" : "",
+                    (ptr->SCp.phase & selecting) ? "selecting|" : "",
-        if (ptr->SCp.phase & not_issued)
+                    (ptr->SCp.phase & identified) ? "identified|" : "",
-                printk("not issued|");
+                    (ptr->SCp.phase & disconnected) ? "disconnected|" : "",
-        if (ptr->SCp.phase & selecting)
+                    (ptr->SCp.phase & completed) ? "completed|" : "",
-                printk("selecting|");
+                    (ptr->SCp.phase & spiordy) ? "spiordy|" : "",
-        if (ptr->SCp.phase & identified)
+                    (ptr->SCp.phase & syncneg) ? "syncneg|" : "",
-                printk("identified|");
+                    (ptr->SCp.phase & aborted) ? "aborted|" : "",
-        if (ptr->SCp.phase & disconnected)
+                    (ptr->SCp.phase & resetted) ? "resetted|" : "",
-                printk("disconnected|");
+                    (SCDATA(ptr)) ? SCNEXT(ptr) : NULL);
-        if (ptr->SCp.phase & completed)
-                printk("completed|");
-        if (ptr->SCp.phase & spiordy)
-                printk("spiordy|");
-        if (ptr->SCp.phase & syncneg)
-                printk("syncneg|");
-        if (ptr->SCp.phase & aborted)
-                printk("aborted|");
-        if (ptr->SCp.phase & resetted)
-                printk("resetted|");
-        if( SCDATA(ptr) ) {
-                printk("; next=0x%p\n", SCNEXT(ptr));
-        } else {
-                printk("; next=(host scribble NULL)\n");
-        }
 }
 /*
@@ -2972,7 +2487,6 @@ static void show_queues(struct Scsi_Host *shpnt)
        for (ptr = DISCONNECTED_SC; ptr; ptr = SCDATA(ptr) ? SCNEXT(ptr) : NULL)
                show_command(ptr);
-        disp_ports(shpnt);
        disp_enintr(shpnt);
 }
@@ -3276,15 +2790,6 @@ static int aha152x_set_info(struct Scsi_Host *shpnt, char *buffer, int length)
        if(!shpnt || !buffer || length<8 || strncmp("aha152x ", buffer, 8)!=0)
                return -EINVAL;
-#if defined(AHA152X_DEBUG)
-        if(length>14 && strncmp("debug ", buffer+8, 6)==0) {
-                int debug = HOSTDATA(shpnt)->debug;
-                HOSTDATA(shpnt)->debug = simple_strtoul(buffer+14, NULL, 0);
-                printk(KERN_INFO "aha152x%d: debugging options set to 0x%04x (were 0x%04x)\n", HOSTNO, HOSTDATA(shpnt)->debug, debug);
-        } else
-#endif
 #if defined(AHA152X_STAT)
        if(length>13 && strncmp("reset", buffer+8, 5)==0) {
                int i;
@@ -3302,7 +2807,7 @@ static int aha152x_set_info(struct Scsi_Host *shpnt, char *buffer, int length)
                        HOSTDATA(shpnt)->time[i]=0;
                }
-                printk(KERN_INFO "aha152x%d: stats reseted.\n", HOSTNO);
+                shost_printk(KERN_INFO, shpnt, "aha152x: stats reset.\n");
        } else
 #endif
@@ -3343,29 +2848,6 @@ static int aha152x_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
                                        (((HOSTDATA(shpnt)->syncrate[i] & 0x70) >> 4) + 2) * 50,
                                    HOSTDATA(shpnt)->syncrate[i] & 0x0f);
        }
-#if defined(AHA152X_DEBUG)
-#define PDEBUG(flags,txt) \
-        if(HOSTDATA(shpnt)->debug & flags) SPRINTF("(%s) ", txt);
-        SPRINTF("enabled debugging options: ");
-        PDEBUG(debug_procinfo, "procinfo");
-        PDEBUG(debug_queue, "queue");
-        PDEBUG(debug_intr, "interrupt");
-        PDEBUG(debug_selection, "selection");
-        PDEBUG(debug_msgo, "message out");
-        PDEBUG(debug_msgi, "message in");
-        PDEBUG(debug_status, "status");
-        PDEBUG(debug_cmd, "command");
-        PDEBUG(debug_datai, "data in");
-        PDEBUG(debug_datao, "data out");
-        PDEBUG(debug_eh, "eh");
-        PDEBUG(debug_locking, "locks");
-        PDEBUG(debug_phases, "phases");
-        SPRINTF("\n");
-#endif
        SPRINTF("\nqueue status:\n");
        DO_LOCK(flags);
        if (ISSUE_SC) {
@@ -3393,8 +2875,8 @@ static int aha152x_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
 #if defined(AHA152X_STAT)
        SPRINTF("statistics:\n"
-                "total commands:               %d\n"
+                "total commands:               %d\n"
-                "disconnections:               %d\n"
+                "disconnections:               %d\n"
                "busfree with check condition: %d\n"
                "busfree without old command:  %d\n"
                "busfree without new command:  %d\n"
@@ -3413,7 +2895,7 @@ static int aha152x_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
                HOSTDATA(shpnt)->busfree_without_any_action);
        for(i=0; i<maxstate; i++) {
                SPRINTF("%-10s %-12d %-12d %-12ld\n",
-                        states[i].name,
+                        states[i].name,
                        HOSTDATA(shpnt)->count_trans[i],
                        HOSTDATA(shpnt)->count[i],
                        HOSTDATA(shpnt)->time[i]);
@@ -3671,25 +3153,19 @@ static int __init aha152x_init(void)
                        setup[setup_count].synchronous = aha152x[5];
                        setup[setup_count].delay       = aha152x[6];
                        setup[setup_count].ext_trans   = aha152x[7];
-#if defined(AHA152X_DEBUG)
+                } else if (io[0] != 0 || irq[0] != 0) {
-                        setup[setup_count].debug       = aha152x[8];
-#endif
-                } else if(io[0]!=0 || irq[0]!=0) {
                        if(io[0]!=0)  setup[setup_count].io_port = io[0];
                        if(irq[0]!=0) setup[setup_count].irq     = irq[0];
-                        setup[setup_count].scsiid      = scsiid[0];
+                        setup[setup_count].scsiid      = scsiid[0];
-                        setup[setup_count].reconnect   = reconnect[0];
+                        setup[setup_count].reconnect   = reconnect[0];
-                        setup[setup_count].parity      = parity[0];
+                        setup[setup_count].parity      = parity[0];
-                        setup[setup_count].synchronous = sync[0];
+                        setup[setup_count].synchronous = sync[0];
-                        setup[setup_count].delay       = delay[0];
+                        setup[setup_count].delay       = delay[0];
-                        setup[setup_count].ext_trans   = exttrans[0];
+                        setup[setup_count].ext_trans   = exttrans[0];
-#if defined(AHA152X_DEBUG)
-                        setup[setup_count].debug       = debug[0];
-#endif
                }
-                if (checksetup(&setup[setup_count]))
+                if (checksetup(&setup[setup_count]))
                        setup_count++;
                else
                        printk(KERN_ERR "aha152x: invalid module params io=0x%x, irq=%d,scsiid=%d,reconnect=%d,parity=%d,sync=%d,delay=%d,exttrans=%d\n",
@@ -3714,22 +3190,16 @@ static int __init aha152x_init(void)
                        setup[setup_count].synchronous = aha152x1[5];
                        setup[setup_count].delay       = aha152x1[6];
                        setup[setup_count].ext_trans   = aha152x1[7];
-#if defined(AHA152X_DEBUG)
+                } else if (io[1] != 0 || irq[1] != 0) {
-                        setup[setup_count].debug       = aha152x1[8];
-#endif
-                } else if(io[1]!=0 || irq[1]!=0) {
                        if(io[1]!=0)  setup[setup_count].io_port = io[1];
                        if(irq[1]!=0) setup[setup_count].irq     = irq[1];
-                        setup[setup_count].scsiid      = scsiid[1];
+                        setup[setup_count].scsiid      = scsiid[1];
-                        setup[setup_count].reconnect   = reconnect[1];
+                        setup[setup_count].reconnect   = reconnect[1];
-                        setup[setup_count].parity      = parity[1];
+                        setup[setup_count].parity      = parity[1];
-                        setup[setup_count].synchronous = sync[1];
+                        setup[setup_count].synchronous = sync[1];
-                        setup[setup_count].delay       = delay[1];
+                        setup[setup_count].delay       = delay[1];
-                        setup[setup_count].ext_trans   = exttrans[1];
+                        setup[setup_count].ext_trans   = exttrans[1];
-#if defined(AHA152X_DEBUG)
-                        setup[setup_count].debug       = debug[1];
-#endif
                }
                if (checksetup(&setup[setup_count]))
                        setup_count++;
@@ -3776,9 +3246,6 @@ static int __init aha152x_init(void)
                        setup[setup_count].synchronous = 1;
                        setup[setup_count].delay       = DELAY_DEFAULT;
                        setup[setup_count].ext_trans   = 0;
-#if defined(AHA152X_DEBUG)
-                        setup[setup_count].debug       = DEBUG_DEFAULT;
-#endif
 #if defined(__ISAPNP__)
                        pnpdev[setup_count]            = dev;
 #endif
@@ -3847,9 +3314,6 @@ static int __init aha152x_init(void)
                        setup[setup_count].synchronous = conf.cf_syncneg;
                        setup[setup_count].delay = DELAY_DEFAULT;
                        setup[setup_count].ext_trans = 0;
-#if defined(AHA152X_DEBUG)
-                        setup[setup_count].debug = DEBUG_DEFAULT;
-#endif
                        setup_count++;
                }
@@ -3903,11 +3367,8 @@ module_exit(aha152x_exit);
 #if !defined(MODULE)
 static int __init aha152x_setup(char *str)
 {
-#if defined(AHA152X_DEBUG)
-        int ints[11];
-#else
        int ints[10];
-#endif
        get_options(str, ARRAY_SIZE(ints), ints);
        if(setup_count>=ARRAY_SIZE(setup)) {
@@ -3924,16 +3385,9 @@ static int __init aha152x_setup(char *str)
        setup[setup_count].synchronous = ints[0] >= 6 ? ints[6] : 1;
        setup[setup_count].delay       = ints[0] >= 7 ? ints[7] : DELAY_DEFAULT;
        setup[setup_count].ext_trans   = ints[0] >= 8 ? ints[8] : 0;
-#if defined(AHA152X_DEBUG)
-        setup[setup_count].debug       = ints[0] >= 9 ? ints[9] : DEBUG_DEFAULT;
-        if (ints[0] > 9) {
-                printk(KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>"
-                       "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>[,<DEBUG>]]]]]]]]\n");
-#else
        if (ints[0] > 8) {                                                /*}*/
                printk(KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>"
                       "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n");
-#endif
        } else {
                setup_count++;
                return 0;
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 5f3101797c93..31ace4bef8fe 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -531,7 +531,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
 * quiet as possible...
 */
-        return 0;
+        return SUCCESS;
 }
 static struct scsi_host_template aha1740_template = {
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index ed333669a7dc..80cb4fd7caaa 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,9 @@ 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);
-                break;
        case AHD_DEV_Q_TAGGED:
-                scsi_set_tag_type(sdev, MSG_ORDERED_TASK);
+                scsi_adjust_queue_depth(sdev,
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                                dev->openings + dev->active);
                break;
        default:
                /*
@@ -1482,7 +1480,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, 1);
                break;
        }
 }
@@ -1619,15 +1617,6 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
        }
        if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
-                int     msg_bytes;
-                uint8_t tag_msgs[2];
-                msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
-                if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
-                        hscb->control |= tag_msgs[0];
-                        if (tag_msgs[0] == MSG_ORDERED_TASK)
-                                dev->commands_since_idle_or_otag = 0;
-                } else
                if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
                 && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
                        hscb->control |= MSG_ORDERED_TASK;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d2c9bf39033d..a6a27d5398dd 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,13 +1335,9 @@ 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);
-                break;
        case AHC_DEV_Q_TAGGED:
-                scsi_set_tag_type(sdev, MSG_ORDERED_TAG);
+                scsi_adjust_queue_depth(sdev,
-                scsi_activate_tcq(sdev, dev->openings + dev->active);
+                                dev->openings + dev->active);
-                break;
        default:
                /*
                 * We allow the OS to queue 2 untagged transactions to
@@ -1348,7 +1345,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, 2);
                break;
        }
 }
@@ -1447,7 +1444,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
         * we are storing a full busy target *lun*
         * table in SCB space.
         */
-        if (!blk_rq_tagged(cmd->request)
+        if (!(cmd->flags & SCMD_TAGGED)
            && (ahc->features & AHC_SCB_BTT) == 0) {
                int target_offset;
@@ -1501,15 +1498,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
        }
        if ((dev->flags & (AHC_DEV_Q_TAGGED|AHC_DEV_Q_BASIC)) != 0) {
-                int     msg_bytes;
+                if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH
-                uint8_t tag_msgs[2];
-                
-                msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
-                if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
-                        hscb->control |= tag_msgs[0];
-                        if (tag_msgs[0] == MSG_ORDERED_TASK)
-                                dev->commands_since_idle_or_otag = 0;
-                } else if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH
                                && (dev->flags & AHC_DEV_Q_TAGGED) != 0) {
                        hscb->control |= MSG_ORDERED_TASK;
                        dev->commands_since_idle_or_otag = 0;
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/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 0b44fb5ee485..209f77162d06 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -122,7 +122,7 @@ static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev,
        if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
                queue_depth = ARCMSR_MAX_CMD_PERLUN;
-        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 }
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index d89b9b4deb3c..deaaf84989cd 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -850,13 +850,13 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
                        break;
                    default:
-                        printk(KERN_ERR "scsi%d.H: incomplete data transfer detected: result=%08X command=",
+                        scmd_printk(KERN_ERR, SCpnt,
-                                host->host->host_no, SCpnt->result);
+                                    "incomplete data transfer detected: "
-                        __scsi_print_command(SCpnt->cmnd);
+                                    "result=%08X", SCpnt->result);
+                        scsi_print_command(SCpnt);
                        acornscsi_dumpdma(host, "done");
-                        acornscsi_dumplog(host, SCpnt->device->id);
+                        acornscsi_dumplog(host, SCpnt->device->id);
-                        SCpnt->result &= 0xffff;
+                        set_host_byte(SCpnt, DID_ERROR);
-                        SCpnt->result |= DID_ERROR << 16;
                    }
                }
        }
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 71cfb1e504c4..e64c3af7c1a0 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -308,8 +308,7 @@ static void fas216_log_command(FAS216_Info *info, int level,
        fas216_do_log(info, '0' + SCpnt->device->id, fmt, args);
        va_end(args);
-        printk(" CDB: ");
+        scsi_print_command(SCpnt);
-        __scsi_print_command(SCpnt->cmnd);
 }
 static void
@@ -2079,14 +2078,12 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result)
                        break;
                default:
-                        printk(KERN_ERR "scsi%d.%c: incomplete data transfer "
+                        scmd_printk(KERN_ERR, SCpnt,
-                                "detected: res=%08X ptr=%p len=%X CDB: ",
+                                    "incomplete data transfer detected: res=%08X ptr=%p len=%X\n",
-                                info->host->host_no, '0' + SCpnt->device->id,
+                                    SCpnt->result, info->scsi.SCp.ptr,
-                                SCpnt->result, info->scsi.SCp.ptr,
+                                    info->scsi.SCp.this_residual);
-                                info->scsi.SCp.this_residual);
+                        scsi_print_command(SCpnt);
-                        __scsi_print_command(SCpnt->cmnd);
+                        set_host_byte(SCpnt, DID_ERROR);
-                        SCpnt->result &= ~(255 << 16);
-                        SCpnt->result |= DID_BAD_TARGET << 16;
                        goto request_sense;
                }
        }
@@ -2158,12 +2155,11 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
         * to transfer, we should not have a valid pointer.
         */
        if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {
-                printk("scsi%d.%c: zero bytes left to transfer, but "
+                scmd_printk(KERN_INFO, SCpnt,
-                       "buffer pointer still valid: ptr=%p len=%08x CDB: ",
+                            "zero bytes left to transfer, but buffer pointer still valid: ptr=%p len=%08x\n",
-                       info->host->host_no, '0' + SCpnt->device->id,
+                            info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
-                       info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
                info->scsi.SCp.ptr = NULL;
-                __scsi_print_command(SCpnt->cmnd);
+                scsi_print_command(SCpnt);
        }
        /*
@@ -2427,14 +2423,11 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
        info->stats.aborts += 1;
-        printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no);
+        scmd_printk(KERN_WARNING, SCpnt, "abort command\n");
-        __scsi_print_command(SCpnt->cmnd);
        print_debug_list();
        fas216_dumpstate(info);
-        printk(KERN_WARNING "scsi%d: abort %p ", info->host->host_no, SCpnt);
        switch (fas216_find_command(info, SCpnt)) {
        /*
         * We found the command, and cleared it out.  Either
@@ -2442,7 +2435,7 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
         * target, or the busylun bit is not set.
         */
        case res_success:
-                printk("success\n");
+                scmd_printk(KERN_WARNING, SCpnt, "abort %p success\n", SCpnt);
                result = SUCCESS;
                break;
@@ -2452,14 +2445,13 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
         * if the bus is free.
         */
        case res_hw_abort:
-                
        /*
         * We are unable to abort the command for some reason.
         */
        default:
        case res_failed:
-                printk("failed\n");
+                scmd_printk(KERN_WARNING, SCpnt, "abort %p failed\n", SCpnt);
                break;
        }
@@ -2664,8 +2656,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
        fas216_checkmagic(info);
-        printk("scsi%d.%c: %s: resetting host\n",
+        fas216_log(info, LOG_ERROR, "resetting host");
-                info->host->host_no, '0' + SCpnt->device->id, __func__);
        /*
         * Reset the SCSI chip.
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 79e6f045c2a9..11e93025b87a 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -2607,7 +2607,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
 *      host byte of the result field to, if zero DID_ABORTED is
 *      used.
 *
- * Returns : 0 - success, -1 on failure.
+ * Returns : SUCCESS - success, FAILED on failure.
 *
 * XXX - there is no way to abort the command that is currently
 *       connected, you have to wait for it to complete.  If this is
@@ -2623,8 +2623,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd)
        Scsi_Cmnd *tmp, **prev;
        unsigned long flags;
-        printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
+        scmd_printk(KERN_NOTICE, cmd, "aborting command\n");
-        scsi_print_command(cmd);
        NCR5380_print_status(instance);
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index f067332bf763..87b09cd232cc 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_adjust_queue_depth(sdev, bfa_lun_queue_depth);
-                scsi_activate_tcq(sdev, bfa_lun_queue_depth);
-        else
-                scsi_deactivate_tcq(sdev, 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
@@ -868,14 +866,8 @@ bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct scsi_device *sdev)
                        if (bfa_lun_queue_depth > tmp_sdev->queue_depth) {
                                if (tmp_sdev->id != sdev->id)
                                        continue;
-                                if (tmp_sdev->ordered_tags)
+                                scsi_adjust_queue_depth(tmp_sdev,
-                                        scsi_adjust_queue_depth(tmp_sdev,
+                                        tmp_sdev->queue_depth + 1);
-                                                MSG_ORDERED_TAG,
-                                                tmp_sdev->queue_depth + 1);
-                                else
-                                        scsi_adjust_queue_depth(tmp_sdev,
-                                                MSG_SIMPLE_TAG,
-                                                tmp_sdev->queue_depth + 1);
                                itnim->last_ramp_up_time = jiffies;
                        }
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 72533c58c1f3..3c7db3e8aa76 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -2791,12 +2791,13 @@ static struct scsi_host_template bnx2fc_shost_template = {
        .eh_host_reset_handler  = fc_eh_host_reset,
        .slave_alloc            = fc_slave_alloc,
        .change_queue_depth     = fc_change_queue_depth,
-        .change_queue_type      = fc_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
        .this_id                = -1,
        .cmd_per_lun            = 3,
        .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/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 5b99844ef6bf..4b56858c1df2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1725,7 +1725,6 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req,
                                  struct fcp_cmnd *fcp_cmnd)
 {
        struct scsi_cmnd *sc_cmd = io_req->sc_cmd;
-        char tag[2];
        memset(fcp_cmnd, 0, sizeof(struct fcp_cmnd));
@@ -1739,21 +1738,10 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req,
        fcp_cmnd->fc_tm_flags = io_req->mp_req.tm_flags;
        fcp_cmnd->fc_flags = io_req->io_req_flags;
-        if (scsi_populate_tag_msg(sc_cmd, tag)) {
+        if (sc_cmd->flags & SCMD_TAGGED)
-                switch (tag[0]) {
+                fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
-                case HEAD_OF_QUEUE_TAG:
+        else
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_HEADQ;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_ORDERED;
-                        break;
-                default:
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
-                        break;
-                }
-        } else {
                fcp_cmnd->fc_pri_ta = 0;
-        }
 }
 static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req,
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index ef5ae0d03616..6bac8a746ee2 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -85,8 +85,7 @@ static const char * vendor_labels[CH_TYPES-4] = {
 // module_param_string_array(vendor_labels, NULL, 0444);
 #define ch_printk(prefix, ch, fmt, a...) \
-        sdev_printk(prefix, (ch)->device, "[%s] " fmt, \
+        sdev_prefix_printk(prefix, (ch)->device, (ch)->name, fmt, ##a)
-                    (ch)->name, ##a)
 #define DPRINTK(fmt, arg...)                                            \
 do {                                                                    \
@@ -183,7 +182,7 @@ static int ch_find_errno(struct scsi_sense_hdr *sshdr)
 }
 static int
-ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
+ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len,
           void *buffer, unsigned buflength,
           enum dma_data_direction direction)
 {
@@ -197,7 +196,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
        errno = 0;
        if (debug) {
                DPRINTK("command: ");
-                __scsi_print_command(cmd);
+                __scsi_print_command(cmd, cmd_len);
        }
        result = scsi_execute_req(ch->device, cmd, direction, buffer,
@@ -207,7 +206,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
        DPRINTK("result: 0x%x\n",result);
        if (driver_byte(result) & DRIVER_SENSE) {
                if (debug)
-                        scsi_print_sense_hdr(ch->name, &sshdr);
+                        scsi_print_sense_hdr(ch->device, ch->name, &sshdr);
                errno = ch_find_errno(&sshdr);
                switch(sshdr.sense_key) {
@@ -258,7 +257,8 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
        cmd[3] = elem        & 0xff;
        cmd[5] = 1;
        cmd[9] = 255;
-        if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) {
+        if (0 == (result = ch_do_scsi(ch, cmd, 12,
+                                      buffer, 256, DMA_FROM_DEVICE))) {
                if (((buffer[16] << 8) | buffer[17]) != elem) {
                        DPRINTK("asked for element 0x%02x, got 0x%02x\n",
                                elem,(buffer[16] << 8) | buffer[17]);
@@ -288,7 +288,7 @@ ch_init_elem(scsi_changer *ch)
        memset(cmd,0,sizeof(cmd));
        cmd[0] = INITIALIZE_ELEMENT_STATUS;
        cmd[1] = (ch->device->lun & 0x7) << 5;
-        err = ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE);
+        err = ch_do_scsi(ch, cmd, 6, NULL, 0, DMA_NONE);
        VPRINTK(KERN_INFO, "... finished\n");
        return err;
 }
@@ -310,10 +310,10 @@ ch_readconfig(scsi_changer *ch)
        cmd[1] = (ch->device->lun & 0x7) << 5;
        cmd[2] = 0x1d;
        cmd[4] = 255;
-        result = ch_do_scsi(ch, cmd, buffer, 255, DMA_FROM_DEVICE);
+        result = ch_do_scsi(ch, cmd, 10, buffer, 255, DMA_FROM_DEVICE);
        if (0 != result) {
                cmd[1] |= (1<<3);
-                result  = ch_do_scsi(ch, cmd, buffer, 255, DMA_FROM_DEVICE);
+                result  = ch_do_scsi(ch, cmd, 10, buffer, 255, DMA_FROM_DEVICE);
        }
        if (0 == result) {
                ch->firsts[CHET_MT] =
@@ -438,7 +438,7 @@ ch_position(scsi_changer *ch, u_int trans, u_int elem, int rotate)
        cmd[4]  = (elem  >> 8) & 0xff;
        cmd[5]  =  elem        & 0xff;
        cmd[8]  = rotate ? 1 : 0;
-        return ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE);
+        return ch_do_scsi(ch, cmd, 10, NULL, 0, DMA_NONE);
 }
 static int
@@ -459,7 +459,7 @@ ch_move(scsi_changer *ch, u_int trans, u_int src, u_int dest, int rotate)
        cmd[6]  = (dest  >> 8) & 0xff;
        cmd[7]  =  dest        & 0xff;
        cmd[10] = rotate ? 1 : 0;
-        return ch_do_scsi(ch, cmd, NULL,0, DMA_NONE);
+        return ch_do_scsi(ch, cmd, 12, NULL,0, DMA_NONE);
 }
 static int
@@ -485,7 +485,7 @@ ch_exchange(scsi_changer *ch, u_int trans, u_int src,
        cmd[9]  =  dest2       & 0xff;
        cmd[10] = (rotate1 ? 1 : 0) | (rotate2 ? 2 : 0);
-        return ch_do_scsi(ch, cmd, NULL,0, DMA_NONE);
+        return ch_do_scsi(ch, cmd, 12, NULL, 0, DMA_NONE);
 }
 static void
@@ -535,7 +535,7 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
        memcpy(buffer,tag,32);
        ch_check_voltag(buffer);
-        result = ch_do_scsi(ch, cmd, buffer, 256, DMA_TO_DEVICE);
+        result = ch_do_scsi(ch, cmd, 12, buffer, 256, DMA_TO_DEVICE);
        kfree(buffer);
        return result;
 }
@@ -616,6 +616,11 @@ static long ch_ioctl(struct file *file,
        int retval;
        void __user *argp = (void __user *)arg;
+        retval = scsi_ioctl_block_when_processing_errors(ch->device, cmd,
+                        file->f_flags & O_NDELAY);
+        if (retval)
+                return retval;
        switch (cmd) {
        case CHIOGPARAMS:
        {
@@ -766,7 +771,8 @@ static long ch_ioctl(struct file *file,
                ch_cmd[5] = 1;
                ch_cmd[9] = 255;
-                result = ch_do_scsi(ch, ch_cmd, buffer, 256, DMA_FROM_DEVICE);
+                result = ch_do_scsi(ch, ch_cmd, 12,
+                                    buffer, 256, DMA_FROM_DEVICE);
                if (!result) {
                        cge.cge_status = buffer[18];
                        cge.cge_flags = 0;
@@ -966,9 +972,9 @@ static int ch_remove(struct device *dev)
 }
 static struct scsi_driver ch_template = {
-        .owner          = THIS_MODULE,
        .gendrv         = {
                .name   = "ch",
+                .owner  = THIS_MODULE,
                .probe  = ch_probe,
                .remove = ch_remove,
        },
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index d35a5d6c8d7c..e2068a2621c4 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -21,15 +21,21 @@
 /* Commands with service actions that change the command name */
-#define SERVICE_ACTION_IN_12 0xab
-#define SERVICE_ACTION_OUT_12 0xa9
-#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
-#define SERVICE_ACTION_IN_16 0x9e
-#define SERVICE_ACTION_OUT_16 0x9f
 #define THIRD_PARTY_COPY_OUT 0x83
 #define THIRD_PARTY_COPY_IN 0x84
+#define VENDOR_SPECIFIC_CDB 0xc0
+struct sa_name_list {
+        int opcode;
+        const struct value_name_pair *arr;
+        int arr_sz;
+};
+struct value_name_pair {
+        int value;
+        const char * name;
+};
 #ifdef CONFIG_SCSI_CONSTANTS
 static const char * cdb_byte0_names[] = {
@@ -102,11 +108,6 @@ static const char * cdb_byte0_names[] = {
            "Volume set (out), Send DVD structure",
 };
-struct value_name_pair {
-        int value;
-        const char * name;
-};
 static const struct value_name_pair maint_in_arr[] = {
        {0x5, "Report identifying information"},
        {0xa, "Report target port groups"},
@@ -244,170 +245,119 @@ static const struct value_name_pair variable_length_arr[] = {
 };
 #define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
-static const char * get_sa_name(const struct value_name_pair * arr,
+static struct sa_name_list sa_names_arr[] = {
-                                int arr_sz, int service_action)
+        {VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
-{
+        {MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
-        int k;
+        {MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
+        {PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
+        {PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
+        {SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
+        {SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
+        {SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
+        {SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
+        {SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
+        {THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
+        {THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
+        {0, NULL, 0},
+};
-        for (k = 0; k < arr_sz; ++k, ++arr) {
+#else /* ifndef CONFIG_SCSI_CONSTANTS */
-                if (service_action == arr->value)
+static const char *cdb_byte0_names[0];
-                        break;
-        }
+static struct sa_name_list sa_names_arr[] = {
-        return (k < arr_sz) ? arr->name : NULL;
+        {VARIABLE_LENGTH_CMD, NULL, 0},
-}
+        {MAINTENANCE_IN, NULL, 0},
+        {MAINTENANCE_OUT, NULL, 0},
+        {PERSISTENT_RESERVE_IN, NULL, 0},
+        {PERSISTENT_RESERVE_OUT, NULL, 0},
+        {SERVICE_ACTION_IN_12, NULL, 0},
+        {SERVICE_ACTION_OUT_12, NULL, 0},
+        {SERVICE_ACTION_BIDIRECTIONAL, NULL, 0},
+        {SERVICE_ACTION_IN_16, NULL, 0},
+        {SERVICE_ACTION_OUT_16, NULL, 0},
+        {THIRD_PARTY_COPY_IN, NULL, 0},
+        {THIRD_PARTY_COPY_OUT, NULL, 0},
+        {0, NULL, 0},
+};
+#endif /* CONFIG_SCSI_CONSTANTS */
-/* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
+static bool scsi_opcode_sa_name(int opcode, int service_action,
-static void print_opcode_name(unsigned char * cdbp, int cdb_len)
+                                const char **cdb_name, const char **sa_name)
 {
-        int sa, len, cdb0;
+        struct sa_name_list *sa_name_ptr;
-        int fin_name = 0;
+        const struct value_name_pair *arr = NULL;
-        const char * name;
+        int arr_sz, k;
-        cdb0 = cdbp[0];
+        *cdb_name = NULL;
-        switch(cdb0) {
+        if (opcode >= VENDOR_SPECIFIC_CDB)
-        case VARIABLE_LENGTH_CMD:
+                return false;
-                len = scsi_varlen_cdb_length(cdbp);
-                if (len < 10) {
-                        printk("short variable length command, "
-                               "len=%d ext_len=%d", len, cdb_len);
-                        break;
-                }
-                sa = (cdbp[8] << 8) + cdbp[9];
-                name = get_sa_name(variable_length_arr, VARIABLE_LENGTH_SZ,
-                                   sa);
-                if (name)
-                        printk("%s", name);
-                else
-                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
-                if ((cdb_len > 0) && (len != cdb_len))
+        if (opcode < ARRAY_SIZE(cdb_byte0_names))
-                        printk(", in_cdb_len=%d, ext_len=%d", len, cdb_len);
+                *cdb_name = cdb_byte0_names[opcode];
-                break;
+        for (sa_name_ptr = sa_names_arr; sa_name_ptr->arr; ++sa_name_ptr) {
-        case MAINTENANCE_IN:
+                if (sa_name_ptr->opcode == opcode) {
-                sa = cdbp[1] & 0x1f;
+                        arr = sa_name_ptr->arr;
-                name = get_sa_name(maint_in_arr, MAINT_IN_SZ, sa);
+                        arr_sz = sa_name_ptr->arr_sz;
-                fin_name = 1;
+                        break;
-                break;
+                }
-        case MAINTENANCE_OUT:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(maint_out_arr, MAINT_OUT_SZ, sa);
-                fin_name = 1;
-                break;
-        case PERSISTENT_RESERVE_IN:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(pr_in_arr, PR_IN_SZ, sa);
-                fin_name = 1;
-                break;
-        case PERSISTENT_RESERVE_OUT:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(pr_out_arr, PR_OUT_SZ, sa);
-                fin_name = 1;
-                break;
-        case SERVICE_ACTION_IN_12:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(serv_in12_arr, SERV_IN12_SZ, sa);
-                fin_name = 1;
-                break;
-        case SERVICE_ACTION_OUT_12:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(serv_out12_arr, SERV_OUT12_SZ, sa);
-                fin_name = 1;
-                break;
-        case SERVICE_ACTION_BIDIRECTIONAL:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(serv_bidi_arr, SERV_BIDI_SZ, sa);
-                fin_name = 1;
-                break;
-        case SERVICE_ACTION_IN_16:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(serv_in16_arr, SERV_IN16_SZ, sa);
-                fin_name = 1;
-                break;
-        case SERVICE_ACTION_OUT_16:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(serv_out16_arr, SERV_OUT16_SZ, sa);
-                fin_name = 1;
-                break;
-        case THIRD_PARTY_COPY_IN:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(tpc_in_arr, TPC_IN_SZ, sa);
-                fin_name = 1;
-                break;
-        case THIRD_PARTY_COPY_OUT:
-                sa = cdbp[1] & 0x1f;
-                name = get_sa_name(tpc_out_arr, TPC_OUT_SZ, sa);
-                fin_name = 1;
-                break;
-        default:
-                if (cdb0 < 0xc0) {
-                        name = cdb_byte0_names[cdb0];
-                        if (name)
-                                printk("%s", name);
-                        else
-                                printk("cdb[0]=0x%x (reserved)", cdb0);
-                } else
-                        printk("cdb[0]=0x%x (vendor)", cdb0);
-                break;
        }
-        if (fin_name) {
+        if (!arr)
-                if (name)
+                return false;
-                        printk("%s", name);
-                else
+        for (k = 0; k < arr_sz; ++k, ++arr) {
-                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
+                if (service_action == arr->value)
+                        break;
        }
-}
+        if (k < arr_sz)
+                *sa_name = arr->name;
-#else /* ifndef CONFIG_SCSI_CONSTANTS */
+        return true;
+}
-static void print_opcode_name(unsigned char * cdbp, int cdb_len)
+static void print_opcode_name(const unsigned char *cdbp, size_t cdb_len)
 {
-        int sa, len, cdb0;
+        int sa, cdb0;
+        const char *cdb_name = NULL, *sa_name = NULL;
        cdb0 = cdbp[0];
-        switch(cdb0) {
+        if (cdb0 == VARIABLE_LENGTH_CMD) {
-        case VARIABLE_LENGTH_CMD:
+                if (cdb_len < 10) {
-                len = scsi_varlen_cdb_length(cdbp);
+                        printk("short variable length command, len=%zu",
-                if (len < 10) {
+                               cdb_len);
-                        printk("short opcode=0x%x command, len=%d "
+                        return;
-                               "ext_len=%d", cdb0, len, cdb_len);
-                        break;
                }
                sa = (cdbp[8] << 8) + cdbp[9];
-                printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
+        } else
-                if (len != cdb_len)
-                        printk(", in_cdb_len=%d, ext_len=%d", len, cdb_len);
-                break;
-        case MAINTENANCE_IN:
-        case MAINTENANCE_OUT:
-        case PERSISTENT_RESERVE_IN:
-        case PERSISTENT_RESERVE_OUT:
-        case SERVICE_ACTION_IN_12:
-        case SERVICE_ACTION_OUT_12:
-        case SERVICE_ACTION_BIDIRECTIONAL:
-        case SERVICE_ACTION_IN_16:
-        case SERVICE_ACTION_OUT_16:
-        case THIRD_PARTY_COPY_IN:
-        case THIRD_PARTY_COPY_OUT:
                sa = cdbp[1] & 0x1f;
-                printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
-                break;
+        if (!scsi_opcode_sa_name(cdb0, sa, &cdb_name, &sa_name)) {
-        default:
+                if (cdb_name)
-                if (cdb0 < 0xc0)
+                        printk("%s", cdb_name);
+                else if (cdb0 >= VENDOR_SPECIFIC_CDB)
+                        printk("cdb[0]=0x%x (vendor)", cdb0);
+                else if (cdb0 >= 0x60 && cdb0 < 0x7e)
+                        printk("cdb[0]=0x%x (reserved)", cdb0);
+                else
                        printk("cdb[0]=0x%x", cdb0);
+        } else {
+                if (sa_name)
+                        printk("%s", sa_name);
+                else if (cdb_name)
+                        printk("%s, sa=0x%x", cdb_name, sa);
                else
-                        printk("cdb[0]=0x%x (vendor)", cdb0);
+                        printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
-                break;
        }
 }
-#endif
-void __scsi_print_command(unsigned char *cdb)
+void __scsi_print_command(const unsigned char *cdb, size_t cdb_len)
 {
        int k, len;
-        print_opcode_name(cdb, 0);
+        print_opcode_name(cdb, cdb_len);
        len = scsi_command_size(cdb);
+        if (cdb_len < len)
+                len = cdb_len;
        /* print out all bytes in cdb */
        for (k = 0; k < len; ++k)
                printk(" %02x", cdb[k]);
@@ -433,41 +383,6 @@ void scsi_print_command(struct scsi_cmnd *cmd)
 }
 EXPORT_SYMBOL(scsi_print_command);
-/**
- *      scsi_print_status - print scsi status description
- *      @scsi_status: scsi status value
- *
- *      If the status is recognized, the description is printed.
- *      Otherwise "Unknown status" is output. No trailing space.
- *      If CONFIG_SCSI_CONSTANTS is not set, then print status in hex
- *      (e.g. "0x2" for Check Condition).
- **/
-void
-scsi_print_status(unsigned char scsi_status) {
-#ifdef CONFIG_SCSI_CONSTANTS
-        const char * ccp;
-        switch (scsi_status) {
-        case 0:    ccp = "Good"; break;
-        case 0x2:  ccp = "Check Condition"; break;
-        case 0x4:  ccp = "Condition Met"; break;
-        case 0x8:  ccp = "Busy"; break;
-        case 0x10: ccp = "Intermediate"; break;
-        case 0x14: ccp = "Intermediate-Condition Met"; break;
-        case 0x18: ccp = "Reservation Conflict"; break;
-        case 0x22: ccp = "Command Terminated"; break;   /* obsolete */
-        case 0x28: ccp = "Task set Full"; break;        /* was: Queue Full */
-        case 0x30: ccp = "ACA Active"; break;
-        case 0x40: ccp = "Task Aborted"; break;
-        default:   ccp = "Unknown status";
-        }
-        printk(KERN_INFO "%s", ccp);
-#else
-        printk(KERN_INFO "0x%0x", scsi_status);
-#endif
-}
-EXPORT_SYMBOL(scsi_print_status);
 #ifdef CONFIG_SCSI_CONSTANTS
 struct error_info {
@@ -1292,18 +1207,19 @@ static const struct error_info additional[] =
 struct error_info2 {
        unsigned char code1, code2_min, code2_max;
+        const char * str;
        const char * fmt;
 };
 static const struct error_info2 additional2[] =
 {
-        {0x40, 0x00, 0x7f, "Ram failure (%x)"},
+        {0x40, 0x00, 0x7f, "Ram failure", ""},
-        {0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
+        {0x40, 0x80, 0xff, "Diagnostic failure on component", ""},
-        {0x41, 0x00, 0xff, "Data path failure (%x)"},
+        {0x41, 0x00, 0xff, "Data path failure", ""},
-        {0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
+        {0x42, 0x00, 0xff, "Power-on or self-test failure", ""},
-        {0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
+        {0x4D, 0x00, 0xff, "Tagged overlapped commands", "task tag "},
-        {0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
+        {0x70, 0x00, 0xff, "Decompression exception", "short algorithm id of "},
-        {0, 0, 0, NULL}
+        {0, 0, 0, NULL, NULL}
 };
 /* description of the sense key values */
@@ -1349,69 +1265,79 @@ EXPORT_SYMBOL(scsi_sense_key_string);
 * This string may contain a "%x" and should be printed with ascq as arg.
 */
 const char *
-scsi_extd_sense_format(unsigned char asc, unsigned char ascq) {
+scsi_extd_sense_format(unsigned char asc, unsigned char ascq, const char **fmt)
+{
 #ifdef CONFIG_SCSI_CONSTANTS
        int i;
        unsigned short code = ((asc << 8) | ascq);
+        *fmt = NULL;
        for (i = 0; additional[i].text; i++)
                if (additional[i].code12 == code)
                        return additional[i].text;
        for (i = 0; additional2[i].fmt; i++) {
                if (additional2[i].code1 == asc &&
                    ascq >= additional2[i].code2_min &&
-                    ascq <= additional2[i].code2_max)
+                    ascq <= additional2[i].code2_max) {
-                        return additional2[i].fmt;
+                        *fmt = additional2[i].fmt;
+                        return additional2[i].str;
+                }
        }
+#else
+        *fmt = NULL;
 #endif
        return NULL;
 }
 EXPORT_SYMBOL(scsi_extd_sense_format);
 void
-scsi_show_extd_sense(unsigned char asc, unsigned char ascq)
+scsi_show_extd_sense(const struct scsi_device *sdev, const char *name,
+                     unsigned char asc, unsigned char ascq)
 {
-        const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
+        const char *extd_sense_fmt = NULL;
+        const char *extd_sense_str = scsi_extd_sense_format(asc, ascq,
-        if (extd_sense_fmt) {
+                                                            &extd_sense_fmt);
-                if (strstr(extd_sense_fmt, "%x")) {
-                        printk("Add. Sense: ");
+        if (extd_sense_str) {
-                        printk(extd_sense_fmt, ascq);
+                if (extd_sense_fmt)
-                } else
+                        sdev_prefix_printk(KERN_INFO, sdev, name,
-                        printk("Add. Sense: %s", extd_sense_fmt);
+                                           "Add. Sense: %s (%s%x)",
-        } else {
+                                           extd_sense_str, extd_sense_fmt,
-                if (asc >= 0x80)
+                                           ascq);
-                        printk("<<vendor>> ASC=0x%x ASCQ=0x%x", asc,
-                               ascq);
-                if (ascq >= 0x80)
-                        printk("ASC=0x%x <<vendor>> ASCQ=0x%x", asc,
-                               ascq);
                else
-                        printk("ASC=0x%x ASCQ=0x%x", asc, ascq);
+                        sdev_prefix_printk(KERN_INFO, sdev, name,
-        }
+                                           "Add. Sense: %s", extd_sense_str);
-        printk("\n");
+        } else {
+                sdev_prefix_printk(KERN_INFO, sdev, name,
+                                   "%sASC=0x%x %sASCQ=0x%x\n",
+                                   asc >= 0x80 ? "<<vendor>> " : "", asc,
+                                   ascq >= 0x80 ? "<<vendor>> " : "", ascq);
+        }
 }
 EXPORT_SYMBOL(scsi_show_extd_sense);
 void
-scsi_show_sense_hdr(struct scsi_sense_hdr *sshdr)
+scsi_show_sense_hdr(const struct scsi_device *sdev, const char *name,
+                    const struct scsi_sense_hdr *sshdr)
 {
        const char *sense_txt;
        sense_txt = scsi_sense_key_string(sshdr->sense_key);
        if (sense_txt)
-                printk("Sense Key : %s ", sense_txt);
+                sdev_prefix_printk(KERN_INFO, sdev, name,
+                                   "Sense Key : %s [%s]%s\n", sense_txt,
+                                   scsi_sense_is_deferred(sshdr) ?
+                                   "deferred" : "current",
+                                   sshdr->response_code >= 0x72 ?
+                                   " [descriptor]" : "");
        else
-                printk("Sense Key : 0x%x ", sshdr->sense_key);
+                sdev_prefix_printk(KERN_INFO, sdev, name,
+                                   "Sense Key : 0x%x [%s]%s", sshdr->sense_key,
-        printk("%s", scsi_sense_is_deferred(sshdr) ? "[deferred] " :
+                                   scsi_sense_is_deferred(sshdr) ?
-               "[current] ");
+                                   "deferred" : "current",
+                                   sshdr->response_code >= 0x72 ?
-        if (sshdr->response_code >= 0x72)
+                                   " [descriptor]" : "");
-                printk("[descriptor]");
-        printk("\n");
 }
 EXPORT_SYMBOL(scsi_show_sense_hdr);
@@ -1419,141 +1345,55 @@ EXPORT_SYMBOL(scsi_show_sense_hdr);
 * Print normalized SCSI sense header with a prefix.
 */
 void
-scsi_print_sense_hdr(const char *name, struct scsi_sense_hdr *sshdr)
+scsi_print_sense_hdr(const struct scsi_device *sdev, const char *name,
+                     const struct scsi_sense_hdr *sshdr)
 {
-        printk(KERN_INFO "%s: ", name);
+        scsi_show_sense_hdr(sdev, name, sshdr);
-        scsi_show_sense_hdr(sshdr);
+        scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
-        printk(KERN_INFO "%s: ", name);
-        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
 }
 EXPORT_SYMBOL(scsi_print_sense_hdr);
-/*
- * Print normalized SCSI sense header with device information and a prefix.
- */
-void
-scsi_cmd_print_sense_hdr(struct scsi_cmnd *scmd, const char *desc,
-                          struct scsi_sense_hdr *sshdr)
-{
-        scmd_printk(KERN_INFO, scmd, "%s: ", desc);
-        scsi_show_sense_hdr(sshdr);
-        scmd_printk(KERN_INFO, scmd, "%s: ", desc);
-        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
-}
-EXPORT_SYMBOL(scsi_cmd_print_sense_hdr);
 static void
-scsi_decode_sense_buffer(const unsigned char *sense_buffer, int sense_len,
+scsi_dump_sense_buffer(const unsigned char *sense_buffer, int sense_len)
-                       struct scsi_sense_hdr *sshdr)
 {
-        int k, num, res;
+        int k, num;
-        res = scsi_normalize_sense(sense_buffer, sense_len, sshdr);
+        num = (sense_len < 32) ? sense_len : 32;
-        if (0 == res) {
+        printk("Unrecognized sense data (in hex):");
-                /* this may be SCSI-1 sense data */
+        for (k = 0; k < num; ++k) {
-                num = (sense_len < 32) ? sense_len : 32;
+                if (0 == (k % 16)) {
-                printk("Unrecognized sense data (in hex):");
+                        printk("\n");
-                for (k = 0; k < num; ++k) {
+                        printk(KERN_INFO "        ");
-                        if (0 == (k % 16)) {
-                                printk("\n");
-                                printk(KERN_INFO "        ");
-                        }
-                        printk("%02x ", sense_buffer[k]);
                }
-                printk("\n");
+                printk("%02x ", sense_buffer[k]);
-                return;
        }
-}
+        printk("\n");
+        return;
-static void
-scsi_decode_sense_extras(const unsigned char *sense_buffer, int sense_len,
-                         struct scsi_sense_hdr *sshdr)
-{
-        int k, num, res;
-        if (sshdr->response_code < 0x72)
-        {
-                /* only decode extras for "fixed" format now */
-                char buff[80];
-                int blen, fixed_valid;
-                unsigned int info;
-                fixed_valid = sense_buffer[0] & 0x80;
-                info = ((sense_buffer[3] << 24) | (sense_buffer[4] << 16) |
-                        (sense_buffer[5] << 8) | sense_buffer[6]);
-                res = 0;
-                memset(buff, 0, sizeof(buff));
-                blen = sizeof(buff) - 1;
-                if (fixed_valid)
-                        res += snprintf(buff + res, blen - res,
-                                        "Info fld=0x%x", info);
-                if (sense_buffer[2] & 0x80) {
-                        /* current command has read a filemark */
-                        if (res > 0)
-                                res += snprintf(buff + res, blen - res, ", ");
-                        res += snprintf(buff + res, blen - res, "FMK");
-                }
-                if (sense_buffer[2] & 0x40) {
-                        /* end-of-medium condition exists */
-                        if (res > 0)
-                                res += snprintf(buff + res, blen - res, ", ");
-                        res += snprintf(buff + res, blen - res, "EOM");
-                }
-                if (sense_buffer[2] & 0x20) {
-                        /* incorrect block length requested */
-                        if (res > 0)
-                                res += snprintf(buff + res, blen - res, ", ");
-                        res += snprintf(buff + res, blen - res, "ILI");
-                }
-                if (res > 0)
-                        printk("%s\n", buff);
-        } else if (sshdr->additional_length > 0) {
-                /* descriptor format with sense descriptors */
-                num = 8 + sshdr->additional_length;
-                num = (sense_len < num) ? sense_len : num;
-                printk("Descriptor sense data with sense descriptors "
-                       "(in hex):");
-                for (k = 0; k < num; ++k) {
-                        if (0 == (k % 16)) {
-                                printk("\n");
-                                printk(KERN_INFO "        ");
-                        }
-                        printk("%02x ", sense_buffer[k]);
-                }
-                printk("\n");
-        }
 }
 /* Normalize and print sense buffer with name prefix */
-void __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
+void __scsi_print_sense(const struct scsi_device *sdev, const char *name,
-                        int sense_len)
+                        const unsigned char *sense_buffer, int sense_len)
 {
        struct scsi_sense_hdr sshdr;
-        printk(KERN_INFO "%s: ", name);
+        if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
-        scsi_decode_sense_buffer(sense_buffer, sense_len, &sshdr);
+                scsi_dump_sense_buffer(sense_buffer, sense_len);
-        scsi_show_sense_hdr(&sshdr);
+                return;
-        scsi_decode_sense_extras(sense_buffer, sense_len, &sshdr);
+        }
-        printk(KERN_INFO "%s: ", name);
+        scsi_show_sense_hdr(sdev, name, &sshdr);
-        scsi_show_extd_sense(sshdr.asc, sshdr.ascq);
+        scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
 }
 EXPORT_SYMBOL(__scsi_print_sense);
 /* Normalize and print sense buffer in SCSI command */
-void scsi_print_sense(char *name, struct scsi_cmnd *cmd)
+void scsi_print_sense(const struct scsi_cmnd *cmd)
 {
-        struct scsi_sense_hdr sshdr;
+        struct gendisk *disk = cmd->request->rq_disk;
+        const char *disk_name = disk ? disk->disk_name : NULL;
-        scmd_printk(KERN_INFO, cmd, " ");
+        __scsi_print_sense(cmd->device, disk_name, cmd->sense_buffer,
-        scsi_decode_sense_buffer(cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE,
+                           SCSI_SENSE_BUFFERSIZE);
-                                 &sshdr);
-        scsi_show_sense_hdr(&sshdr);
-        scsi_decode_sense_extras(cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE,
-                                 &sshdr);
-        scmd_printk(KERN_INFO, cmd, " ");
-        scsi_show_extd_sense(sshdr.asc, sshdr.ascq);
 }
 EXPORT_SYMBOL(scsi_print_sense);
@@ -1565,38 +1405,87 @@ static const char * const hostbyte_table[]={
 "DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",
 "DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST", "DID_TARGET_FAILURE",
 "DID_NEXUS_FAILURE" };
-#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
 static const char * const driverbyte_table[]={
 "DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",
 "DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
-#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
-void scsi_show_result(int result)
+#endif
+const char *scsi_hostbyte_string(int result)
 {
+        const char *hb_string = NULL;
+#ifdef CONFIG_SCSI_CONSTANTS
        int hb = host_byte(result);
-        int db = driver_byte(result);
-        printk("Result: hostbyte=%s driverbyte=%s\n",
+        if (hb < ARRAY_SIZE(hostbyte_table))
-               (hb < NUM_HOSTBYTE_STRS ? hostbyte_table[hb]     : "invalid"),
+                hb_string = hostbyte_table[hb];
-               (db < NUM_DRIVERBYTE_STRS ? driverbyte_table[db] : "invalid"));
+#endif
+        return hb_string;
 }
+EXPORT_SYMBOL(scsi_hostbyte_string);
-#else
+const char *scsi_driverbyte_string(int result)
-void scsi_show_result(int result)
 {
-        printk("Result: hostbyte=0x%02x driverbyte=0x%02x\n",
+        const char *db_string = NULL;
-               host_byte(result), driver_byte(result));
+#ifdef CONFIG_SCSI_CONSTANTS
+        int db = driver_byte(result);
+        if (db < ARRAY_SIZE(driverbyte_table))
+                db_string = driverbyte_table[db];
+#endif
+        return db_string;
 }
+EXPORT_SYMBOL(scsi_driverbyte_string);
+#ifdef CONFIG_SCSI_CONSTANTS
+#define scsi_mlreturn_name(result)      { result, #result }
+static const struct value_name_pair scsi_mlreturn_arr[] = {
+        scsi_mlreturn_name(NEEDS_RETRY),
+        scsi_mlreturn_name(SUCCESS),
+        scsi_mlreturn_name(FAILED),
+        scsi_mlreturn_name(QUEUED),
+        scsi_mlreturn_name(SOFT_ERROR),
+        scsi_mlreturn_name(ADD_TO_MLQUEUE),
+        scsi_mlreturn_name(TIMEOUT_ERROR),
+        scsi_mlreturn_name(SCSI_RETURN_NOT_HANDLED),
+        scsi_mlreturn_name(FAST_IO_FAIL)
+};
 #endif
-EXPORT_SYMBOL(scsi_show_result);
+const char *scsi_mlreturn_string(int result)
+{
+#ifdef CONFIG_SCSI_CONSTANTS
+        const struct value_name_pair *arr = scsi_mlreturn_arr;
+        int k;
-void scsi_print_result(struct scsi_cmnd *cmd)
+        for (k = 0; k < ARRAY_SIZE(scsi_mlreturn_arr); ++k, ++arr) {
+                if (result == arr->value)
+                        return arr->name;
+        }
+#endif
+        return NULL;
+}
+EXPORT_SYMBOL(scsi_mlreturn_string);
+void scsi_print_result(struct scsi_cmnd *cmd, const char *msg, int disposition)
 {
-        scmd_printk(KERN_INFO, cmd, " ");
+        const char *mlret_string = scsi_mlreturn_string(disposition);
-        scsi_show_result(cmd->result);
+        const char *hb_string = scsi_hostbyte_string(cmd->result);
+        const char *db_string = scsi_driverbyte_string(cmd->result);
+        if (hb_string || db_string)
+                scmd_printk(KERN_INFO, cmd,
+                            "%s%s Result: hostbyte=%s driverbyte=%s",
+                            msg ? msg : "",
+                            mlret_string ? mlret_string : "UNKNOWN",
+                            hb_string ? hb_string : "invalid",
+                            db_string ? db_string : "invalid");
+        else
+                scmd_printk(KERN_INFO, cmd,
+                            "%s%s Result: hostbyte=0x%02x driverbyte=0x%02x",
+                            msg ? msg : "",
+                            mlret_string ? mlret_string : "UNKNOWN",
+                            host_byte(cmd->result), driver_byte(cmd->result));
 }
 EXPORT_SYMBOL(scsi_print_result);
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 86103c8475d8..44a8cc51428f 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -152,28 +152,6 @@ csio_scsi_itnexus_loss_error(uint16_t error)
        return 0;
 }
-static inline void
-csio_scsi_tag(struct scsi_cmnd *scmnd, uint8_t *tag, uint8_t hq,
-              uint8_t oq, uint8_t sq)
-{
-        char stag[2];
-        if (scsi_populate_tag_msg(scmnd, stag)) {
-                switch (stag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        *tag = hq;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        *tag = oq;
-                        break;
-                default:
-                        *tag = sq;
-                        break;
-                }
-        } else
-                *tag = 0;
-}
 /*
 * csio_scsi_fcp_cmnd - Frame the SCSI FCP command paylod.
 * @req: IO req structure.
@@ -192,11 +170,12 @@ csio_scsi_fcp_cmnd(struct csio_ioreq *req, void *addr)
                int_to_scsilun(scmnd->device->lun, &fcp_cmnd->fc_lun);
                fcp_cmnd->fc_tm_flags = 0;
                fcp_cmnd->fc_cmdref = 0;
-                fcp_cmnd->fc_pri_ta = 0;
                memcpy(fcp_cmnd->fc_cdb, scmnd->cmnd, 16);
-                csio_scsi_tag(scmnd, &fcp_cmnd->fc_pri_ta,
+                if (scmnd->flags & SCMD_TAGGED)
-                              FCP_PTA_HEADQ, FCP_PTA_ORDERED, FCP_PTA_SIMPLE);
+                        fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
+                else
+                        fcp_cmnd->fc_pri_ta = 0;
                fcp_cmnd->fc_dl = cpu_to_be32(scsi_bufflen(scmnd));
                if (req->nsge)
@@ -2262,11 +2241,7 @@ csio_slave_alloc(struct scsi_device *sdev)
 static int
 csio_slave_configure(struct scsi_device *sdev)
 {
-        if (sdev->tagged_supported)
+        scsi_adjust_queue_depth(sdev, csio_lun_qdepth);
-                scsi_activate_tcq(sdev, csio_lun_qdepth);
-        else
-                scsi_deactivate_tcq(sdev, csio_lun_qdepth);
        return 0;
 }
@@ -2311,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 = {
@@ -2330,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/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c
index 33e422e75835..1dba62c5cf6a 100644
--- a/drivers/scsi/device_handler/scsi_dh.c
+++ b/drivers/scsi/device_handler/scsi_dh.c
@@ -98,27 +98,51 @@ device_handler_match(struct scsi_device_handler *scsi_dh,
 static int scsi_dh_handler_attach(struct scsi_device *sdev,
                                  struct scsi_device_handler *scsi_dh)
 {
-        int err = 0;
+        struct scsi_dh_data *d;
        if (sdev->scsi_dh_data) {
                if (sdev->scsi_dh_data->scsi_dh != scsi_dh)
-                        err = -EBUSY;
+                        return -EBUSY;
-                else
-                        kref_get(&sdev->scsi_dh_data->kref);
+                kref_get(&sdev->scsi_dh_data->kref);
-        } else if (scsi_dh->attach) {
+                return 0;
-                err = scsi_dh->attach(sdev);
-                if (!err) {
-                        kref_init(&sdev->scsi_dh_data->kref);
-                        sdev->scsi_dh_data->sdev = sdev;
-                }
        }
-        return err;
+        if (!try_module_get(scsi_dh->module))
+                return -EINVAL;
+        d = scsi_dh->attach(sdev);
+        if (IS_ERR(d)) {
+                sdev_printk(KERN_ERR, sdev, "%s: Attach failed (%ld)\n",
+                            scsi_dh->name, PTR_ERR(d));
+                module_put(scsi_dh->module);
+                return PTR_ERR(d);
+        }
+        d->scsi_dh = scsi_dh;
+        kref_init(&d->kref);
+        d->sdev = sdev;
+        spin_lock_irq(sdev->request_queue->queue_lock);
+        sdev->scsi_dh_data = d;
+        spin_unlock_irq(sdev->request_queue->queue_lock);
+        return 0;
 }
 static void __detach_handler (struct kref *kref)
 {
-        struct scsi_dh_data *scsi_dh_data = container_of(kref, struct scsi_dh_data, kref);
+        struct scsi_dh_data *scsi_dh_data =
-        scsi_dh_data->scsi_dh->detach(scsi_dh_data->sdev);
+                container_of(kref, struct scsi_dh_data, kref);
+        struct scsi_device_handler *scsi_dh = scsi_dh_data->scsi_dh;
+        struct scsi_device *sdev = scsi_dh_data->sdev;
+        spin_lock_irq(sdev->request_queue->queue_lock);
+        sdev->scsi_dh_data = NULL;
+        spin_unlock_irq(sdev->request_queue->queue_lock);
+        scsi_dh->detach(sdev);
+        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", scsi_dh->name);
+        module_put(scsi_dh->module);
 }
 /*
@@ -141,7 +165,7 @@ static void scsi_dh_handler_detach(struct scsi_device *sdev,
        if (!scsi_dh)
                scsi_dh = sdev->scsi_dh_data->scsi_dh;
-        if (scsi_dh && scsi_dh->detach)
+        if (scsi_dh)
                kref_put(&sdev->scsi_dh_data->kref, __detach_handler);
 }
@@ -330,6 +354,9 @@ int scsi_register_device_handler(struct scsi_device_handler *scsi_dh)
        if (get_device_handler(scsi_dh->name))
                return -EBUSY;
+        if (!scsi_dh->attach || !scsi_dh->detach)
+                return -EINVAL;
        spin_lock(&list_lock);
        list_add(&scsi_dh->list, &scsi_dh_list);
        spin_unlock(&list_lock);
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index fd78bdc53528..854b568b9931 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -62,6 +62,7 @@
 #define ALUA_OPTIMIZE_STPG              1
 struct alua_dh_data {
+        struct scsi_dh_data     dh_data;
        int                     group_id;
        int                     rel_port;
        int                     tpgs;
@@ -87,9 +88,7 @@ static int alua_check_sense(struct scsi_device *, struct scsi_sense_hdr *);
 static inline struct alua_dh_data *get_alua_data(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data = sdev->scsi_dh_data;
+        return container_of(sdev->scsi_dh_data, struct alua_dh_data, dh_data);
-        BUG_ON(scsi_dh_data == NULL);
-        return ((struct alua_dh_data *) scsi_dh_data->buf);
 }
 static int realloc_buffer(struct alua_dh_data *h, unsigned len)
@@ -825,42 +824,18 @@ static bool alua_match(struct scsi_device *sdev)
        return (scsi_device_tpgs(sdev) != 0);
 }
-static int alua_bus_attach(struct scsi_device *sdev);
-static void alua_bus_detach(struct scsi_device *sdev);
-static struct scsi_device_handler alua_dh = {
-        .name = ALUA_DH_NAME,
-        .module = THIS_MODULE,
-        .attach = alua_bus_attach,
-        .detach = alua_bus_detach,
-        .prep_fn = alua_prep_fn,
-        .check_sense = alua_check_sense,
-        .activate = alua_activate,
-        .set_params = alua_set_params,
-        .match = alua_match,
-};
 /*
 * alua_bus_attach - Attach device handler
 * @sdev: device to be attached to
 */
-static int alua_bus_attach(struct scsi_device *sdev)
+static struct scsi_dh_data *alua_bus_attach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
        struct alua_dh_data *h;
-        unsigned long flags;
+        int err;
-        int err = SCSI_DH_OK;
-        scsi_dh_data = kzalloc(sizeof(*scsi_dh_data)
-                               + sizeof(*h) , GFP_KERNEL);
-        if (!scsi_dh_data) {
-                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
-                            ALUA_DH_NAME);
-                return -ENOMEM;
-        }
-        scsi_dh_data->scsi_dh = &alua_dh;
+        h = kzalloc(sizeof(*h) , GFP_KERNEL);
-        h = (struct alua_dh_data *) scsi_dh_data->buf;
+        if (!h)
+                return ERR_PTR(-ENOMEM);
        h->tpgs = TPGS_MODE_UNINITIALIZED;
        h->state = TPGS_STATE_OPTIMIZED;
        h->group_id = -1;
@@ -870,23 +845,14 @@ static int alua_bus_attach(struct scsi_device *sdev)
        h->sdev = sdev;
        err = alua_initialize(sdev, h);
-        if ((err != SCSI_DH_OK) && (err != SCSI_DH_DEV_OFFLINED))
+        if (err != SCSI_DH_OK && err != SCSI_DH_DEV_OFFLINED)
-                goto failed;
-        if (!try_module_get(THIS_MODULE))
                goto failed;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        sdev->scsi_dh_data = scsi_dh_data;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
        sdev_printk(KERN_NOTICE, sdev, "%s: Attached\n", ALUA_DH_NAME);
+        return &h->dh_data;
-        return 0;
 failed:
-        kfree(scsi_dh_data);
+        kfree(h);
-        sdev_printk(KERN_ERR, sdev, "%s: not attached\n", ALUA_DH_NAME);
+        return ERR_PTR(-EINVAL);
-        return -EINVAL;
 }
 /*
@@ -895,23 +861,25 @@ failed:
 */
 static void alua_bus_detach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
+        struct alua_dh_data *h = get_alua_data(sdev);
-        struct alua_dh_data *h;
-        unsigned long flags;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        scsi_dh_data = sdev->scsi_dh_data;
-        sdev->scsi_dh_data = NULL;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-        h = (struct alua_dh_data *) scsi_dh_data->buf;
        if (h->buff && h->inq != h->buff)
                kfree(h->buff);
-        kfree(scsi_dh_data);
+        kfree(h);
-        module_put(THIS_MODULE);
-        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", ALUA_DH_NAME);
 }
+static struct scsi_device_handler alua_dh = {
+        .name = ALUA_DH_NAME,
+        .module = THIS_MODULE,
+        .attach = alua_bus_attach,
+        .detach = alua_bus_detach,
+        .prep_fn = alua_prep_fn,
+        .check_sense = alua_check_sense,
+        .activate = alua_activate,
+        .set_params = alua_set_params,
+        .match = alua_match,
+};
 static int __init alua_init(void)
 {
        int r;
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 84765384c47c..6ed1caadbc6a 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -72,6 +72,7 @@ static const char * lun_state[] =
 };
 struct clariion_dh_data {
+        struct scsi_dh_data dh_data;
        /*
         * Flags:
         *  CLARIION_SHORT_TRESPASS
@@ -116,9 +117,8 @@ struct clariion_dh_data {
 static inline struct clariion_dh_data
                        *get_clariion_data(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data = sdev->scsi_dh_data;
+        return container_of(sdev->scsi_dh_data, struct clariion_dh_data,
-        BUG_ON(scsi_dh_data == NULL);
+                        dh_data);
-        return ((struct clariion_dh_data *) scsi_dh_data->buf);
 }
 /*
@@ -622,7 +622,10 @@ done:
        return result;
 }
-static const struct scsi_dh_devlist clariion_dev_list[] = {
+static const struct {
+        char *vendor;
+        char *model;
+} clariion_dev_list[] = {
        {"DGC", "RAID"},
        {"DGC", "DISK"},
        {"DGC", "VRAID"},
@@ -647,39 +650,14 @@ static bool clariion_match(struct scsi_device *sdev)
        return false;
 }
-static int clariion_bus_attach(struct scsi_device *sdev);
+static struct scsi_dh_data *clariion_bus_attach(struct scsi_device *sdev)
-static void clariion_bus_detach(struct scsi_device *sdev);
-static struct scsi_device_handler clariion_dh = {
-        .name           = CLARIION_NAME,
-        .module         = THIS_MODULE,
-        .devlist        = clariion_dev_list,
-        .attach         = clariion_bus_attach,
-        .detach         = clariion_bus_detach,
-        .check_sense    = clariion_check_sense,
-        .activate       = clariion_activate,
-        .prep_fn        = clariion_prep_fn,
-        .set_params     = clariion_set_params,
-        .match          = clariion_match,
-};
-static int clariion_bus_attach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
        struct clariion_dh_data *h;
-        unsigned long flags;
        int err;
-        scsi_dh_data = kzalloc(sizeof(*scsi_dh_data)
+        h = kzalloc(sizeof(*h) , GFP_KERNEL);
-                               + sizeof(*h) , GFP_KERNEL);
+        if (!h)
-        if (!scsi_dh_data) {
+                return ERR_PTR(-ENOMEM);
-                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
-                            CLARIION_NAME);
-                return -ENOMEM;
-        }
-        scsi_dh_data->scsi_dh = &clariion_dh;
-        h = (struct clariion_dh_data *) scsi_dh_data->buf;
        h->lun_state = CLARIION_LUN_UNINITIALIZED;
        h->default_sp = CLARIION_UNBOUND_LU;
        h->current_sp = CLARIION_UNBOUND_LU;
@@ -692,45 +670,37 @@ static int clariion_bus_attach(struct scsi_device *sdev)
        if (err != SCSI_DH_OK)
                goto failed;
-        if (!try_module_get(THIS_MODULE))
-                goto failed;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        sdev->scsi_dh_data = scsi_dh_data;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
        sdev_printk(KERN_INFO, sdev,
                    "%s: connected to SP %c Port %d (%s, default SP %c)\n",
                    CLARIION_NAME, h->current_sp + 'A',
                    h->port, lun_state[h->lun_state],
                    h->default_sp + 'A');
+        return &h->dh_data;
-        return 0;
 failed:
-        kfree(scsi_dh_data);
+        kfree(h);
-        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+        return ERR_PTR(-EINVAL);
-                    CLARIION_NAME);
-        return -EINVAL;
 }
 static void clariion_bus_detach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
+        struct clariion_dh_data *h = get_clariion_data(sdev);
-        unsigned long flags;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        scsi_dh_data = sdev->scsi_dh_data;
-        sdev->scsi_dh_data = NULL;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n",
-                    CLARIION_NAME);
-        kfree(scsi_dh_data);
+        kfree(h);
-        module_put(THIS_MODULE);
 }
+static struct scsi_device_handler clariion_dh = {
+        .name           = CLARIION_NAME,
+        .module         = THIS_MODULE,
+        .attach         = clariion_bus_attach,
+        .detach         = clariion_bus_detach,
+        .check_sense    = clariion_check_sense,
+        .activate       = clariion_activate,
+        .prep_fn        = clariion_prep_fn,
+        .set_params     = clariion_set_params,
+        .match          = clariion_match,
+};
 static int __init clariion_init(void)
 {
        int r;
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 4ee2759f5299..485d99544a15 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -38,6 +38,7 @@
 #define HP_SW_PATH_PASSIVE              1
 struct hp_sw_dh_data {
+        struct scsi_dh_data dh_data;
        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
        int path_state;
        int retries;
@@ -51,9 +52,7 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *);
 static inline struct hp_sw_dh_data *get_hp_sw_data(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data = sdev->scsi_dh_data;
+        return container_of(sdev->scsi_dh_data, struct hp_sw_dh_data, dh_data);
-        BUG_ON(scsi_dh_data == NULL);
-        return ((struct hp_sw_dh_data *) scsi_dh_data->buf);
 }
 /*
@@ -312,7 +311,10 @@ static int hp_sw_activate(struct scsi_device *sdev,
        return 0;
 }
-static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
+static const struct {
+        char *vendor;
+        char *model;
+} hp_sw_dh_data_list[] = {
        {"COMPAQ", "MSA1000 VOLUME"},
        {"COMPAQ", "HSV110"},
        {"HP", "HSV100"},
@@ -338,37 +340,14 @@ static bool hp_sw_match(struct scsi_device *sdev)
        return false;
 }
-static int hp_sw_bus_attach(struct scsi_device *sdev);
+static struct scsi_dh_data *hp_sw_bus_attach(struct scsi_device *sdev)
-static void hp_sw_bus_detach(struct scsi_device *sdev);
-static struct scsi_device_handler hp_sw_dh = {
-        .name           = HP_SW_NAME,
-        .module         = THIS_MODULE,
-        .devlist        = hp_sw_dh_data_list,
-        .attach         = hp_sw_bus_attach,
-        .detach         = hp_sw_bus_detach,
-        .activate       = hp_sw_activate,
-        .prep_fn        = hp_sw_prep_fn,
-        .match          = hp_sw_match,
-};
-static int hp_sw_bus_attach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
        struct hp_sw_dh_data *h;
-        unsigned long flags;
        int ret;
-        scsi_dh_data = kzalloc(sizeof(*scsi_dh_data)
+        h = kzalloc(sizeof(*h), GFP_KERNEL);
-                               + sizeof(*h) , GFP_KERNEL);
+        if (!h)
-        if (!scsi_dh_data) {
+                return ERR_PTR(-ENOMEM);
-                sdev_printk(KERN_ERR, sdev, "%s: Attach Failed\n",
-                            HP_SW_NAME);
-                return 0;
-        }
-        scsi_dh_data->scsi_dh = &hp_sw_dh;
-        h = (struct hp_sw_dh_data *) scsi_dh_data->buf;
        h->path_state = HP_SW_PATH_UNINITIALIZED;
        h->retries = HP_SW_RETRIES;
        h->sdev = sdev;
@@ -377,42 +356,32 @@ static int hp_sw_bus_attach(struct scsi_device *sdev)
        if (ret != SCSI_DH_OK || h->path_state == HP_SW_PATH_UNINITIALIZED)
                goto failed;
-        if (!try_module_get(THIS_MODULE))
-                goto failed;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        sdev->scsi_dh_data = scsi_dh_data;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
        sdev_printk(KERN_INFO, sdev, "%s: attached to %s path\n",
                    HP_SW_NAME, h->path_state == HP_SW_PATH_ACTIVE?
                    "active":"passive");
+        return &h->dh_data;
-        return 0;
 failed:
-        kfree(scsi_dh_data);
+        kfree(h);
-        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+        return ERR_PTR(-EINVAL);
-                    HP_SW_NAME);
-        return -EINVAL;
 }
 static void hp_sw_bus_detach( struct scsi_device *sdev )
 {
-        struct scsi_dh_data *scsi_dh_data;
+        struct hp_sw_dh_data *h = get_hp_sw_data(sdev);
-        unsigned long flags;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        scsi_dh_data = sdev->scsi_dh_data;
-        sdev->scsi_dh_data = NULL;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
-        module_put(THIS_MODULE);
-        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", HP_SW_NAME);
-        kfree(scsi_dh_data);
+        kfree(h);
 }
+static struct scsi_device_handler hp_sw_dh = {
+        .name           = HP_SW_NAME,
+        .module         = THIS_MODULE,
+        .attach         = hp_sw_bus_attach,
+        .detach         = hp_sw_bus_detach,
+        .activate       = hp_sw_activate,
+        .prep_fn        = hp_sw_prep_fn,
+        .match          = hp_sw_match,
+};
 static int __init hp_sw_init(void)
 {
        return scsi_register_device_handler(&hp_sw_dh);
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 1b5bc9293e37..b46ace3d4bf0 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -181,6 +181,7 @@ struct c2_inquiry {
 };
 struct rdac_dh_data {
+        struct scsi_dh_data     dh_data;
        struct rdac_controller  *ctlr;
 #define UNINITIALIZED_LUN       (1 << 8)
        unsigned                lun;
@@ -261,9 +262,7 @@ do { \
 static inline struct rdac_dh_data *get_rdac_data(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data = sdev->scsi_dh_data;
+        return container_of(sdev->scsi_dh_data, struct rdac_dh_data, dh_data);
-        BUG_ON(scsi_dh_data == NULL);
-        return ((struct rdac_dh_data *) scsi_dh_data->buf);
 }
 static struct request *get_rdac_req(struct scsi_device *sdev,
@@ -779,7 +778,10 @@ static int rdac_check_sense(struct scsi_device *sdev,
        return SCSI_RETURN_NOT_HANDLED;
 }
-static const struct scsi_dh_devlist rdac_dev_list[] = {
+static const struct {
+        char *vendor;
+        char *model;
+} rdac_dev_list[] = {
        {"IBM", "1722"},
        {"IBM", "1724"},
        {"IBM", "1726"},
@@ -825,40 +827,16 @@ static bool rdac_match(struct scsi_device *sdev)
        return false;
 }
-static int rdac_bus_attach(struct scsi_device *sdev);
+static struct scsi_dh_data *rdac_bus_attach(struct scsi_device *sdev)
-static void rdac_bus_detach(struct scsi_device *sdev);
-static struct scsi_device_handler rdac_dh = {
-        .name = RDAC_NAME,
-        .module = THIS_MODULE,
-        .devlist = rdac_dev_list,
-        .prep_fn = rdac_prep_fn,
-        .check_sense = rdac_check_sense,
-        .attach = rdac_bus_attach,
-        .detach = rdac_bus_detach,
-        .activate = rdac_activate,
-        .match = rdac_match,
-};
-static int rdac_bus_attach(struct scsi_device *sdev)
 {
-        struct scsi_dh_data *scsi_dh_data;
        struct rdac_dh_data *h;
-        unsigned long flags;
        int err;
        char array_name[ARRAY_LABEL_LEN];
        char array_id[UNIQUE_ID_LEN];
-        scsi_dh_data = kzalloc(sizeof(*scsi_dh_data)
+        h = kzalloc(sizeof(*h) , GFP_KERNEL);
-                               + sizeof(*h) , GFP_KERNEL);
+        if (!h)
-        if (!scsi_dh_data) {
+                return ERR_PTR(-ENOMEM);
-                sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
-                            RDAC_NAME);
-                return -ENOMEM;
-        }
-        scsi_dh_data->scsi_dh = &rdac_dh;
-        h = (struct rdac_dh_data *) scsi_dh_data->buf;
        h->lun = UNINITIALIZED_LUN;
        h->state = RDAC_STATE_ACTIVE;
@@ -878,19 +856,12 @@ static int rdac_bus_attach(struct scsi_device *sdev)
        if (err != SCSI_DH_OK)
                goto clean_ctlr;
-        if (!try_module_get(THIS_MODULE))
-                goto clean_ctlr;
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        sdev->scsi_dh_data = scsi_dh_data;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
        sdev_printk(KERN_NOTICE, sdev,
                    "%s: LUN %d (%s) (%s)\n",
                    RDAC_NAME, h->lun, mode[(int)h->mode],
                    lun_state[(int)h->lun_state]);
-        return 0;
+        return &h->dh_data;
 clean_ctlr:
        spin_lock(&list_lock);
@@ -898,37 +869,34 @@ clean_ctlr:
        spin_unlock(&list_lock);
 failed:
-        kfree(scsi_dh_data);
+        kfree(h);
-        sdev_printk(KERN_ERR, sdev, "%s: not attached\n",
+        return ERR_PTR(-EINVAL);
-                    RDAC_NAME);
-        return -EINVAL;
 }
 static void rdac_bus_detach( struct scsi_device *sdev )
 {
-        struct scsi_dh_data *scsi_dh_data;
+        struct rdac_dh_data *h = get_rdac_data(sdev);
-        struct rdac_dh_data *h;
-        unsigned long flags;
-        scsi_dh_data = sdev->scsi_dh_data;
-        h = (struct rdac_dh_data *) scsi_dh_data->buf;
        if (h->ctlr && h->ctlr->ms_queued)
                flush_workqueue(kmpath_rdacd);
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
-        sdev->scsi_dh_data = NULL;
-        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
        spin_lock(&list_lock);
        if (h->ctlr)
                kref_put(&h->ctlr->kref, release_controller);
        spin_unlock(&list_lock);
-        kfree(scsi_dh_data);
+        kfree(h);
-        module_put(THIS_MODULE);
-        sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", RDAC_NAME);
 }
+static struct scsi_device_handler rdac_dh = {
+        .name = RDAC_NAME,
+        .module = THIS_MODULE,
+        .prep_fn = rdac_prep_fn,
+        .check_sense = rdac_check_sense,
+        .attach = rdac_bus_attach,
+        .detach = rdac_bus_detach,
+        .activate = rdac_activate,
+        .match = rdac_match,
+};
 static int __init rdac_init(void)
 {
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 072f0ec2851e..1af8d54bcded 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -415,10 +415,8 @@ static int adpt_slave_configure(struct scsi_device * device)
        pHba = (adpt_hba *) host->hostdata[0];
        if (host->can_queue && device->tagged_supported) {
-                scsi_adjust_queue_depth(device, MSG_SIMPLE_TAG,
+                scsi_adjust_queue_depth(device,
                                host->can_queue - 1);
-        } else {
-                scsi_adjust_queue_depth(device, 0, 1);
        }
        return 0;
 }
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 943ad3a19661..bc0f918f1729 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -946,20 +946,18 @@ static int eata2x_slave_configure(struct scsi_device *dev)
        if (TLDEV(dev->type) && dev->tagged_supported) {
                if (tag_mode == TAG_SIMPLE) {
-                        scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, tqd);
                        tag_suffix = ", simple tags";
                } else if (tag_mode == TAG_ORDERED) {
-                        scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, tqd);
                        tag_suffix = ", ordered tags";
                } else {
-                        scsi_adjust_queue_depth(dev, 0, tqd);
                        tag_suffix = ", no tags";
                }
+                scsi_adjust_queue_depth(dev, tqd);
        } else if (TLDEV(dev->type) && linked_comm) {
-                scsi_adjust_queue_depth(dev, 0, tqd);
+                scsi_adjust_queue_depth(dev, tqd);
                tag_suffix = ", untagged";
        } else {
-                scsi_adjust_queue_depth(dev, 0, utqd);
+                scsi_adjust_queue_depth(dev, utqd);
                tag_suffix = "";
        }
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index 3fd305d6b67d..1941d837f6f2 100644
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -972,11 +972,7 @@ u8 handle_hba_ioctl(struct esas2r_adapter *a,
                    struct atto_ioctl *ioctl_hba);
 int esas2r_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd);
 int esas2r_show_info(struct seq_file *m, struct Scsi_Host *sh);
-int esas2r_slave_alloc(struct scsi_device *dev);
-int esas2r_slave_configure(struct scsi_device *dev);
-void esas2r_slave_destroy(struct scsi_device *dev);
 int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason);
-int esas2r_change_queue_type(struct scsi_device *dev, int type);
 long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);
 /* SCSI error handler (eh) functions */
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 6504a195c874..30fce64faf75 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -254,12 +254,10 @@ static struct scsi_host_template driver_template = {
        .use_clustering                 = ENABLE_CLUSTERING,
        .emulated                       = 0,
        .proc_name                      = ESAS2R_DRVR_NAME,
-        .slave_configure                = esas2r_slave_configure,
-        .slave_alloc                    = esas2r_slave_alloc,
-        .slave_destroy                  = esas2r_slave_destroy,
        .change_queue_depth             = esas2r_change_queue_depth,
-        .change_queue_type              = esas2r_change_queue_type,
+        .change_queue_type              = scsi_change_queue_type,
        .max_sectors                    = 0xFFFF,
+        .use_blk_tags                   = 1,
 };
 int sgl_page_size = 512;
@@ -1057,7 +1055,7 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd)
                cmd->scsi_done(cmd);
-                return 0;
+                return SUCCESS;
        }
        spin_lock_irqsave(&a->queue_lock, flags);
@@ -1263,56 +1261,11 @@ int esas2r_change_queue_depth(struct scsi_device *dev, int depth, int reason)
 {
        esas2r_log(ESAS2R_LOG_INFO, "change_queue_depth %p, %d", dev, depth);
-        scsi_adjust_queue_depth(dev, scsi_get_tag_type(dev), depth);
+        scsi_adjust_queue_depth(dev, depth);
        return dev->queue_depth;
 }
-int esas2r_change_queue_type(struct scsi_device *dev, int type)
-{
-        esas2r_log(ESAS2R_LOG_INFO, "change_queue_type %p, %d", dev, type);
-        if (dev->tagged_supported) {
-                scsi_set_tag_type(dev, type);
-                if (type)
-                        scsi_activate_tcq(dev, dev->queue_depth);
-                else
-                        scsi_deactivate_tcq(dev, dev->queue_depth);
-        } else {
-                type = 0;
-        }
-        return type;
-}
-int esas2r_slave_alloc(struct scsi_device *dev)
-{
-        return 0;
-}
-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);
-        }
-        return 0;
-}
-void esas2r_slave_destroy(struct scsi_device *dev)
-{
-        esas2r_log_dev(ESAS2R_LOG_INFO, &(dev->sdev_gendev),
-                       "esas2r_slave_destroy()");
-}
 void esas2r_log_request_failure(struct esas2r_adapter *a,
                                struct esas2r_request *rq)
 {
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 55548dc5cec3..38c23e0b73af 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -663,7 +663,7 @@ static struct esp_cmd_entry *find_and_prep_issuable_command(struct esp *esp)
                        return ent;
                }
-                if (!scsi_populate_tag_msg(cmd, &ent->tag[0])) {
+                if (!spi_populate_tag_msg(&ent->tag[0], cmd)) {
                        ent->tag[0] = 0;
                        ent->tag[1] = 0;
                }
@@ -2402,28 +2402,14 @@ static int esp_slave_configure(struct scsi_device *dev)
 {
        struct esp *esp = shost_priv(dev->host);
        struct esp_target_data *tp = &esp->target[dev->id];
-        int goal_tags, queue_depth;
-        goal_tags = 0;
        if (dev->tagged_supported) {
                /* XXX make this configurable somehow XXX */
-                goal_tags = ESP_DEFAULT_TAGS;
+                int goal_tags = min(ESP_DEFAULT_TAGS, ESP_MAX_TAG);
-                if (goal_tags > ESP_MAX_TAG)
+                scsi_adjust_queue_depth(dev, goal_tags);
-                        goal_tags = ESP_MAX_TAG;
        }
-        queue_depth = goal_tags;
-        if (queue_depth < dev->host->cmd_per_lun)
-                queue_depth = dev->host->cmd_per_lun;
-        if (goal_tags) {
-                scsi_set_tag_type(dev, MSG_ORDERED_TAG);
-                scsi_activate_tcq(dev, queue_depth);
-        } else {
-                scsi_deactivate_tcq(dev, queue_depth);
-        }
        tp->flags |= ESP_TGT_DISCONNECT;
        if (!spi_initial_dv(dev->sdev_target))
@@ -2631,6 +2617,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 4a8ac7d8c76b..a3eeb6842499 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -281,13 +281,14 @@ static struct scsi_host_template fcoe_shost_template = {
        .eh_host_reset_handler = fc_eh_host_reset,
        .slave_alloc = fc_slave_alloc,
        .change_queue_depth = fc_change_queue_depth,
-        .change_queue_type = fc_change_queue_type,
+        .change_queue_type = scsi_change_queue_type,
        .this_id = -1,
        .cmd_per_lun = 3,
        .can_queue = FCOE_MAX_OUTSTANDING_COMMANDS,
        .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 8c56fdc3a456..cf1560c30b7f 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -95,12 +95,10 @@ static int fnic_slave_alloc(struct scsi_device *sdev)
 {
        struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
-        sdev->tagged_supported = 1;
        if (!rport || fc_remote_port_chkready(rport))
                return -ENXIO;
-        scsi_activate_tcq(sdev, fnic_max_qdepth);
+        scsi_adjust_queue_depth(sdev, fnic_max_qdepth);
        return 0;
 }
@@ -113,7 +111,7 @@ static struct scsi_host_template fnic_host_template = {
        .eh_host_reset_handler = fnic_host_reset,
        .slave_alloc = fnic_slave_alloc,
        .change_queue_depth = fc_change_queue_depth,
-        .change_queue_type = fc_change_queue_type,
+        .change_queue_type = scsi_change_queue_type,
        .this_id = -1,
        .cmd_per_lun = 3,
        .can_queue = FNIC_DFLT_IO_REQ,
@@ -121,6 +119,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/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 961bdf5d31cd..10d5c6bbc9e7 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -325,13 +325,11 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
        struct fc_rport_libfc_priv *rp = rport->dd_data;
        struct host_sg_desc *desc;
        struct misc_stats *misc_stats = &fnic->fnic_stats.misc_stats;
-        u8 pri_tag = 0;
        unsigned int i;
        unsigned long intr_flags;
        int flags;
        u8 exch_flags;
        struct scsi_lun fc_lun;
-        char msg[2];
        if (sg_count) {
                /* For each SGE, create a device desc entry */
@@ -357,12 +355,6 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
        int_to_scsilun(sc->device->lun, &fc_lun);
-        pri_tag = FCPIO_ICMND_PTA_SIMPLE;
-        msg[0] = MSG_SIMPLE_TAG;
-        scsi_populate_tag_msg(sc, msg);
-        if (msg[0] == MSG_ORDERED_TAG)
-                pri_tag = FCPIO_ICMND_PTA_ORDERED;
        /* Enqueue the descriptor in the Copy WQ */
        spin_lock_irqsave(&fnic->wq_copy_lock[0], intr_flags);
@@ -394,7 +386,8 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *fnic,
                                         io_req->sgl_list_pa,
                                         io_req->sense_buf_pa,
                                         0, /* scsi cmd ref, always 0 */
-                                         pri_tag, /* scsi pri and tag */
+                                         FCPIO_ICMND_PTA_SIMPLE,
+                                                /* scsi pri and tag */
                                         flags, /* command flags */
                                         sc->cmnd, sc->cmd_len,
                                         scsi_bufflen(sc),
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 0f1ae13ce7c7..71e138044379 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -2159,7 +2159,7 @@ static void gdth_next(gdth_ha_str *ha)
              case VERIFY:
              case START_STOP:
              case MODE_SENSE:
-              case SERVICE_ACTION_IN:
+              case SERVICE_ACTION_IN_16:
                TRACE(("cache cmd %x/%x/%x/%x/%x/%x\n",nscp->cmnd[0],
                       nscp->cmnd[1],nscp->cmnd[2],nscp->cmnd[3],
                       nscp->cmnd[4],nscp->cmnd[5]));
@@ -2391,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)
        gdth_copy_internal_data(ha, scp, (char*)&rdc, sizeof(gdth_rdcap_data));
        break;
-      case SERVICE_ACTION_IN:
+      case SERVICE_ACTION_IN_16:
        if ((scp->cmnd[1] & 0x1f) == SAI_READ_CAPACITY_16 &&
            (ha->cache_feat & GDT_64BIT)) {
            gdth_rdcap16_data rdc16;
@@ -4661,7 +4661,6 @@ static void gdth_flush(gdth_ha_str *ha)
 /* configure lun */
 static int gdth_slave_configure(struct scsi_device *sdev)
 {
-    scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
    sdev->skip_ms_page_3f = 1;
    sdev->skip_ms_page_8 = 1;
    return 0;
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 6de80e352871..8bb173e01084 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -418,7 +418,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        shost->cmd_per_lun = sht->cmd_per_lun;
        shost->unchecked_isa_dma = sht->unchecked_isa_dma;
        shost->use_clustering = sht->use_clustering;
-        shost->ordered_tag = sht->ordered_tag;
        shost->no_write_same = sht->no_write_same;
        if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
@@ -485,8 +484,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
                                            WQ_UNBOUND | WQ_MEM_RECLAIM,
                                           1, shost->host_no);
        if (!shost->tmf_work_q) {
-                printk(KERN_WARNING "scsi%d: failed to create tmf workq\n",
+                shost_printk(KERN_WARNING, shost,
-                       shost->host_no);
+                             "failed to create tmf workq\n");
                goto fail_kthread;
        }
        scsi_proc_hostdir_add(shost->hostt);
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cef5d49b59cd..18ea2e16e34f 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4165,7 +4165,7 @@ static int hpsa_change_queue_depth(struct scsi_device *sdev,
        else
                if (qdepth > h->nr_cmds)
                        qdepth = h->nr_cmds;
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index dedb62c21b29..151893148abd 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -1127,7 +1127,7 @@ static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev,
        if (queue_depth > hba->max_requests)
                queue_depth = hba->max_requests;
-        scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return queue_depth;
 }
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 598c42cba5a8..147b80e07b00 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1643,19 +1643,9 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,
        int_to_scsilun(cmnd->device->lun, &vfc_cmd->iu.lun);
        memcpy(vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);
-        if (scsi_populate_tag_msg(cmnd, tag)) {
+        if (cmnd->flags & SCMD_TAGGED) {
-                vfc_cmd->task_tag = cpu_to_be64(tag[1]);
+                vfc_cmd->task_tag = cpu_to_be64(cmnd->tag);
-                switch (tag[0]) {
+                vfc_cmd->iu.pri_task_attr = IBMVFC_SIMPLE_TASK;
-                case MSG_SIMPLE_TAG:
-                        vfc_cmd->iu.pri_task_attr = IBMVFC_SIMPLE_TASK;
-                        break;
-                case MSG_HEAD_TAG:
-                        vfc_cmd->iu.pri_task_attr = IBMVFC_HEAD_OF_QUEUE;
-                        break;
-                case MSG_ORDERED_TAG:
-                        vfc_cmd->iu.pri_task_attr = IBMVFC_ORDERED_TASK;
-                        break;
-                };
        }
        if (likely(!(rc = ibmvfc_map_sg_data(cmnd, evt, vfc_cmd, vhost->dev))))
@@ -2897,12 +2887,6 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)
        spin_lock_irqsave(shost->host_lock, flags);
        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);
        spin_unlock_irqrestore(shost->host_lock, flags);
        return 0;
 }
@@ -2925,33 +2909,10 @@ static int ibmvfc_change_queue_depth(struct scsi_device *sdev, int qdepth,
        if (qdepth > IBMVFC_MAX_CMDS_PER_LUN)
                qdepth = IBMVFC_MAX_CMDS_PER_LUN;
-        scsi_adjust_queue_depth(sdev, 0, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
-/**
- * ibmvfc_change_queue_type - Change the device's queue type
- * @sdev:               scsi device struct
- * @tag_type:   type of tags to use
- *
- * Return value:
- *      actual queue type set
- **/
-static int ibmvfc_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;
-        return tag_type;
-}
 static ssize_t ibmvfc_show_host_partition_name(struct device *dev,
                                                 struct device_attribute *attr, char *buf)
 {
@@ -3133,7 +3094,7 @@ static struct scsi_host_template driver_template = {
        .target_alloc = ibmvfc_target_alloc,
        .scan_finished = ibmvfc_scan_finished,
        .change_queue_depth = ibmvfc_change_queue_depth,
-        .change_queue_type = ibmvfc_change_queue_type,
+        .change_queue_type = scsi_change_queue_type,
        .cmd_per_lun = 16,
        .can_queue = IBMVFC_MAX_REQUESTS_DEFAULT,
        .this_id = -1,
@@ -3141,6 +3102,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/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 7b23f21f22f1..e8c3cdf0d03b 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1929,7 +1929,6 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
                blk_queue_rq_timeout(sdev->request_queue, 120 * HZ);
        }
        spin_unlock_irqrestore(shost->host_lock, lock_flags);
-        scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
        return 0;
 }
@@ -1951,7 +1950,7 @@ static int ibmvscsi_change_queue_depth(struct scsi_device *sdev, int qdepth,
        if (qdepth > IBMVSCSI_MAX_CMDS_PER_LUN)
                qdepth = IBMVSCSI_MAX_CMDS_PER_LUN;
-        scsi_adjust_queue_depth(sdev, 0, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 2a9578c116b7..256ef98f5c29 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4344,7 +4344,7 @@ static int ipr_change_queue_depth(struct scsi_device *sdev, int qdepth,
                qdepth = IPR_MAX_CMD_PER_ATA_LUN;
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
@@ -4364,24 +4364,10 @@ static int ipr_change_queue_type(struct scsi_device *sdev, int tag_type)
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
        res = (struct ipr_resource_entry *)sdev->hostdata;
+        if (res && ipr_is_gscsi(res))
-        if (res) {
+                tag_type = scsi_change_queue_type(sdev, tag_type);
-                if (ipr_is_gscsi(res) && sdev->tagged_supported) {
+        else
-                        /*
-                         * We don't bother quiescing the device here since the
-                         * adapter firmware does it for us.
-                         */
-                        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;
-        } else
                tag_type = 0;
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
        return tag_type;
 }
@@ -4765,10 +4751,10 @@ static int ipr_slave_configure(struct scsi_device *sdev)
                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
                if (ap) {
-                        scsi_adjust_queue_depth(sdev, 0, IPR_MAX_CMD_PER_ATA_LUN);
+                        scsi_adjust_queue_depth(sdev, IPR_MAX_CMD_PER_ATA_LUN);
                        ata_sas_slave_configure(sdev, ap);
-                } else
+                }
-                        scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
                if (ioa_cfg->sis64)
                        sdev_printk(KERN_INFO, sdev, "Resource path: %s\n",
                                    ipr_format_res_path(ioa_cfg,
@@ -5673,35 +5659,6 @@ static int ipr_build_ioadl(struct ipr_ioa_cfg *ioa_cfg,
 }
 /**
- * ipr_get_task_attributes - Translate SPI Q-Tag to task attributes
- * @scsi_cmd:   scsi command struct
- *
- * Return value:
- *      task attributes
- **/
-static u8 ipr_get_task_attributes(struct scsi_cmnd *scsi_cmd)
-{
-        u8 tag[2];
-        u8 rc = IPR_FLAGS_LO_UNTAGGED_TASK;
-        if (scsi_populate_tag_msg(scsi_cmd, tag)) {
-                switch (tag[0]) {
-                case MSG_SIMPLE_TAG:
-                        rc = IPR_FLAGS_LO_SIMPLE_TASK;
-                        break;
-                case MSG_HEAD_TAG:
-                        rc = IPR_FLAGS_LO_HEAD_OF_Q_TASK;
-                        break;
-                case MSG_ORDERED_TAG:
-                        rc = IPR_FLAGS_LO_ORDERED_TASK;
-                        break;
-                };
-        }
-        return rc;
-}
-/**
 * ipr_erp_done - Process completion of ERP for a device
 * @ipr_cmd:            ipr command struct
 *
@@ -6236,7 +6193,10 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
                        ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_DELAY_AFTER_RST;
                }
                ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_ALIGNED_BFR;
-                ioarcb->cmd_pkt.flags_lo |= ipr_get_task_attributes(scsi_cmd);
+                if (scsi_cmd->flags & SCMD_TAGGED)
+                        ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_SIMPLE_TASK;
+                else
+                        ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_UNTAGGED_TASK;
        }
        if (scsi_cmd->cmnd[0] >= 0xC0 &&
@@ -6357,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/ips.c b/drivers/scsi/ips.c
index e5afc3884d74..454741a8da45 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -1210,7 +1210,7 @@ ips_slave_configure(struct scsi_device * SDptr)
                min = ha->max_cmds / 2;
                if (ha->enq->ucLogDriveCount <= 2)
                        min = ha->max_cmds - 1;
-                scsi_adjust_queue_depth(SDptr, MSG_ORDERED_TAG, min);
+                scsi_adjust_queue_depth(SDptr, min);
        }
        SDptr->skip_ms_page_8 = 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 1d7e76e8b447..bf954ee050f8 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_adjust_queue_depth(sdev, FC_FCP_DFLT_QUEUE_DEPTH);
-                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);
        return 0;
 }
 EXPORT_SYMBOL(fc_slave_alloc);
@@ -2180,13 +2175,13 @@ int fc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 {
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, qdepth);
                break;
        case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
                break;
        default:
                return -EOPNOTSUPP;
@@ -2196,26 +2191,6 @@ int fc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 EXPORT_SYMBOL(fc_change_queue_depth);
 /**
- * fc_change_queue_type() - Change a device's queue type
- * @sdev:     The SCSI device whose queue depth is to change
- * @tag_type: Identifier for queue type
- */
-int fc_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;
-        return tag_type;
-}
-EXPORT_SYMBOL(fc_change_queue_type);
-/**
 * fc_fcp_destory() - Tear down the FCP layer for a given local port
 * @lport: The local port that no longer needs the FCP layer
 */
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 0d8bc6c66650..d521624dedfb 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1775,13 +1775,13 @@ int iscsi_change_queue_depth(struct scsi_device *sdev, int depth, int reason)
 {
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, depth);
                break;
        case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        default:
                return -EOPNOTSUPP;
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 24e477d2ea70..89e8b687a679 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -940,15 +940,12 @@ 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_adjust_queue_depth(scsi_dev, SAS_DEF_QD);
-                scsi_activate_tcq(scsi_dev, 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_adjust_queue_depth(scsi_dev, 1);
-                scsi_set_tag_type(scsi_dev, 0);
-                scsi_deactivate_tcq(scsi_dev, 1);
        }
        scsi_dev->allow_restart = 1;
@@ -969,7 +966,7 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth, int reason)
        case SCSI_QDEPTH_RAMP_UP:
                if (!sdev->tagged_supported)
                        depth = 1;
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, depth);
@@ -981,22 +978,11 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth, int reason)
        return depth;
 }
-int sas_change_queue_type(struct scsi_device *scsi_dev, int qt)
+int sas_change_queue_type(struct scsi_device *scsi_dev, int type)
 {
-        struct domain_device *dev = sdev_to_domain_dev(scsi_dev);
+        if (dev_is_sata(sdev_to_domain_dev(scsi_dev)))
-        if (dev_is_sata(dev))
                return -EINVAL;
+        return scsi_change_queue_type(scsi_dev, type);
-        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);
-        return qt;
 }
 int sas_bios_param(struct scsi_device *scsi_dev,
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index b99399fe2548..8533ee9b818d 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -320,7 +320,7 @@ lpfc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        case SCSI_QDEPTH_DEFAULT:
                /* change request from sysfs, fall through */
        case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
                break;
        case SCSI_QDEPTH_QFULL:
                if (scsi_track_queue_full(sdev, qdepth) == 0)
@@ -345,26 +345,6 @@ lpfc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 }
 /**
- * lpfc_change_queue_type() - Change a device's scsi tag queuing type
- * @sdev: Pointer the scsi device whose queue depth is to change
- * @tag_type: Identifier for queue tag type
- */
-static int
-lpfc_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;
-        return tag_type;
-}
-/**
 * lpfc_rampdown_queue_depth - Post RAMP_DOWN_QUEUE event to worker thread
 * @phba: The Hba for which this call is being executed.
 *
@@ -4286,7 +4266,6 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
        IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;
        struct lpfc_iocbq *piocbq = &(lpfc_cmd->cur_iocbq);
        int datadir = scsi_cmnd->sc_data_direction;
-        char tag[2];
        uint8_t *ptr;
        bool sli4;
        uint32_t fcpdl;
@@ -4308,20 +4287,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                memset(ptr, 0, (LPFC_FCP_CDB_LEN - scsi_cmnd->cmd_len));
        }
-        if (scsi_populate_tag_msg(scsi_cmnd, tag)) {
+        fcp_cmnd->fcpCntl1 = SIMPLE_Q;
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        fcp_cmnd->fcpCntl1 = HEAD_OF_Q;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        fcp_cmnd->fcpCntl1 = ORDERED_Q;
-                        break;
-                default:
-                        fcp_cmnd->fcpCntl1 = SIMPLE_Q;
-                        break;
-                }
-        } else
-                fcp_cmnd->fcpCntl1 = SIMPLE_Q;
        sli4 = (phba->sli_rev == LPFC_SLI_REV4);
        piocbq->iocb.un.fcpi.fcpi_XRdy = 0;
@@ -5632,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_adjust_queue_depth(sdev, vport->cfg_lun_queue_depth);
-                scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth);
-        else
-                scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth);
        if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
                lpfc_sli_handle_fast_ring_event(phba,
@@ -6019,7 +5982,8 @@ struct scsi_host_template lpfc_template = {
        .max_sectors            = 0xFFFF,
        .vendor_id              = LPFC_NL_VENDOR_ID,
        .change_queue_depth     = lpfc_change_queue_depth,
-        .change_queue_type      = lpfc_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
+        .use_blk_tags           = 1,
 };
 struct scsi_host_template lpfc_vport_template = {
@@ -6042,5 +6006,6 @@ struct scsi_host_template lpfc_vport_template = {
        .shost_attrs            = lpfc_vport_attrs,
        .max_sectors            = 0xFFFF,
        .change_queue_depth     = lpfc_change_queue_depth,
-        .change_queue_type      = lpfc_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
+        .use_blk_tags           = 1,
 };
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index ac5d94cfd52f..2485255f3414 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1945,7 +1945,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
             cmd->device->id, (u32)cmd->device->lun);
        if(list_empty(&adapter->pending_list))
-                return FALSE;
+                return FAILED;
        list_for_each_safe(pos, next, &adapter->pending_list) {
@@ -1968,7 +1968,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                                        (aor==SCB_ABORT) ? "ABORTING":"RESET",
                                        scb->idx);
-                                return FALSE;
+                                return FAILED;
                        }
                        else {
@@ -1993,12 +1993,12 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                                list_add_tail(SCSI_LIST(cmd),
                                                &adapter->completed_list);
-                                return TRUE;
+                                return SUCCESS;
                        }
                }
        }
-        return FALSE;
+        return FAILED;
 }
 static inline int
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 531dce419c18..6b077d839f2b 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -349,7 +349,7 @@ static int megaraid_change_queue_depth(struct scsi_device *sdev, int qdepth,
        if (qdepth > MBOX_MAX_SCSI_CMDS)
                qdepth = MBOX_MAX_SCSI_CMDS;
-        scsi_adjust_queue_depth(sdev, 0, qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        return sdev->queue_depth;
 }
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 5640ad1c8214..107244cebd22 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2594,8 +2594,7 @@ static int megasas_change_queue_depth(struct scsi_device *sdev,
        if (queue_depth > sdev->host->can_queue)
                queue_depth = sdev->host->can_queue;
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev),
+        scsi_adjust_queue_depth(sdev, queue_depth);
-                                queue_depth);
        return queue_depth;
 }
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index c80ed0482649..42fef914d441 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -1222,7 +1222,7 @@ _scsih_adjust_queue_depth(struct scsi_device *sdev, int qdepth)
                max_depth = 1;
        if (qdepth > max_depth)
                qdepth = max_depth;
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
 }
 /**
@@ -1246,37 +1246,15 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        if (sdev->inquiry_len > 7)
                sdev_printk(KERN_INFO, sdev, "qdepth(%d), tagged(%d), "
-                "simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n",
+                "simple(%d), scsi_level(%d), cmd_que(%d)\n",
                sdev->queue_depth, sdev->tagged_supported, sdev->simple_tags,
-                sdev->ordered_tags, sdev->scsi_level,
+                sdev->scsi_level,
                (sdev->inquiry[7] & 2) >> 1);
        return sdev->queue_depth;
 }
 /**
- * _scsih_change_queue_type - changing device queue tag type
- * @sdev: scsi device struct
- * @tag_type: requested tag type
- *
- * Returns queue tag type.
- */
-static int
-_scsih_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;
-        return tag_type;
-}
-/**
 * _scsih_target_alloc - target add routine
 * @starget: scsi target struct
 *
@@ -3966,16 +3944,8 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
                mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;
        /* set tags */
-        if (!(sas_device_priv_data->flags & MPT_DEVICE_FLAGS_INIT)) {
+        mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-                if (scmd->device->tagged_supported) {
-                        if (scmd->device->ordered_tags)
-                                mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;
-                        else
-                                mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-                } else
-                        mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-        } else
-                mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
        /* Make sure Device is not raid volume.
         * We do not expose raid functionality to upper layer for warpdrive.
         */
@@ -7653,7 +7623,7 @@ static struct scsi_host_template scsih_driver_template = {
        .scan_finished                  = _scsih_scan_finished,
        .scan_start                     = _scsih_scan_start,
        .change_queue_depth             = _scsih_change_queue_depth,
-        .change_queue_type              = _scsih_change_queue_type,
+        .change_queue_type              = scsi_change_queue_type,
        .eh_abort_handler               = _scsih_abort,
        .eh_device_reset_handler        = _scsih_dev_reset,
        .eh_target_reset_handler        = _scsih_target_reset,
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 857276b8880f..b23c2e7588e5 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1090,7 +1090,7 @@ _scsih_adjust_queue_depth(struct scsi_device *sdev, int qdepth)
                max_depth = 1;
        if (qdepth > max_depth)
                qdepth = max_depth;
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
 }
 /**
@@ -1114,38 +1114,15 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        if (sdev->inquiry_len > 7)
                sdev_printk(KERN_INFO, sdev, "qdepth(%d), tagged(%d), " \
-                "simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n",
+                "simple(%d), scsi_level(%d), cmd_que(%d)\n",
                sdev->queue_depth, sdev->tagged_supported, sdev->simple_tags,
-                sdev->ordered_tags, sdev->scsi_level,
+                sdev->scsi_level,
                (sdev->inquiry[7] & 2) >> 1);
        return sdev->queue_depth;
 }
 /**
- * _scsih_change_queue_type - changing device queue tag type
- * @sdev: scsi device struct
- * @tag_type: requested tag type
- *
- * Returns queue tag type.
- */
-static int
-_scsih_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;
-        return tag_type;
-}
-/**
 * _scsih_target_alloc - target add routine
 * @starget: scsi target struct
 *
@@ -3586,16 +3563,7 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
                mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;
        /* set tags */
-        if (!(sas_device_priv_data->flags & MPT_DEVICE_FLAGS_INIT)) {
+        mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-                if (scmd->device->tagged_supported) {
-                        if (scmd->device->ordered_tags)
-                                mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;
-                        else
-                                mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-                } else
-                        mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-        } else
-                mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
        if ((sas_device_priv_data->flags & MPT_DEVICE_TLR_ON) &&
            scmd->cmd_len != 32)
@@ -7284,7 +7252,7 @@ static struct scsi_host_template scsih_driver_template = {
        .scan_finished                  = _scsih_scan_finished,
        .scan_start                     = _scsih_scan_start,
        .change_queue_depth             = _scsih_change_queue_depth,
-        .change_queue_type              = _scsih_change_queue_type,
+        .change_queue_type              = scsi_change_queue_type,
        .eh_abort_handler               = _scsih_abort,
        .eh_device_reset_handler        = _scsih_dev_reset,
        .eh_target_reset_handler        = _scsih_target_reset,
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/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index a7305ffc359d..9c331b7bfdcd 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -7997,10 +7997,7 @@ static int ncr53c8xx_slave_configure(struct scsi_device *device)
        if (depth_to_use > MAX_TAGS)
                depth_to_use = MAX_TAGS;
-        scsi_adjust_queue_depth(device,
+        scsi_adjust_queue_depth(device, depth_to_use);
-                                (device->tagged_supported ?
-                                 MSG_SIMPLE_TAG : 0),
-                                depth_to_use);
        /*
        **      Since the queue depth is not tunable under Linux,
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 92cdd4b06526..243eab3d10d0 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -540,9 +540,9 @@ static int osd_remove(struct device *dev)
 */
 static struct scsi_driver osd_driver = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = osd_name,
+                .owner          = THIS_MODULE,
                .probe          = osd_probe,
                .remove         = osd_remove,
        }
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index dff37a250d79..5033223f6287 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -172,9 +172,9 @@ static int osst_probe(struct device *);
 static int osst_remove(struct device *);
 static struct scsi_driver osst_template = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           =  "osst",
+                .owner          = THIS_MODULE,
                .probe          = osst_probe,
                .remove         = osst_remove,
        }
@@ -259,9 +259,10 @@ static int osst_chk_result(struct osst_tape * STp, struct osst_request * SRpnt)
                   SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2],
                   SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]);
                if (scode) printk(OSST_DEB_MSG "%s:D: Sense: %02x, ASC: %02x, ASCQ: %02x\n",
-                                name, scode, sense[12], sense[13]);
+                                  name, scode, sense[12], sense[13]);
                if (cmdstatp->have_sense)
-                        __scsi_print_sense("osst ", SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
+                        __scsi_print_sense(STp->device, name,
+                                           SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
        }
        else
 #endif
@@ -275,7 +276,8 @@ static int osst_chk_result(struct osst_tape * STp, struct osst_request * SRpnt)
                 SRpnt->cmd[0] != TEST_UNIT_READY)) { /* Abnormal conditions for tape */
                if (cmdstatp->have_sense) {
                        printk(KERN_WARNING "%s:W: Command with sense data:\n", name);
-                        __scsi_print_sense("osst ", SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
+                        __scsi_print_sense(STp->device, name,
+                                           SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
                }
                else {
                        static  int     notyetprinted = 1;
@@ -3325,19 +3327,18 @@ static int osst_write_frame(struct osst_tape * STp, struct osst_request ** aSRpn
 /* Lock or unlock the drive door. Don't use when struct osst_request allocated. */
 static int do_door_lock(struct osst_tape * STp, int do_lock)
 {
-        int retval, cmd;
+        int retval;
-        cmd = do_lock ? SCSI_IOCTL_DOORLOCK : SCSI_IOCTL_DOORUNLOCK;
 #if DEBUG
        printk(OSST_DEB_MSG "%s:D: %socking drive door.\n", tape_name(STp), do_lock ? "L" : "Unl");
 #endif
-        retval = scsi_ioctl(STp->device, cmd, NULL);
-        if (!retval) {
+        retval = scsi_set_medium_removal(STp->device,
+                        do_lock ? SCSI_REMOVAL_PREVENT : SCSI_REMOVAL_ALLOW);
+        if (!retval)
                STp->door_locked = do_lock ? ST_LOCKED_EXPLICIT : ST_UNLOCKED;
-        }
+        else
-        else {
                STp->door_locked = ST_LOCK_FAILS;
-        }
        return retval;
 }
@@ -4967,10 +4968,10 @@ static long osst_ioctl(struct file * file,
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-        if( !scsi_block_when_processing_errors(STp->device) ) {
+        retval = scsi_ioctl_block_when_processing_errors(STp->device, cmd_in,
-                retval = (-ENXIO);
+                        file->f_flags & O_NDELAY);
+        if (retval)
                goto out;
-        }
        cmd_type = _IOC_TYPE(cmd_in);
        cmd_nr   = _IOC_NR(cmd_in);
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 bcb64eb1387f..d8b9ba251fbd 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -249,15 +249,11 @@ static int pmcraid_slave_configure(struct scsi_device *scsi_dev)
                                      PMCRAID_VSET_MAX_SECTORS);
        }
-        if (scsi_dev->tagged_supported &&
+        /*
-            (RES_IS_GSCSI(res->cfg_entry) || RES_IS_VSET(res->cfg_entry))) {
+         * We never want to report TCQ support for these types of devices.
-                scsi_activate_tcq(scsi_dev, scsi_dev->queue_depth);
+         */
-                scsi_adjust_queue_depth(scsi_dev, MSG_SIMPLE_TAG,
+        if (!RES_IS_GSCSI(res->cfg_entry) && !RES_IS_VSET(res->cfg_entry))
-                                        scsi_dev->host->cmd_per_lun);
+                scsi_dev->tagged_supported = 0;
-        } else {
-                scsi_adjust_queue_depth(scsi_dev, 0,
-                                        scsi_dev->host->cmd_per_lun);
-        }
        return 0;
 }
@@ -303,41 +299,12 @@ static int pmcraid_change_queue_depth(struct scsi_device *scsi_dev, int depth,
        if (depth > PMCRAID_MAX_CMD_PER_LUN)
                depth = PMCRAID_MAX_CMD_PER_LUN;
-        scsi_adjust_queue_depth(scsi_dev, scsi_get_tag_type(scsi_dev), depth);
+        scsi_adjust_queue_depth(scsi_dev, depth);
        return scsi_dev->queue_depth;
 }
 /**
- * pmcraid_change_queue_type - Change the device's queue type
- * @scsi_dev: scsi device struct
- * @tag: type of tags to use
- *
- * Return value:
- *      actual queue type set
- */
-static int pmcraid_change_queue_type(struct scsi_device *scsi_dev, int tag)
-{
-        struct pmcraid_resource_entry *res;
-        res = (struct pmcraid_resource_entry *)scsi_dev->hostdata;
-        if ((res) && scsi_dev->tagged_supported &&
-            (RES_IS_GSCSI(res->cfg_entry) || RES_IS_VSET(res->cfg_entry))) {
-                scsi_set_tag_type(scsi_dev, tag);
-                if (tag)
-                        scsi_activate_tcq(scsi_dev, scsi_dev->queue_depth);
-                else
-                        scsi_deactivate_tcq(scsi_dev, scsi_dev->queue_depth);
-        } else
-                tag = 0;
-        return tag;
-}
-/**
 * pmcraid_init_cmdblk - initializes a command block
 *
 * @cmd: pointer to struct pmcraid_cmd to be initialized
@@ -3175,36 +3142,6 @@ static int pmcraid_eh_host_reset_handler(struct scsi_cmnd *scmd)
 }
 /**
- * pmcraid_task_attributes - Translate SPI Q-Tags to task attributes
- * @scsi_cmd:   scsi command struct
- *
- * Return value
- *        number of tags or 0 if the task is not tagged
- */
-static u8 pmcraid_task_attributes(struct scsi_cmnd *scsi_cmd)
-{
-        char tag[2];
-        u8 rc = 0;
-        if (scsi_populate_tag_msg(scsi_cmd, tag)) {
-                switch (tag[0]) {
-                case MSG_SIMPLE_TAG:
-                        rc = TASK_TAG_SIMPLE;
-                        break;
-                case MSG_HEAD_TAG:
-                        rc = TASK_TAG_QUEUE_HEAD;
-                        break;
-                case MSG_ORDERED_TAG:
-                        rc = TASK_TAG_ORDERED;
-                        break;
-                };
-        }
-        return rc;
-}
-/**
 * pmcraid_init_ioadls - initializes IOADL related fields in IOARCB
 * @cmd: pmcraid command struct
 * @sgcount: count of scatter-gather elements
@@ -3559,7 +3496,9 @@ static int pmcraid_queuecommand_lck(
                }
                ioarcb->request_flags0 |= NO_LINK_DESCS;
-                ioarcb->request_flags1 |= pmcraid_task_attributes(scsi_cmd);
+                if (scsi_cmd->flags & SCMD_TAGGED)
+                        ioarcb->request_flags1 |= TASK_TAG_SIMPLE;
                if (RES_IS_GSCSI(res->cfg_entry))
                        ioarcb->request_flags1 |= DELAY_AFTER_RESET;
@@ -4320,7 +4259,7 @@ static struct scsi_host_template pmcraid_host_template = {
        .slave_configure = pmcraid_slave_configure,
        .slave_destroy = pmcraid_slave_destroy,
        .change_queue_depth = pmcraid_change_queue_depth,
-        .change_queue_type  = pmcraid_change_queue_type,
+        .change_queue_type  = scsi_change_queue_type,
        .can_queue = PMCRAID_MAX_IO_CMD,
        .this_id = -1,
        .sg_tablesize = PMCRAID_MAX_IOADLS,
@@ -4329,7 +4268,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/ps3rom.c b/drivers/scsi/ps3rom.c
index ef23fabe3924..b3b48b5a984c 100644
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -220,10 +220,6 @@ static int ps3rom_queuecommand_lck(struct scsi_cmnd *cmd,
        unsigned char opcode;
        int res;
-#ifdef DEBUG
-        scsi_print_command(cmd);
-#endif
        priv->curr_cmd = cmd;
        cmd->scsi_done = done;
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 158020522dfb..adedb6ef8eec 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1224,10 +1224,9 @@ qla1280_slave_configure(struct scsi_device *device)
        if (device->tagged_supported &&
            (ha->bus_settings[bus].qtag_enables & (BIT_0 << target))) {
-                scsi_adjust_queue_depth(device, MSG_ORDERED_TAG,
+                scsi_adjust_queue_depth(device, ha->bus_settings[bus].hiwat);
-                                        ha->bus_settings[bus].hiwat);
        } else {
-                scsi_adjust_queue_depth(device, 0, default_depth);
+                scsi_adjust_queue_depth(device, default_depth);
        }
        nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index f0edb07f3198..a1ab25fca874 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -325,7 +325,6 @@ qla2x00_start_scsi(srb_t *sp)
        struct qla_hw_data *ha;
        struct req_que *req;
        struct rsp_que *rsp;
-        char            tag[2];
        /* Setup device pointers. */
        ret = 0;
@@ -404,26 +403,7 @@ qla2x00_start_scsi(srb_t *sp)
        /* Set target ID and LUN number*/
        SET_TARGET_ID(ha, cmd_pkt->target, sp->fcport->loop_id);
        cmd_pkt->lun = cpu_to_le16(cmd->device->lun);
+        cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
-        /* Update tagged queuing modifier */
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        cmd_pkt->control_flags =
-                            __constant_cpu_to_le16(CF_HEAD_TAG);
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        cmd_pkt->control_flags =
-                            __constant_cpu_to_le16(CF_ORDERED_TAG);
-                        break;
-                default:
-                        cmd_pkt->control_flags =
-                            __constant_cpu_to_le16(CF_SIMPLE_TAG);
-                        break;
-                }
-        } else {
-                cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
-        }
        /* Load SCSI command packet. */
        memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len);
@@ -1264,7 +1244,6 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
        uint16_t                fcp_cmnd_len;
        struct fcp_cmnd         *fcp_cmnd;
        dma_addr_t              crc_ctx_dma;
-        char                    tag[2];
        cmd = GET_CMD_SP(sp);
@@ -1356,25 +1335,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
        cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32(
            MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));
        fcp_cmnd->task_management = 0;
+        fcp_cmnd->task_attribute = TSK_SIMPLE;
-        /*
-         * Update tagged queuing modifier if using command tag queuing
-         */
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                    fcp_cmnd->task_attribute = TSK_HEAD_OF_QUEUE;
-                    break;
-                case ORDERED_QUEUE_TAG:
-                    fcp_cmnd->task_attribute = TSK_ORDERED;
-                    break;
-                default:
-                    fcp_cmnd->task_attribute = TSK_SIMPLE;
-                    break;
-                }
-        } else {
-                fcp_cmnd->task_attribute = TSK_SIMPLE;
-        }
        cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */
@@ -1495,7 +1456,6 @@ qla24xx_start_scsi(srb_t *sp)
        struct scsi_cmnd *cmd = GET_CMD_SP(sp);
        struct scsi_qla_host *vha = sp->fcport->vha;
        struct qla_hw_data *ha = vha->hw;
-        char            tag[2];
        /* Setup device pointers. */
        ret = 0;
@@ -1578,22 +1538,7 @@ qla24xx_start_scsi(srb_t *sp)
        int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
        host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
-        /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
+        cmd_pkt->task = TSK_SIMPLE;
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        cmd_pkt->task = TSK_HEAD_OF_QUEUE;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        cmd_pkt->task = TSK_ORDERED;
-                        break;
-                default:
-                    cmd_pkt->task = TSK_SIMPLE;
-                    break;
-                }
-        } else {
-                cmd_pkt->task = TSK_SIMPLE;
-        }
        /* Load SCSI command packet. */
        memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
@@ -2310,7 +2255,6 @@ qla82xx_start_scsi(srb_t *sp)
        struct qla_hw_data *ha = vha->hw;
        struct req_que *req = NULL;
        struct rsp_que *rsp = NULL;
-        char tag[2];
        /* Setup device pointers. */
        ret = 0;
@@ -2489,22 +2433,6 @@ sufficient_dsds:
                else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
                        ctx->fcp_cmnd->additional_cdb_len |= 2;
-                /*
-                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
-                 */
-                if (scsi_populate_tag_msg(cmd, tag)) {
-                        switch (tag[0]) {
-                        case HEAD_OF_QUEUE_TAG:
-                                ctx->fcp_cmnd->task_attribute =
-                                    TSK_HEAD_OF_QUEUE;
-                                break;
-                        case ORDERED_QUEUE_TAG:
-                                ctx->fcp_cmnd->task_attribute =
-                                    TSK_ORDERED;
-                                break;
-                        }
-                }
                /* Populate the FCP_PRIO. */
                if (ha->flags.fcp_prio_enabled)
                        ctx->fcp_cmnd->task_attribute |=
@@ -2565,20 +2493,6 @@ sufficient_dsds:
                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun,
                    sizeof(cmd_pkt->lun));
-                /*
-                 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).
-                 */
-                if (scsi_populate_tag_msg(cmd, tag)) {
-                        switch (tag[0]) {
-                        case HEAD_OF_QUEUE_TAG:
-                                cmd_pkt->task = TSK_HEAD_OF_QUEUE;
-                                break;
-                        case ORDERED_QUEUE_TAG:
-                                cmd_pkt->task = TSK_ORDERED;
-                                break;
-                        }
-                }
                /* Populate the FCP_PRIO. */
                if (ha->flags.fcp_prio_enabled)
                        cmd_pkt->task |= sp->fcport->fcp_prio << 3;
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 80867599527d..6d190b4b82a0 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -3086,7 +3086,6 @@ qlafx00_start_scsi(srb_t *sp)
        struct cmd_type_7_fx00 *cmd_pkt;
        struct cmd_type_7_fx00 lcmd_pkt;
        struct scsi_lun llun;
-        char            tag[2];
        /* Setup device pointers. */
        ret = 0;
@@ -3157,18 +3156,6 @@ qlafx00_start_scsi(srb_t *sp)
        host_to_adap((uint8_t *)&llun, (uint8_t *)&lcmd_pkt.lun,
            sizeof(lcmd_pkt.lun));
-        /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        lcmd_pkt.task = TSK_HEAD_OF_QUEUE;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        lcmd_pkt.task = TSK_ORDERED;
-                        break;
-                }
-        }
        /* Load SCSI command packet. */
        host_to_adap(cmd->cmnd, lcmd_pkt.fcp_cdb, sizeof(lcmd_pkt.fcp_cdb));
        lcmd_pkt.byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index db3dbd999cb6..33166ebec7d8 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -237,7 +237,6 @@ static int qla2xxx_eh_bus_reset(struct scsi_cmnd *);
 static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
 static int qla2x00_change_queue_depth(struct scsi_device *, int, int);
-static int qla2x00_change_queue_type(struct scsi_device *, int);
 static void qla2x00_clear_drv_active(struct qla_hw_data *);
 static void qla2x00_free_device(scsi_qla_host_t *);
 static void qla83xx_disable_laser(scsi_qla_host_t *vha);
@@ -260,7 +259,7 @@ struct scsi_host_template qla2xxx_driver_template = {
        .scan_finished          = qla2xxx_scan_finished,
        .scan_start             = qla2xxx_scan_start,
        .change_queue_depth     = qla2x00_change_queue_depth,
-        .change_queue_type      = qla2x00_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
        .this_id                = -1,
        .cmd_per_lun            = 3,
        .use_clustering         = ENABLE_CLUSTERING,
@@ -270,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;
@@ -1405,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_adjust_queue_depth(sdev, req->max_q_depth);
-                scsi_activate_tcq(sdev, req->max_q_depth);
-        else
-                scsi_deactivate_tcq(sdev, req->max_q_depth);
        return 0;
 }
@@ -1443,10 +1440,7 @@ static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)
        if (req->max_q_depth <= sdev->queue_depth || req->max_q_depth < qdepth)
                return;
-        if (sdev->ordered_tags)
+        scsi_adjust_queue_depth(sdev, qdepth);
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, qdepth);
-        else
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, qdepth);
        ql_dbg(ql_dbg_io, vha, 0x302a,
            "Queue depth adjusted-up to %d for nexus=%ld:%d:%llu.\n",
@@ -1458,7 +1452,7 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 {
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
                break;
        case SCSI_QDEPTH_QFULL:
                qla2x00_handle_queue_full(sdev, qdepth);
@@ -1473,21 +1467,6 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
        return sdev->queue_depth;
 }
-static int
-qla2x00_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;
-        return tag_type;
-}
 /**
 * qla2x00_config_dma_addressing() - Configure OS DMA addressing method.
 * @ha: HA context
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index 08ab6dac226d..17222eb49762 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -280,7 +280,6 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
        uint16_t req_cnt;
        unsigned long flags;
        uint32_t index;
-        char tag[2];
        /* Get real lun and adapter */
        ddb_entry = srb->ddb;
@@ -352,15 +351,6 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
        /* Set tagged queueing control flags */
        cmd_entry->control_flags |= CF_SIMPLE_TAG;
-        if (scsi_populate_tag_msg(cmd, tag))
-                switch (tag[0]) {
-                case MSG_HEAD_TAG:
-                        cmd_entry->control_flags |= CF_HEAD_TAG;
-                        break;
-                case MSG_ORDERED_TAG:
-                        cmd_entry->control_flags |= CF_ORDERED_TAG;
-                        break;
-                }
        qla4xxx_advance_req_ring_ptr(ha);
        qla4xxx_build_scsi_iocbs(srb, cmd_entry, tot_dsds);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 199fcf79a051..f8724f2e0158 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -162,8 +162,6 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd);
 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,
@@ -204,9 +202,7 @@ static struct scsi_host_template qla4xxx_driver_template = {
        .eh_host_reset_handler  = qla4xxx_eh_host_reset,
        .eh_timed_out           = qla4xxx_eh_cmd_timed_out,
-        .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 +214,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 = {
@@ -9060,26 +9057,14 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
        ddb = sess->dd_data;
        sdev->hostdata = ddb;
-        sdev->tagged_supported = 1;
        if (ql4xmaxqdepth != 0 && ql4xmaxqdepth <= 0xffffU)
                queue_depth = ql4xmaxqdepth;
-        scsi_activate_tcq(sdev, queue_depth);
+        scsi_adjust_queue_depth(sdev, queue_depth);
        return 0;
 }
-static int qla4xxx_slave_configure(struct scsi_device *sdev)
-{
-        sdev->tagged_supported = 1;
-        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 79c77b485a67..2d9730432233 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -527,9 +527,9 @@ void scsi_log_send(struct scsi_cmnd *cmd)
         *
         * 1: nothing (match completion)
         *
-         * 2: log opcode + command of all commands
+         * 2: log opcode + command of all commands + cmd address
         *
-         * 3: same as 2 plus dump cmd address
+         * 3: same as 2
         *
         * 4: same as 3 plus dump extra junk
         */
@@ -537,10 +537,8 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,
                                       SCSI_LOG_MLQUEUE_BITS);
                if (level > 1) {
-                        scmd_printk(KERN_INFO, cmd, "Send: ");
+                        scmd_printk(KERN_INFO, cmd,
-                        if (level > 2)
+                                    "Send: scmd 0x%p\n", cmd);
-                                printk("0x%p ", cmd);
-                        printk("\n");
                        scsi_print_command(cmd);
                        if (level > 3) {
                                printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
@@ -565,7 +563,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
         *
         * 2: same as 1 but for all command completions.
         *
-         * 3: same as 2 plus dump cmd address
+         * 3: same as 2
         *
         * 4: same as 3 plus dump extra junk
         */
@@ -574,39 +572,10 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                                       SCSI_LOG_MLCOMPLETE_BITS);
                if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||
                    (level > 1)) {
-                        scmd_printk(KERN_INFO, cmd, "Done: ");
+                        scsi_print_result(cmd, "Done: ", disposition);
-                        if (level > 2)
-                                printk("0x%p ", cmd);
-                        /*
-                         * Dump truncated values, so we usually fit within
-                         * 80 chars.
-                         */
-                        switch (disposition) {
-                        case SUCCESS:
-                                printk("SUCCESS\n");
-                                break;
-                        case NEEDS_RETRY:
-                                printk("RETRY\n");
-                                break;
-                        case ADD_TO_MLQUEUE:
-                                printk("MLQUEUE\n");
-                                break;
-                        case FAILED:
-                                printk("FAILED\n");
-                                break;
-                        case TIMEOUT_ERROR:
-                                /* 
-                                 * If called via scsi_times_out.
-                                 */
-                                printk("TIMEOUT\n");
-                                break;
-                        default:
-                                printk("UNKNOWN\n");
-                        }
-                        scsi_print_result(cmd);
                        scsi_print_command(cmd);
                        if (status_byte(cmd->result) & CHECK_CONDITION)
-                                scsi_print_sense("", cmd);
+                                scsi_print_sense(cmd);
                        if (level > 3)
                                scmd_printk(KERN_INFO, cmd,
                                            "scsi host busy %d failed %d\n",
@@ -634,87 +603,6 @@ void scsi_cmd_get_serial(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 EXPORT_SYMBOL(scsi_cmd_get_serial);
 /**
- * scsi_dispatch_command - Dispatch a command to the low-level driver.
- * @cmd: command block we are dispatching.
- *
- * Return: nonzero return request was rejected and device's queue needs to be
- * plugged.
- */
-int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
-{
-        struct Scsi_Host *host = cmd->device->host;
-        int rtn = 0;
-        atomic_inc(&cmd->device->iorequest_cnt);
-        /* check if the device is still usable */
-        if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-                /* in SDEV_DEL we error all commands. DID_NO_CONNECT
-                 * returns an immediate error upwards, and signals
-                 * that the device is no longer present */
-                cmd->result = DID_NO_CONNECT << 16;
-                goto done;
-        }
-        /* Check to see if the scsi lld made this device blocked. */
-        if (unlikely(scsi_device_blocked(cmd->device))) {
-                /*
-                 * in blocked state, the command is just put back on
-                 * the device queue.  The suspend state has already
-                 * blocked the queue so future requests should not
-                 * occur until the device transitions out of the
-                 * suspend state.
-                 */
-                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
-                        "queuecommand : device blocked\n"));
-                return SCSI_MLQUEUE_DEVICE_BUSY;
-        }
-        /* Store the LUN value in cmnd, if needed. */
-        if (cmd->device->lun_in_cdb)
-                cmd->cmnd[1] = (cmd->cmnd[1] & 0x1f) |
-                               (cmd->device->lun << 5 & 0xe0);
-        scsi_log_send(cmd);
-        /*
-         * Before we queue this command, check if the command
-         * length exceeds what the host adapter can handle.
-         */
-        if (cmd->cmd_len > cmd->device->host->max_cmd_len) {
-                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
-                               "queuecommand : command too long. "
-                               "cdb_size=%d host->max_cmd_len=%d\n",
-                               cmd->cmd_len, cmd->device->host->max_cmd_len));
-                cmd->result = (DID_ABORT << 16);
-                goto done;
-        }
-        if (unlikely(host->shost_state == SHOST_DEL)) {
-                cmd->result = (DID_NO_CONNECT << 16);
-                goto done;
-        }
-        trace_scsi_dispatch_cmd_start(cmd);
-        rtn = host->hostt->queuecommand(host, cmd);
-        if (rtn) {
-                trace_scsi_dispatch_cmd_error(cmd, rtn);
-                if (rtn != SCSI_MLQUEUE_DEVICE_BUSY &&
-                    rtn != SCSI_MLQUEUE_TARGET_BUSY)
-                        rtn = SCSI_MLQUEUE_HOST_BUSY;
-                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
-                        "queuecommand : request rejected\n"));
-        }
-        return rtn;
- done:
-        cmd->scsi_done(cmd);
-        return 0;
-}
-/**
 * scsi_finish_command - cleanup and pass command back to upper layer
 * @cmd: the command
 *
@@ -775,8 +663,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
 /**
 * scsi_adjust_queue_depth - Let low level drivers change a device's queue depth
 * @sdev: SCSI Device in question
- * @tagged: Do we use tagged queueing (non-0) or do we treat
- *          this device as an untagged device (0)
 * @tags: Number of tags allowed if tagged queueing enabled,
 *        or number of commands the low level driver can
 *        queue up in non-tagged mode (as per cmd_per_lun).
@@ -790,7 +676,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
 *              currently active and whether or not it even has the
 *              command blocks built yet.
 */
-void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
+void scsi_adjust_queue_depth(struct scsi_device *sdev, int tags)
 {
        unsigned long flags;
@@ -818,26 +704,6 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
        }
        sdev->queue_depth = tags;
-        switch (tagged) {
-                case 0:
-                        sdev->ordered_tags = 0;
-                        sdev->simple_tags = 0;
-                        break;
-                case MSG_ORDERED_TAG:
-                        sdev->ordered_tags = 1;
-                        sdev->simple_tags = 1;
-                        break;
-                case MSG_SIMPLE_TAG:
-                        sdev->ordered_tags = 0;
-                        sdev->simple_tags = 1;
-                        break;
-                default:
-                        sdev->ordered_tags = 0;
-                        sdev->simple_tags = 0;
-                        sdev_printk(KERN_WARNING, sdev,
-                                    "scsi_adjust_queue_depth, bad queue type, "
-                                    "disabled\n");
-        }
 out:
        spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
 }
@@ -885,19 +751,33 @@ int scsi_track_queue_full(struct scsi_device *sdev, int depth)
                return 0;
        if (sdev->last_queue_full_depth < 8) {
                /* Drop back to untagged */
-                scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
+                scsi_set_tag_type(sdev, 0);
+                scsi_adjust_queue_depth(sdev, sdev->host->cmd_per_lun);
                return -1;
        }
-        
-        if (sdev->ordered_tags)
+        scsi_adjust_queue_depth(sdev, depth);
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
-        else
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
        return depth;
 }
 EXPORT_SYMBOL(scsi_track_queue_full);
 /**
+ * scsi_change_queue_type() - Change a device's queue type
+ * @sdev:     The SCSI device whose queue depth is to change
+ * @tag_type: Identifier for queue type
+ */
+int scsi_change_queue_type(struct scsi_device *sdev, int tag_type)
+{
+        if (!sdev->tagged_supported)
+                return 0;
+        scsi_set_tag_type(sdev, tag_type);
+        return tag_type;
+}
+EXPORT_SYMBOL(scsi_change_queue_type);
+/**
 * scsi_vpd_inquiry - Request a device provide us with a VPD page
 * @sdev: The device to ask
 * @buffer: Where to put the result
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 238e06f13b8a..378e0aae29ca 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2701,10 +2701,6 @@ static int scsi_debug_slave_configure(struct scsi_device *sdp)
        if (NULL == devip)
                return 1;       /* no resources, will be marked offline */
        sdp->hostdata = devip;
-        sdp->tagged_supported = 1;
-        if (sdp->host->cmd_per_lun)
-                scsi_adjust_queue_depth(sdp, DEF_TAGGED_QUEUING,
-                                        DEF_CMD_PER_LUN);
        blk_queue_max_segment_size(sdp->request_queue, -1U);
        if (scsi_debug_no_uld)
                sdp->no_uld_attach = 1;
@@ -4214,7 +4210,7 @@ scsi_debug_queuecommand(struct scsi_cmnd *SCpnt)
        case READ_CAPACITY:
                errsts = resp_readcap(SCpnt, devip);
                break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                if (cmd[1] == SAI_READ_CAPACITY_16)
                        errsts = resp_readcap16(SCpnt, devip);
                else if (cmd[1] == SAI_GET_LBA_STATUS) {
@@ -4494,7 +4490,7 @@ sdebug_change_qdepth(struct scsi_device *sdev, int qdepth, int reason)
                /* allow to exceed max host queued_arr elements for testing */
                if (qdepth > SCSI_DEBUG_CANQUEUE + 10)
                        qdepth = SCSI_DEBUG_CANQUEUE + 10;
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+                scsi_adjust_queue_depth(sdev, qdepth);
        } else if (reason == SCSI_QDEPTH_QFULL)
                scsi_track_queue_full(sdev, qdepth);
        else
@@ -4532,14 +4528,7 @@ sdebug_change_qdepth(struct scsi_device *sdev, int qdepth, int reason)
 static int
 sdebug_change_qtype(struct scsi_device *sdev, int qtype)
 {
-        if (sdev->tagged_supported) {
+        qtype = scsi_change_queue_type(sdev, qtype);
-                scsi_set_tag_type(sdev, qtype);
-                if (qtype)
-                        scsi_activate_tcq(sdev, sdev->queue_depth);
-                else
-                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
-        } else
-                qtype = 0;
        if (SCSI_DEBUG_OPT_Q_NOISE & scsi_debug_opts) {
                const char *cp;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index bc5ff6ff9c79..96627bae753c 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -36,6 +36,7 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/sg.h>
 #include "scsi_priv.h"
 #include "scsi_logging.h"
@@ -157,8 +158,9 @@ scmd_eh_abort_handler(struct work_struct *work)
                } else {
                        SCSI_LOG_ERROR_RECOVERY(3,
                                scmd_printk(KERN_INFO, scmd,
-                                            "scmd %p abort failed, rtn %d\n",
+                                            "scmd %p abort %s\n", scmd,
-                                            scmd, rtn));
+                                            (rtn == FAST_IO_FAIL) ?
+                                            "not send" : "failed"));
                }
        }
@@ -355,7 +357,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
                if (cmd_cancel || cmd_failed) {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                sdev_printk(KERN_INFO, sdev,
+                                shost_printk(KERN_INFO, shost,
                                            "%s: cmds failed: %d, cancel: %d\n",
                                            __func__, cmd_failed,
                                            cmd_cancel));
@@ -869,7 +871,24 @@ static int scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
        return rtn;
 }
-static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt, struct scsi_cmnd *scmd)
+/**
+ * scsi_try_to_abort_cmd - Ask host to abort a SCSI command
+ * @scmd:       SCSI cmd used to send a target reset
+ *
+ * Return value:
+ *      SUCCESS, FAILED, or FAST_IO_FAIL
+ *
+ * Notes:
+ *    SUCCESS does not necessarily indicate that the command
+ *    has been aborted; it only indicates that the LLDDs
+ *    has cleared all references to that command.
+ *    LLDDs should return FAILED only if an abort was required
+ *    but could not be executed. LLDDs should return FAST_IO_FAIL
+ *    if the device is temporarily unavailable (eg due to a
+ *    link down on FibreChannel)
+ */
+static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt,
+                                 struct scsi_cmnd *scmd)
 {
        if (!hostt->eh_abort_handler)
                return FAILED;
@@ -1156,9 +1175,9 @@ int scsi_eh_get_sense(struct list_head *work_q,
                shost = scmd->device->host;
                if (scsi_host_eh_past_deadline(shost)) {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                scmd_printk(KERN_INFO, scmd,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: skip request sense, past eh deadline\n",
-                                             __func__));
+                                             current->comm));
                        break;
                }
                if (status_byte(scmd->result) != CHECK_CONDITION)
@@ -1180,7 +1199,7 @@ int scsi_eh_get_sense(struct list_head *work_q,
                SCSI_LOG_ERROR_RECOVERY(3, scmd_printk(KERN_INFO, scmd,
                        "sense requested for %p result %x\n",
                        scmd, scmd->result));
-                SCSI_LOG_ERROR_RECOVERY(3, scsi_print_sense("bh", scmd));
+                SCSI_LOG_ERROR_RECOVERY(3, scsi_print_sense(scmd));
                rtn = scsi_decide_disposition(scmd);
@@ -1265,9 +1284,9 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
                                /* Push items back onto work_q */
                                list_splice_init(cmd_list, work_q);
                                SCSI_LOG_ERROR_RECOVERY(3,
-                                        shost_printk(KERN_INFO, sdev->host,
+                                        sdev_printk(KERN_INFO, sdev,
-                                                     "skip %s, past eh deadline",
+                                                    "%s: skip test device, past eh deadline",
-                                                     __func__));
+                                                    current->comm));
                                break;
                        }
                }
@@ -1318,21 +1337,20 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
                if (scsi_host_eh_past_deadline(shost)) {
                        list_splice_init(&check_list, work_q);
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                scmd_printk(KERN_INFO, scmd,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: skip aborting cmd, past eh deadline\n",
-                                             __func__));
+                                            current->comm));
                        return list_empty(work_q);
                }
                SCSI_LOG_ERROR_RECOVERY(3,
-                        shost_printk(KERN_INFO, shost,
+                        scmd_printk(KERN_INFO, scmd,
-                                     "%s: aborting cmd: 0x%p\n",
+                                     "%s: aborting cmd\n", current->comm));
-                                     current->comm, scmd));
                rtn = scsi_try_to_abort_cmd(shost->hostt, scmd);
                if (rtn == FAILED) {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                scmd_printk(KERN_INFO, scmd,
-                                             "%s: aborting cmd failed: 0x%p\n",
+                                            "%s: aborting cmd failed\n",
-                                             current->comm, scmd));
+                                             current->comm));
                        list_splice_init(&check_list, work_q);
                        return list_empty(work_q);
                }
@@ -1390,9 +1408,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
        shost_for_each_device(sdev, shost) {
                if (scsi_host_eh_past_deadline(shost)) {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                sdev_printk(KERN_INFO, sdev,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: skip START_UNIT, past eh deadline\n",
-                                             __func__));
+                                            current->comm));
                        break;
                }
                stu_scmd = NULL;
@@ -1407,9 +1425,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
                        continue;
                SCSI_LOG_ERROR_RECOVERY(3,
-                        shost_printk(KERN_INFO, shost,
+                        sdev_printk(KERN_INFO, sdev,
-                                     "%s: Sending START_UNIT to sdev: 0x%p\n",
+                                     "%s: Sending START_UNIT\n",
-                                     current->comm, sdev));
+                                    current->comm));
                if (!scsi_eh_try_stu(stu_scmd)) {
                        if (!scsi_device_online(sdev) ||
@@ -1423,9 +1441,9 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
                        }
                } else {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                sdev_printk(KERN_INFO, sdev,
-                                             "%s: START_UNIT failed to sdev:"
+                                            "%s: START_UNIT failed\n",
-                                             " 0x%p\n", current->comm, sdev));
+                                            current->comm));
                }
        }
@@ -1456,9 +1474,9 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
        shost_for_each_device(sdev, shost) {
                if (scsi_host_eh_past_deadline(shost)) {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                sdev_printk(KERN_INFO, sdev,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: skip BDR, past eh deadline\n",
-                                             __func__));
+                                             current->comm));
                        break;
                }
                bdr_scmd = NULL;
@@ -1472,9 +1490,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
                        continue;
                SCSI_LOG_ERROR_RECOVERY(3,
-                        shost_printk(KERN_INFO, shost,
+                        sdev_printk(KERN_INFO, sdev,
-                                     "%s: Sending BDR sdev: 0x%p\n",
+                                     "%s: Sending BDR\n", current->comm));
-                                     current->comm, sdev));
                rtn = scsi_try_bus_device_reset(bdr_scmd);
                if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
                        if (!scsi_device_online(sdev) ||
@@ -1490,9 +1507,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
                        }
                } else {
                        SCSI_LOG_ERROR_RECOVERY(3,
-                                shost_printk(KERN_INFO, shost,
+                                sdev_printk(KERN_INFO, sdev,
-                                             "%s: BDR failed sdev: 0x%p\n",
+                                            "%s: BDR failed\n", current->comm));
-                                             current->comm, sdev));
                }
        }
@@ -1528,8 +1544,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                        list_splice_init(&tmp_list, work_q);
                        SCSI_LOG_ERROR_RECOVERY(3,
                                shost_printk(KERN_INFO, shost,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: Skip target reset, past eh deadline\n",
-                                             __func__));
+                                             current->comm));
                        return list_empty(work_q);
                }
@@ -1591,8 +1607,8 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
                        list_splice_init(&check_list, work_q);
                        SCSI_LOG_ERROR_RECOVERY(3,
                                shost_printk(KERN_INFO, shost,
-                                            "skip %s, past eh deadline\n",
+                                            "%s: skip BRST, past eh deadline\n",
-                                             __func__));
+                                             current->comm));
                        return list_empty(work_q);
                }
@@ -2193,9 +2209,9 @@ int scsi_error_handler(void *data)
                 */
                if (!shost->eh_noresume && scsi_autopm_get_host(shost) != 0) {
                        SCSI_LOG_ERROR_RECOVERY(1,
-                                printk(KERN_ERR "Error handler scsi_eh_%d "
+                                shost_printk(KERN_ERR, shost,
-                                                "unable to autoresume\n",
+                                             "scsi_eh_%d: unable to autoresume\n",
-                                                shost->host_no));
+                                             shost->host_no));
                        continue;
                }
@@ -2296,42 +2312,34 @@ scsi_reset_provider_done_command(struct scsi_cmnd *scmd)
 {
 }
-/*
+/**
- * Function:    scsi_reset_provider
+ * scsi_ioctl_reset: explicitly reset a host/bus/target/device
- *
+ * @dev:        scsi_device to operate on
- * Purpose:     Send requested reset to a bus or device at any phase.
+ * @arg:        reset type (see sg.h)
- *
- * Arguments:   device  - device to send reset to
- *              flag - reset type (see scsi.h)
- *
- * Returns:     SUCCESS/FAILURE.
- *
- * Notes:       This is used by the SCSI Generic driver to provide
- *              Bus/Device reset capability.
 */
 int
-scsi_reset_provider(struct scsi_device *dev, int flag)
+scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
 {
        struct scsi_cmnd *scmd;
        struct Scsi_Host *shost = dev->host;
        struct request req;
        unsigned long flags;
-        int rtn;
+        int error = 0, rtn, val;
-        if (scsi_autopm_get_host(shost) < 0)
+        if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
-                return FAILED;
+                return -EACCES;
-        if (!get_device(&dev->sdev_gendev)) {
+        error = get_user(val, arg);
-                rtn = FAILED;
+        if (error)
-                goto out_put_autopm_host;
+                return error;
-        }
+        if (scsi_autopm_get_host(shost) < 0)
+                return -EIO;
+        error = -EIO;
        scmd = scsi_get_command(dev, GFP_KERNEL);
-        if (!scmd) {
+        if (!scmd)
-                rtn = FAILED;
-                put_device(&dev->sdev_gendev);
                goto out_put_autopm_host;
-        }
        blk_rq_init(NULL, &req);
        scmd->request = &req;
@@ -2349,29 +2357,37 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
        shost->tmf_in_progress = 1;
        spin_unlock_irqrestore(shost->host_lock, flags);
-        switch (flag) {
+        switch (val & ~SG_SCSI_RESET_NO_ESCALATE) {
-        case SCSI_TRY_RESET_DEVICE:
+        case SG_SCSI_RESET_NOTHING:
+                rtn = SUCCESS;
+                break;
+        case SG_SCSI_RESET_DEVICE:
                rtn = scsi_try_bus_device_reset(scmd);
-                if (rtn == SUCCESS)
+                if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
                        break;
                /* FALLTHROUGH */
-        case SCSI_TRY_RESET_TARGET:
+        case SG_SCSI_RESET_TARGET:
                rtn = scsi_try_target_reset(scmd);
-                if (rtn == SUCCESS)
+                if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
                        break;
                /* FALLTHROUGH */
-        case SCSI_TRY_RESET_BUS:
+        case SG_SCSI_RESET_BUS:
                rtn = scsi_try_bus_reset(scmd);
-                if (rtn == SUCCESS)
+                if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
                        break;
                /* FALLTHROUGH */
-        case SCSI_TRY_RESET_HOST:
+        case SG_SCSI_RESET_HOST:
                rtn = scsi_try_host_reset(scmd);
-                break;
+                if (rtn == SUCCESS)
+                        break;
        default:
+                /* FALLTHROUGH */
                rtn = FAILED;
+                break;
        }
+        error = (rtn == SUCCESS) ? 0 : -EIO;
        spin_lock_irqsave(shost->host_lock, flags);
        shost->tmf_in_progress = 0;
        spin_unlock_irqrestore(shost->host_lock, flags);
@@ -2385,15 +2401,15 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
                             "waking up host to restart after TMF\n"));
        wake_up(&shost->host_wait);
        scsi_run_host_queues(shost);
-        scsi_next_command(scmd);
+        scsi_put_command(scmd);
 out_put_autopm_host:
        scsi_autopm_put_host(shost);
-        return rtn;
+        return error;
 }
-EXPORT_SYMBOL(scsi_reset_provider);
+EXPORT_SYMBOL(scsi_ioctl_reset);
 /**
 * scsi_normalize_sense - normalize main elements from either fixed or
@@ -2412,20 +2428,20 @@ EXPORT_SYMBOL(scsi_reset_provider);
 *      responded to a SCSI command with the CHECK_CONDITION status.
 *
 * Return value:
- *      1 if valid sense data information found, else 0;
+ *      true if valid sense data information found, else false;
 */
-int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
+bool scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
-                         struct scsi_sense_hdr *sshdr)
+                          struct scsi_sense_hdr *sshdr)
 {
        if (!sense_buffer || !sb_len)
-                return 0;
+                return false;
        memset(sshdr, 0, sizeof(struct scsi_sense_hdr));
        sshdr->response_code = (sense_buffer[0] & 0x7f);
        if (!scsi_sense_valid(sshdr))
-                return 0;
+                return false;
        if (sshdr->response_code >= 0x72) {
                /*
@@ -2455,12 +2471,12 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
                }
        }
-        return 1;
+        return true;
 }
 EXPORT_SYMBOL(scsi_normalize_sense);
-int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
+bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,
-                                 struct scsi_sense_hdr *sshdr)
+                                  struct scsi_sense_hdr *sshdr)
 {
        return scsi_normalize_sense(cmd->sense_buffer,
                        SCSI_SENSE_BUFFERSIZE, sshdr);
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 1aaaf43c6803..c4f7b56fa6f6 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -126,7 +126,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                        sdev_printk(KERN_INFO, sdev,
                                    "ioctl_internal_command return code = %x\n",
                                    result);
-                        scsi_print_sense_hdr("   ", &sshdr);
+                        scsi_print_sense_hdr(sdev, NULL, &sshdr);
                        break;
                }
        }
@@ -200,19 +200,6 @@ int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 {
        char scsi_cmd[MAX_COMMAND_SIZE];
-        /* No idea how this happens.... */
-        if (!sdev)
-                return -ENXIO;
-        /*
-         * If we are in the middle of error recovery, don't let anyone
-         * else try and use this device.  Also, if error recovery fails, it
-         * may try and take the device offline, in which case all further
-         * access to the device is prohibited.
-         */
-        if (!scsi_block_when_processing_errors(sdev))
-                return -ENODEV;
        /* Check for deprecated ioctls ... all the ioctls which don't
         * follow the new unique numbering scheme are deprecated */
        switch (cmd) {
@@ -273,6 +260,8 @@ int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
                                     START_STOP_TIMEOUT, NORMAL_RETRIES);
        case SCSI_IOCTL_GET_PCI:
                return scsi_ioctl_get_pci(sdev, arg);
+        case SG_SCSI_RESET:
+                return scsi_ioctl_reset(sdev, arg);
        default:
                if (sdev->host->hostt->ioctl)
                        return sdev->host->hostt->ioctl(sdev, cmd, arg);
@@ -281,55 +270,20 @@ int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 }
 EXPORT_SYMBOL(scsi_ioctl);
-/**
+/*
- * scsi_nonblockable_ioctl() - Handle SG_SCSI_RESET
+ * We can process a reset even when a device isn't fully operable.
- * @sdev: scsi device receiving ioctl
- * @cmd: Must be SC_SCSI_RESET
- * @arg: pointer to int containing SG_SCSI_RESET_{DEVICE,BUS,HOST}
- * @ndelay: file mode O_NDELAY flag
 */
-int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
+int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev, int cmd,
-                            void __user *arg, int ndelay)
+                bool ndelay)
 {
-        int val, result;
+        if (cmd == SG_SCSI_RESET && ndelay) {
-        /* The first set of iocts may be executed even if we're doing
-         * error processing, as long as the device was opened
-         * non-blocking */
-        if (ndelay) {
                if (scsi_host_in_recovery(sdev->host))
+                        return -EAGAIN;
+        } else {
+                if (!scsi_block_when_processing_errors(sdev))
                        return -ENODEV;
-        } else if (!scsi_block_when_processing_errors(sdev))
-                return -ENODEV;
-        switch (cmd) {
-        case SG_SCSI_RESET:
-                result = get_user(val, (int __user *)arg);
-                if (result)
-                        return result;
-                if (val == SG_SCSI_RESET_NOTHING)
-                        return 0;
-                switch (val) {
-                case SG_SCSI_RESET_DEVICE:
-                        val = SCSI_TRY_RESET_DEVICE;
-                        break;
-                case SG_SCSI_RESET_TARGET:
-                        val = SCSI_TRY_RESET_TARGET;
-                        break;
-                case SG_SCSI_RESET_BUS:
-                        val = SCSI_TRY_RESET_BUS;
-                        break;
-                case SG_SCSI_RESET_HOST:
-                        val = SCSI_TRY_RESET_HOST;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
-                        return -EACCES;
-                return (scsi_reset_provider(sdev, val) ==
-                        SUCCESS) ? 0 : -EIO;
        }
-        return -ENODEV;
+        return 0;
 }
-EXPORT_SYMBOL(scsi_nonblockable_ioctl);
+EXPORT_SYMBOL_GPL(scsi_ioctl_block_when_processing_errors);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 50a6e1ac8d9c..7e3d954c9cac 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -22,6 +22,7 @@
 #include <linux/hardirq.h>
 #include <linux/scatterlist.h>
 #include <linux/blk-mq.h>
+#include <linux/ratelimit.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -47,7 +48,7 @@ struct scsi_host_sg_pool {
        mempool_t       *pool;
 };
-#define SP(x) { x, "sgpool-" __stringify(x) }
+#define SP(x) { .size = x, "sgpool-" __stringify(x) }
 #if (SCSI_MAX_SG_SEGMENTS < 32)
 #error SCSI_MAX_SG_SEGMENTS is too small (must be 32 or greater)
 #endif
@@ -542,17 +543,6 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
        put_device(&sdev->sdev_gendev);
 }
-void scsi_next_command(struct scsi_cmnd *cmd)
-{
-        struct scsi_device *sdev = cmd->device;
-        struct request_queue *q = sdev->request_queue;
-        scsi_put_command(cmd);
-        scsi_run_queue(q);
-        put_device(&sdev->sdev_gendev);
-}
 void scsi_run_host_queues(struct Scsi_Host *shost)
 {
        struct scsi_device *sdev;
@@ -598,10 +588,10 @@ static void scsi_free_sgtable(struct scsi_data_buffer *sdb, bool mq)
        __sg_free_table(&sdb->table, SCSI_MAX_SG_SEGMENTS, mq, scsi_sg_free);
 }
-static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents,
+static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
-                              gfp_t gfp_mask, bool mq)
 {
        struct scatterlist *first_chunk = NULL;
+        gfp_t gfp_mask = mq ? GFP_NOIO : GFP_ATOMIC;
        int ret;
        BUG_ON(!nents);
@@ -730,8 +720,6 @@ static bool scsi_end_request(struct request *req, int error,
                        kblockd_schedule_work(&sdev->requeue_work);
                else
                        blk_mq_start_stopped_hw_queues(q, true);
-                put_device(&sdev->sdev_gendev);
        } else {
                unsigned long flags;
@@ -743,9 +731,12 @@ static bool scsi_end_request(struct request *req, int error,
                spin_unlock_irqrestore(q->queue_lock, flags);
                scsi_release_buffers(cmd);
-                scsi_next_command(cmd);
+                scsi_put_command(cmd);
+                scsi_run_queue(q);
        }
+        put_device(&sdev->sdev_gendev);
        return false;
 }
@@ -831,8 +822,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
        struct request *req = cmd->request;
        int error = 0;
        struct scsi_sense_hdr sshdr;
-        int sense_valid = 0;
+        bool sense_valid = false;
-        int sense_deferred = 0;
+        int sense_deferred = 0, level = 0;
        enum {ACTION_FAIL, ACTION_REPREP, ACTION_RETRY,
              ACTION_DELAYED_RETRY} action;
        unsigned long wait_for = (cmd->allowed + 1) * req->timeout;
@@ -912,7 +903,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                if ((sshdr.asc == 0x0) && (sshdr.ascq == 0x1d))
                        ;
                else if (!(req->cmd_flags & REQ_QUIET))
-                        scsi_print_sense("", cmd);
+                        scsi_print_sense(cmd);
                result = 0;
                /* BLOCK_PC may have set error */
                error = 0;
@@ -1039,10 +1030,24 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
        case ACTION_FAIL:
                /* Give up and fail the remainder of the request */
                if (!(req->cmd_flags & REQ_QUIET)) {
-                        scsi_print_result(cmd);
+                        static DEFINE_RATELIMIT_STATE(_rs,
-                        if (driver_byte(result) & DRIVER_SENSE)
+                                        DEFAULT_RATELIMIT_INTERVAL,
-                                scsi_print_sense("", cmd);
+                                        DEFAULT_RATELIMIT_BURST);
-                        scsi_print_command(cmd);
+                        if (unlikely(scsi_logging_level))
+                                level = SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,
+                                                       SCSI_LOG_MLCOMPLETE_BITS);
+                        /*
+                         * if logging is enabled the failure will be printed
+                         * in scsi_log_completion(), so avoid duplicate messages
+                         */
+                        if (!level && __ratelimit(&_rs)) {
+                                scsi_print_result(cmd, NULL, FAILED);
+                                if (driver_byte(result) & DRIVER_SENSE)
+                                        scsi_print_sense(cmd);
+                                scsi_print_command(cmd);
+                        }
                }
                if (!scsi_end_request(req, error, blk_rq_err_bytes(req), 0))
                        return;
@@ -1072,8 +1077,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
        }
 }
-static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
+static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb)
-                             gfp_t gfp_mask)
 {
        int count;
@@ -1081,7 +1085,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
         * If sg table allocation fails, requeue request later.
         */
        if (unlikely(scsi_alloc_sgtable(sdb, req->nr_phys_segments,
-                                        gfp_mask, req->mq_ctx != NULL)))
+                                        req->mq_ctx != NULL)))
                return BLKPREP_DEFER;
        /* 
@@ -1106,7 +1110,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
 *              BLKPREP_DEFER if the failure is retryable
 *              BLKPREP_KILL if the failure is fatal
 */
-int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
+int scsi_init_io(struct scsi_cmnd *cmd)
 {
        struct scsi_device *sdev = cmd->device;
        struct request *rq = cmd->request;
@@ -1115,7 +1119,7 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
        BUG_ON(!rq->nr_phys_segments);
-        error = scsi_init_sgtable(rq, &cmd->sdb, gfp_mask);
+        error = scsi_init_sgtable(rq, &cmd->sdb);
        if (error)
                goto err_exit;
@@ -1131,8 +1135,7 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
                        rq->next_rq->special = bidi_sdb;
                }
-                error = scsi_init_sgtable(rq->next_rq, rq->next_rq->special,
+                error = scsi_init_sgtable(rq->next_rq, rq->next_rq->special);
-                                          GFP_ATOMIC);
                if (error)
                        goto err_exit;
        }
@@ -1144,7 +1147,7 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
                BUG_ON(prot_sdb == NULL);
                ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
-                if (scsi_alloc_sgtable(prot_sdb, ivecs, gfp_mask, is_mq)) {
+                if (scsi_alloc_sgtable(prot_sdb, ivecs, is_mq)) {
                        error = BLKPREP_DEFER;
                        goto err_exit;
                }
@@ -1213,7 +1216,7 @@ static int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
         * submit a request without an attached bio.
         */
        if (req->bio) {
-                int ret = scsi_init_io(cmd, GFP_ATOMIC);
+                int ret = scsi_init_io(cmd);
                if (unlikely(ret))
                        return ret;
        } else {
@@ -1638,6 +1641,87 @@ static void scsi_softirq_done(struct request *rq)
 }
 /**
+ * scsi_dispatch_command - Dispatch a command to the low-level driver.
+ * @cmd: command block we are dispatching.
+ *
+ * Return: nonzero return request was rejected and device's queue needs to be
+ * plugged.
+ */
+static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+{
+        struct Scsi_Host *host = cmd->device->host;
+        int rtn = 0;
+        atomic_inc(&cmd->device->iorequest_cnt);
+        /* check if the device is still usable */
+        if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
+                /* in SDEV_DEL we error all commands. DID_NO_CONNECT
+                 * returns an immediate error upwards, and signals
+                 * that the device is no longer present */
+                cmd->result = DID_NO_CONNECT << 16;
+                goto done;
+        }
+        /* Check to see if the scsi lld made this device blocked. */
+        if (unlikely(scsi_device_blocked(cmd->device))) {
+                /*
+                 * in blocked state, the command is just put back on
+                 * the device queue.  The suspend state has already
+                 * blocked the queue so future requests should not
+                 * occur until the device transitions out of the
+                 * suspend state.
+                 */
+                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
+                        "queuecommand : device blocked\n"));
+                return SCSI_MLQUEUE_DEVICE_BUSY;
+        }
+        /* Store the LUN value in cmnd, if needed. */
+        if (cmd->device->lun_in_cdb)
+                cmd->cmnd[1] = (cmd->cmnd[1] & 0x1f) |
+                               (cmd->device->lun << 5 & 0xe0);
+        scsi_log_send(cmd);
+        /*
+         * Before we queue this command, check if the command
+         * length exceeds what the host adapter can handle.
+         */
+        if (cmd->cmd_len > cmd->device->host->max_cmd_len) {
+                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
+                               "queuecommand : command too long. "
+                               "cdb_size=%d host->max_cmd_len=%d\n",
+                               cmd->cmd_len, cmd->device->host->max_cmd_len));
+                cmd->result = (DID_ABORT << 16);
+                goto done;
+        }
+        if (unlikely(host->shost_state == SHOST_DEL)) {
+                cmd->result = (DID_NO_CONNECT << 16);
+                goto done;
+        }
+        trace_scsi_dispatch_cmd_start(cmd);
+        rtn = host->hostt->queuecommand(host, cmd);
+        if (rtn) {
+                trace_scsi_dispatch_cmd_error(cmd, rtn);
+                if (rtn != SCSI_MLQUEUE_DEVICE_BUSY &&
+                    rtn != SCSI_MLQUEUE_TARGET_BUSY)
+                        rtn = SCSI_MLQUEUE_HOST_BUSY;
+                SCSI_LOG_MLQUEUE(3, scmd_printk(KERN_INFO, cmd,
+                        "queuecommand : request rejected\n"));
+        }
+        return rtn;
+ done:
+        cmd->scsi_done(cmd);
+        return 0;
+}
+/**
 * scsi_done - Invoke completion on finished SCSI command.
 * @cmd: The SCSI Command for which a low-level device driver (LLDD) gives
 * ownership back to SCSI Core -- i.e. the LLDD has finished with it.
@@ -1725,7 +1809,7 @@ static void scsi_request_fn(struct request_queue *q)
                 * we add the dev to the starved list so it eventually gets
                 * a run when a tag is freed.
                 */
-                if (blk_queue_tagged(q) && !blk_rq_tagged(req)) {
+                if (blk_queue_tagged(q) && !(req->cmd_flags & REQ_QUEUED)) {
                        spin_lock_irq(shost->host_lock);
                        if (list_empty(&sdev->starved_entry))
                                list_add_tail(&sdev->starved_entry,
@@ -1739,6 +1823,11 @@ static void scsi_request_fn(struct request_queue *q)
                if (!scsi_host_queue_ready(q, shost, sdev))
                        goto host_not_ready;
+        
+                if (sdev->simple_tags)
+                        cmd->flags |= SCMD_TAGGED;
+                else
+                        cmd->flags &= ~SCMD_TAGGED;
                /*
                 * Finally, initialize any error handling parameters, and set up
@@ -1893,10 +1982,10 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req,
                blk_mq_start_request(req);
        }
-        if (blk_queue_tagged(q))
+        if (sdev->simple_tags)
-                req->cmd_flags |= REQ_QUEUED;
+                cmd->flags |= SCMD_TAGGED;
        else
-                req->cmd_flags &= ~REQ_QUEUED;
+                cmd->flags &= ~SCMD_TAGGED;
        scsi_init_cmd_errh(cmd);
        cmd->scsi_done = scsi_mq_done;
@@ -2091,7 +2180,7 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)
        memset(&shost->tag_set, 0, sizeof(shost->tag_set));
        shost->tag_set.ops = &scsi_mq_ops;
-        shost->tag_set.nr_hw_queues = 1;
+        shost->tag_set.nr_hw_queues = shost->nr_hw_queues ? : 1;
        shost->tag_set.queue_depth = shost->can_queue;
        shost->tag_set.cmd_size = cmd_size;
        shost->tag_set.numa_node = NUMA_NO_NODE;
diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index 1f65139e14f8..7fe64a847143 100644
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -51,6 +51,7 @@ do {								\
                } while (0);                                    \
 } while (0)
 #else
+#define SCSI_LOG_LEVEL(SHIFT, BITS) 0
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 12b8e1bee7f0..2dc4a83fb84c 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -29,7 +29,6 @@ extern int scsi_init_hosts(void);
 extern void scsi_exit_hosts(void);
 /* scsi.c */
-extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);
 extern int scsi_setup_command_freelist(struct Scsi_Host *shost);
 extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);
 #ifdef CONFIG_SCSI_LOGGING
@@ -84,7 +83,6 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd);
 extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
 extern void scsi_device_unbusy(struct scsi_device *sdev);
 extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);
-extern void scsi_next_command(struct scsi_cmnd *cmd);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
 extern void scsi_run_host_queues(struct Scsi_Host *shost);
 extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index ba3f1e8d0d57..0cda53adfd35 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -286,7 +286,13 @@ 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;
-        scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
+        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, sdev->host->cmd_per_lun);
        scsi_sysfs_device_initialize(sdev);
@@ -874,8 +880,10 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
                        (inq_result[3] & 0x0f) == 1 ? " CCS" : "");
        if ((sdev->scsi_level >= SCSI_2) && (inq_result[7] & 2) &&
-            !(*bflags & BLIST_NOTQ))
+            !(*bflags & BLIST_NOTQ)) {
                sdev->tagged_supported = 1;
+                sdev->simple_tags = 1;
+        }
        /*
         * Some devices (Texel CD ROM drives) have handshaking problems
@@ -1214,9 +1222,9 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
                sparse_lun = 0;
        /*
-         * If less than SCSI_1_CSS, and no special lun scaning, stop
+         * If less than SCSI_1_CCS, and no special lun scanning, stop
         * scanning; this matches 2.4 behaviour, but could just be a bug
-         * (to continue scanning a SCSI_1_CSS device).
+         * (to continue scanning a SCSI_1_CCS device).
         *
         * This test is broken.  We might not have any device on lun0 for
         * a sparselun device, and if that's the case then how would we
@@ -1585,16 +1593,15 @@ EXPORT_SYMBOL(scsi_add_device);
 void scsi_rescan_device(struct device *dev)
 {
-        struct scsi_driver *drv;
-        
        if (!dev->driver)
                return;
-        drv = to_scsi_driver(dev->driver);
+        if (try_module_get(dev->driver->owner)) {
-        if (try_module_get(drv->owner)) {
+                struct scsi_driver *drv = to_scsi_driver(dev->driver);
                if (drv->rescan)
                        drv->rescan(dev);
-                module_put(drv->owner);
+                module_put(dev->driver->owner);
        }
 }
 EXPORT_SYMBOL(scsi_rescan_device);
@@ -1727,7 +1734,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
        if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||
            ((id != SCAN_WILD_CARD) && (id >= shost->max_id)) ||
-            ((lun != SCAN_WILD_CARD) && (lun > shost->max_lun)))
+            ((lun != SCAN_WILD_CARD) && (lun >= shost->max_lun)))
                return -EINVAL;
        mutex_lock(&shost->scan_mutex);
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index f4cb7b3e9e23..35d93b0af82b 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -727,9 +727,7 @@ show_queue_type_field(struct device *dev, struct device_attribute *attr,
        struct scsi_device *sdev = to_scsi_device(dev);
        const char *name = "none";
-        if (sdev->ordered_tags)
+        if (sdev->simple_tags)
-                name = "ordered";
-        else if (sdev->simple_tags)
                name = "simple";
        return snprintf(buf, 20, "%s\n", name);
@@ -747,9 +745,12 @@ store_queue_type_field(struct device *dev, struct device_attribute *attr,
        if (!sdev->tagged_supported || !sht->change_queue_type)
                return -EINVAL;
-        if (strncmp(buf, "ordered", 7) == 0)
+        /*
-                tag_type = MSG_ORDERED_TAG;
+         * We're never issueing order tags these days, but allow the value
-        else if (strncmp(buf, "simple", 6) == 0)
+         * for backwards compatibility.
+         */
+        if (strncmp(buf, "ordered", 7) == 0 ||
+            strncmp(buf, "simple", 6) == 0)
                tag_type = MSG_SIMPLE_TAG;
        else if (strncmp(buf, "none", 4) != 0)
                return -EINVAL;
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 503594e5f76d..82af28b90294 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -278,7 +278,7 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
                return scsi_trace_rw16(p, cdb, len);
        case UNMAP:
                return scsi_trace_unmap(p, cdb, len);
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                return scsi_trace_service_action_in(p, cdb, len);
        case VARIABLE_LENGTH_CMD:
                return scsi_trace_varlen(p, cdb, len);
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index cf08071a9b6e..fa2aece76cc2 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -32,6 +32,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
@@ -1207,6 +1208,28 @@ int spi_populate_ppr_msg(unsigned char *msg, int period, int offset,
 }
 EXPORT_SYMBOL_GPL(spi_populate_ppr_msg);
+/**
+ * spi_populate_tag_msg - place a tag message in a buffer
+ * @msg:        pointer to the area to place the tag
+ * @cmd:        pointer to the scsi command for the tag
+ *
+ * Notes:
+ *      designed to create the correct type of tag message for the 
+ *      particular request.  Returns the size of the tag message.
+ *      May return 0 if TCQ is disabled for this device.
+ **/
+int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd)
+{
+        if (cmd->flags & SCMD_TAGGED) {
+                *msg++ = MSG_SIMPLE_TAG;
+                *msg++ = cmd->request->tag;
+                return 2;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(spi_populate_tag_msg);
 #ifdef CONFIG_SCSI_CONSTANTS
 static const char * const one_byte_msgs[] = {
 /* 0x00 */ "Task Complete", NULL /* Extended Message */, "Save Pointers",
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 92d24d6dcb39..910f4a7a3924 100644
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -163,8 +163,8 @@ int scsi_partsize(unsigned char *buf, unsigned long capacity,
                    end_head * end_sector + end_sector;
                /* This is the actual _sector_ number at the end */
-                logical_end = get_unaligned(&largest->start_sect)
+                logical_end = get_unaligned_le32(&largest->start_sect)
-                    + get_unaligned(&largest->nr_sects);
+                    + get_unaligned_le32(&largest->nr_sects);
                /* This is for >1023 cylinders */
                ext_cyl = (logical_end - (end_head * end_sector + end_sector))
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index cfba74cd8e8b..fedab3c21ddf 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -116,7 +116,7 @@ static int sd_eh_action(struct scsi_cmnd *, int);
 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
 static void scsi_disk_release(struct device *cdev);
 static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
-static void sd_print_result(struct scsi_disk *, int);
+static void sd_print_result(const struct scsi_disk *, const char *, int);
 static DEFINE_SPINLOCK(sd_index_lock);
 static DEFINE_IDA(sd_index_ida);
@@ -510,9 +510,9 @@ static const struct dev_pm_ops sd_pm_ops = {
 };
 static struct scsi_driver sd_template = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "sd",
+                .owner          = THIS_MODULE,
                .probe          = sd_probe,
                .remove         = sd_remove,
                .shutdown       = sd_shutdown,
@@ -656,7 +656,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
        unsigned int logical_block_size = sdkp->device->sector_size;
        unsigned int max_blocks = 0;
-        q->limits.discard_zeroes_data = sdkp->lbprz;
+        q->limits.discard_zeroes_data = 0;
        q->limits.discard_alignment = sdkp->unmap_alignment *
                logical_block_size;
        q->limits.discard_granularity =
@@ -680,11 +680,13 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
        case SD_LBP_WS16:
                max_blocks = min_not_zero(sdkp->max_ws_blocks,
                                          (u32)SD_MAX_WS16_BLOCKS);
+                q->limits.discard_zeroes_data = sdkp->lbprz;
                break;
        case SD_LBP_WS10:
                max_blocks = min_not_zero(sdkp->max_ws_blocks,
                                          (u32)SD_MAX_WS10_BLOCKS);
+                q->limits.discard_zeroes_data = sdkp->lbprz;
                break;
        case SD_LBP_ZERO:
@@ -784,7 +786,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
         * amount of blocks described by the request.
         */
        blk_add_request_payload(rq, page, len);
-        ret = scsi_init_io(cmd, GFP_ATOMIC);
+        ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
 out:
@@ -878,7 +880,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
         * knows how much to actually write.
         */
        rq->__data_len = sdp->sector_size;
-        ret = scsi_init_io(cmd, GFP_ATOMIC);
+        ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
        return ret;
 }
@@ -912,7 +914,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
        int ret;
        unsigned char protect;
-        ret = scsi_init_io(SCpnt, GFP_ATOMIC);
+        ret = scsi_init_io(SCpnt);
        if (ret != BLKPREP_OK)
                goto out;
        SCpnt = rq->special;
@@ -1334,9 +1336,9 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-        error = scsi_nonblockable_ioctl(sdp, cmd, p,
+        error = scsi_ioctl_block_when_processing_errors(sdp, cmd,
-                                        (mode & FMODE_NDELAY) != 0);
+                        (mode & FMODE_NDELAY) != 0);
-        if (!scsi_block_when_processing_errors(sdp) || !error)
+        if (error)
                goto out;
        /*
@@ -1492,7 +1494,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
        }
        if (res) {
-                sd_print_result(sdkp, res);
+                sd_print_result(sdkp, "Synchronize Cache(10) failed", res);
                if (driver_byte(res) & DRIVER_SENSE)
                        sd_print_sense_hdr(sdkp, &sshdr);
@@ -1541,31 +1543,19 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
                           unsigned int cmd, unsigned long arg)
 {
        struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
-        int ret;
+        int error;
-        ret = scsi_verify_blk_ioctl(bdev, cmd);
-        if (ret < 0)
-                return ret;
-        /*
+        error = scsi_ioctl_block_when_processing_errors(sdev, cmd,
-         * If we are in the middle of error recovery, don't let anyone
+                        (mode & FMODE_NDELAY) != 0);
-         * else try and use this device.  Also, if error recovery fails, it
+        if (error)
-         * may try and take the device offline, in which case all further
+                return error;
-         * access to the device is prohibited.
-         */
-        if (!scsi_block_when_processing_errors(sdev))
-                return -ENODEV;
               
-        if (sdev->host->hostt->compat_ioctl) {
-                ret = sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);
-                return ret;
-        }
        /* 
         * Let the static ioctl translation table take care of it.
         */
-        return -ENOIOCTLCMD; 
+        if (!sdev->host->hostt->compat_ioctl)
+                return -ENOIOCTLCMD; 
+        return sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);
 }
 #endif
@@ -1713,17 +1703,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                if (sense_valid)
                        sense_deferred = scsi_sense_is_deferred(&sshdr);
        }
-#ifdef CONFIG_SCSI_LOGGING
-        SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));
-        if (sense_valid) {
-                SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
-                                                   "sd_done: sb[respc,sk,asc,"
-                                                   "ascq]=%x,%x,%x,%x\n",
-                                                   sshdr.response_code,
-                                                   sshdr.sense_key, sshdr.asc,
-                                                   sshdr.ascq));
-        }
-#endif
        sdkp->medium_access_timed_out = 0;
        if (driver_byte(result) != DRIVER_SENSE &&
@@ -1743,7 +1722,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 * unknown amount of data was transferred so treat it as an
                 * error.
                 */
-                scsi_print_sense("sd", SCpnt);
                SCpnt->result = 0;
                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
                break;
@@ -1779,6 +1757,10 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                break;
        }
 out:
+        SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
+                                           "sd_done: completed %d of %d bytes\n",
+                                           good_bytes, scsi_bufflen(SCpnt)));
        if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
                sd_dif_complete(SCpnt, good_bytes);
@@ -1834,12 +1816,12 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                        /* no sense, TUR either succeeded or failed
                         * with a status error */
                        if(!spintime && !scsi_status_is_good(the_result)) {
-                                sd_printk(KERN_NOTICE, sdkp, "Unit Not Ready\n");
+                                sd_print_result(sdkp, "Test Unit Ready failed",
-                                sd_print_result(sdkp, the_result);
+                                                the_result);
                        }
                        break;
                }
-                                        
                /*
                 * The device does not want the automatic start to be issued.
                 */
@@ -1955,7 +1937,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,
                        struct scsi_sense_hdr *sshdr, int sense_valid,
                        int the_result)
 {
-        sd_print_result(sdkp, the_result);
        if (driver_byte(the_result) & DRIVER_SENSE)
                sd_print_sense_hdr(sdkp, sshdr);
        else
@@ -2001,7 +1982,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
        do {
                memset(cmd, 0, 16);
-                cmd[0] = SERVICE_ACTION_IN;
+                cmd[0] = SERVICE_ACTION_IN_16;
                cmd[1] = SAI_READ_CAPACITY_16;
                cmd[13] = RC16_LEN;
                memset(buffer, 0, RC16_LEN);
@@ -2036,7 +2017,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
        } while (the_result && retries);
        if (the_result) {
-                sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n");
+                sd_print_result(sdkp, "Read Capacity(16) failed", the_result);
                read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
                return -EINVAL;
        }
@@ -2118,7 +2099,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
        } while (the_result && retries);
        if (the_result) {
-                sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY failed\n");
+                sd_print_result(sdkp, "Read Capacity(10) failed", the_result);
                read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
                return -EINVAL;
        }
@@ -2643,12 +2624,12 @@ static void sd_read_block_limits(struct scsi_disk *sdkp)
                } else {        /* LBP VPD page tells us what to use */
-                        if (sdkp->lbpu && sdkp->max_unmap_blocks)
+                        if (sdkp->lbpws)
-                                sd_config_discard(sdkp, SD_LBP_UNMAP);
-                        else if (sdkp->lbpws)
                                sd_config_discard(sdkp, SD_LBP_WS16);
                        else if (sdkp->lbpws10)
                                sd_config_discard(sdkp, SD_LBP_WS10);
+                        else if (sdkp->lbpu && sdkp->max_unmap_blocks)
+                                sd_config_discard(sdkp, SD_LBP_UNMAP);
                        else
                                sd_config_discard(sdkp, SD_LBP_DISABLE);
                }
@@ -3142,8 +3123,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
        res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
                               SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM);
        if (res) {
-                sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n");
+                sd_print_result(sdkp, "Start/Stop Unit failed", res);
-                sd_print_result(sdkp, res);
                if (driver_byte(res) & DRIVER_SENSE)
                        sd_print_sense_hdr(sdkp, &sshdr);
                if (scsi_sense_valid(&sshdr) &&
@@ -3337,15 +3317,27 @@ module_exit(exit_sd);
 static void sd_print_sense_hdr(struct scsi_disk *sdkp,
                               struct scsi_sense_hdr *sshdr)
 {
-        sd_printk(KERN_INFO, sdkp, " ");
+        scsi_show_sense_hdr(sdkp->device,
-        scsi_show_sense_hdr(sshdr);
+                            sdkp->disk ? sdkp->disk->disk_name : NULL, sshdr);
-        sd_printk(KERN_INFO, sdkp, " ");
+        scsi_show_extd_sense(sdkp->device,
-        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+                             sdkp->disk ? sdkp->disk->disk_name : NULL,
+                             sshdr->asc, sshdr->ascq);
 }
-static void sd_print_result(struct scsi_disk *sdkp, int result)
+static void sd_print_result(const struct scsi_disk *sdkp, const char *msg,
+                            int result)
 {
-        sd_printk(KERN_INFO, sdkp, " ");
+        const char *hb_string = scsi_hostbyte_string(result);
-        scsi_show_result(result);
+        const char *db_string = scsi_driverbyte_string(result);
+        if (hb_string || db_string)
+                sd_printk(KERN_INFO, sdkp,
+                          "%s: Result: hostbyte=%s driverbyte=%s\n", msg,
+                          hb_string ? hb_string : "invalid",
+                          db_string ? db_string : "invalid");
+        else
+                sd_printk(KERN_INFO, sdkp,
+                          "%s: Result: hostbyte=0x%02x driverbyte=0x%02x\n",
+                          msg, host_byte(result), driver_byte(result));
 }
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 467377884b63..63ba5ca7f9a1 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -103,9 +103,9 @@ static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
 #define sd_printk(prefix, sdsk, fmt, a...)                              \
        (sdsk)->disk ?                                                  \
-        sdev_printk(prefix, (sdsk)->device, "[%s] " fmt,                \
+              sdev_prefix_printk(prefix, (sdsk)->device,                \
-                    (sdsk)->disk->disk_name, ##a) :                     \
+                                 (sdsk)->disk->disk_name, fmt, ##a) :   \
-        sdev_printk(prefix, (sdsk)->device, fmt, ##a)
+              sdev_printk(prefix, (sdsk)->device, fmt, ##a)
 #define sd_first_printk(prefix, sdsk, fmt, a...)                        \
        do {                                                            \
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 80bfece1a2de..b7e79e7646ad 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -693,9 +693,9 @@ static struct class_interface ses_interface = {
 };
 static struct scsi_driver ses_template = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "ses",
+                .owner          = THIS_MODULE,
                .probe          = ses_probe,
                .remove         = ses_remove,
        },
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 60354449d9ed..b14f64cb9724 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -219,8 +219,8 @@ static void sg_device_destroy(struct kref *kref);
 #define SZ_SG_REQ_INFO sizeof(sg_req_info_t)
 #define sg_printk(prefix, sdp, fmt, a...) \
-        sdev_printk(prefix, (sdp)->device, "[%s] " fmt, \
+        sdev_prefix_printk(prefix, (sdp)->device,               \
-                    (sdp)->disk->disk_name, ##a)
+                           (sdp)->disk->disk_name, fmt, ##a)
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
@@ -1071,39 +1071,6 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
                if (atomic_read(&sdp->detaching))
                        return -ENODEV;
                return put_user(sdp->device->host->hostt->emulated, ip);
-        case SG_SCSI_RESET:
-                if (atomic_read(&sdp->detaching))
-                        return -ENODEV;
-                if (filp->f_flags & O_NONBLOCK) {
-                        if (scsi_host_in_recovery(sdp->device->host))
-                                return -EBUSY;
-                } else if (!scsi_block_when_processing_errors(sdp->device))
-                        return -EBUSY;
-                result = get_user(val, ip);
-                if (result)
-                        return result;
-                if (SG_SCSI_RESET_NOTHING == val)
-                        return 0;
-                switch (val) {
-                case SG_SCSI_RESET_DEVICE:
-                        val = SCSI_TRY_RESET_DEVICE;
-                        break;
-                case SG_SCSI_RESET_TARGET:
-                        val = SCSI_TRY_RESET_TARGET;
-                        break;
-                case SG_SCSI_RESET_BUS:
-                        val = SCSI_TRY_RESET_BUS;
-                        break;
-                case SG_SCSI_RESET_HOST:
-                        val = SCSI_TRY_RESET_HOST;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
-                        return -EACCES;
-                return (scsi_reset_provider(sdp->device, val) ==
-                        SUCCESS) ? 0 : -EIO;
        case SCSI_IOCTL_SEND_COMMAND:
                if (atomic_read(&sdp->detaching))
                        return -ENODEV;
@@ -1123,13 +1090,6 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
                        return result;
                sdp->sgdebug = (char) val;
                return 0;
-        case SCSI_IOCTL_GET_IDLUN:
-        case SCSI_IOCTL_GET_BUS_NUMBER:
-        case SCSI_IOCTL_PROBE_HOST:
-        case SG_GET_TRANSFORM:
-                if (atomic_read(&sdp->detaching))
-                        return -ENODEV;
-                return scsi_ioctl(sdp->device, cmd_in, p);
        case BLKSECTGET:
                return put_user(max_sectors_bytes(sdp->device->request_queue),
                                ip);
@@ -1145,11 +1105,25 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
                return blk_trace_startstop(sdp->device->request_queue, 0);
        case BLKTRACETEARDOWN:
                return blk_trace_remove(sdp->device->request_queue);
+        case SCSI_IOCTL_GET_IDLUN:
+        case SCSI_IOCTL_GET_BUS_NUMBER:
+        case SCSI_IOCTL_PROBE_HOST:
+        case SG_GET_TRANSFORM:
+        case SG_SCSI_RESET:
+                if (atomic_read(&sdp->detaching))
+                        return -ENODEV;
+                break;
        default:
                if (read_only)
                        return -EPERM;  /* don't know so take safe approach */
-                return scsi_ioctl(sdp->device, cmd_in, p);
+                break;
        }
+        result = scsi_ioctl_block_when_processing_errors(sdp->device,
+                        cmd_in, filp->f_flags & O_NDELAY);
+        if (result)
+                return result;
+        return scsi_ioctl(sdp->device, cmd_in, p);
 }
 #ifdef CONFIG_COMPAT
@@ -1360,7 +1334,7 @@ sg_rq_end_io(struct request *rq, int uptodate)
                if ((sdp->sgdebug > 0) &&
                    ((CHECK_CONDITION == srp->header.masked_status) ||
                     (COMMAND_TERMINATED == srp->header.masked_status)))
-                        __scsi_print_sense(__func__, sense,
+                        __scsi_print_sense(sdp->device, __func__, sense,
                                           SCSI_SENSE_BUFFERSIZE);
                /* Following if statement is a patch supplied by Eric Youngdale */
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 2de44cc58b1a..8bd54a64efd6 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -88,9 +88,9 @@ static struct dev_pm_ops sr_pm_ops = {
 };
 static struct scsi_driver sr_template = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "sr",
+                .owner          = THIS_MODULE,
                .probe          = sr_probe,
                .remove         = sr_remove,
                .pm             = &sr_pm_ops,
@@ -387,7 +387,7 @@ static int sr_init_command(struct scsi_cmnd *SCpnt)
        struct request *rq = SCpnt->request;
        int ret;
-        ret = scsi_init_io(SCpnt, GFP_ATOMIC);
+        ret = scsi_init_io(SCpnt);
        if (ret != BLKPREP_OK)
                goto out;
        SCpnt = rq->special;
@@ -549,6 +549,11 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
        mutex_lock(&sr_mutex);
+        ret = scsi_ioctl_block_when_processing_errors(sdev, cmd,
+                        (mode & FMODE_NDELAY) != 0);
+        if (ret)
+                goto out;
        /*
         * Send SCSI addressing ioctls directly to mid level, send other
         * ioctls to cdrom/block level.
@@ -564,16 +569,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
        if (ret != -ENOSYS)
                goto out;
-        /*
-         * ENODEV means that we didn't recognise the ioctl, or that we
-         * cannot execute it in the current device state.  In either
-         * case fall through to scsi_ioctl, which will return ENDOEV again
-         * if it doesn't recognise the ioctl
-         */
-        ret = scsi_nonblockable_ioctl(sdev, cmd, argp,
-                                        (mode & FMODE_NDELAY) != 0);
-        if (ret != -ENODEV)
-                goto out;
        ret = scsi_ioctl(sdev, cmd, argp);
 out:
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index 1d1f6f416c59..1de33719ad8e 100644
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -57,8 +57,7 @@ typedef struct scsi_cd {
 } Scsi_CD;
 #define sr_printk(prefix, cd, fmt, a...) \
-        sdev_printk(prefix, (cd)->device, "[%s] " fmt, \
+        sdev_prefix_printk(prefix, (cd)->device, (cd)->cdi.name, fmt, ##a)
-                    (cd)->cdi.name, ##a)
 int sr_do_ioctl(Scsi_CD *, struct packet_command *);
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 6389fcff12ec..fb929fac22ba 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -246,7 +246,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                                          "CDROM not ready.  Make sure there "
                                          "is a disc in the drive.\n");
 #ifdef DEBUG
-                        scsi_print_sense_hdr("sr", &sshdr);
+                        scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
 #endif
                        err = -ENOMEDIUM;
                        break;
@@ -257,15 +257,15 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                                /* sense: Invalid command operation code */
                                err = -EDRIVE_CANT_DO_THIS;
 #ifdef DEBUG
-                        __scsi_print_command(cgc->cmd);
+                        __scsi_print_command(cgc->cmd, CDROM_PACKET_SIZE);
-                        scsi_print_sense_hdr("sr", &sshdr);
+                        scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
 #endif
                        break;
                default:
                        sr_printk(KERN_ERR, cd,
                                  "CDROM (ioctl) error, command: ");
-                        __scsi_print_command(cgc->cmd);
+                        __scsi_print_command(cgc->cmd, CDROM_PACKET_SIZE);
-                        scsi_print_sense_hdr("sr", &sshdr);
+                        scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
                        err = -EIO;
                }
        }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 4daa372ed381..128d3b55bdd9 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -56,7 +56,8 @@ static const char *verstr = "20101219";
 /* The driver prints some debugging information on the console if DEBUG
   is defined and non-zero. */
-#define DEBUG 0
+#define DEBUG 1
+#define NO_DEBUG 0
 #define ST_DEB_MSG  KERN_NOTICE
 #if DEBUG
@@ -80,6 +81,7 @@ static int max_sg_segs;
 static int try_direct_io = TRY_DIRECT_IO;
 static int try_rdio = 1;
 static int try_wdio = 1;
+static int debug_flag;
 static struct class st_sysfs_class;
 static const struct attribute_group *st_dev_groups[];
@@ -100,6 +102,9 @@ module_param_named(max_sg_segs, max_sg_segs, int, 0);
 MODULE_PARM_DESC(max_sg_segs, "Maximum number of scatter/gather segments to use (256)");
 module_param_named(try_direct_io, try_direct_io, int, 0);
 MODULE_PARM_DESC(try_direct_io, "Try direct I/O between user buffer and tape drive (1)");
+module_param_named(debug_flag, debug_flag, int, 0);
+MODULE_PARM_DESC(debug_flag, "Enable DEBUG, same as setting debugging=1");
 /* Extra parameters for testing */
 module_param_named(try_rdio, try_rdio, int, 0);
@@ -124,6 +129,9 @@ static struct st_dev_parm {
        },
        {
                "try_direct_io", &try_direct_io
+        },
+        {
+                "debug_flag", &debug_flag
        }
 };
 #endif
@@ -194,9 +202,9 @@ static int do_create_sysfs_files(void);
 static void do_remove_sysfs_files(void);
 static struct scsi_driver st_template = {
-        .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "st",
+                .owner          = THIS_MODULE,
                .probe          = st_probe,
                .remove         = st_remove,
        },
@@ -306,8 +314,7 @@ static inline char *tape_name(struct scsi_tape *tape)
 }
 #define st_printk(prefix, t, fmt, a...) \
-        sdev_printk(prefix, (t)->device, "%s: " fmt, \
+        sdev_prefix_printk(prefix, (t)->device, tape_name(t), fmt, ##a)
-                    tape_name(t), ##a)
 #ifdef DEBUG
 #define DEBC_printk(t, fmt, a...) \
        if (debugging) { st_printk(ST_DEB_MSG, t, fmt, ##a ); }
@@ -374,7 +381,8 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt)
                            SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2],
                            SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]);
                if (cmdstatp->have_sense)
-                         __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
+                        __scsi_print_sense(STp->device, name,
+                                           SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
        } ) /* end DEB */
        if (!debugging) { /* Abnormal conditions for tape */
                if (!cmdstatp->have_sense)
@@ -390,7 +398,8 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt)
                         SRpnt->cmd[0] != MODE_SENSE &&
                         SRpnt->cmd[0] != TEST_UNIT_READY) {
-                        __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
+                        __scsi_print_sense(STp->device, name,
+                                           SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
                }
        }
@@ -852,17 +861,16 @@ static int set_mode_densblk(struct scsi_tape * STp, struct st_modedef * STm)
 /* Lock or unlock the drive door. Don't use when st_request allocated. */
 static int do_door_lock(struct scsi_tape * STp, int do_lock)
 {
-        int retval, cmd;
+        int retval;
-        cmd = do_lock ? SCSI_IOCTL_DOORLOCK : SCSI_IOCTL_DOORUNLOCK;
        DEBC_printk(STp, "%socking drive door.\n", do_lock ? "L" : "Unl");
-        retval = scsi_ioctl(STp->device, cmd, NULL);
-        if (!retval) {
+        retval = scsi_set_medium_removal(STp->device,
+                        do_lock ? SCSI_REMOVAL_PREVENT : SCSI_REMOVAL_ALLOW);
+        if (!retval)
                STp->door_locked = do_lock ? ST_LOCKED_EXPLICIT : ST_UNLOCKED;
-        }
+        else
-        else {
                STp->door_locked = ST_LOCK_FAILS;
-        }
        return retval;
 }
@@ -3367,11 +3375,10 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-        retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p,
+        retval = scsi_ioctl_block_when_processing_errors(STp->device, cmd_in,
-                                        file->f_flags & O_NDELAY);
+                        file->f_flags & O_NDELAY);
-        if (!scsi_block_when_processing_errors(STp->device) || retval != -ENODEV)
+        if (retval)
                goto out;
-        retval = 0;
        cmd_type = _IOC_TYPE(cmd_in);
        cmd_nr = _IOC_NR(cmd_in);
@@ -4309,6 +4316,12 @@ static int __init init_st(void)
        printk(KERN_INFO "st: Version %s, fixed bufsize %d, s/g segs %d\n",
                verstr, st_fixed_buffer_size, st_max_sg_segs);
+        debugging = (debug_flag > 0) ? debug_flag : NO_DEBUG;
+        if (debugging) {
+                printk(KERN_INFO "st: Debugging enabled debug_flag = %d\n",
+                        debugging);
+        }
        err = class_register(&st_sysfs_class);
        if (err) {
                pr_err("Unable register sysfs class for SCSI tapes\n");
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 1aa4befcfbd0..98a62bc15069 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -544,33 +544,15 @@ stex_ss_send_cmd(struct st_hba *hba, struct req_msg *req, u16 tag)
 }
 static int
-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);
-        return 0;
-}
-static int
 stex_slave_config(struct scsi_device *sdev)
 {
        sdev->use_10_for_rw = 1;
        sdev->use_10_for_ms = 1;
        blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
-        sdev->tagged_supported = 1;
        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 *))
 {
@@ -1162,9 +1144,7 @@ static int stex_abort(struct scsi_cmnd *cmd)
        int result = SUCCESS;
        unsigned long flags;
-        printk(KERN_INFO DRV_NAME
+        scmd_printk(KERN_INFO, cmd, "aborting command\n");
-                "(%s): aborting command\n", pci_name(hba->pdev));
-        scsi_print_command(cmd);
        base = hba->mmio_base;
        spin_lock_irqsave(host->host_lock, flags);
@@ -1352,9 +1332,8 @@ static int stex_reset(struct scsi_cmnd *cmd)
        hba = (struct st_hba *) &cmd->device->host->hostdata[0];
-        printk(KERN_INFO DRV_NAME
+        shost_printk(KERN_INFO, cmd->device->host,
-                "(%s): resetting host\n", pci_name(hba->pdev));
+                     "resetting host\n");
-        scsi_print_command(cmd);
        return stex_do_reset(hba) ? FAILED : SUCCESS;
 }
@@ -1391,12 +1370,11 @@ static struct scsi_host_template driver_template = {
        .proc_name                      = DRV_NAME,
        .bios_param                     = stex_biosparam,
        .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/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 733e5f759518..ff8befbdf17c 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1097,7 +1097,8 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
        if (scmnd->result) {
                if (scsi_normalize_sense(scmnd->sense_buffer,
                                SCSI_SENSE_BUFFERSIZE, &sense_hdr))
-                        scsi_print_sense_hdr("storvsc", &sense_hdr);
+                        scsi_print_sense_hdr(scmnd->device, "storvsc",
+                                             &sense_hdr);
        }
        if (vm_srb->srb_status != SRB_STATUS_SUCCESS)
@@ -1428,8 +1429,7 @@ static void storvsc_device_destroy(struct scsi_device *sdevice)
 static int storvsc_device_configure(struct scsi_device *sdevice)
 {
-        scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG,
+        scsi_adjust_queue_depth(sdevice, STORVSC_MAX_IO_REQUESTS);
-                                STORVSC_MAX_IO_REQUESTS);
        blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 1a2367a1b1f2..835bd8dafe0a 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -2590,15 +2590,15 @@ static void NCR5380_reselect (struct Scsi_Host *instance)
 * Purpose : abort a command
 *
 * Inputs : cmd - the struct scsi_cmnd to abort, code - code to set the
- *      host byte of the result field to, if zero DID_ABORTED is 
+ *      host byte of the result field to, if zero DID_ABORTED is
 *      used.
 *
- * Returns : 0 - success, -1 on failure.
+ * Returns : SUCCESS - success, FAILED on failure.
 *
- * XXX - there is no way to abort the command that is currently 
+ * XXX - there is no way to abort the command that is currently
- *       connected, you have to wait for it to complete.  If this is 
+ *       connected, you have to wait for it to complete.  If this is
 *       a problem, we could implement longjmp() / setjmp(), setjmp()
- *       called where the loop started in NCR5380_main().
+ *       called where the loop started in NCR5380_main().
 */
 static int NCR5380_abort(struct scsi_cmnd *cmd)
@@ -2608,8 +2608,7 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
    struct scsi_cmnd *tmp, **prev;
    unsigned long flags;
-    printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);
+    scmd_printk(KERN_NOTICE, cmd, "aborting command\n");
-    scsi_print_command(cmd);
    NCR5380_print_status (instance);
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index e59e6f96b725..3557b385251a 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -820,9 +820,7 @@ static int sym53c8xx_slave_configure(struct scsi_device *sdev)
        if (reqtags > SYM_CONF_MAX_TAG)
                reqtags = SYM_CONF_MAX_TAG;
        depth_to_use = reqtags ? reqtags : 1;
-        scsi_adjust_queue_depth(sdev,
+        scsi_adjust_queue_depth(sdev, depth_to_use);
-                                sdev->tagged_supported ? MSG_SIMPLE_TAG : 0,
-                                depth_to_use);
        lp->s.scdev_depth = depth_to_use;
        sym_tune_dev_queuing(tp, sdev->lun, reqtags);
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 764575726c85..844c9a048c00 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -243,7 +243,6 @@
 #include <scsi/scsicam.h>
 #include <scsi/scsi_tcq.h>
 #define DC390_BANNER "Tekram DC390/AM53C974"
 #define DC390_VERSION "2.1d 2004-05-27"
@@ -508,7 +507,6 @@ dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_sr
    struct scsi_cmnd *scmd = pSRB->pcmd;
    struct scsi_device *sdev = scmd->device;
    u8 cmd, disc_allowed, try_sync_nego;
-    char tag[2];
    pSRB->ScsiPhase = SCSI_NOP0;
@@ -560,11 +558,11 @@ dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_sr
    cmd = SEL_W_ATN;
    DC390_write8 (ScsiFifo, IDENTIFY(disc_allowed, pDCB->TargetLUN));
    /* Change 99/05/31: Don't use tags when not disconnecting (BUSY) */
-    if ((pDCB->SyncMode & EN_TAG_QUEUEING) && disc_allowed && scsi_populate_tag_msg(scmd, tag)) {
+    if ((pDCB->SyncMode & EN_TAG_QUEUEING) && disc_allowed && (scmd->flags & SCMD_TAGGED)) {
-        DC390_write8(ScsiFifo, tag[0]);
+        DC390_write8(ScsiFifo, MSG_SIMPLE_TAG);
-        pDCB->TagMask |= 1 << tag[1];
+        pDCB->TagMask |= 1 << scmd->request->tag;
-        pSRB->TagNumber = tag[1];
+        pSRB->TagNumber = scmd->request->tag;
-        DC390_write8(ScsiFifo, tag[1]);
+        DC390_write8(ScsiFifo, scmd->request->tag);
        DEBUG1(printk(KERN_INFO "DC390: Select w/DisCn for SRB %p, block tag %02x\n", pSRB, tag[1]));
        cmd = SEL_W_ATN3;
    } else {
@@ -2187,9 +2185,16 @@ static int dc390_slave_configure(struct scsi_device *sdev)
        struct dc390_dcb *dcb = (struct dc390_dcb *)sdev->hostdata;
        acb->scan_devices = 0;
+        /*
+         * XXX: Note that while this driver used to called scsi_activate_tcq,
+         * it never actually set a tag type, so emulate the old behavior.
+         */
+        scsi_set_tag_type(sdev, 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, acb->TagMaxNum);
        }
        return 0;
@@ -2211,6 +2216,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/u14-34f.c b/drivers/scsi/u14-34f.c
index d8dcf36aed11..aa0f4035afaf 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -696,25 +696,25 @@ static int u14_34f_slave_configure(struct scsi_device *dev) {
   if (TLDEV(dev->type) && dev->tagged_supported)
      if (tag_mode == TAG_SIMPLE) {
-         scsi_adjust_queue_depth(dev, MSG_SIMPLE_TAG, tqd);
+         scsi_adjust_queue_depth(dev, tqd);
         tag_suffix = ", simple tags";
         }
      else if (tag_mode == TAG_ORDERED) {
-         scsi_adjust_queue_depth(dev, MSG_ORDERED_TAG, tqd);
+         scsi_adjust_queue_depth(dev, tqd);
         tag_suffix = ", ordered tags";
         }
      else {
-         scsi_adjust_queue_depth(dev, 0, tqd);
+         scsi_adjust_queue_depth(dev, tqd);
         tag_suffix = ", no tags";
         }
   else if (TLDEV(dev->type) && linked_comm) {
-      scsi_adjust_queue_depth(dev, 0, tqd);
+      scsi_adjust_queue_depth(dev, tqd);
      tag_suffix = ", untagged";
      }
   else {
-      scsi_adjust_queue_depth(dev, 0, utqd);
+      scsi_adjust_queue_depth(dev, utqd);
      tag_suffix = "";
      }
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 605ca60e8a10..820fc7d96084 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2713,7 +2713,7 @@ 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);
+        scsi_adjust_queue_depth(sdev, lun_qdepth);
 }
 /*
@@ -2783,11 +2783,9 @@ static int ufshcd_slave_alloc(struct scsi_device *sdev)
        struct ufs_hba *hba;
        hba = shost_priv(sdev->host);
-        sdev->tagged_supported = 1;
        /* Mode sense(6) is not supported by UFS, so use Mode sense(10) */
        sdev->use_10_for_ms = 1;
-        scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
        /* allow SCSI layer to restart the device in case of errors */
        sdev->allow_restart = 1;
@@ -2823,9 +2821,7 @@ static int ufshcd_change_queue_depth(struct scsi_device *sdev,
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
        case SCSI_QDEPTH_RAMP_UP:
-                if (!sdev->tagged_supported)
+                scsi_adjust_queue_depth(sdev, depth);
-                        depth = 1;
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, depth);
@@ -2860,7 +2856,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) {
                unsigned long flags;
@@ -4239,6 +4234,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,
@@ -4731,11 +4727,11 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
                                     START_STOP_TIMEOUT, 0, NULL, REQ_PM);
        if (ret) {
                sdev_printk(KERN_WARNING, sdp,
-                          "START_STOP failed for power mode: %d\n", pwr_mode);
+                            "START_STOP failed for power mode: %d, result %x\n",
-                scsi_show_result(ret);
+                            pwr_mode, ret);
                if (driver_byte(ret) & DRIVER_SENSE) {
-                        scsi_show_sense_hdr(&sshdr);
+                        scsi_show_sense_hdr(sdp, NULL, &sshdr);
-                        scsi_show_extd_sense(sshdr.asc, sshdr.ascq);
+                        scsi_show_extd_sense(sdp, NULL, sshdr.asc, sshdr.ascq);
                }
        }
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index b83846fc7859..355afbc7fde1 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -683,9 +683,7 @@ static int virtscsi_change_queue_depth(struct scsi_device *sdev,
                break;
        case SCSI_QDEPTH_RAMP_UP: /* Raise qdepth after BUSY state resolved */
        case SCSI_QDEPTH_DEFAULT: /* Manual change via sysfs */
-                scsi_adjust_queue_depth(sdev,
+                scsi_adjust_queue_depth(sdev, min(max_depth, qdepth));
-                                        scsi_get_tag_type(sdev),
-                                        min(max_depth, qdepth));
                break;
        default:
                return -EOPNOTSUPP;
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 598f65efaaec..c3b4f8b3a3a5 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -522,13 +522,13 @@ static int pvscsi_change_queue_depth(struct scsi_device *sdev,
                max_depth = 1;
        if (qdepth > max_depth)
                qdepth = max_depth;
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        scsi_adjust_queue_depth(sdev, qdepth);
        if (sdev->inquiry_len > 7)
                sdev_printk(KERN_INFO, sdev,
-                            "qdepth(%d), tagged(%d), simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n",
+                            "qdepth(%d), tagged(%d), simple(%d), scsi_level(%d), cmd_que(%d)\n",
                            sdev->queue_depth, sdev->tagged_supported,
-                            sdev->simple_tags, sdev->ordered_tags,
+                            sdev->simple_tags,
                            sdev->scsi_level, (sdev->inquiry[7] & 2) >> 1);
        return sdev->queue_depth;
 }
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index ab3ab27d49b7..0ed96644ec94 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -121,13 +121,13 @@ static int tcm_loop_change_queue_depth(
 {
        switch (reason) {
        case SCSI_QDEPTH_DEFAULT:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        case SCSI_QDEPTH_QFULL:
                scsi_track_queue_full(sdev, depth);
                break;
        case SCSI_QDEPTH_RAMP_UP:
-                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+                scsi_adjust_queue_depth(sdev, depth);
                break;
        default:
                return -EOPNOTSUPP;
@@ -135,33 +135,6 @@ static int tcm_loop_change_queue_depth(
        return sdev->queue_depth;
 }
-static int tcm_loop_change_queue_type(struct scsi_device *sdev, int tag)
-{
-        if (sdev->tagged_supported) {
-                scsi_set_tag_type(sdev, tag);
-                if (tag)
-                        scsi_activate_tcq(sdev, sdev->queue_depth);
-                else
-                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
-        } else
-                tag = 0;
-        return tag;
-}
-/*
- * Locate the SAM Task Attr from struct scsi_cmnd *
- */
-static int tcm_loop_sam_attr(struct scsi_cmnd *sc, int tag)
-{
-        if (sc->device->tagged_supported &&
-            sc->device->ordered_tags && tag >= 0)
-                return MSG_ORDERED_TAG;
-        return MSG_SIMPLE_TAG;
-}
 static void tcm_loop_submission_work(struct work_struct *work)
 {
        struct tcm_loop_cmd *tl_cmd =
@@ -220,7 +193,7 @@ static void tcm_loop_submission_work(struct work_struct *work)
        rc = target_submit_cmd_map_sgls(se_cmd, tl_nexus->se_sess, sc->cmnd,
                        &tl_cmd->tl_sense_buf[0], tl_cmd->sc->device->lun,
-                        transfer_length, tcm_loop_sam_attr(sc, tl_cmd->sc_cmd_tag),
+                        transfer_length, MSG_SIMPLE_TAG,
                        sc->sc_data_direction, 0,
                        scsi_sglist(sc), scsi_sg_count(sc),
                        sgl_bidi, sgl_bidi_count,
@@ -431,27 +404,13 @@ static int tcm_loop_slave_alloc(struct scsi_device *sd)
        return 0;
 }
-static int tcm_loop_slave_configure(struct scsi_device *sd)
-{
-        if (sd->tagged_supported) {
-                scsi_activate_tcq(sd, sd->queue_depth);
-                scsi_adjust_queue_depth(sd, MSG_SIMPLE_TAG,
-                                        sd->host->cmd_per_lun);
-        } else {
-                scsi_adjust_queue_depth(sd, 0,
-                                        sd->host->cmd_per_lun);
-        }
-        return 0;
-}
 static struct scsi_host_template tcm_loop_driver_template = {
        .show_info              = tcm_loop_show_info,
        .proc_name              = "tcm_loopback",
        .name                   = "TCM_Loopback",
        .queuecommand           = tcm_loop_queuecommand,
        .change_queue_depth     = tcm_loop_change_queue_depth,
-        .change_queue_type      = tcm_loop_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
        .eh_abort_handler = tcm_loop_abort_task,
        .eh_device_reset_handler = tcm_loop_device_reset,
        .eh_target_reset_handler = tcm_loop_target_reset,
@@ -462,8 +421,8 @@ static struct scsi_host_template tcm_loop_driver_template = {
        .max_sectors            = 0xFFFF,
        .use_clustering         = DISABLE_CLUSTERING,
        .slave_alloc            = tcm_loop_slave_alloc,
-        .slave_configure        = tcm_loop_slave_configure,
        .module                 = THIS_MODULE,
+        .use_blk_tags           = 1,
 };
 static int tcm_loop_driver_probe(struct device *dev)
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index fb87780929d2..75cbde1f7c5b 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -576,7 +576,7 @@ static inline int core_alua_state_standby(
        case SEND_DIAGNOSTIC:
        case READ_CAPACITY:
                return 0;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                switch (cdb[1] & 0x1f) {
                case SAI_READ_CAPACITY_16:
                        return 0;
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 9f93b8234095..4c261c33cf55 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -459,7 +459,7 @@ static int core_scsi3_pr_seq_non_holder(
        case ACCESS_CONTROL_OUT:
        case INQUIRY:
        case LOG_SENSE:
-        case READ_MEDIA_SERIAL_NUMBER:
+        case SERVICE_ACTION_IN_12:
        case REPORT_LUNS:
        case REQUEST_SENSE:
        case PERSISTENT_RESERVE_IN:
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index ebe62afb957d..8d171ff77e75 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -852,7 +852,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                size = READ_CAP_LEN;
                cmd->execute_cmd = sbc_emulate_readcapacity;
                break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                switch (cmd->t_task_cdb[1] & 0x1f) {
                case SAI_READ_CAPACITY_16:
                        cmd->execute_cmd = sbc_emulate_readcapacity_16;
diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.c b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
index 6cdb7a534f23..024f58475a94 100644
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
@@ -912,7 +912,7 @@ static int get_cmd_dir(const unsigned char *cdb)
        case INQUIRY:
        case MODE_SENSE:
        case MODE_SENSE_10:
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
        case MAINTENANCE_IN:
        case PERSISTENT_RESERVE_IN:
        case SECURITY_PROTOCOL_IN:
diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index e08f64780e30..66a684a29938 100644
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -164,10 +164,10 @@ void usb_stor_show_sense(const struct us_data *us,
                         unsigned char asc,
                         unsigned char ascq)
 {
-        const char *what, *keystr;
+        const char *what, *keystr, *fmt;
        keystr = scsi_sense_key_string(key);
-        what = scsi_extd_sense_format(asc, ascq);
+        what = scsi_extd_sense_format(asc, ascq, &fmt);
        if (keystr == NULL)
                keystr = "(Unknown Key)";
@@ -175,8 +175,10 @@ void usb_stor_show_sense(const struct us_data *us,
                what = "(unknown ASC/ASCQ)";
        usb_stor_dbg(us, "%s: ", keystr);
-        US_DEBUGPX(what, ascq);
+        if (fmt)
-        US_DEBUGPX("\n");
+                US_DEBUGPX("%s (%s%x)\n", what, fmt, ascq);
+        else
+                US_DEBUGPX("%s\n", what);
 }
 int usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 89b24349269e..33f211b56a42 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -181,7 +181,7 @@ static int uas_get_tag(struct scsi_cmnd *cmnd)
 {
        int tag;
-        if (blk_rq_tagged(cmnd->request))
+        if (cmnd->flags & SCMD_TAGGED)
                tag = cmnd->request->tag + 2;
        else
                tag = 1;
@@ -799,8 +799,7 @@ static int uas_slave_configure(struct scsi_device *sdev)
        if (devinfo->flags & US_FL_NO_REPORT_OPCODES)
                sdev->no_report_opcodes = 1;
-        scsi_set_tag_type(sdev, MSG_ORDERED_TAG);
+        scsi_adjust_queue_depth(sdev, devinfo->qdepth - 2);
-        scsi_activate_tcq(sdev, devinfo->qdepth - 2);
        return 0;
 }
@@ -817,7 +816,6 @@ static struct scsi_host_template uas_host_template = {
        .sg_tablesize = SG_NONE,
        .cmd_per_lun = 1,       /* until we override it */
        .skip_settle_delay = 1,
-        .ordered_tag = 1,
        /*
         * The uas drivers expects tags not to be bigger than the maximum
@@ -825,6 +823,7 @@ static struct scsi_host_template uas_host_template = {
         * allocator.
         */
        .disable_blk_mq = true,
+        .use_blk_tags = 1,
 };
 #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 3e32146472a5..50610a6acf3d 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -274,10 +274,6 @@ static void scsiback_print_status(char *sense_buffer, int errors,
               tpg->tport->tport_name, pending_req->v2p->lun,
               pending_req->cmnd[0], status_byte(errors), msg_byte(errors),
               host_byte(errors), driver_byte(errors));
-        if (CHECK_CONDITION & status_byte(errors))
-                __scsi_print_sense("xen-pvscsi", sense_buffer,
-                                   SCSI_SENSE_BUFFERSIZE);
 }
 static void scsiback_fast_flush_area(struct vscsibk_pend *req)
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index c9be1589415a..15f7034aa377 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -167,6 +167,23 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw,
                gfp_t gfp, bool reserved);
 struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag);
+enum {
+        BLK_MQ_UNIQUE_TAG_BITS = 16,
+        BLK_MQ_UNIQUE_TAG_MASK = (1 << BLK_MQ_UNIQUE_TAG_BITS) - 1,
+};
+u32 blk_mq_unique_tag(struct request *rq);
+static inline u16 blk_mq_unique_tag_to_hwq(u32 unique_tag)
+{
+        return unique_tag >> BLK_MQ_UNIQUE_TAG_BITS;
+}
+static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
+{
+        return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
+}
 struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
 struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index aac0f9ea952a..6d76b8b4aa2b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1136,7 +1136,6 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk)
 /*
 * tag stuff
 */
-#define blk_rq_tagged(rq)               ((rq)->cmd_flags & REQ_QUEUED)
 extern int blk_queue_start_tag(struct request_queue *, struct request *);
 extern struct request *blk_queue_find_tag(struct request_queue *, int);
 extern void blk_queue_end_tag(struct request_queue *, struct request *);
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 52beadf9a29b..2e0cf568a9c1 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -1106,7 +1106,6 @@ int fc_eh_device_reset(struct scsi_cmnd *);
 int fc_eh_host_reset(struct scsi_cmnd *);
 int fc_slave_alloc(struct scsi_device *);
 int fc_change_queue_depth(struct scsi_device *, int qdepth, int reason);
-int fc_change_queue_type(struct scsi_device *, int tag_type);
 /*
 * ELS/CT interface
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index d17178e6fcdd..8a7f8ad58aac 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -128,8 +128,10 @@ enum scsi_timeouts {
 #define MOVE_MEDIUM           0xa5
 #define EXCHANGE_MEDIUM       0xa6
 #define READ_12               0xa8
+#define SERVICE_ACTION_OUT_12 0xa9
 #define WRITE_12              0xaa
-#define READ_MEDIA_SERIAL_NUMBER 0xab
+#define READ_MEDIA_SERIAL_NUMBER 0xab /* Obsolete with SPC-2 */
+#define SERVICE_ACTION_IN_12  0xab
 #define WRITE_VERIFY_12       0xae
 #define VERIFY_12             0xaf
 #define SEARCH_HIGH_12        0xb0
@@ -151,7 +153,9 @@ enum scsi_timeouts {
 #define VERIFY_16             0x8f
 #define SYNCHRONIZE_CACHE_16  0x91
 #define WRITE_SAME_16         0x93
-#define SERVICE_ACTION_IN     0x9e
+#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
+#define SERVICE_ACTION_IN_16  0x9e
+#define SERVICE_ACTION_OUT_16 0x9f
 /* values for service action in */
 #define SAI_READ_CAPACITY_16  0x10
 #define SAI_GET_LBA_STATUS    0x12
@@ -165,8 +169,8 @@ enum scsi_timeouts {
 #define MI_REPORT_ALIASES     0x0b
 #define MI_REPORT_SUPPORTED_OPERATION_CODES 0x0c
 #define MI_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS 0x0d
-#define MI_REPORT_PRIORITY   0x0e
+#define MI_REPORT_PRIORITY    0x0e
-#define MI_REPORT_TIMESTAMP  0x0f
+#define MI_REPORT_TIMESTAMP   0x0f
 #define MI_MANAGEMENT_PROTOCOL_IN 0x10
 /* value for MI_REPORT_TARGET_PGS ext header */
 #define MI_EXT_HDR_PARAM_FMT  0x20
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 522a5f27f553..9fc1aecfc813 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -53,6 +53,9 @@ struct scsi_pointer {
        volatile int phase;
 };
+/* for scmd->flags */
+#define SCMD_TAGGED             (1 << 0)
 struct scsi_cmnd {
        struct scsi_device *device;
        struct list_head list;  /* scsi_cmnd participates in queue lists */
@@ -132,6 +135,7 @@ struct scsi_cmnd {
                                         * to be at an address < 16Mb). */
        int result;             /* Status code from lower level driver */
+        int flags;              /* Command flags */
        unsigned char tag;      /* SCSI-II queued command tag */
 };
@@ -159,7 +163,7 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
                                 size_t *offset, size_t *len);
 extern void scsi_kunmap_atomic_sg(void *virt);
-extern int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask);
+extern int scsi_init_io(struct scsi_cmnd *cmd);
 extern int scsi_dma_map(struct scsi_cmnd *cmd);
 extern void scsi_dma_unmap(struct scsi_cmnd *cmd);
diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
index e89844cc2cd3..7982795df595 100644
--- a/include/scsi/scsi_dbg.h
+++ b/include/scsi/scsi_dbg.h
@@ -2,23 +2,27 @@
 #define _SCSI_SCSI_DBG_H
 struct scsi_cmnd;
+struct scsi_device;
 struct scsi_sense_hdr;
 extern void scsi_print_command(struct scsi_cmnd *);
-extern void __scsi_print_command(unsigned char *);
+extern void __scsi_print_command(const unsigned char *, size_t);
-extern void scsi_show_extd_sense(unsigned char, unsigned char);
+extern void scsi_show_extd_sense(const struct scsi_device *, const char *,
-extern void scsi_show_sense_hdr(struct scsi_sense_hdr *);
+                                 unsigned char, unsigned char);
-extern void scsi_print_sense_hdr(const char *, struct scsi_sense_hdr *);
+extern void scsi_show_sense_hdr(const struct scsi_device *, const char *,
-extern void scsi_cmd_print_sense_hdr(struct scsi_cmnd *, const char *,
+                                const struct scsi_sense_hdr *);
-                                     struct scsi_sense_hdr *);
+extern void scsi_print_sense_hdr(const struct scsi_device *, const char *,
-extern void scsi_print_sense(char *, struct scsi_cmnd *);
+                                 const struct scsi_sense_hdr *);
-extern void __scsi_print_sense(const char *name,
+extern void scsi_print_sense(const struct scsi_cmnd *);
+extern void __scsi_print_sense(const struct scsi_device *, const char *name,
                               const unsigned char *sense_buffer,
                               int sense_len);
-extern void scsi_show_result(int);
+extern void scsi_print_result(struct scsi_cmnd *, const char *, int);
-extern void scsi_print_result(struct scsi_cmnd *);
+extern const char *scsi_hostbyte_string(int);
-extern void scsi_print_status(unsigned char);
+extern const char *scsi_driverbyte_string(int);
+extern const char *scsi_mlreturn_string(int);
 extern const char *scsi_sense_key_string(unsigned char);
-extern const char *scsi_extd_sense_format(unsigned char, unsigned char);
+extern const char *scsi_extd_sense_format(unsigned char, unsigned char,
+                                          const char **);
 #endif /* _SCSI_SCSI_DBG_H */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 27ecee73bd72..0aeaa003c3c1 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -141,7 +141,6 @@ struct scsi_device {
        unsigned ppr:1;         /* Device supports PPR messages */
        unsigned tagged_supported:1;    /* Supports SCSI-II tagged queuing */
        unsigned simple_tags:1; /* simple queue tag messages are enabled */
-        unsigned ordered_tags:1;/* ordered queue tag messages are enabled */
        unsigned was_reset:1;   /* There was a bus reset on the bus for 
                                 * this device */
        unsigned expecting_cc_ua:1; /* Expecting a CHECK_CONDITION/UNIT_ATTN
@@ -201,11 +200,6 @@ struct scsi_device {
        unsigned long           sdev_data[0];
 } __attribute__((aligned(sizeof(unsigned long))));
-struct scsi_dh_devlist {
-        char *vendor;
-        char *model;
-};
 typedef void (*activate_complete)(void *, int);
 struct scsi_device_handler {
        /* Used by the infrastructure */
@@ -214,9 +208,8 @@ struct scsi_device_handler {
        /* Filled by the hardware handler */
        struct module *module;
        const char *name;
-        const struct scsi_dh_devlist *devlist;
        int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
-        int (*attach)(struct scsi_device *);
+        struct scsi_dh_data *(*attach)(struct scsi_device *);
        void (*detach)(struct scsi_device *);
        int (*activate)(struct scsi_device *, activate_complete, void *);
        int (*prep_fn)(struct scsi_device *, struct request *);
@@ -228,7 +221,6 @@ struct scsi_dh_data {
        struct scsi_device_handler *scsi_dh;
        struct scsi_device *sdev;
        struct kref kref;
-        char buf[0];
 };
 #define to_scsi_device(d)       \
@@ -244,6 +236,15 @@ struct scsi_dh_data {
 #define sdev_dbg(sdev, fmt, a...) \
        dev_dbg(&(sdev)->sdev_gendev, fmt, ##a)
+/*
+ * like scmd_printk, but the device name is passed in
+ * as a string pointer
+ */
+#define sdev_prefix_printk(l, sdev, p, fmt, a...)                       \
+        (p) ?                                                           \
+        sdev_printk(l, sdev, "[%s] " fmt, p, ##a) :                     \
+        sdev_printk(l, sdev, fmt, ##a)
 #define scmd_printk(prefix, scmd, fmt, a...)                            \
        (scmd)->request->rq_disk ?                                      \
        sdev_printk(prefix, (scmd)->device, "[%s] " fmt,                \
@@ -379,7 +380,7 @@ extern struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *,
 #define __shost_for_each_device(sdev, shost) \
        list_for_each_entry((sdev), &((shost)->__devices), siblings)
-extern void scsi_adjust_queue_depth(struct scsi_device *, int, int);
+extern void scsi_adjust_queue_depth(struct scsi_device *, int);
 extern int scsi_track_queue_full(struct scsi_device *, int);
 extern int scsi_set_medium_removal(struct scsi_device *, char);
diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index c2b759809d8a..891a658aa867 100644
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -9,7 +9,6 @@ struct scsi_cmnd;
 struct scsi_device;
 struct scsi_driver {
-        struct module           *owner;
        struct device_driver    gendrv;
        void (*rescan)(struct device *);
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 06a8790893ef..1e1421b06565 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -27,10 +27,10 @@ struct scsi_sense_hdr {		/* See SPC-3 section 4.5 */
        u8 additional_length;   /* always 0 for fixed sense format */
 };
-static inline int scsi_sense_valid(struct scsi_sense_hdr *sshdr)
+static inline bool scsi_sense_valid(const struct scsi_sense_hdr *sshdr)
 {
        if (!sshdr)
-                return 0;
+                return false;
        return (sshdr->response_code & 0x70) == 0x70;
 }
@@ -42,12 +42,12 @@ extern void scsi_eh_flush_done_q(struct list_head *done_q);
 extern void scsi_report_bus_reset(struct Scsi_Host *, int);
 extern void scsi_report_device_reset(struct Scsi_Host *, int, int);
 extern int scsi_block_when_processing_errors(struct scsi_device *);
-extern int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
+extern bool scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
-                struct scsi_sense_hdr *sshdr);
+                                 struct scsi_sense_hdr *sshdr);
-extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
+extern bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,
-                struct scsi_sense_hdr *sshdr);
+                                         struct scsi_sense_hdr *sshdr);
-static inline int scsi_sense_is_deferred(struct scsi_sense_hdr *sshdr)
+static inline bool scsi_sense_is_deferred(const struct scsi_sense_hdr *sshdr)
 {
        return ((sshdr->response_code >= 0x70) && (sshdr->response_code & 1));
 }
@@ -60,15 +60,7 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
 extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq);
-/*
+extern int scsi_ioctl_reset(struct scsi_device *, int __user *);
- * Reset request from external source
- */
-#define SCSI_TRY_RESET_DEVICE   1
-#define SCSI_TRY_RESET_BUS      2
-#define SCSI_TRY_RESET_HOST     3
-#define SCSI_TRY_RESET_TARGET   4
-extern int scsi_reset_provider(struct scsi_device *, int);
 struct scsi_eh_save {
        /* saved state */
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 5e362489ee88..61a81bf77e28 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -422,6 +422,11 @@ struct scsi_host_template {
        unsigned char present;
        /*
+         * Let the block layer assigns tags to all commands.
+         */
+        unsigned use_blk_tags:1;
+        /*
         * This specifies the mode that a LLD supports.
         */
        unsigned supported_mode:2;
@@ -451,11 +456,6 @@ struct scsi_host_template {
         */
        unsigned skip_settle_delay:1;
-        /*
-         * True if we are using ordered write support.
-         */
-        unsigned ordered_tag:1;
        /* True if the controller does not support WRITE SAME */
        unsigned no_write_same:1;
@@ -638,6 +638,14 @@ struct Scsi_Host {
        short unsigned int sg_prot_tablesize;
        unsigned int max_sectors;
        unsigned long dma_boundary;
+        /*
+         * In scsi-mq mode, the number of hardware queues supported by the LLD.
+         *
+         * Note: it is assumed that each hardware queue has a queue depth of
+         * can_queue. In other words, the total queue depth per host
+         * is nr_hw_queues * can_queue.
+         */
+        unsigned nr_hw_queues;
        /* 
         * Used to assign serial numbers to the cmds.
         * Protected by the host lock.
@@ -647,7 +655,6 @@ struct Scsi_Host {
        unsigned active_mode:2;
        unsigned unchecked_isa_dma:1;
        unsigned use_clustering:1;
-        unsigned use_blk_tcq:1;
        /*
         * Host has requested that no further requests come through for the
@@ -662,11 +669,6 @@ struct Scsi_Host {
         */
        unsigned reverse_ordering:1;
-        /*
-         * Ordered write support
-         */
-        unsigned ordered_tag:1;
        /* Task mgmt function in progress */
        unsigned tmf_in_progress:1;
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index b9006848b813..8d19d1d233c3 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -40,9 +40,9 @@ typedef struct scsi_fctargaddress {
        unsigned char host_wwn[8]; // include NULL term.
 } Scsi_FCTargAddress;
+int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev,
+                int cmd, bool ndelay);
 extern int scsi_ioctl(struct scsi_device *, int, void __user *);
-extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
-                                   void __user *arg, int ndelay);
 #endif /* __KERNEL__ */
 #endif /* _SCSI_IOCTL_H */
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 56ed843969ca..fe4a70299419 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -16,20 +16,16 @@
 #ifdef CONFIG_BLOCK
+int scsi_change_queue_type(struct scsi_device *sdev, int tag_type);
 /**
 * scsi_get_tag_type - get the type of tag the device supports
 * @sdev:       the scsi device
- *
- * Notes:
- *      If the drive only supports simple tags, returns MSG_SIMPLE_TAG
- *      if it supports all tag types, returns MSG_ORDERED_TAG.
 */
 static inline int scsi_get_tag_type(struct scsi_device *sdev)
 {
        if (!sdev->tagged_supported)
                return 0;
-        if (sdev->ordered_tags)
-                return MSG_ORDERED_TAG;
        if (sdev->simple_tags)
                return MSG_SIMPLE_TAG;
        return 0;
@@ -39,90 +35,33 @@ static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)
 {
        switch (tag) {
        case MSG_ORDERED_TAG:
-                sdev->ordered_tags = 1;
-                /* fall through */
        case MSG_SIMPLE_TAG:
                sdev->simple_tags = 1;
                break;
        case 0:
                /* fall through */
        default:
-                sdev->ordered_tags = 0;
                sdev->simple_tags = 0;
                break;
        }
 }
-/**
- * scsi_activate_tcq - turn on tag command queueing
- * @SDpnt:      device to turn on TCQ for
- * @depth:      queue depth
- *
- * Notes:
- *      Eventually, I hope depth would be the maximum depth
- *      the device could cope with and the real queue depth
- *      would be adjustable from 0 to depth.
- **/
-static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
-{
-        if (!sdev->tagged_supported)
-                return;
-        if (shost_use_blk_mq(sdev->host))
-                queue_flag_set_unlocked(QUEUE_FLAG_QUEUED, sdev->request_queue);
-        else if (!blk_queue_tagged(sdev->request_queue))
-                blk_queue_init_tags(sdev->request_queue, depth,
-                                    sdev->host->bqt);
-        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
-}
-/**
- * scsi_deactivate_tcq - turn off tag command queueing
- * @SDpnt:      device to turn off TCQ for
- **/
-static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
-{
-        if (blk_queue_tagged(sdev->request_queue))
-                blk_queue_free_tags(sdev->request_queue);
-        scsi_adjust_queue_depth(sdev, 0, depth);
-}
-/**
- * scsi_populate_tag_msg - place a tag message in a buffer
- * @SCpnt:      pointer to the Scsi_Cmnd for the tag
- * @msg:        pointer to the area to place the tag
- *
- * Notes:
- *      designed to create the correct type of tag message for the 
- *      particular request.  Returns the size of the tag message.
- *      May return 0 if TCQ is disabled for this device.
- **/
-static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
-{
-        struct request *req = cmd->request;
-        if (blk_rq_tagged(req)) {
-                *msg++ = MSG_SIMPLE_TAG;
-                *msg++ = req->tag;
-                return 2;
-        }
-        return 0;
-}
 static inline struct scsi_cmnd *scsi_mq_find_tag(struct Scsi_Host *shost,
-                unsigned int hw_ctx, int tag)
+                                                 int unique_tag)
 {
-        struct request *req;
+        u16 hwq = blk_mq_unique_tag_to_hwq(unique_tag);
+        struct request *req = NULL;
-        req = blk_mq_tag_to_rq(shost->tag_set.tags[hw_ctx], tag);
+        if (hwq < shost->tag_set.nr_hw_queues)
+                req = blk_mq_tag_to_rq(shost->tag_set.tags[hwq],
+                                       blk_mq_unique_tag_to_tag(unique_tag));
        return req ? (struct scsi_cmnd *)req->special : NULL;
 }
 /**
 * scsi_find_tag - find a tagged command by device
 * @SDpnt:      pointer to the ScSI device
- * @tag:        the tag number
+ * @tag:        tag generated by blk_mq_unique_tag()
 *
 * Notes:
 *      Only works with tags allocated by the generic blk layer.
@@ -133,9 +72,9 @@ static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag)
        if (tag != SCSI_NO_TAG) {
                if (shost_use_blk_mq(sdev->host))
-                        return scsi_mq_find_tag(sdev->host, 0, tag);
+                        return scsi_mq_find_tag(sdev->host, tag);
-                req = blk_queue_find_tag(sdev->request_queue, tag);
+                req = blk_queue_find_tag(sdev->request_queue, tag);
                return req ? (struct scsi_cmnd *)req->special : NULL;
        }
@@ -174,7 +113,7 @@ static inline int scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)
 /**
 * scsi_host_find_tag - find the tagged command by host
 * @shost:      pointer to scsi_host
- * @tag:        tag of the scsi_cmnd
+ * @tag:        tag generated by blk_mq_unique_tag()
 *
 * Notes:
 *      Only works with tags allocated by the generic blk layer.
@@ -186,7 +125,7 @@ static inline struct scsi_cmnd *scsi_host_find_tag(struct Scsi_Host *shost,
        if (tag != SCSI_NO_TAG) {
                if (shost_use_blk_mq(shost))
-                        return scsi_mq_find_tag(shost, 0, tag);
+                        return scsi_mq_find_tag(shost, tag);
                req = blk_map_queue_find_tag(shost->bqt, tag);
                return req ? (struct scsi_cmnd *)req->special : NULL;
        }
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 7497a383b1a4..a4fa52b4d5c5 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -157,5 +157,6 @@ int spi_populate_width_msg(unsigned char *msg, int width);
 int spi_populate_sync_msg(unsigned char *msg, int period, int offset);
 int spi_populate_ppr_msg(unsigned char *msg, int period, int offset, int width,
                int options);
+int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd);
 #endif /* SCSI_TRANSPORT_SPI_H */
diff --git a/include/scsi/sg.h b/include/scsi/sg.h
index 750e5db7c6bf..3afec7032448 100644
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -164,12 +164,15 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
 /* Returns -EBUSY if occupied. 3rd argument pointer to int (see next) */
 #define SG_SCSI_RESET 0x2284
-/* Associated values that can be given to SG_SCSI_RESET follow */
+/* Associated values that can be given to SG_SCSI_RESET follow.
+ * SG_SCSI_RESET_NO_ESCALATE may be OR-ed to the _DEVICE, _TARGET, _BUS
+ * or _HOST reset value so only that action is attempted. */
 #define         SG_SCSI_RESET_NOTHING   0
 #define         SG_SCSI_RESET_DEVICE    1
 #define         SG_SCSI_RESET_BUS       2
 #define         SG_SCSI_RESET_HOST      3
 #define         SG_SCSI_RESET_TARGET    4
+#define         SG_SCSI_RESET_NO_ESCALATE       0x100
 /* synchronous SCSI command ioctl, (only in version 3 interface) */
 #define SG_IO 0x2285   /* similar effect as write() followed by read() */
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index db6c93510f74..079bd10a01b4 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -94,7 +94,7 @@
                scsi_opcode_name(WRITE_16),                     \
                scsi_opcode_name(VERIFY_16),                    \
                scsi_opcode_name(WRITE_SAME_16),                \
-                scsi_opcode_name(SERVICE_ACTION_IN),            \
+                scsi_opcode_name(SERVICE_ACTION_IN_16),         \
                scsi_opcode_name(SAI_READ_CAPACITY_16),         \
                scsi_opcode_name(SAI_GET_LBA_STATUS),           \
                scsi_opcode_name(MI_REPORT_TARGET_PGS),         \
diff --git a/include/trace/events/target.h b/include/trace/events/target.h
index da9cc0f05c93..45403443dd82 100644
--- a/include/trace/events/target.h
+++ b/include/trace/events/target.h
@@ -96,7 +96,7 @@
                scsi_opcode_name(WRITE_16),                     \
                scsi_opcode_name(VERIFY_16),                    \
                scsi_opcode_name(WRITE_SAME_16),                \
-                scsi_opcode_name(SERVICE_ACTION_IN),            \
+                scsi_opcode_name(SERVICE_ACTION_IN_16),         \
                scsi_opcode_name(SAI_READ_CAPACITY_16),         \
                scsi_opcode_name(SAI_GET_LBA_STATUS),           \
                scsi_opcode_name(MI_REPORT_TARGET_PGS),         \
diff --git a/tools/lib/traceevent/plugin_scsi.c b/tools/lib/traceevent/plugin_scsi.c
index eda326fc8620..3727de48c8d5 100644
--- a/tools/lib/traceevent/plugin_scsi.c
+++ b/tools/lib/traceevent/plugin_scsi.c
@@ -85,8 +85,9 @@ typedef unsigned int u32;
 #define MOVE_MEDIUM                     0xa5
 #define EXCHANGE_MEDIUM                 0xa6
 #define READ_12                         0xa8
+#define SERVICE_ACTION_OUT_12           0xa9
 #define WRITE_12                        0xaa
-#define READ_MEDIA_SERIAL_NUMBER        0xab
+#define SERVICE_ACTION_IN_12            0xab
 #define WRITE_VERIFY_12                 0xae
 #define VERIFY_12                       0xaf
 #define SEARCH_HIGH_12                  0xb0
@@ -107,7 +108,9 @@ typedef unsigned int u32;
 #define VERIFY_16                       0x8f
 #define SYNCHRONIZE_CACHE_16            0x91
 #define WRITE_SAME_16                   0x93
-#define SERVICE_ACTION_IN               0x9e
+#define SERVICE_ACTION_BIDIRECTIONAL    0x9d
+#define SERVICE_ACTION_IN_16            0x9e
+#define SERVICE_ACTION_OUT_16           0x9f
 /* values for service action in */
 #define SAI_READ_CAPACITY_16            0x10
 #define SAI_GET_LBA_STATUS              0x12
@@ -393,7 +396,7 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
                return scsi_trace_rw16(p, cdb, len);
        case UNMAP:
                return scsi_trace_unmap(p, cdb, len);
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                return scsi_trace_service_action_in(p, cdb, len);
        case VARIABLE_LENGTH_CMD:
                return scsi_trace_varlen(p, cdb, len);