Commit 59fbab1a authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Move dw_pcie_msi_init() into core 

The host drivers which call dw_pcie_msi_init() are all the ones using
the built-in MSI controller, so let's move it into the common DWC code.

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


Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
Cc: Kishon Vijay Abraham I <kishon@ti.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-omap@vger.kernel.org
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 886a9c13

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

+0 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static int dra7xx_pcie_host_init(struct pcie_port *pp) 
	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);



	dw_pcie_setup_rc(pp);



	dw_pcie_msi_init(pp);

	dra7xx_pcie_enable_interrupts(dra7xx);



	return 0;

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

+0 −4
Original line number Diff line number Diff line
@@ -273,12 +273,8 @@ static irqreturn_t exynos_pcie_irq_handler(int irq, void *arg) 


static void exynos_pcie_msi_init(struct exynos_pcie *ep)

{

	struct dw_pcie *pci = ep->pci;

	struct pcie_port *pp = &pci->pp;

	u32 val;



	dw_pcie_msi_init(pp);



	/* enable MSI interrupt */

	val = exynos_pcie_readl(ep->mem_res->elbi_base, PCIE_IRQ_EN_LEVEL);

	val |= IRQ_MSI_ENABLE;

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

+0 −1
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ static int imx6_pcie_host_init(struct pcie_port *pp) 
	imx6_pcie_deassert_core_reset(imx6_pcie);

	imx6_setup_phy_mpll(imx6_pcie);

	dw_pcie_setup_rc(pp);

	dw_pcie_msi_init(pp);



	return 0;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ static int meson_pcie_host_init(struct pcie_port *pp) 
	meson_set_max_rd_req_size(mp, MAX_READ_REQ_SIZE);



	dw_pcie_setup_rc(pp);

	dw_pcie_msi_init(pp);



	return 0;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ static int artpec6_pcie_host_init(struct pcie_port *pp) 
	artpec6_pcie_deassert_core_reset(artpec6_pcie);

	artpec6_pcie_wait_for_phy(artpec6_pcie);

	dw_pcie_setup_rc(pp);

	dw_pcie_msi_init(pp);



	return 0;

}