From: Leon Romanovsky <leonro@nvidia.com>

Date: Sat, 25 Sep 2021 14:22:42 +0300

Subject: bnxt_en: Register devlink instance at the end devlink configuration

Patch-mainline: v5.16-rc1

Git-commit: 5df290e7a70367d476406420d19c4dea14d45dd1

References: jsc#SLE-18978

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>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c |   15 ++++++---------

 1 file changed, 6 insertions(+), 9 deletions(-)

--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

@@ -745,14 +745,10 @@ static int bnxt_dl_params_register(struc

 	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)

@@ -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;

@@ -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:

@@ -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);

 }