Skip to content

Commit bba2a05

Browse files
kaleshap86kuba-moo
authored andcommitted
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: Pavan Chebbi <pavan.chebbi@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Link: https://patch.msgid.link/20251126215648.1885936-4-michael.chan@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent f3d88fe commit bba2a05

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ int bnxt_register_dev(struct bnxt_en_dev *edev,
142142
edev->ulp_tbl->msix_requested = bnxt_get_ulp_msix_num(bp);
143143

144144
bnxt_fill_msix_vecs(bp, bp->edev->msix_entries);
145-
edev->flags |= BNXT_EN_FLAG_MSIX_REQUESTED;
146145
exit:
147146
mutex_unlock(&edev->en_dev_lock);
148147
netdev_unlock(dev);
@@ -159,8 +158,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev)
159158
ulp = edev->ulp_tbl;
160159
netdev_lock(dev);
161160
mutex_lock(&edev->en_dev_lock);
162-
if (ulp->msix_requested)
163-
edev->flags &= ~BNXT_EN_FLAG_MSIX_REQUESTED;
164161
edev->ulp_tbl->msix_requested = 0;
165162

166163
if (ulp->max_async_event_id)
@@ -298,7 +295,7 @@ void bnxt_ulp_irq_stop(struct bnxt *bp)
298295
struct bnxt_ulp_ops *ops;
299296
bool reset = false;
300297

301-
if (!edev || !(edev->flags & BNXT_EN_FLAG_MSIX_REQUESTED))
298+
if (!edev)
302299
return;
303300

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

324-
if (!edev || !(edev->flags & BNXT_EN_FLAG_MSIX_REQUESTED))
321+
if (!edev)
325322
return;
326323

327324
if (bnxt_ulp_registered(bp->edev)) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ struct bnxt_en_dev {
5858
#define BNXT_EN_FLAG_ROCEV2_CAP 0x2
5959
#define BNXT_EN_FLAG_ROCE_CAP (BNXT_EN_FLAG_ROCEV1_CAP | \
6060
BNXT_EN_FLAG_ROCEV2_CAP)
61-
#define BNXT_EN_FLAG_MSIX_REQUESTED 0x4
6261
#define BNXT_EN_FLAG_ULP_STOPPED 0x8
6362
#define BNXT_EN_FLAG_VF 0x10
6463
#define BNXT_EN_VF(edev) ((edev)->flags & BNXT_EN_FLAG_VF)

0 commit comments

Comments
 (0)