Commit dd1f05ba authored by Martin Jocic's avatar Martin Jocic Committed by Marc Kleine-Budde
Browse files

can: kvaser_pciefd: Add MSI interrupts 



Use MSI interrupts with fallback to INTx interrupts.

Signed-off-by: default avatarMartin Jocic <martin.jocic@kvaser.com>
Link: https://lore.kernel.org/all/20240620181320.235465-3-martin.jocic@kvaser.com


[mkl: kvaser_pciefd_probe(): call pci_free_irq_vectors() unconditionally]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 48f827d4

drivers/net/can/kvaser_pciefd.c

+20 −4
Original line number Diff line number Diff line
@@ -1774,11 +1774,24 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev, 
	if (ret)

		goto err_teardown_can_ctrls;



	ret = request_irq(pcie->pci->irq, kvaser_pciefd_irq_handler,

			  IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie);

	if (ret)

	ret = pci_alloc_irq_vectors(pcie->pci, 1, 1, PCI_IRQ_INTX | PCI_IRQ_MSI);

	if (ret < 0) {

		dev_err(&pcie->pci->dev, "Failed to allocate IRQ vectors.\n");

		goto err_teardown_can_ctrls;

	}



	ret = pci_irq_vector(pcie->pci, 0);

	if (ret < 0)

		goto err_pci_free_irq_vectors;



	pcie->pci->irq = ret;



	ret = request_irq(pcie->pci->irq, kvaser_pciefd_irq_handler,

			  IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie);

	if (ret) {

		dev_err(&pcie->pci->dev, "Failed to request IRQ %d\n", pcie->pci->irq);

		goto err_pci_free_irq_vectors;

	}

	iowrite32(KVASER_PCIEFD_SRB_IRQ_DPD0 | KVASER_PCIEFD_SRB_IRQ_DPD1,

		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IRQ_REG);
@@ -1807,6 +1820,9 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev, 
	iowrite32(0, irq_en_base);

	free_irq(pcie->pci->irq, pcie);



err_pci_free_irq_vectors:

	pci_free_irq_vectors(pcie->pci);



err_teardown_can_ctrls:

	kvaser_pciefd_teardown_can_ctrls(pcie);

	iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);
@@ -1852,7 +1868,7 @@ static void kvaser_pciefd_remove(struct pci_dev *pdev) 
	iowrite32(0, KVASER_PCIEFD_PCI_IEN_ADDR(pcie));



	free_irq(pcie->pci->irq, pcie);



	pci_free_irq_vectors(pcie->pci);

	pci_iounmap(pdev, pcie->reg_base);

	pci_release_regions(pdev);

	pci_disable_device(pdev);