drivers/net: remove redundant new line from logs
[dpdk.git] / drivers / net / sfc / sfc_ev.c
index 075172a..f717faa 100644 (file)
@@ -30,6 +30,7 @@
 #include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_alarm.h>
+#include <rte_branch_prediction.h>
 
 #include "efx.h"
 
@@ -39,6 +40,7 @@
 #include "sfc_ev.h"
 #include "sfc_rx.h"
 #include "sfc_tx.h"
+#include "sfc_kvargs.h"
 
 
 /* Initial delay when waiting for event queue init complete event */
@@ -102,7 +104,7 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
                        evq->exception = B_TRUE;
                        sfc_err(evq->sa,
                                "EVQ %u RxQ %u invalid RX abort "
-                               "(id=%#x size=%u flags=%#x); needs restart\n",
+                               "(id=%#x size=%u flags=%#x); needs restart",
                                evq->evq_index, sfc_rxq_sw_index(rxq),
                                id, size, flags);
                        goto done;
@@ -117,7 +119,7 @@ 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\n",
+                       "(id=%#x delta=%u flags=%#x); needs restart",
                        evq->evq_index, sfc_rxq_sw_index(rxq), id, delta,
                        flags);
 
@@ -140,12 +142,30 @@ done:
 }
 
 static boolean_t
-sfc_ev_tx(void *arg, __rte_unused uint32_t label, __rte_unused uint32_t id)
+sfc_ev_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_txq *txq;
+       unsigned int stop;
+       unsigned int delta;
 
-       sfc_err(evq->sa, "EVQ %u unexpected Tx event", evq->evq_index);
-       return B_TRUE;
+       txq = evq->txq;
+
+       SFC_ASSERT(txq != NULL);
+       SFC_ASSERT(txq->evq == evq);
+
+       if (unlikely((txq->state & SFC_TXQ_STARTED) == 0))
+               goto done;
+
+       stop = (id + 1) & txq->ptr_mask;
+       id = txq->pending & txq->ptr_mask;
+
+       delta = (stop >= id) ? (stop - id) : (txq->ptr_mask + 1 - id + stop);
+
+       txq->pending += delta;
+
+done:
+       return B_FALSE;
 }
 
 static boolean_t
@@ -267,11 +287,25 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
        struct sfc_adapter *sa = evq->sa;
        struct rte_eth_link *dev_link = &sa->eth_dev->data->dev_link;
        struct rte_eth_link new_link;
+       uint64_t new_link_u64;
+       uint64_t old_link_u64;
 
        EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
 
        sfc_port_link_mode_to_info(link_mode, &new_link);
-       rte_atomic64_set((rte_atomic64_t *)dev_link, *(uint64_t *)&new_link);
+
+       new_link_u64 = *(uint64_t *)&new_link;
+       do {
+               old_link_u64 = rte_atomic64_read((rte_atomic64_t *)dev_link);
+               if (old_link_u64 == new_link_u64)
+                       break;
+
+               if (rte_atomic64_cmpset((volatile uint64_t *)dev_link,
+                                       old_link_u64, new_link_u64)) {
+                       evq->sa->port.lsc_seq++;
+                       break;
+               }
+       } while (B_TRUE);
 
        return B_FALSE;
 }
@@ -302,6 +336,45 @@ sfc_ev_qpoll(struct sfc_evq *evq)
 
        efx_ev_qpoll(evq->common, &evq->read_ptr, &sfc_ev_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);
+
+                       sfc_warn(sa,
+                                "restart RxQ %u because of exception on its EvQ %u",
+                                rxq_sw_index, evq->evq_index);
+
+                       sfc_rx_qstop(sa, rxq_sw_index);
+                       rc = sfc_rx_qstart(sa, rxq_sw_index);
+                       if (rc != 0)
+                               sfc_err(sa, "cannot restart RxQ %u",
+                                       rxq_sw_index);
+               }
+
+               if (evq->txq != NULL) {
+                       unsigned int txq_sw_index = sfc_txq_sw_index(evq->txq);
+
+                       sfc_warn(sa,
+                                "restart TxQ %u because of exception on its EvQ %u",
+                                txq_sw_index, evq->evq_index);
+
+                       sfc_tx_qstop(sa, txq_sw_index);
+                       rc = sfc_tx_qstart(sa, txq_sw_index);
+                       if (rc != 0)
+                               sfc_err(sa, "cannot restart TxQ %u",
+                                       txq_sw_index);
+               }
+
+               if (evq->exception)
+                       sfc_panic(sa, "unrecoverable exception on EvQ %u",
+                                 evq->evq_index);
+
+               sfc_adapter_unlock(sa);
+       }
+
        /* Poll-mode driver does not re-prime the event queue for interrupts */
 }
 
