git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix checking VNIC in shutdown path
[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
a22700a
..
40e1b0c
100644
(file)
--- a/
drivers/net/bnxt/bnxt_irq.c
+++ b/
drivers/net/bnxt/bnxt_irq.c
@@
-9,7
+9,6
@@
#include <rte_malloc.h>
#include "bnxt.h"
#include <rte_malloc.h>
#include "bnxt.h"
-#include "bnxt_cpr.h"
#include "bnxt_irq.h"
#include "bnxt_ring.h"
#include "hsi_struct_def_dpdk.h"
#include "bnxt_irq.h"
#include "bnxt_ring.h"
#include "hsi_struct_def_dpdk.h"
@@
-18,7
+17,7
@@
* Interrupts
*/
* Interrupts
*/
-
static
void bnxt_int_handler(void *param)
+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 rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
struct bnxt *bp = eth_dev->data->dev_private;
@@
-31,9
+30,17
@@
static void bnxt_int_handler(void *param)
return;
raw_cons = cpr->cp_raw_cons;
return;
raw_cons = cpr->cp_raw_cons;
+ pthread_mutex_lock(&bp->def_cp_lock);
while (1) {
while (1) {
- if (!cpr || !cpr->cp_ring_struct || !cpr->cp_db.doorbell)
+ if (!cpr || !cpr->cp_ring_struct || !cpr->cp_db.doorbell) {
+ pthread_mutex_unlock(&bp->def_cp_lock);
return;
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];
cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
cmp = &cpr->cp_desc_ring[cons];
@@
-50,6
+57,8
@@
static void bnxt_int_handler(void *param)
bnxt_db_nq_arm(cpr);
else
B_CP_DB_REARM(cpr, cpr->cp_raw_cons);
bnxt_db_nq_arm(cpr);
else
B_CP_DB_REARM(cpr, cpr->cp_raw_cons);
+
+ pthread_mutex_unlock(&bp->def_cp_lock);
}
int bnxt_free_int(struct bnxt *bp)
}
int bnxt_free_int(struct bnxt *bp)
@@
-100,6
+109,9
@@
void bnxt_disable_int(struct bnxt *bp)
if (BNXT_NUM_ASYNC_CPR(bp) == 0)
return;
if (BNXT_NUM_ASYNC_CPR(bp) == 0)
return;
+ if (is_bnxt_in_error(bp))
+ return;
+
if (!cpr || !cpr->cp_db.doorbell)
return;
if (!cpr || !cpr->cp_db.doorbell)
return;
@@
-169,5
+181,13
@@
int bnxt_request_int(struct bnxt *bp)
irq->requested = 1;
}
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;
}
return rc;
}