summaryrefslogtreecommitdiffstats
path: root/drivers/ptp
diff options
context:
space:
mode:
authorLeon Romanovsky <leonro@nvidia.com>2021-08-08 21:57:43 +0300
committerDavid S. Miller <davem@davemloft.net>2021-08-09 10:21:40 +0100
commit919d13a7e455c2e7676042d7a5f94c164e859d8a (patch)
tree0b272b82900d1a7760b3cb2838390fa54cbd9a69 /drivers/ptp
parent94c0a6fbd5cfc34d3ce5fea5867123402cdc8794 (diff)
downloadlinux-919d13a7e455c2e7676042d7a5f94c164e859d8a.tar.bz2
devlink: Set device as early as possible
All kernel devlink implementations call to devlink_alloc() during initialization routine for specific device which is used later as a parent device for devlink_register(). Such late device assignment causes to the situation which requires us to call to device_register() before setting other parameters, but that call opens devlink to the world and makes accessible for the netlink users. Any attempt to move devlink_register() to be the last call generates the following error due to access to the devlink->dev pointer. [ 8.758862] devlink_nl_param_fill+0x2e8/0xe50 [ 8.760305] devlink_param_notify+0x6d/0x180 [ 8.760435] __devlink_params_register+0x2f1/0x670 [ 8.760558] devlink_params_register+0x1e/0x20 The simple change of API to set devlink device in the devlink_alloc() instead of devlink_register() fixes all this above and ensures that prior to call to devlink_register() everything already set. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp')
-rw-r--r--drivers/ptp/ptp_ocp.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 6b9c14586987..92edf772feed 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -735,24 +735,6 @@ ptp_ocp_info(struct ptp_ocp *bp)
ptp_ocp_tod_info(bp);
}
-static int
-ptp_ocp_devlink_register(struct devlink *devlink, struct device *dev)
-{
- int err;
-
- err = devlink_register(devlink, dev);
- if (err)
- return err;
-
- return 0;
-}
-
-static void
-ptp_ocp_devlink_unregister(struct devlink *devlink)
-{
- devlink_unregister(devlink);
-}
-
static struct device *
ptp_ocp_find_flash(struct ptp_ocp *bp)
{
@@ -1437,13 +1419,13 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct ptp_ocp *bp;
int err;
- devlink = devlink_alloc(&ptp_ocp_devlink_ops, sizeof(*bp));
+ devlink = devlink_alloc(&ptp_ocp_devlink_ops, sizeof(*bp), &pdev->dev);
if (!devlink) {
dev_err(&pdev->dev, "devlink_alloc failed\n");
return -ENOMEM;
}
- err = ptp_ocp_devlink_register(devlink, &pdev->dev);
+ err = devlink_register(devlink);
if (err)
goto out_free;
@@ -1497,7 +1479,7 @@ out:
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
out_unregister:
- ptp_ocp_devlink_unregister(devlink);
+ devlink_unregister(devlink);
out_free:
devlink_free(devlink);
@@ -1514,7 +1496,7 @@ ptp_ocp_remove(struct pci_dev *pdev)
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
- ptp_ocp_devlink_unregister(devlink);
+ devlink_unregister(devlink);
devlink_free(devlink);
}