Skip to contentSkip to conversation

ipr_test_msi() failed when running msi-x enabled adapter

PATCH In review [email protected] 2 participants 3 messages Feb 27, 2013 – Feb 28, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ipr_test_msi() failed when running msi-x enabled adapter

Loading ipr module failed(-22)with msi-x enabled adapter. This patch fixes the issue.

Thanks for your help!
Wendy

#1 lore raw

PATCH 1/1 ipr: ipr_test_msi() fails when running with msi-x enabled adapter

Loading ipr modules failed(-22) with msi-x enabled adapter. In ipr_test_msi(), We need to pass the first vector of msix vectors instead of using pdev->irq to request_irq() when adapter enables msix feature.

---
 drivers/scsi/ipr.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/scsi/ipr.c +8 -2
Index: b/drivers/scsi/ipr.c
===================================================================
@@ -9349,7 +9349,10 @@ static int ipr_test_msi(struct ipr_ioa_c
 	int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
 	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
-	rc = request_irq(pdev->irq, ipr_test_intr, 0, IPR_NAME, ioa_cfg);
+	if (ioa_cfg->intr_flag == IPR_USE_MSIX)
+		rc = request_irq(ioa_cfg->vectors_info[0].vec, ipr_test_intr, 0, IPR_NAME, ioa_cfg);
+	else
+		rc = request_irq(pdev->irq, ipr_test_intr, 0, IPR_NAME, ioa_cfg);
 	if (rc) {
 		dev_err(&pdev->dev, "Can not assign irq %d\n", pdev->irq);
 		return rc;
@@ -9371,7 +9374,10 @@ static int ipr_test_msi(struct ipr_ioa_c
 
 	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
-	free_irq(pdev->irq, ioa_cfg);
+	if (ioa_cfg->intr_flag == IPR_USE_MSIX)
+		free_irq(ioa_cfg->vectors_info[0].vec, ioa_cfg);
+	else
+		free_irq(pdev->irq, ioa_cfg);
 
 	LEAVE;
 
Acked-by on v1 1/1
#2 lore raw

Re: [PATCH 1/1] ipr: ipr_test_msi() fails when running with msi-x enabled adapter

Signature · 3 lines
Brian King
Power Linux I/O
IBM Linux Technology Center