Commit 5bcb1757 authored Nov 05, 2020 by Rob Herring Committed by Lorenzo Pieralisi Nov 19, 2020

PCI: dwc: Move MSI interrupt setup into DWC common code

Platforms using the built-in DWC MSI controller all have a dedicated
interrupt with "msi" name or at index 0, so let's move setting up the
interrupt to the common DWC code.

spear13xx and dra7xx are the 2 oddballs with muxed interrupts, so
we need to prevent configuring the MSI interrupt by setting msi_irq
to negative.

Link: https://lore.kernel.org/r/20201105211159.1814485-9-robh@kernel.org


Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Jingoo Han <jingoohan1@gmail.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Yue Wang <yue.wang@Amlogic.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Xiaowei Song <songxiaowei@hisilicon.com>
Cc: Binghui Wang <wangbinghui@hisilicon.com>
Cc: Stanimir Varbanov <svarbanov@mm-sol.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Pratyush Anand <pratyush.anand@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@axis.com
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-tegra@vger.kernel.org

parent 331e9bce

drivers/pci/controller/dwc/pci-dra7xx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
		if (pp->irq < 0)
		return pp->irq;

		/* MSI IRQ is muxed */
		pp->msi_irq = -ENODEV;

		ret = dra7xx_pcie_init_irq_domain(pp);
		if (ret < 0)
		return ret;

drivers/pci/controller/dwc/pci-exynos.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -415,12 +415,6 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
		return ret;
		}

		if (IS_ENABLED(CONFIG_PCI_MSI)) {
		pp->msi_irq = platform_get_irq(pdev, 0);
		if (pp->msi_irq < 0)
		return pp->msi_irq;
		}

		pp->ops = &exynos_pcie_host_ops;

		ret = dw_pcie_host_init(pp);

drivers/pci/controller/dwc/pci-imx6.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -853,12 +853,6 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
		struct device *dev = &pdev->dev;
		int ret;

		if (IS_ENABLED(CONFIG_PCI_MSI)) {
		pp->msi_irq = platform_get_irq_byname(pdev, "msi");
		if (pp->msi_irq < 0)
		return pp->msi_irq;
		}

		pp->ops = &imx6_pcie_host_ops;

		ret = dw_pcie_host_init(pp);

drivers/pci/controller/dwc/pci-meson.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -405,12 +405,6 @@ static int meson_add_pcie_port(struct meson_pcie *mp,
		struct device *dev = &pdev->dev;
		int ret;

		if (IS_ENABLED(CONFIG_PCI_MSI)) {
		pp->msi_irq = platform_get_irq(pdev, 0);
		if (pp->msi_irq < 0)
		return pp->msi_irq;
		}

		pp->ops = &meson_pcie_host_ops;

		ret = dw_pcie_host_init(pp);

drivers/pci/controller/dwc/pcie-artpec6.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -348,12 +348,6 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
		struct device *dev = pci->dev;
		int ret;

		if (IS_ENABLED(CONFIG_PCI_MSI)) {
		pp->msi_irq = platform_get_irq_byname(pdev, "msi");
		if (pp->msi_irq < 0)
		return pp->msi_irq;
		}

		pp->ops = &artpec6_pcie_host_ops;

		ret = dw_pcie_host_init(pp);