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

PCI: dwc: Check CONFIG_PCI_MSI inside dw_pcie_msi_init() 

Move the IS_ENABLED(CONFIG_PCI_MSI) check into dw_pcie_msi_init()
instead of duplicating it in all the drivers.

Link: https://lore.kernel.org/r/20200821035420.380495-22-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
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: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Jingoo Han <jingoohan1@gmail.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: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@axis.com
Cc: linux-arm-msm@vger.kernel.org
parent 421063ef

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

+1 −3
Original line number Diff line number Diff line
@@ -847,8 +847,6 @@ static int imx6_pcie_host_init(struct pcie_port *pp) 
	imx6_setup_phy_mpll(imx6_pcie);

	dw_pcie_setup_rc(pp);

	imx6_pcie_establish_link(imx6_pcie);



	if (IS_ENABLED(CONFIG_PCI_MSI))

	dw_pcie_msi_init(pp);



	return 0;

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

+1 −7
Original line number Diff line number Diff line
@@ -377,12 +377,6 @@ static int meson_pcie_establish_link(struct meson_pcie *mp) 
	return dw_pcie_wait_for_link(pci);

}



static void meson_pcie_enable_interrupts(struct meson_pcie *mp)

{

	if (IS_ENABLED(CONFIG_PCI_MSI))

		dw_pcie_msi_init(&mp->pci.pp);

}



static int meson_pcie_rd_own_conf(struct pci_bus *bus, u32 devfn,

				  int where, int size, u32 *val)

{
@@ -466,7 +460,7 @@ static int meson_pcie_host_init(struct pcie_port *pp) 
	if (ret)

		return ret;



	meson_pcie_enable_interrupts(mp);

	dw_pcie_msi_init(pp);



	return 0;

}

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

+1 −10
Original line number Diff line number Diff line
@@ -346,15 +346,6 @@ static void artpec6_pcie_deassert_core_reset(struct artpec6_pcie *artpec6_pcie) 
	usleep_range(100, 200);

}



static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie)

{

	struct dw_pcie *pci = artpec6_pcie->pci;

	struct pcie_port *pp = &pci->pp;



	if (IS_ENABLED(CONFIG_PCI_MSI))

		dw_pcie_msi_init(pp);

}



static int artpec6_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
@@ -368,7 +359,7 @@ static int artpec6_pcie_host_init(struct pcie_port *pp) 
	dw_pcie_setup_rc(pp);

	artpec6_pcie_establish_link(pci);

	dw_pcie_wait_for_link(pci);

	artpec6_pcie_enable_interrupts(artpec6_pcie);

	dw_pcie_msi_init(pp);



	return 0;

}

drivers/pci/controller/dwc/pcie-designware-host.c

+3 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ void dw_pcie_msi_init(struct pcie_port *pp) 
	struct device *dev = pci->dev;

	u64 msi_target;



	if (!IS_ENABLED(CONFIG_PCI_MSI))

		return;



	pp->msi_page = alloc_page(GFP_KERNEL);

	pp->msi_data = dma_map_page(dev, pp->msi_page, 0, PAGE_SIZE,

				    DMA_FROM_DEVICE);

drivers/pci/controller/dwc/pcie-designware-plat.c

+1 −3
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ static int dw_plat_pcie_host_init(struct pcie_port *pp) 


	dw_pcie_setup_rc(pp);

	dw_pcie_wait_for_link(pci);



	if (IS_ENABLED(CONFIG_PCI_MSI))

	dw_pcie_msi_init(pp);



	return 0;