Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bb96226 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

tick: Consolidate timekeeping handling code 



Unify the duplicated timekeeping handling code of low and high res tick
sched handlers.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
parent ddffeb8c

kernel/time/tick-sched.c

+24 −30
Original line number Diff line number Diff line
@@ -98,6 +98,28 @@ static ktime_t tick_init_jiffy_update(void) 
	return period;

}





static void tick_sched_do_timer(ktime_t now)

{

	int cpu = smp_processor_id();



#ifdef CONFIG_NO_HZ

	/*

	 * Check if the do_timer duty was dropped. We don't care about

	 * concurrency: This happens only when the cpu in charge went

	 * into a long sleep. If two cpus happen to assign themself to

	 * this duty, then the jiffies update is still serialized by

	 * xtime_lock.

	 */

	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))

		tick_do_timer_cpu = cpu;

#endif



	/* Check, if the jiffies need an update */

	if (tick_do_timer_cpu == cpu)

		tick_do_update_jiffies64(now);

}



/*

 * NOHZ - aka dynamic tick functionality

 */
@@ -648,24 +670,11 @@ static void tick_nohz_handler(struct clock_event_device *dev) 
{

	struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);

	struct pt_regs *regs = get_irq_regs();

	int cpu = smp_processor_id();

	ktime_t now = ktime_get();



	dev->next_event.tv64 = KTIME_MAX;



	/*

	 * Check if the do_timer duty was dropped. We don't care about

	 * concurrency: This happens only when the cpu in charge went

	 * into a long sleep. If two cpus happen to assign themself to

	 * this duty, then the jiffies update is still serialized by

	 * xtime_lock.

	 */

	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))

		tick_do_timer_cpu = cpu;



	/* Check, if the jiffies need an update */

	if (tick_do_timer_cpu == cpu)

		tick_do_update_jiffies64(now);

	tick_sched_do_timer(now);



	/*

	 * When we are idle and the tick is stopped, we have to touch
@@ -802,23 +811,8 @@ static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer) 
		container_of(timer, struct tick_sched, sched_timer);

	struct pt_regs *regs = get_irq_regs();

	ktime_t now = ktime_get();

	int cpu = smp_processor_id();



#ifdef CONFIG_NO_HZ

	/*

	 * Check if the do_timer duty was dropped. We don't care about

	 * concurrency: This happens only when the cpu in charge went

	 * into a long sleep. If two cpus happen to assign themself to

	 * this duty, then the jiffies update is still serialized by

	 * xtime_lock.

	 */

	if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE))

		tick_do_timer_cpu = cpu;

#endif



	/* Check, if the jiffies need an update */

	if (tick_do_timer_cpu == cpu)

		tick_do_update_jiffies64(now);

	tick_sched_do_timer(now);



	/*

	 * Do not call, when we are not in irq context and have