net/sfc: use NIC EVQ descs limits instead of defines

[dpdk.git] / drivers / net / sfc / sfc_ev.c

diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index 8a5030b..939766d 100644 (file)
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -158,8 +158,37 @@ sfc_ev_dp_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
        dp_rxq = evq->dp_rxq;
        SFC_ASSERT(dp_rxq != NULL);
 
-       SFC_ASSERT(evq->sa->dp_rx->qrx_ev != NULL);
-       return evq->sa->dp_rx->qrx_ev(dp_rxq, id);
+       SFC_ASSERT(evq->sa->priv.dp_rx->qrx_ev != NULL);
+       return evq->sa->priv.dp_rx->qrx_ev(dp_rxq, id);
+}
+
+static boolean_t
+sfc_ev_nop_rx_ps(void *arg, uint32_t label, uint32_t id,
+                uint32_t pkt_count, uint16_t flags)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa,
+               "EVQ %u unexpected packed stream Rx event label=%u id=%#x pkt_count=%u flags=%#x",
+               evq->evq_index, label, id, pkt_count, flags);
+       return B_TRUE;
+}
+
+/* It is not actually used on datapath, but required on RxQ flush */
+static boolean_t
+sfc_ev_dp_rx_ps(void *arg, __rte_unused uint32_t label, uint32_t id,
+               __rte_unused uint32_t pkt_count, __rte_unused uint16_t flags)
+{
+       struct sfc_evq *evq = arg;
+       struct sfc_dp_rxq *dp_rxq;
+
+       dp_rxq = evq->dp_rxq;
+       SFC_ASSERT(dp_rxq != NULL);
+
+       if (evq->sa->priv.dp_rx->qrx_ps_ev != NULL)
+               return evq->sa->priv.dp_rx->qrx_ps_ev(dp_rxq, id);
+       else
+               return B_FALSE;
 }
 
 static boolean_t
@@ -210,8 +239,8 @@ sfc_ev_dp_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
        dp_txq = evq->dp_txq;
        SFC_ASSERT(dp_txq != NULL);
 
-       SFC_ASSERT(evq->sa->dp_tx->qtx_ev != NULL);
-       return evq->sa->dp_tx->qtx_ev(dp_txq, id);
+       SFC_ASSERT(evq->sa->priv.dp_tx->qtx_ev != NULL);
+       return evq->sa->priv.dp_tx->qtx_ev(dp_txq, id);
 }
 
 static boolean_t
@@ -264,7 +293,9 @@ sfc_ev_rxq_flush_done(void *arg, __rte_unused uint32_t rxq_hw_index)
        SFC_ASSERT(rxq != NULL);
        SFC_ASSERT(rxq->hw_index == rxq_hw_index);
        SFC_ASSERT(rxq->evq == evq);
-       sfc_rx_qflush_done(rxq);
+       RTE_SET_USED(rxq);
+
+       sfc_rx_qflush_done(sfc_rxq_info_by_dp_rxq(dp_rxq));
 
        return B_FALSE;
 }
@@ -293,7 +324,9 @@ sfc_ev_rxq_flush_failed(void *arg, __rte_unused uint32_t rxq_hw_index)
        SFC_ASSERT(rxq != NULL);
        SFC_ASSERT(rxq->hw_index == rxq_hw_index);
        SFC_ASSERT(rxq->evq == evq);
-       sfc_rx_qflush_failed(rxq);
+       RTE_SET_USED(rxq);
+
+       sfc_rx_qflush_failed(sfc_rxq_info_by_dp_rxq(dp_rxq));
 
        return B_FALSE;
 }
@@ -322,7 +355,9 @@ sfc_ev_txq_flush_done(void *arg, __rte_unused uint32_t txq_hw_index)
        SFC_ASSERT(txq != NULL);
        SFC_ASSERT(txq->hw_index == txq_hw_index);
        SFC_ASSERT(txq->evq == evq);
-       sfc_tx_qflush_done(txq);
+       RTE_SET_USED(txq);
+
+       sfc_tx_qflush_done(sfc_txq_info_by_dp_txq(dp_txq));
 
        return B_FALSE;
 }
@@ -394,6 +429,7 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
 static const efx_ev_callbacks_t sfc_ev_callbacks = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
@@ -409,6 +445,7 @@ static const efx_ev_callbacks_t sfc_ev_callbacks = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_efx_rx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_efx_rx,
+       .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
@@ -424,6 +461,7 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_efx_rx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_dp_rx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_dp_rx,
+       .eec_rx_ps              = sfc_ev_dp_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
@@ -439,6 +477,7 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_dp_rx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_efx_tx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
@@ -454,6 +493,7 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_efx_tx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_dp_tx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_dp_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
@@ -575,12 +615,14 @@ sfc_ev_qstart(struct sfc_evq *evq, unsigned int hw_index)
 
        SFC_ASSERT(evq->dp_rxq == NULL || evq->dp_txq == NULL);
        if (evq->dp_rxq != 0) {
-               if (strcmp(sa->dp_rx->dp.name, SFC_KVARG_DATAPATH_EFX) == 0)
+               if (strcmp(sa->priv.dp_rx->dp.name,
+                          SFC_KVARG_DATAPATH_EFX) == 0)
                        evq->callbacks = &sfc_ev_callbacks_efx_rx;
                else
                        evq->callbacks = &sfc_ev_callbacks_dp_rx;
        } else if (evq->dp_txq != 0) {
-               if (strcmp(sa->dp_tx->dp.name, SFC_KVARG_DATAPATH_EFX) == 0)
+               if (strcmp(sa->priv.dp_tx->dp.name,
+                          SFC_KVARG_DATAPATH_EFX) == 0)
                        evq->callbacks = &sfc_ev_callbacks_efx_tx;
                else
                        evq->callbacks = &sfc_ev_callbacks_dp_tx;
@@ -855,7 +897,7 @@ sfc_ev_attach(struct sfc_adapter *sa)
        sa->mgmt_evq_index = 0;
        rte_spinlock_init(&sa->mgmt_evq_lock);
 
-       rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_MGMT, 0, SFC_MGMT_EVQ_ENTRIES,
+       rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_MGMT, 0, sa->evq_min_entries,
                          sa->socket_id, &sa->mgmt_evq);
        if (rc != 0)
                goto fail_mgmt_evq_init;