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: check duplicate queue IDs
[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
..
508abfc
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.
*/
@@
-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,27
+17,39
@@
* 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;
- 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;
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;
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];
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);
break;
bnxt_event_hwrm_resp_handler(bp, cmp);
@@
-50,11
+61,13
@@
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)
{
- struct rte_intr_handle *intr_handle =
&
bp->pdev->intr_handle;
+ struct rte_intr_handle *intr_handle = bp->pdev->intr_handle;
struct bnxt_irq *irq = bp->irq_tbl;
int rc = 0;
struct bnxt_irq *irq = bp->irq_tbl;
int rc = 0;
@@
-100,6
+113,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;
@@
-139,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++) {
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;
@@
-154,7
+170,7
@@
int bnxt_setup_int(struct bnxt *bp)
int bnxt_request_int(struct bnxt *bp)
{
int bnxt_request_int(struct bnxt *bp)
{
- struct rte_intr_handle *intr_handle =
&
bp->pdev->intr_handle;
+ struct rte_intr_handle *intr_handle = bp->pdev->intr_handle;
struct bnxt_irq *irq = bp->irq_tbl;
int rc = 0;
struct bnxt_irq *irq = bp->irq_tbl;
int rc = 0;
@@
-169,5
+185,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;
}