From: Wen Xiong <wenxi...@linux.vnet.ibm.com>
Add scsi multi-queue support in ipr driver.
Signed-off-by: Brian King <brk...@linux.vnet.ibm.com>
---
drivers/scsi/ipr.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff -puN drivers/scsi/ipr.c~ipr_scsimq drivers/scsi/ipr.c
--- linux-2.6.git/drivers/scsi/ipr.c~ipr_scsimq 2016-09-05 14:30:47.450074000
-0500
+++ linux-2.6.git-bjking1/drivers/scsi/ipr.c 2016-09-05 15:36:33.216027606
-0500
@@ -6492,6 +6492,7 @@ static int ipr_queuecommand(struct Scsi_
int rc;
struct ipr_hrr_queue *hrrq;
int hrrq_id;
+ uint32_t tag;
ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
@@ -6505,7 +6506,12 @@ static int ipr_queuecommand(struct Scsi_
return rc;
}
- hrrq_id = ipr_get_hrrq_index(ioa_cfg);
+ if (shost_use_blk_mq(scsi_cmd->device->host) && ioa_cfg->hrrq_num > 1) {
+ tag = blk_mq_unique_tag(scsi_cmd->request);
+ hrrq_id = blk_mq_unique_tag_to_hwq(tag) + 1;
+ } else
+ hrrq_id = ipr_get_hrrq_index(ioa_cfg);
+
hrrq = &ioa_cfg->hrrq[hrrq_id];
spin_lock_irqsave(hrrq->lock, hrrq_flags);
@@ -10306,6 +10312,12 @@ static int ipr_probe_ioa(struct pci_dev
(unsigned int)num_online_cpus(),
(unsigned int)IPR_MAX_HRRQ_NUM);
+ /* Reserve the first hardware queue for slow interrupts, such as errors
*/
+ if (ioa_cfg->hrrq_num > 1)
+ host->nr_hw_queues = ioa_cfg->hrrq_num - 1;
+ else
+ host->nr_hw_queues = 1;
+
if ((rc = ipr_save_pcix_cmd_reg(ioa_cfg)))
goto out_msi_disable;
_
------------------------------------------------------------------------------
_______________________________________________
Iprdd-devel mailing list
Iprdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/iprdd-devel
