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>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index f8c2c72b382d8aa425cb85ffb9066fc80646590a..927971c362f16dbea8a215efb62895a245efcc93 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -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)) {

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
index 7b9dd8ebe4bccadfe07f189618ce2b9bd5524352..3c5b8a53f71507e57d213a5875612e6fb3e10733 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
@@ -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)