net/sfc: remove flags from EvQ info
[dpdk.git] / drivers / net / sfc / sfc_ev.c
index 412645a..bf108f1 100644 (file)
 /* Management event queue polling period in microseconds */
 #define SFC_MGMT_EV_QPOLL_PERIOD_US    (US_PER_S)
 
+static const char *
+sfc_evq_type2str(enum sfc_evq_type type)
+{
+       switch (type) {
+       case SFC_EVQ_TYPE_MGMT:
+               return "mgmt-evq";
+       case SFC_EVQ_TYPE_RX:
+               return "rx-evq";
+       case SFC_EVQ_TYPE_TX:
+               return "tx-evq";
+       default:
+               SFC_ASSERT(B_FALSE);
+               return NULL;
+       }
+}
 
 static boolean_t
 sfc_ev_initialized(void *arg)
@@ -71,25 +86,37 @@ sfc_ev_initialized(void *arg)
 }
 
 static boolean_t
-sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
-         uint32_t size, uint16_t flags)
+sfc_ev_nop_rx(void *arg, uint32_t label, uint32_t id,
+             uint32_t size, uint16_t flags)
 {
        struct sfc_evq *evq = arg;
-       struct sfc_rxq *rxq;
+
+       sfc_err(evq->sa,
+               "EVQ %u unexpected Rx event label=%u id=%#x size=%u flags=%#x",
+               evq->evq_index, label, id, size, flags);
+       return B_TRUE;
+}
+
+static boolean_t
+sfc_ev_efx_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
+             uint32_t size, uint16_t flags)
+{
+       struct sfc_evq *evq = arg;
+       struct sfc_efx_rxq *rxq;
        unsigned int stop;
        unsigned int pending_id;
        unsigned int delta;
        unsigned int i;
-       struct sfc_rx_sw_desc *rxd;
+       struct sfc_efx_rx_sw_desc *rxd;
 
        if (unlikely(evq->exception))
                goto done;
 
-       rxq = evq->rxq;
+       rxq = sfc_efx_rxq_by_dp_rxq(evq->dp_rxq);
 
        SFC_ASSERT(rxq != NULL);
        SFC_ASSERT(rxq->evq == evq);
-       SFC_ASSERT(rxq->state & SFC_RXQ_STARTED);
+       SFC_ASSERT(rxq->flags & SFC_EFX_RXQ_FLAG_STARTED);
 
        stop = (id + 1) & rxq->ptr_mask;
        pending_id = rxq->pending & rxq->ptr_mask;
@@ -107,7 +134,7 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
                        sfc_err(evq->sa,
                                "EVQ %u RxQ %u invalid RX abort "
                                "(id=%#x size=%u flags=%#x); needs restart",
-                               evq->evq_index, sfc_rxq_sw_index(rxq),
+                               evq->evq_index, rxq->dp.dpq.queue_id,
                                id, size, flags);
                        goto done;
                }
@@ -122,8 +149,8 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
                sfc_err(evq->sa,
                        "EVQ %u RxQ %u completion out of order "
                        "(id=%#x delta=%u flags=%#x); needs restart",
-                       evq->evq_index, sfc_rxq_sw_index(rxq), id, delta,
-                       flags);
+                       evq->evq_index, rxq->dp.dpq.queue_id,
+                       id, delta, flags);
 
                goto done;
        }
@@ -143,20 +170,46 @@ done:
        return B_FALSE;
 }
 
