| From b1dd2aac4cc0892b82ec60232ed37e3b0af776cc Mon Sep 17 00:00:00 2001 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Sun, 19 Oct 2014 17:13:58 +0200 |
| Subject: scsi: set REQ_QUEUE for the blk-mq case |
| |
| From: Christoph Hellwig <hch@lst.de> |
| |
| commit b1dd2aac4cc0892b82ec60232ed37e3b0af776cc upstream. |
| |
| To generate the right SPI tag messages we need to properly set |
| QUEUE_FLAG_QUEUED in the request_queue and mirror it to the |
| request. |
| |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Acked-by: Jens Axboe <axboe@kernel.dk> |
| Reported-by: Meelis Roos <mroos@linux.ee> |
| Tested-by: Meelis Roos <mroos@linux.ee> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/scsi_lib.c | 5 +++++ |
| include/scsi/scsi_tcq.h | 8 ++++---- |
| 2 files changed, 9 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/scsi/scsi_lib.c |
| +++ b/drivers/scsi/scsi_lib.c |
| @@ -1887,6 +1887,11 @@ static int scsi_queue_rq(struct blk_mq_h |
| req->cmd_flags |= REQ_DONTPREP; |
| } |
| |
| + if (blk_queue_tagged(q)) |
| + req->cmd_flags |= REQ_QUEUED; |
| + else |
| + req->cmd_flags &= ~REQ_QUEUED; |
| + |
| scsi_init_cmd_errh(cmd); |
| cmd->scsi_done = scsi_mq_done; |
| |
| --- a/include/scsi/scsi_tcq.h |
| +++ b/include/scsi/scsi_tcq.h |
| @@ -67,8 +67,9 @@ static inline void scsi_activate_tcq(str |
| 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,8 +82,7 @@ static inline void scsi_activate_tcq(str |
| **/ |
| 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); |
| } |