net/ice/base: add helper function to redirect flags

[dpdk.git] / drivers / net / bnxt / bnxt_irq.c

diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c
index 4feb637..122a1f9 100644 (file)
--- a/drivers/net/bnxt/bnxt_irq.c
+++ b/drivers/net/bnxt/bnxt_irq.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2018 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -21,11 +21,14 @@ void bnxt_int_handler(void *param)
 {
        struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
        struct bnxt *bp = eth_dev->data->dev_private;
-       struct bnxt_cp_ring_info *cpr = bp->async_cp_ring;
+       uint32_t cons, raw_cons, cp_ring_size;
+       struct bnxt_cp_ring_info *cpr;
        struct cmpl_base *cmp;
-       uint32_t raw_cons;
-       uint32_t cons;
 
+
+       if (bp == NULL)
+               return;
+       cpr = bp->async_cp_ring;
        if (cpr == NULL)
                return;
 
@@ -37,10 +40,16 @@ void bnxt_int_handler(void *param)
                        return;
                }
 
+               if (is_bnxt_in_error(bp)) {
+                       pthread_mutex_unlock(&bp->def_cp_lock);
+                       return;
+               }
+
+               cp_ring_size = cpr->cp_ring_struct->ring_size;
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
                cmp = &cpr->cp_desc_ring[cons];
 
-               if (!CMP_VALID(cmp, raw_cons, cpr->cp_ring_struct))
+               if (!bnxt_cpr_cmp_valid(cmp, raw_cons, cp_ring_size))
                        break;
 
                bnxt_event_hwrm_resp_handler(bp, cmp);
@@ -104,6 +113,9 @@ void bnxt_disable_int(struct bnxt *bp)
        if (BNXT_NUM_ASYNC_CPR(bp) == 0)
                return;
 
+       if (is_bnxt_in_error(bp))
+               return;
+
        if (!cpr || !cpr->cp_db.doorbell)
                return;
 
@@ -143,7 +155,7 @@ int bnxt_setup_int(struct bnxt *bp)
                                 sizeof(struct bnxt_irq), 0);
        if (bp->irq_tbl) {
                for (i = 0; i < total_vecs; i++) {
-                       bp->irq_tbl[i].vector = i;
+                       bp->irq_tbl[i].vector_idx = i;
                        snprintf(bp->irq_tbl[i].name, len,
                                 "%s-%d", bp->eth_dev->device->name, i);
                        bp->irq_tbl[i].handler = bnxt_int_handler;
@@ -173,5 +185,13 @@ int bnxt_request_int(struct bnxt *bp)
                        irq->requested = 1;
        }
 
+#ifdef RTE_EXEC_ENV_FREEBSD
+       /**
+        * In FreeBSD OS, nic_uio does not support interrupts and
+        * interrupt register callback will fail.
+        */
+       rc = 0;
+#endif
+
        return rc;
 }