Commit 8fd84415 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-fixes' 



Leon Romanovsky says:

====================
Batch of devlink related fixes

I'm asking to apply this batch of devlink fixes to net-next and not to
net, because most if not all fixes are for old code or/and can be considered
as cleanup.

It will cancel the need to deal with merge conflicts for my next devlink series :).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a8551c9b e6a54d6f

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

+4 −1
Original line number Diff line number Diff line
@@ -13370,7 +13370,9 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	bnxt_inv_fw_health_reg(bp);

	bnxt_dl_register(bp);

	rc = bnxt_dl_register(bp);

	if (rc)

		goto init_err_dl;



	rc = register_netdev(dev);

	if (rc)
@@ -13390,6 +13392,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


init_err_cleanup:

	bnxt_dl_unregister(bp);

init_err_dl:

	bnxt_shutdown_tc(bp);

	bnxt_clear_int_mode(bp);

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

+6 −20
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void bnxt_dl_fw_reporters_create(struct bnxt *bp) 
{

	struct bnxt_fw_health *health = bp->fw_health;



	if (!bp->dl || !health)

	if (!health)

		return;



	if (!(bp->fw_cap & BNXT_FW_CAP_HOT_RESET) || health->fw_reset_reporter)
@@ -188,7 +188,7 @@ void bnxt_dl_fw_reporters_destroy(struct bnxt *bp, bool all) 
{

	struct bnxt_fw_health *health = bp->fw_health;



	if (!bp->dl || !health)

	if (!health)

		return;



	if ((all || !(bp->fw_cap & BNXT_FW_CAP_HOT_RESET)) &&
@@ -736,9 +736,6 @@ static const struct devlink_param bnxt_dl_params[] = { 
			     NULL),

};



static const struct devlink_param bnxt_dl_port_params[] = {

};



static int bnxt_dl_params_register(struct bnxt *bp)

{

	int rc;
@@ -753,14 +750,6 @@ static int bnxt_dl_params_register(struct bnxt *bp) 
			    rc);

		return rc;

	}

	rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,

					  ARRAY_SIZE(bnxt_dl_port_params));

	if (rc) {

		netdev_err(bp->dev, "devlink_port_params_register failed\n");

		devlink_params_unregister(bp->dl, bnxt_dl_params,

					  ARRAY_SIZE(bnxt_dl_params));

		return rc;

	}

	devlink_params_publish(bp->dl);



	return 0;
@@ -773,14 +762,13 @@ static void bnxt_dl_params_unregister(struct bnxt *bp) 


	devlink_params_unregister(bp->dl, bnxt_dl_params,

				  ARRAY_SIZE(bnxt_dl_params));

	devlink_port_params_unregister(&bp->dl_port, bnxt_dl_port_params,

				       ARRAY_SIZE(bnxt_dl_port_params));

}



int bnxt_dl_register(struct bnxt *bp)

{

	const struct devlink_ops *devlink_ops;

	struct devlink_port_attrs attrs = {};

	struct bnxt_dl *bp_dl;

	struct devlink *dl;

	int rc;
@@ -795,7 +783,9 @@ int bnxt_dl_register(struct bnxt *bp) 
		return -ENOMEM;

	}



	bnxt_link_bp_to_dl(bp, dl);

	bp->dl = dl;

	bp_dl = devlink_priv(dl);

	bp_dl->bp = bp;



	/* Add switchdev eswitch mode setting, if SRIOV supported */

	if (pci_find_ext_capability(bp->pdev, PCI_EXT_CAP_ID_SRIOV) &&
@@ -826,7 +816,6 @@ int bnxt_dl_register(struct bnxt *bp) 
err_dl_port_unreg:

	devlink_port_unregister(&bp->dl_port);

err_dl_free:

	bnxt_link_bp_to_dl(bp, NULL);

	devlink_free(dl);

	return rc;

}
@@ -835,9 +824,6 @@ void bnxt_dl_unregister(struct bnxt *bp) 
{

	struct devlink *dl = bp->dl;



	if (!dl)

		return;



	if (BNXT_PF(bp)) {

		bnxt_dl_params_unregister(bp);

		devlink_port_unregister(&bp->dl_port);

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

+0 −13
Original line number Diff line number Diff line
@@ -20,19 +20,6 @@ static inline struct bnxt *bnxt_get_bp_from_dl(struct devlink *dl) 
	return ((struct bnxt_dl *)devlink_priv(dl))->bp;

}



/* To clear devlink pointer from bp, pass NULL dl */

static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl)

{

	bp->dl = dl;



	/* add a back pointer in dl to bp */

	if (dl) {

		struct bnxt_dl *bp_dl = devlink_priv(dl);



		bp_dl->bp = bp;

	}

}



#define NVM_OFF_MSIX_VEC_PER_PF_MAX	108

#define NVM_OFF_MSIX_VEC_PER_PF_MIN	114

#define NVM_OFF_IGNORE_ARI		164

drivers/net/ethernet/intel/ice/ice_main.c

+0 −3
Original line number Diff line number Diff line
@@ -4593,9 +4593,6 @@ static void ice_remove(struct pci_dev *pdev) 
	struct ice_pf *pf = pci_get_drvdata(pdev);

	int i;



	if (!pf)

		return;



	for (i = 0; i < ICE_MAX_RESET_WAIT; i++) {

		if (!ice_is_reset_in_progress(pf->state))

			break;

drivers/net/ethernet/qlogic/qede/qede_main.c

+5 −7
Original line number Diff line number Diff line
@@ -1176,19 +1176,17 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level, 
		edev->devlink = qed_ops->common->devlink_register(cdev);

		if (IS_ERR(edev->devlink)) {

			DP_NOTICE(edev, "Cannot register devlink\n");

			rc = PTR_ERR(edev->devlink);

			edev->devlink = NULL;

			/* Go on, we can live without devlink */

			goto err3;

		}

	} else {

		struct net_device *ndev = pci_get_drvdata(pdev);

		struct qed_devlink *qdl;



		edev = netdev_priv(ndev);



		if (edev->devlink) {

			struct qed_devlink *qdl = devlink_priv(edev->devlink);



		qdl = devlink_priv(edev->devlink);

		qdl->cdev = cdev;

		}

		edev->cdev = cdev;

		memset(&edev->stats, 0, sizeof(edev->stats));

		memcpy(&edev->dev_info, &dev_info, sizeof(dev_info));