X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_irq.c;h=8abbadb3d19d595b4a25e63b0d282cda651f0ef9;hb=537399a91b93243795fcea2fbf8e8945950afc9c;hp=4feb637e2211d57a85d6588e420db0ea394d89b7;hpb=5526c8025d4d16e68b412e378b0ceab42dbcd9d4;p=dpdk.git

diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c
index 4feb637e22..8abbadb3d1 100644
--- 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.
  */
 
@@ -37,6 +37,11 @@ void bnxt_int_handler(void *param)
 			return;
 		}
 
+		if (is_bnxt_in_error(bp)) {
+			pthread_mutex_unlock(&bp->def_cp_lock);
+			return;
+		}
+
 		cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
 		cmp = &cpr->cp_desc_ring[cons];
 
@@ -104,6 +109,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 +151,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 +181,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;
 }