Skip to content

Commit

Permalink
bnxt_en: Register devlink instance at the end devlink configuration
Browse files Browse the repository at this point in the history
Move devlink_register() to be last command in devlink configuration
sequence, so no user space access will be possible till devlink instance
is fully operable. As part of this change, the devlink_params_publish
call is removed as not needed.

This change fixes forgotten devlink_params_unpublish() too.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
rleon authored and davem330 committed Sep 27, 2021
1 parent cf53021 commit 5df290e
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
Expand Up @@ -745,14 +745,10 @@ static int bnxt_dl_params_register(struct bnxt *bp)

rc = devlink_params_register(bp->dl, bnxt_dl_params,
ARRAY_SIZE(bnxt_dl_params));
if (rc) {
if (rc)
netdev_warn(bp->dev, "devlink_params_register failed. rc=%d\n",
rc);
return rc;
}
devlink_params_publish(bp->dl);

return 0;
return rc;
}

static void bnxt_dl_params_unregister(struct bnxt *bp)
Expand Down Expand Up @@ -792,9 +788,8 @@ int bnxt_dl_register(struct bnxt *bp)
bp->hwrm_spec_code > 0x10803)
bp->eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;

devlink_register(dl);
if (!BNXT_PF(bp))
return 0;
goto out;

attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
attrs.phys.port_number = bp->pf.port_id;
Expand All @@ -811,6 +806,8 @@ int bnxt_dl_register(struct bnxt *bp)
if (rc)
goto err_dl_port_unreg;

out:
devlink_register(dl);
return 0;

err_dl_port_unreg:
Expand All @@ -824,10 +821,10 @@ void bnxt_dl_unregister(struct bnxt *bp)
{
struct devlink *dl = bp->dl;

devlink_unregister(dl);
if (BNXT_PF(bp)) {
bnxt_dl_params_unregister(bp);
devlink_port_unregister(&bp->dl_port);
}
devlink_unregister(dl);
devlink_free(dl);
}

0 comments on commit 5df290e

Please sign in to comment.