Skip to content

Commit 9f55cf5

Browse files
arndbbjorn-helgaas
authored andcommitted
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: 500a1d9 ("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>
1 parent 5228e39 commit 9f55cf5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/pci/host/pcie-hisi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static struct pcie_host_ops hisi_pcie_host_ops = {
111111
.link_up = hisi_pcie_link_up,
112112
};
113113

114-
static int __init hisi_add_pcie_port(struct pcie_port *pp,
114+
static int hisi_add_pcie_port(struct pcie_port *pp,
115115
struct platform_device *pdev)
116116
{
117117
int ret;
@@ -139,7 +139,7 @@ static int __init hisi_add_pcie_port(struct pcie_port *pp,
139139
return 0;
140140
}
141141

142-
static int __init hisi_pcie_probe(struct platform_device *pdev)
142+
static int hisi_pcie_probe(struct platform_device *pdev)
143143
{
144144
struct hisi_pcie *hisi_pcie;
145145
struct pcie_port *pp;

0 commit comments

Comments
 (0)