+static boolean_t
+sfc_ev_dp_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
+            __rte_unused uint32_t size, __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);
+
+       SFC_ASSERT(evq->sa->dp_rx->qrx_ev != NULL);
+       return evq->sa->dp_rx->qrx_ev(dp_rxq, id);
+}
+
+static boolean_t
+sfc_ev_nop_tx(void *arg, uint32_t label, uint32_t id)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected Tx event label=%u id=%#x",
+               evq->evq_index, label, id);
+       return B_TRUE;
+}
+
 static boolean_t
 sfc_ev_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
 {
        struct sfc_evq *evq = arg;
-       struct sfc_txq *txq;
+       struct sfc_dp_txq *dp_txq;
+       struct sfc_efx_txq *txq;
        unsigned int stop;
        unsigned int delta;
 
-       txq = evq->txq;
+       dp_txq = evq->dp_txq;
+       SFC_ASSERT(dp_txq != NULL);
 
-       SFC_ASSERT(txq != NULL);
+       txq = sfc_efx_txq_by_dp_txq(dp_txq);
        SFC_ASSERT(txq->evq == evq);
 
-       if (unlikely((txq->state & SFC_TXQ_STARTED) == 0))
+       if (unlikely((txq->flags & SFC_EFX_TXQ_FLAG_STARTED) == 0))
                goto done;
 
        stop = (id + 1) & txq->ptr_mask;
@@ -170,6 +223,19 @@ done:
        return B_FALSE;
 }
 
+static boolean_t
+sfc_ev_dp_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
+{
+       struct sfc_evq *evq = arg;
+       struct sfc_dp_txq *dp_txq;
+
+       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);
+}
+
 static boolean_t
 sfc_ev_exception(void *arg, __rte_unused uint32_t code,
                 __rte_unused uint32_t data)
@@ -197,13 +263,27 @@ sfc_ev_exception(void *arg, __rte_unused uint32_t code,
        return B_TRUE;
 }
 
+static boolean_t
+sfc_ev_nop_rxq_flush_done(void *arg, uint32_t rxq_hw_index)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected RxQ %u flush done",
+               evq->evq_index, rxq_hw_index);
+       return B_TRUE;
+}
+
 static boolean_t
 sfc_ev_rxq_flush_done(void *arg, __rte_unused uint32_t rxq_hw_index)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_dp_rxq *dp_rxq;
        struct sfc_rxq *rxq;
 
-       rxq = evq->rxq;
+       dp_rxq = evq->dp_rxq;
+       SFC_ASSERT(dp_rxq != NULL);
+
+       rxq = sfc_rxq_by_dp_rxq(dp_rxq);
        SFC_ASSERT(rxq != NULL);
        SFC_ASSERT(rxq->hw_index == rxq_hw_index);
        SFC_ASSERT(rxq->evq == evq);
@@ -212,13 +292,27 @@ sfc_ev_rxq_flush_done(void *arg, __rte_unused uint32_t rxq_hw_index)
        return B_FALSE;
 }
 
+static boolean_t
+sfc_ev_nop_rxq_flush_failed(void *arg, uint32_t rxq_hw_index)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected RxQ %u flush failed",
+               evq->evq_index, rxq_hw_index);
+       return B_TRUE;
+}
+
 static boolean_t
 sfc_ev_rxq_flush_failed(void *arg, __rte_unused uint32_t rxq_hw_index)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_dp_rxq *dp_rxq;
        struct sfc_rxq *rxq;
 
-       rxq = evq->rxq;
+       dp_rxq = evq->dp_rxq;
+       SFC_ASSERT(dp_rxq != NULL);
+
+       rxq = sfc_rxq_by_dp_rxq(dp_rxq);
        SFC_ASSERT(rxq != NULL);
        SFC_ASSERT(rxq->hw_index == rxq_hw_index);
        SFC_ASSERT(rxq->evq == evq);
@@ -227,13 +321,27 @@ sfc_ev_rxq_flush_failed(void *arg, __rte_unused uint32_t rxq_hw_index)
        return B_FALSE;
 }
 
+static boolean_t
+sfc_ev_nop_txq_flush_done(void *arg, uint32_t txq_hw_index)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected TxQ %u flush done",
+               evq->evq_index, txq_hw_index);
+       return B_TRUE;
+}
+
 static boolean_t
 sfc_ev_txq_flush_done(void *arg, __rte_unused uint32_t txq_hw_index)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_dp_txq *dp_txq;
        struct sfc_txq *txq;
 
