#include <inttypes.h>
+#include <rte_cycles.h>
#include <rte_malloc.h>
#include "bnxt.h"
{
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;
bnxt_event_hwrm_resp_handler(bp, cmp);
raw_cons = NEXT_RAW_CMP(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);
}
-void bnxt_free_int(struct bnxt *bp)
+int bnxt_free_int(struct bnxt *bp)
{
- struct bnxt_irq *irq;
-
- irq = bp->irq_tbl;
- if (irq) {
- if (irq->requested) {
- rte_intr_disable(&bp->pdev->intr_handle);
- rte_intr_callback_unregister(&bp->pdev->intr_handle,
- irq->handler,
- (void *)bp->eth_dev);
- irq->requested = 0;
+ struct rte_intr_handle *intr_handle = &bp->pdev->intr_handle;
+ struct bnxt_irq *irq = bp->irq_tbl;
+ int rc = 0;
+
+ if (!irq)
+ return 0;
+
+ if (irq->requested) {
+ int count = 0;
+
+ /*
+ * Callback deregistration will fail with rc -EAGAIN if the
+ * callback is currently active. Retry every 50 ms until
+ * successful or 500 ms has elapsed.
+ */
+ do {
+ rc = rte_intr_callback_unregister(intr_handle,
+ irq->handler,
+ bp->eth_dev);
+ if (rc >= 0) {
+ irq->requested = 0;
+ break;
+ }
+ rte_delay_ms(50);
+ } while (count++ < 10);
+
+ if (rc < 0) {
+ PMD_DRV_LOG(ERR, "irq cb unregister failed rc: %d\n",
+ rc);
+ return rc;
}
- rte_free((void *)bp->irq_tbl);
- bp->irq_tbl = NULL;
}
+
+ rte_free(bp->irq_tbl);
+ bp->irq_tbl = NULL;
+
+ return 0;
}
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 (!cpr || !cpr->cp_db.doorbell)
+ return;
/* 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)
{
- 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 */
- if (cpr != NULL && cpr->cp_db.doorbell != NULL)
+ if (BNXT_HAS_NQ(bp))
+ bnxt_db_nq_arm(cpr);
+ else
B_CP_DB_ARM(cpr);
}
{
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;
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)
{
+ 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;
+ if (!irq)
+ return 0;
- rte_intr_callback_register(&bp->pdev->intr_handle, irq->handler,
- (void *)bp->eth_dev);
- rte_intr_enable(&bp->pdev->intr_handle);
+ if (!irq->requested) {
+ rc = rte_intr_callback_register(intr_handle,
+ irq->handler,
+ bp->eth_dev);
+ if (!rc)
+ irq->requested = 1;
+ }
- irq->requested = 1;
return rc;
}