From: Wen Xiong <wenxiong@xxxxxxxxxxxxxxxxxx>
Add scsi multi-queue support in ipr driver. This feature
is enabled by setting ipr_use_blk_mq=1 when loading ipr
module and scsi blk-mq is enabled in the kernel.
Signed-off-by: Wen Xiong <wenxiong@xxxxxxxxxxxxxxxxxx>
---
drivers/scsi/ipr.c | 16 ++++++++++++++--
drivers/scsi/ipr.h | 1 +
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 1f539c2..21b6da6 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -100,6 +100,7 @@ static unsigned int ipr_max_devs = IPR_DEFAULT_SIS64_DEVS;
static unsigned int ipr_dual_ioa_raid = 1;
static unsigned int ipr_number_of_msix = 16;
static unsigned int ipr_fast_reboot;
+static unsigned int ipr_use_blk_mq = 0;
static DEFINE_SPINLOCK(ipr_driver_lock);
/* This table describes the differences between DMA controller chips */
@@ -225,6 +226,8 @@ module_param_named(number_of_msix, ipr_number_of_msix, int, 0);
MODULE_PARM_DESC(number_of_msix, "Specify the number of MSIX interrupts to use on capable adapters (1 - 16). (default:16)");
module_param_named(fast_reboot, ipr_fast_reboot, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(fast_reboot, "Skip adapter shutdown during reboot. Set to 1 to enable. (default: 0)");
+module_param_named(use_blk_mq, ipr_use_blk_mq, uint, S_IRUGO);
+MODULE_PARM_DESC(use_blk_mq, "ipr use block mq enable/disable. (default: 0)");
MODULE_LICENSE("GPL");
MODULE_VERSION(IPR_DRIVER_VERSION);
@@ -6316,6 +6319,7 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
int rc;
struct ipr_hrr_queue *hrrq;
int hrrq_id;
+ uint32_t tag;
ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
@@ -6329,7 +6333,12 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
return rc;
}
- hrrq_id = ipr_get_hrrq_index(ioa_cfg);
+ if (ioa_cfg->use_blk_mq && shost_use_blk_mq(scsi_cmd->device->host)) {
+ tag = blk_mq_unique_tag(scsi_cmd->request);
+ hrrq_id = blk_mq_unique_tag_to_hwq(tag);
+ } else
+ hrrq_id = ipr_get_hrrq_index(ioa_cfg);
+
hrrq = &ioa_cfg->hrrq[hrrq_id];
spin_lock_irqsave(hrrq->lock, hrrq_flags);
@@ -10144,6 +10153,8 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
(unsigned int)num_online_cpus(),
(unsigned int)IPR_MAX_HRRQ_NUM);
+ host->nr_hw_queues = ioa_cfg->hrrq_num;
+
if ((rc = ipr_save_pcix_cmd_reg(ioa_cfg)))
goto out_msi_disable;
@@ -10377,7 +10388,7 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
return rc;
}
- rc = scsi_add_host(ioa_cfg->host, &pdev->dev);
+ rc = scsi_add_host_with_dma(ioa_cfg->host, &pdev->dev, &pdev->dev);
if (rc) {
__ipr_remove(pdev);
@@ -10406,6 +10417,7 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
scsi_scan_host(ioa_cfg->host);
ioa_cfg->iopoll_weight = ioa_cfg->chip_cfg->iopoll_weight;
+ ioa_cfg->use_blk_mq = ipr_use_blk_mq;
if (ioa_cfg->iopoll_weight && ioa_cfg->sis64 && ioa_cfg->nvectors > 1) {
for (i = 1; i < ioa_cfg->hrrq_num; i++) {
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 1d42c74..f79c96b 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1597,6 +1597,7 @@ struct ipr_ioa_cfg {
} vectors_info[IPR_MAX_MSIX_VECTORS];
u32 iopoll_weight;
+ u32 use_blk_mq;
}; /* struct ipr_ioa_cfg */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
