Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 012dba0a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

PCI: keystone: Don't discard .probe() callback 

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: 0c4ffcfe ("PCI: keystone: Add TI Keystone PCIe driver")
Link: https://lore.kernel.org/r/20231001170254.2506508-5-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9988c9dc

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

+2 −2
Original line number Diff line number Diff line
@@ -1181,7 +1181,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;
@@ -1423,7 +1423,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 = {