Commit bba2a057 authored by Kalesh AP's avatar Kalesh AP Committed by Jakub Kicinski
Browse files

bnxt_en: Remove the redundant BNXT_EN_FLAG_MSIX_REQUESTED flag 



MSIX is always requested when the RoCE driver calls bnxt_register_dev().
We already check bnxt_ulp_registered(), so checking the flag is
redundant.  It was a left-over flag after converting to auxbus, so
remove it.

Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20251126215648.1885936-4-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f3d88fe6

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

+2 −5
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ int bnxt_register_dev(struct bnxt_en_dev *edev, 
	edev->ulp_tbl->msix_requested = bnxt_get_ulp_msix_num(bp);



	bnxt_fill_msix_vecs(bp, bp->edev->msix_entries);

	edev->flags |= BNXT_EN_FLAG_MSIX_REQUESTED;

exit:

	mutex_unlock(&edev->en_dev_lock);

	netdev_unlock(dev);
@@ -159,8 +158,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev) 
	ulp = edev->ulp_tbl;

	netdev_lock(dev);

	mutex_lock(&edev->en_dev_lock);

	if (ulp->msix_requested)

		edev->flags &= ~BNXT_EN_FLAG_MSIX_REQUESTED;

	edev->ulp_tbl->msix_requested = 0;



	if (ulp->max_async_event_id)
@@ -298,7 +295,7 @@ void bnxt_ulp_irq_stop(struct bnxt *bp) 
	struct bnxt_ulp_ops *ops;

	bool reset = false;



	if (!edev || !(edev->flags & BNXT_EN_FLAG_MSIX_REQUESTED))

	if (!edev)

		return;



	if (bnxt_ulp_registered(bp->edev)) {
@@ -321,7 +318,7 @@ void bnxt_ulp_irq_restart(struct bnxt *bp, int err) 
	struct bnxt_en_dev *edev = bp->edev;

	struct bnxt_ulp_ops *ops;



	if (!edev || !(edev->flags & BNXT_EN_FLAG_MSIX_REQUESTED))

	if (!edev)

		return;



	if (bnxt_ulp_registered(bp->edev)) {

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

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct bnxt_en_dev { 
	#define BNXT_EN_FLAG_ROCEV2_CAP		0x2

	#define BNXT_EN_FLAG_ROCE_CAP		(BNXT_EN_FLAG_ROCEV1_CAP | \

						 BNXT_EN_FLAG_ROCEV2_CAP)

	#define BNXT_EN_FLAG_MSIX_REQUESTED	0x4

	#define BNXT_EN_FLAG_ULP_STOPPED	0x8

	#define BNXT_EN_FLAG_VF			0x10

#define BNXT_EN_VF(edev)	((edev)->flags & BNXT_EN_FLAG_VF)