From: hongzha1 Subject: [PATCH V2 1/5] cobalt/tick: dovetail: implement pipeline_set_timer_shot to trigger tick shot Date: Thu, 21 Jan 2021 21:12:36 -0500 Message-Id: <20210122021240.18768-1-hongzhan.chen@intel.com> List-Id: Discussions about the Xenomai project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xenomai@xenomai.org Signed-off-by: hongzha1 diff --git a/include/cobalt/kernel/dovetail/pipeline/clock.h b/include/cobalt/kernel/dovetail/pipeline/clock.h index 28d89b44b..7b6ce161c 100644 --- a/include/cobalt/kernel/dovetail/pipeline/clock.h +++ b/include/cobalt/kernel/dovetail/pipeline/clock.h @@ -17,17 +17,7 @@ static inline u64 pipeline_read_cycle_counter(void) return ktime_get_raw_fast_ns(); } -static inline void pipeline_set_timer_shot(unsigned long cycles) -{ - /* - * N/A. Revisit: xnclock_core_local_shot() should go to the - * I-pipe section, we do things differently on Dovetail via - * the proxy tick device. As a consequence, - * pipeline_set_timer_shot() should not be part of the - * pipeline interface. - */ - TODO(); -} +void pipeline_set_timer_shot(unsigned long cycles); static inline const char *pipeline_timer_name(void) { diff --git a/kernel/cobalt/dovetail/tick.c b/kernel/cobalt/dovetail/tick.c index 6a196496c..75d908bd4 100644 --- a/kernel/cobalt/dovetail/tick.c +++ b/kernel/cobalt/dovetail/tick.c @@ -16,6 +16,36 @@ extern struct xnintr nktimer; static DEFINE_PER_CPU(struct clock_proxy_device *, proxy_device); +void pipeline_set_timer_shot(unsigned long cycles) +{ + struct clock_proxy_device *dev = __this_cpu_read(proxy_device); + struct clock_event_device *real_dev = dev->real_device; + int ret; + u64 sumcyc; + ktime_t t; + + if (real_dev->features & CLOCK_EVT_FEAT_KTIME) { + t = ktime_add(cycles, xnclock_core_read_raw()); + real_dev->set_next_ktime(t, real_dev); + } else { + if (cycles <= 0) + cycles = real_dev->min_delta_ns; + else { + cycles = min_t(int64_t, cycles, + real_dev->max_delta_ns); + cycles = max_t(int64_t, cycles, + real_dev->min_delta_ns); + } + sumcyc = ((u64)cycles * real_dev->mult) >> real_dev->shift; + + ret = real_dev->set_next_event(sumcyc, real_dev); + if (ret) { + ret = real_dev->set_next_event(real_dev->min_delta_ticks, + real_dev); + } + } +} + static int proxy_set_next_ktime(ktime_t expires, struct clock_event_device *proxy_dev) { -- 2.17.1