net/i40e: remove duplicate tunnel type check

[dpdk.git] / drivers / event / octeontx2 / otx2_tim_worker.c

diff --git a/drivers/event/octeontx2/otx2_tim_worker.c b/drivers/event/octeontx2/otx2_tim_worker.c
index fd1f026..4b5cfdc 100644 (file)
--- a/drivers/event/octeontx2/otx2_tim_worker.c
+++ b/drivers/event/octeontx2/otx2_tim_worker.c
@@ -38,6 +38,23 @@ tim_format_event(const struct rte_event_timer * const tim,
        entry->wqe = tim->ev.u64;
 }
 
+static inline void
+tim_sync_start_cyc(struct otx2_tim_ring *tim_ring)
+{
+       uint64_t cur_cyc = rte_rdtsc();
+       uint32_t real_bkt;
+
+       if (cur_cyc - tim_ring->last_updt_cyc > tim_ring->tot_int) {
+               real_bkt = otx2_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
+               cur_cyc = rte_rdtsc();
+
+               tim_ring->ring_start_cyc = cur_cyc -
+                                               (real_bkt * tim_ring->tck_int);
+               tim_ring->last_updt_cyc = cur_cyc;
+       }
+
+}
+
 static __rte_always_inline uint16_t
 tim_timer_arm_burst(const struct rte_event_timer_adapter *adptr,
                    struct rte_event_timer **tim,
@@ -49,6 +66,7 @@ tim_timer_arm_burst(const struct rte_event_timer_adapter *adptr,
        uint16_t index;
        int ret;
 
+       tim_sync_start_cyc(tim_ring);
        for (index = 0; index < nb_timers; index++) {
                if (tim_arm_checks(tim_ring, tim[index]))
                        break;
@@ -69,6 +87,9 @@ tim_timer_arm_burst(const struct rte_event_timer_adapter *adptr,
                }
        }
 
+       if (flags & OTX2_TIM_ENA_STATS)
+               __atomic_fetch_add(&tim_ring->arm_cnt, index, __ATOMIC_RELAXED);
+
        return index;
 }
 
@@ -96,6 +117,7 @@ tim_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
                return 0;
        }
 
+       tim_sync_start_cyc(tim_ring);
        while (arr_idx < nb_timers) {
                for (idx = 0; idx < OTX2_TIM_MAX_BURST && (arr_idx < nb_timers);
                     idx++, arr_idx++) {
@@ -107,11 +129,14 @@ tim_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
                if (ret != idx)
                        break;
        }
+       if (flags & OTX2_TIM_ENA_STATS)
+               __atomic_fetch_add(&tim_ring->arm_cnt, set_timers,
+                                  __ATOMIC_RELAXED);
 
        return set_timers;
 }
 
-#define FP(_name, _f3, _f2, _f1, _flags)                                 \
+#define FP(_name, _f4, _f3, _f2, _f1, _flags)                          \
 uint16_t __rte_noinline                                                          \
 otx2_tim_arm_burst_ ## _name(const struct rte_event_timer_adapter *adptr, \
                             struct rte_event_timer **tim,                \
@@ -122,7 +147,7 @@ otx2_tim_arm_burst_ ## _name(const struct rte_event_timer_adapter *adptr, \
 TIM_ARM_FASTPATH_MODES
 #undef FP
 
-#define FP(_name, _f2, _f1, _flags)                                    \
+#define FP(_name, _f3, _f2, _f1, _flags)                               \
 uint16_t __rte_noinline                                                        \
 otx2_tim_arm_tmo_tick_burst_ ## _name(                                 \
                        const struct rte_event_timer_adapter *adptr,    \