Commit 9f55cf56 authored Nov 24, 2015 by Arnd Bergmann Committed by Bjorn Helgaas Nov 24, 2015

PCI: hisi: Fix deferred probing



The hisi_pcie_probe() function is incorrectly marked as __init, as Kconfig
tells us:

  WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe()

If the probe for this device gets deferred past the point where __init
functions are removed, or the device is unbound and then reattached to the
driver, we branch into uninitialized memory, which is bad.

Remove the __init annotation from hisi_pcie_probe() and
hisi_add_pcie_port().

Fixes: 500a1d9a ("PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Zhou Wang <wangzhou1@hisilicon.com>

parent 5228e39e

drivers/pci/host/pcie-hisi.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = {
	.link_up = hisi_pcie_link_up,		.link_up = hisi_pcie_link_up,
	};		};

	static int __init hisi_add_pcie_port(struct pcie_port *pp,		static int hisi_add_pcie_port(struct pcie_port *pp,
	struct platform_device *pdev)		struct platform_device *pdev)
	{		{
	int ret;		int ret;
	@@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp,
	return 0;		return 0;
	}		}

	static int __init hisi_pcie_probe(struct platform_device *pdev)		static int hisi_pcie_probe(struct platform_device *pdev)
	{		{
	struct hisi_pcie *hisi_pcie;		struct hisi_pcie *hisi_pcie;
	struct pcie_port *pp;		struct pcie_port *pp;