@@ -347,9 +420,7 @@ sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
        /* Create the common code event queue */
        rc = efx_ev_qcreate(sa->nic, sw_index, esmp, evq_info->entries,
-                           0 /* unused on EF10 */, 0,
-                           EFX_EVQ_FLAGS_TYPE_THROUGHPUT |
-                           EFX_EVQ_FLAGS_NOTIFY_DISABLED,
+                           0 /* unused on EF10 */, 0, evq_info->flags,
                            &evq->common);
        if (rc != 0)
                goto fail_ev_qcreate;
@@ -428,10 +499,14 @@ sfc_ev_mgmt_periodic_qpoll(void *arg)
 
        rc = rte_eal_alarm_set(SFC_MGMT_EV_QPOLL_PERIOD_US,
                               sfc_ev_mgmt_periodic_qpoll, sa);
-       if (rc != 0)
-               sfc_panic(sa,
-                         "cannot rearm management EVQ polling alarm (rc=%d)",
-                         rc);
+       if (rc == -ENOTSUP) {
+               sfc_warn(sa, "alarms are not supported");
+               sfc_warn(sa, "management EVQ must be polled indirectly using no-wait link status update");
+       } else if (rc != 0) {
+               sfc_err(sa,
+                       "cannot rearm management EVQ polling alarm (rc=%d)",
+                       rc);
+       }
 }
 
 static void
@@ -464,6 +539,12 @@ sfc_ev_start(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_mgmt_evq_start;
 
+       if (sa->intr.lsc_intr) {
+               rc = sfc_ev_qprime(sa->evq_info[sa->mgmt_evq_index].evq);
+               if (rc != 0)
+                       goto fail_evq0_prime;
+       }
+
        rte_spinlock_unlock(&sa->mgmt_evq_lock);
 
        /*
@@ -481,6 +562,9 @@ sfc_ev_start(struct sfc_adapter *sa)
 
        return 0;
 
+fail_evq0_prime:
+       sfc_ev_qstop(sa, 0);
+
 fail_mgmt_evq_start:
        rte_spinlock_unlock(&sa->mgmt_evq_lock);
        efx_ev_fini(sa->nic);
@@ -582,6 +666,28 @@ sfc_ev_qinit_info(struct sfc_adapter *sa, unsigned int 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;
+}
+
+static int
+sfc_kvarg_perf_profile_handler(__rte_unused const char *key,
+                              const char *value_str, void *opaque)
+{
+       uint64_t *value = opaque;
+
+       if (strcasecmp(value_str, SFC_KVARG_PERF_PROFILE_THROUGHPUT) == 0)
+               *value = EFX_EVQ_FLAGS_TYPE_THROUGHPUT;
+       else if (strcasecmp(value_str, SFC_KVARG_PERF_PROFILE_LOW_LATENCY) == 0)
+               *value = EFX_EVQ_FLAGS_TYPE_LOW_LATENCY;
+       else if (strcasecmp(value_str, SFC_KVARG_PERF_PROFILE_AUTO) == 0)
+               *value = EFX_EVQ_FLAGS_TYPE_AUTO;
+       else
+               return -EINVAL;
 
        return 0;
 }
@@ -602,6 +708,16 @@ sfc_ev_init(struct sfc_adapter *sa)
 
        sfc_log_init(sa, "entry");
 
+       sa->evq_flags = EFX_EVQ_FLAGS_TYPE_THROUGHPUT;
+       rc = sfc_kvargs_process(sa, SFC_KVARG_PERF_PROFILE,
+                               sfc_kvarg_perf_profile_handler,
+                               &sa->evq_flags);
+       if (rc != 0) {
+               sfc_err(sa, "invalid %s parameter value",
+                       SFC_KVARG_PERF_PROFILE);
+               goto fail_kvarg_perf_profile;
+       }
+
        sa->evq_count = sfc_ev_qcount(sa);
        sa->mgmt_evq_index = 0;
        rte_spinlock_init(&sa->mgmt_evq_lock);
@@ -642,6 +758,8 @@ fail_ev_qinit_info:
 
 fail_evqs_alloc:
        sa->evq_count = 0;
+
+fail_kvarg_perf_profile:
        sfc_log_init(sa, "failed %d", rc);
        return rc;
 }