PCI: rcar: Remove IRQ mappings in rcar_pcie_enable_msi() failpath (0bbf6b92) · Commits · 戴 / test

The rcar_pcie_enable_msi() creates IRQ mappings using irq_create_mapping() before requesting the IRQs using devm_request_irq(). If devm_request_irq() fails for some reason, rcar_pcie_enable_msi() does not remove the mapping. Pull out the code for disposing IRQ mappings from rcar_pcie_teardown_msi() into a separate function and call it from both rcar_pcie_teardown_msi() and rcar_pcie_enable_msi() failpath to remove the mappings correctly. Reported-by:

Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by:

Marek Vasut <marek.vasut+renesas@gmail.com> Signed-off-by:

Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Phil Edworthy <phil.edworthy@renesas.com> Cc: Simon Horman <horms+renesas@verge.net.au> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: linux-renesas-soc@vger.kernel.org

drivers/pci/host/pcie-rcar.c

+16 −9

Original line number	Diff line number	Diff line
		@@ -866,6 +866,20 @@ static const struct irq_domain_ops msi_domain_ops = {
		.map = rcar_msi_map,
		};

		static void rcar_pcie_unmap_msi(struct rcar_pcie *pcie)
		{
		struct rcar_msi *msi = &pcie->msi;
		int i, irq;

		for (i = 0; i < INT_PCI_MSI_NR; i++) {
		irq = irq_find_mapping(msi->domain, i);
		if (irq > 0)
		irq_dispose_mapping(irq);
		}

		irq_domain_remove(msi->domain);
		}

		static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
		{
		struct device *dev = pcie->dev;
		@@ -920,14 +934,13 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
		return 0;

		err:
		irq_domain_remove(msi->domain);
		rcar_pcie_unmap_msi(pcie);
		return err;
		}

		static void rcar_pcie_teardown_msi(struct rcar_pcie *pcie)
		{
		struct rcar_msi *msi = &pcie->msi;
		int irq, i;

		/* Disable all MSI interrupts */
		rcar_pci_write_reg(pcie, 0, PCIEMSIIER);
		@@ -937,13 +950,7 @@ static void rcar_pcie_teardown_msi(struct rcar_pcie *pcie)

		free_pages(msi->pages, 0);

		for (i = 0; i < INT_PCI_MSI_NR; i++) {
		irq = irq_find_mapping(msi->domain, i);
		if (irq > 0)
		irq_dispose_mapping(irq);
		}

		irq_domain_remove(msi->domain);
		rcar_pcie_unmap_msi(pcie);
		}

		static int rcar_pcie_get_resources(struct rcar_pcie *pcie)

Admin message