Commit cda2cab0 authored by Vasundhara Volam's avatar Vasundhara Volam Committed by David S. Miller
Browse files

bnxt_en: Move devlink_register before registering netdev 



Latest kernels get the phys_port_name via devlink, if
ndo_get_phys_port_name is not defined. To provide the phys_port_name
correctly, register devlink before registering netdev.

Also call devlink_port_type_eth_set() after registering netdev as
devlink port updates the netdev structure and notifies user.

Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 002870eb

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+8 −4
Original line number Diff line number Diff line
@@ -11445,9 +11445,9 @@ static void bnxt_remove_one(struct pci_dev *pdev) 
		bnxt_sriov_disable(bp);



	bnxt_dl_fw_reporters_destroy(bp, true);

	bnxt_dl_unregister(bp);

	pci_disable_pcie_error_reporting(pdev);

	unregister_netdev(dev);

	bnxt_dl_unregister(bp);

	bnxt_shutdown_tc(bp);

	bnxt_cancel_sp_work(bp);

	bp->sp_event = 0;
@@ -11917,11 +11917,14 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		bnxt_init_tc(bp);

	}



	bnxt_dl_register(bp);



	rc = register_netdev(dev);

	if (rc)

		goto init_err_cleanup_tc;

		goto init_err_cleanup;



	bnxt_dl_register(bp);

	if (BNXT_PF(bp))

		devlink_port_type_eth_set(&bp->dl_port, bp->dev);

	bnxt_dl_fw_reporters_create(bp);



	netdev_info(dev, "%s found at mem %lx, node addr %pM\n",
@@ -11931,7 +11934,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	return 0;



init_err_cleanup_tc:

init_err_cleanup:

	bnxt_dl_unregister(bp);

	bnxt_shutdown_tc(bp);

	bnxt_clear_int_mode(bp);

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

+0 −1
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ int bnxt_dl_register(struct bnxt *bp) 
		netdev_err(bp->dev, "devlink_port_register failed");

		goto err_dl_unreg;

	}

	devlink_port_type_eth_set(&bp->dl_port, bp->dev);



	rc = bnxt_dl_params_register(bp);

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE