event/octeontx2: add timer cancel function

Add function to cancel event timer that has been armed.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>

diff --git a/drivers/event/octeontx2/otx2_tim_evdev.c b/drivers/event/octeontx2/otx2_tim_evdev.c
index c668e26..e724a5f 100644 (file)
--- a/drivers/event/octeontx2/otx2_tim_evdev.c
+++ b/drivers/event/octeontx2/otx2_tim_evdev.c
@@ -53,6 +53,7 @@ TIM_ARM_TMO_FASTPATH_MODES
                                [tim_ring->ena_dfb][prod_flag];
        otx2_tim_ops.arm_tmo_tick_burst = arm_tmo_burst[tim_ring->optimized]
                                [tim_ring->ena_dfb];
+       otx2_tim_ops.cancel_burst = otx2_tim_timer_cancel_burst;
 }
 
 static void

diff --git a/drivers/event/octeontx2/otx2_tim_evdev.h b/drivers/event/octeontx2/otx2_tim_evdev.h
index 7516597..7bdd5c8 100644 (file)
--- a/drivers/event/octeontx2/otx2_tim_evdev.h
+++ b/drivers/event/octeontx2/otx2_tim_evdev.h
@@ -191,6 +191,10 @@ uint16_t otx2_tim_arm_tmo_tick_burst_ ## _name(                            \
 TIM_ARM_TMO_FASTPATH_MODES
 #undef FP
 
+uint16_t otx2_tim_timer_cancel_burst(
+               const struct rte_event_timer_adapter *adptr,
+               struct rte_event_timer **tim, const uint16_t nb_timers);
+
 int otx2_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
                      uint32_t *caps,
                      const struct rte_event_timer_adapter_ops **ops);

diff --git a/drivers/event/octeontx2/otx2_tim_worker.c b/drivers/event/octeontx2/otx2_tim_worker.c
index 737b167..fd1f026 100644 (file)
--- a/drivers/event/octeontx2/otx2_tim_worker.c
+++ b/drivers/event/octeontx2/otx2_tim_worker.c
@@ -135,3 +135,32 @@ otx2_tim_arm_tmo_tick_burst_ ## _name(                                     \
 }
 TIM_ARM_TMO_FASTPATH_MODES
 #undef FP
+
+uint16_t
+otx2_tim_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
+                           struct rte_event_timer **tim,
+                           const uint16_t nb_timers)
+{
+       uint16_t index;
+       int ret;
+
+       RTE_SET_USED(adptr);
+       for (index = 0; index < nb_timers; index++) {
+               if (tim[index]->state == RTE_EVENT_TIMER_CANCELED) {
+                       rte_errno = EALREADY;
+                       break;
+               }
+
+               if (tim[index]->state != RTE_EVENT_TIMER_ARMED) {
+                       rte_errno = EINVAL;
+                       break;
+               }
+               ret = tim_rm_entry(tim[index]);
+               if (ret) {
+                       rte_errno = -ret;
+                       break;
+               }
+       }
+
+       return index;
+}

diff --git a/drivers/event/octeontx2/otx2_tim_worker.h b/drivers/event/octeontx2/otx2_tim_worker.h
index da8c93f..b193e2c 100644 (file)
--- a/drivers/event/octeontx2/otx2_tim_worker.h
+++ b/drivers/event/octeontx2/otx2_tim_worker.h
@@ -410,4 +410,41 @@ __retry:
        return nb_timers;
 }
 
+static int
+tim_rm_entry(struct rte_event_timer *tim)
+{
+       struct otx2_tim_ent *entry;
+       struct otx2_tim_bkt *bkt;
+       uint64_t lock_sema;
+
+       if (tim->impl_opaque[1] == 0 || tim->impl_opaque[0] == 0)
+               return -ENOENT;
+
+       entry = (struct otx2_tim_ent *)(uintptr_t)tim->impl_opaque[0];
+       if (entry->wqe != tim->ev.u64) {
+               tim->impl_opaque[0] = 0;
+               tim->impl_opaque[1] = 0;
+               return -ENOENT;
+       }
+
+       bkt = (struct otx2_tim_bkt *)(uintptr_t)tim->impl_opaque[1];
+       lock_sema = tim_bkt_inc_lock(bkt);
+       if (tim_bkt_get_hbt(lock_sema) || !tim_bkt_get_nent(lock_sema)) {
+               tim_bkt_dec_lock(bkt);
+               tim->impl_opaque[0] = 0;
+               tim->impl_opaque[1] = 0;
+               return -ENOENT;
+       }
+
+       entry->w0 = 0;
+       entry->wqe = 0;
+       tim_bkt_dec_lock(bkt);
+
+       tim->state = RTE_EVENT_TIMER_CANCELED;
+       tim->impl_opaque[0] = 0;
+       tim->impl_opaque[1] = 0;
+
+       return 0;
+}
+
 #endif /* __OTX2_TIM_WORKER_H__ */