]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: keystone: Don't discard .probe() callback
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 1 Oct 2023 17:02:54 +0000 (19:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 16:56:30 +0000 (16:56 +0000)
commit 7994db905c0fd692cf04c527585f08a91b560144 upstream.

The __init annotation makes the ks_pcie_probe() function disappear after
booting completes. However a device can also be bound later. In that case,
we try to call ks_pcie_probe(), but the backing memory is likely already
overwritten.

The right thing to do is do always have the probe callback available.  Note
that the (wrong) __refdata annotation prevented this issue to be noticed by
modpost.

Fixes: 0c4ffcfe1fbc ("PCI: keystone: Add TI Keystone PCIe driver")
Link: https://lore.kernel.org/r/20231001170254.2506508-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pci/controller/dwc/pci-keystone.c

index ef7126ba751f73976027ea57f2c4986bb9381300..eacdcb0a87719003f6fbc103b0454435ebc1d5ef 100644 (file)
@@ -1080,7 +1080,7 @@ static const struct of_device_id ks_pcie_of_match[] = {
        { },
 };
 
-static int __init ks_pcie_probe(struct platform_device *pdev)
+static int ks_pcie_probe(struct platform_device *pdev)
 {
        const struct dw_pcie_host_ops *host_ops;
        const struct dw_pcie_ep_ops *ep_ops;
@@ -1300,7 +1300,7 @@ static int ks_pcie_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct platform_driver ks_pcie_driver __refdata = {
+static struct platform_driver ks_pcie_driver = {
        .probe  = ks_pcie_probe,
        .remove = ks_pcie_remove,
        .driver = {