Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19799f4 authored by wenxiong@linux.vnet.ibm.com's avatar wenxiong@linux.vnet.ibm.com Committed by James Bottomley
Browse files

[SCSI] 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.

Signed-off-by: default avatarWen Xiong <wenxiong@linux.vnet.ibm.com>
Acked-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent fe696909

drivers/scsi/ipr.c

+8 −2
Original line number Diff line number Diff line
@@ -9349,6 +9349,9 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev) 
	int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);

	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);



	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);
@@ -9371,6 +9374,9 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev) 


	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);



	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;