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/mvpp2: apply flow control after port init
[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
9016871
..
a29ac28
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,11
+17,11
@@
* 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->
def
_cp_ring;
+ struct bnxt_cp_ring_info *cpr = bp->
async
_cp_ring;
struct cmpl_base *cmp;
uint32_t raw_cons;
uint32_t cons;
struct cmpl_base *cmp;
uint32_t raw_cons;
uint32_t cons;
@@
-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];
@@
-43,10
+50,15
@@
static void bnxt_int_handler(void *param)
bnxt_event_hwrm_resp_handler(bp, cmp);
raw_cons = NEXT_RAW_CMP(raw_cons);
bnxt_event_hwrm_resp_handler(bp, cmp);
raw_cons = NEXT_RAW_CMP(raw_cons);
- }
;
+ }
cpr->cp_raw_cons = raw_cons;
cpr->cp_raw_cons = raw_cons;
- B_CP_DB_REARM(cpr, cpr->cp_raw_cons);
+ if (BNXT_HAS_NQ(bp))
+ 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)
@@
-92,19
+104,38
@@
int bnxt_free_int(struct bnxt *bp)
void bnxt_disable_int(struct bnxt *bp)
{
void bnxt_disable_int(struct bnxt *bp)
{
- struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;
+ struct bnxt_cp_ring_info *cpr = bp->async_cp_ring;
+
+ if (BNXT_NUM_ASYNC_CPR(bp) == 0)
+ return;
+
+ if (is_bnxt_in_error(bp))
+ return;
+
+ if (!cpr || !cpr->cp_db.doorbell)
+ return;
/* Only the default completion ring */
/* Only the default completion ring */
- if (cpr != NULL && cpr->cp_db.doorbell != NULL)
+ if (BNXT_HAS_NQ(bp))
+ bnxt_db_nq(cpr);
+ else
B_CP_DB_DISARM(cpr);
}
void bnxt_enable_int(struct bnxt *bp)
{
B_CP_DB_DISARM(cpr);
}
void bnxt_enable_int(struct bnxt *bp)
{
- struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;
+ struct bnxt_cp_ring_info *cpr = bp->async_cp_ring;
+
+ if (BNXT_NUM_ASYNC_CPR(bp) == 0)
+ return;
+
+ if (!cpr || !cpr->cp_db.doorbell)
+ return;
/* Only the default completion ring */
/* Only the default completion ring */
- if (cpr != NULL && cpr->cp_db.doorbell != NULL)
+ if (BNXT_HAS_NQ(bp))
+ bnxt_db_nq_arm(cpr);
+ else
B_CP_DB_ARM(cpr);
}
B_CP_DB_ARM(cpr);
}
@@
-112,7
+143,7
@@
int bnxt_setup_int(struct bnxt *bp)
{
uint16_t total_vecs;
const int len = sizeof(bp->irq_tbl[0].name);
{
uint16_t total_vecs;
const int len = sizeof(bp->irq_tbl[0].name);
- int i
, rc = 0
;
+ int i;
/* DPDK host only supports 1 MSI-X vector */
total_vecs = 1;
/* DPDK host only supports 1 MSI-X vector */
total_vecs = 1;
@@
-126,14
+157,11
@@
int bnxt_setup_int(struct bnxt *bp)
bp->irq_tbl[i].handler = bnxt_int_handler;
}
} else {
bp->irq_tbl[i].handler = bnxt_int_handler;
}
} else {
-
rc = -ENOMEM
;
-
goto setup_exit
;
+
PMD_DRV_LOG(ERR, "bnxt_irq_tbl setup failed\n")
;
+
return -ENOMEM
;
}
}
- return 0;
-setup_exit:
- PMD_DRV_LOG(ERR, "bnxt_irq_tbl setup failed\n");
- return rc;
+ return 0;
}
int bnxt_request_int(struct bnxt *bp)
}
int bnxt_request_int(struct bnxt *bp)
@@
-153,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;
}