scsi: remove abuses of scsi_populate_tag

[linux-block.git] / include / scsi / scsi_tcq.h

diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index e64583560701bb1f2f0038717457321597b39e85..005f68da5adb38b2b222b0f200d8e300bf27e4fa 100644 (file)
--- 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,15 +35,12 @@ 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;
        }
@@ -67,8 +60,9 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
        if (!sdev->tagged_supported)
                return;
 
-       if (!shost_use_blk_mq(sdev->host) &&
-           !blk_queue_tagged(sdev->request_queue))
+       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);
 
@@ -81,48 +75,27 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
  **/
 static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
 {
-       if (!shost_use_blk_mq(sdev->host) &&
-           blk_queue_tagged(sdev->request_queue))
+       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 +106,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 +147,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 +159,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;
        }