-       txq = evq->txq;
+       dp_txq = evq->dp_txq;
+       SFC_ASSERT(dp_txq != NULL);
+
+       txq = sfc_txq_by_dp_txq(dp_txq);
        SFC_ASSERT(txq != NULL);
        SFC_ASSERT(txq->hw_index == txq_hw_index);
        SFC_ASSERT(txq->evq == evq);
@@ -282,6 +390,16 @@ sfc_ev_timer(void *arg, uint32_t index)
        return B_TRUE;
 }
 
+static boolean_t
+sfc_ev_nop_link_change(void *arg, __rte_unused efx_link_mode_t link_mode)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected link change event",
+               evq->evq_index);
+       return B_TRUE;
+}
+
 static boolean_t
 sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
 {
@@ -314,17 +432,77 @@ 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_rx,
-       .eec_tx                 = sfc_ev_tx,
+       .eec_rx                 = sfc_ev_nop_rx,
+       .eec_tx                 = sfc_ev_nop_tx,
+       .eec_exception          = sfc_ev_exception,
+       .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
+       .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,
+       .eec_txq_flush_done     = sfc_ev_nop_txq_flush_done,
+       .eec_software           = sfc_ev_software,
+       .eec_sram               = sfc_ev_sram,
+       .eec_wake_up            = sfc_ev_wake_up,
+       .eec_timer              = sfc_ev_timer,
+       .eec_link_change        = sfc_ev_link_change,
+};
+
+static const efx_ev_callbacks_t sfc_ev_callbacks_efx_rx = {
+       .eec_initialized        = sfc_ev_initialized,
+       .eec_rx                 = sfc_ev_efx_rx,
+       .eec_tx                 = sfc_ev_nop_tx,
+       .eec_exception          = sfc_ev_exception,
+       .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
+       .eec_rxq_flush_failed   = sfc_ev_rxq_flush_failed,
+       .eec_txq_flush_done     = sfc_ev_nop_txq_flush_done,
+       .eec_software           = sfc_ev_software,
+       .eec_sram               = sfc_ev_sram,
+       .eec_wake_up            = sfc_ev_wake_up,
+       .eec_timer              = sfc_ev_timer,
+       .eec_link_change        = sfc_ev_nop_link_change,
+};
+
+static const efx_ev_callbacks_t sfc_ev_callbacks_dp_rx = {
+       .eec_initialized        = sfc_ev_initialized,
+       .eec_rx                 = sfc_ev_dp_rx,
+       .eec_tx                 = sfc_ev_nop_tx,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_rxq_flush_failed,
+       .eec_txq_flush_done     = sfc_ev_nop_txq_flush_done,
+       .eec_software           = sfc_ev_software,
+       .eec_sram               = sfc_ev_sram,
+       .eec_wake_up            = sfc_ev_wake_up,
+       .eec_timer              = sfc_ev_timer,
+       .eec_link_change        = sfc_ev_nop_link_change,
+};
+
+static const efx_ev_callbacks_t sfc_ev_callbacks_efx_tx = {
+       .eec_initialized        = sfc_ev_initialized,
+       .eec_rx                 = sfc_ev_nop_rx,
+       .eec_tx                 = sfc_ev_tx,
+       .eec_exception          = sfc_ev_exception,
+       .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
+       .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,
        .eec_txq_flush_done     = sfc_ev_txq_flush_done,
        .eec_software           = sfc_ev_software,
        .eec_sram               = sfc_ev_sram,
        .eec_wake_up            = sfc_ev_wake_up,
        .eec_timer              = sfc_ev_timer,
-       .eec_link_change        = sfc_ev_link_change,
+       .eec_link_change        = sfc_ev_nop_link_change,
+};
+
+static const efx_ev_callbacks_t sfc_ev_callbacks_dp_tx = {
+       .eec_initialized        = sfc_ev_initialized,
+       .eec_rx                 = sfc_ev_nop_rx,
+       .eec_tx                 = sfc_ev_dp_tx,
+       .eec_exception          = sfc_ev_exception,
+       .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
+       .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,
+       .eec_txq_flush_done     = sfc_ev_txq_flush_done,
+       .eec_software           = sfc_ev_software,
+       .eec_sram               = sfc_ev_sram,
+       .eec_wake_up            = sfc_ev_wake_up,
+       .eec_timer              = sfc_ev_timer,
+       .eec_link_change        = sfc_ev_nop_link_change,
 };
 
 
