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/mlx5: fix meter policy flow match item
[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
6c5bcfb
..
fd8b8fa
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
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-20
18
Broadcom
+ * Copyright(c) 2014-20
21
Broadcom
* All rights reserved.
*/
* All rights reserved.
*/
@@
-21,18
+21,29
@@
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;
- struct bnxt_cp_ring_info *cpr
= bp->async_cp_ring
;
+ struct bnxt_cp_ring_info *cpr;
struct cmpl_base *cmp;
uint32_t raw_cons;
uint32_t cons;
struct cmpl_base *cmp;
uint32_t raw_cons;
uint32_t cons;
+ if (bp == NULL)
+ return;
+ cpr = bp->async_cp_ring;
if (cpr == NULL)
return;
raw_cons = cpr->cp_raw_cons;
if (cpr == NULL)
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;
+ }
+
+ if (is_bnxt_in_error(bp)) {
+ pthread_mutex_unlock(&bp->def_cp_lock);
return;
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];
@@
-49,6
+60,8
@@
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)
@@
-99,6
+112,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;
@@
-138,7
+154,7
@@
int bnxt_setup_int(struct bnxt *bp)
sizeof(struct bnxt_irq), 0);
if (bp->irq_tbl) {
for (i = 0; i < total_vecs; i++) {
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;
snprintf(bp->irq_tbl[i].name, len,
"%s-%d", bp->eth_dev->device->name, i);
bp->irq_tbl[i].handler = bnxt_int_handler;
@@
-168,5
+184,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;
}