@@ -336,14 +514,16 @@ sfc_ev_qpoll(struct sfc_evq *evq)
 
        /* Synchronize the DMA memory for reading not required */
 
-       efx_ev_qpoll(evq->common, &evq->read_ptr, &sfc_ev_callbacks, evq);
+       efx_ev_qpoll(evq->common, &evq->read_ptr, evq->callbacks, evq);
 
        if (unlikely(evq->exception) && sfc_adapter_trylock(evq->sa)) {
                struct sfc_adapter *sa = evq->sa;
                int rc;
 
-               if ((evq->rxq != NULL) && (evq->rxq->state & SFC_RXQ_RUNNING)) {
-                       unsigned int rxq_sw_index = sfc_rxq_sw_index(evq->rxq);
+               if (evq->dp_rxq != NULL) {
+                       unsigned int rxq_sw_index;
+
+                       rxq_sw_index = evq->dp_rxq->dpq.queue_id;
 
                        sfc_warn(sa,
                                 "restart RxQ %u because of exception on its EvQ %u",
@@ -356,8 +536,10 @@ sfc_ev_qpoll(struct sfc_evq *evq)
                                        rxq_sw_index);
                }
 
-               if (evq->txq != NULL) {
-                       unsigned int txq_sw_index = sfc_txq_sw_index(evq->txq);
+               if (evq->dp_txq != NULL) {
+                       unsigned int txq_sw_index;
+
+                       txq_sw_index = evq->dp_txq->dpq.queue_id;
 
                        sfc_warn(sa,
                                 "restart TxQ %u because of exception on its EvQ %u",
@@ -406,6 +588,7 @@ sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index)
        const struct sfc_evq_info *evq_info;
        struct sfc_evq *evq;
        efsys_mem_t *esmp;
+       uint32_t evq_flags = sa->evq_flags;
        unsigned int total_delay_us;
        unsigned int delay_us;
        int rc;
@@ -417,16 +600,35 @@ sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index)
        esmp = &evq->mem;
 
        /* Clear all events */
-       (void)memset((void *)esmp->esm_base, 0xff,
-                    EFX_EVQ_SIZE(evq_info->entries));
+       (void)memset((void *)esmp->esm_base, 0xff, EFX_EVQ_SIZE(evq->entries));
+
+       if (sa->intr.lsc_intr && sw_index == sa->mgmt_evq_index)
+               evq_flags |= EFX_EVQ_FLAGS_NOTIFY_INTERRUPT;
+       else
+               evq_flags |= EFX_EVQ_FLAGS_NOTIFY_DISABLED;
 
        /* Create the common code event queue */
-       rc = efx_ev_qcreate(sa->nic, sw_index, esmp, evq_info->entries,
-                           0 /* unused on EF10 */, 0, evq_info->flags,
+       rc = efx_ev_qcreate(sa->nic, sw_index, esmp, evq->entries,
+                           0 /* unused on EF10 */, 0, evq_flags,
                            &evq->common);
        if (rc != 0)
                goto fail_ev_qcreate;
 
+       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)
+                       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)
+                       evq->callbacks = &sfc_ev_callbacks_efx_tx;
+               else
+                       evq->callbacks = &sfc_ev_callbacks_dp_tx;
+       } else {
+               evq->callbacks = &sfc_ev_callbacks;
+       }
+
        evq->init_state = SFC_EVQ_STARTING;
 
        /* Wait for the initialization event */
@@ -485,6 +687,7 @@ sfc_ev_qstop(struct sfc_adapter *sa, unsigned int sw_index)
                return;
 
        evq->init_state = SFC_EVQ_INITIALIZED;
+       evq->callbacks = NULL;
        evq->read_ptr = 0;
        evq->exception = B_FALSE;
 
@@ -603,39 +806,50 @@ sfc_ev_stop(struct sfc_adapter *sa)
 
 int
 sfc_ev_qinit(struct sfc_adapter *sa, unsigned int sw_index,
+            enum sfc_evq_type type, unsigned int type_index,
             unsigned int entries, int socket_id)
 {
        struct sfc_evq_info *evq_info;
        struct sfc_evq *evq;
        int rc;
 
-       sfc_log_init(sa, "sw_index=%u", sw_index);
+       sfc_log_init(sa, "sw_index=%u type=%s type_index=%u",
+                    sw_index, sfc_evq_type2str(type), type_index);
 
        evq_info = &sa->evq_info[sw_index];
 
        SFC_ASSERT(rte_is_power_of_2(entries));
-       SFC_ASSERT(entries <= evq_info->max_entries);
-       evq_info->entries = entries;
 
+       rc = ENOMEM;
        evq = rte_zmalloc_socket("sfc-evq", sizeof(*evq), RTE_CACHE_LINE_SIZE,
                                 socket_id);
        if (evq == NULL)
-               return ENOMEM;
+               goto fail_evq_alloc;
 
        evq->sa = sa;
        evq->evq_index = sw_index;
+       evq->type = type;
+       evq->entries = entries;
 
        /* Allocate DMA space */
-       rc = sfc_dma_alloc(sa, "evq", sw_index, EFX_EVQ_SIZE(evq_info->entries),
-                          socket_id, &evq->mem);
+       rc = sfc_dma_alloc(sa, sfc_evq_type2str(type), type_index,
+                          EFX_EVQ_SIZE(evq->entries), socket_id, &evq->mem);
        if (rc != 0)
-               return rc;
+               goto fail_dma_alloc;
 
        evq->init_state = SFC_EVQ_INITIALIZED;
 
        evq_info->evq = evq;
 
        return 0;
+
+fail_dma_alloc:
+       rte_free(evq);
+
+fail_evq_alloc:
+
+       sfc_log_init(sa, "failed %d", rc);
+       return rc;
 }
 
 void
@@ -659,20 +873,8 @@ sfc_ev_qfini(struct sfc_adapter *sa, unsigned int sw_index)
 static int
 sfc_ev_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)
 {
-       struct sfc_evq_info *evq_info = &sa->evq_info[sw_index];
-       unsigned int max_entries;
-
        sfc_log_init(sa, "sw_index=%u", sw_index);
 
-       max_entries = sfc_evq_max_entries(sa, sw_index);
-       SFC_ASSERT(rte_is_power_of_2(max_entries));
-
-       evq_info->max_entries = max_entries;
-       evq_info->flags = sa->evq_flags |
-               ((sa->intr.lsc_intr && sw_index == sa->mgmt_evq_index) ?
-                       EFX_EVQ_FLAGS_NOTIFY_INTERRUPT :
-                       EFX_EVQ_FLAGS_NOTIFY_DISABLED);
-
        return 0;
 }
 
@@ -738,8 +940,8 @@ sfc_ev_init(struct sfc_adapter *sa)
                        goto fail_ev_qinit_info;
        }
 
-       rc = sfc_ev_qinit(sa, sa->mgmt_evq_index, SFC_MGMT_EVQ_ENTRIES,
-                         sa->socket_id);
+       rc = sfc_ev_qinit(sa, sa->mgmt_evq_index, SFC_EVQ_TYPE_MGMT, 0,
+                         SFC_MGMT_EVQ_ENTRIES, sa->socket_id);
        if (rc != 0)
                goto fail_mgmt_evq_init;