Commit e4db9253 authored by Nicolai Stange's avatar Nicolai Stange Committed by John Stultz
Browse files

MIPS: clockevent drivers: Set ->min_delta_ticks and ->max_delta_ticks 



In preparation for making the clockevents core NTP correction aware,
all clockevent device drivers must set ->min_delta_ticks and
->max_delta_ticks rather than ->min_delta_ns and ->max_delta_ns: a
clockevent device's rate is going to change dynamically and thus, the
ratio of ns to ticks ceases to stay invariant.

Make the MIPS arch's clockevent drivers initialize these fields properly.

This patch alone doesn't introduce any change in functionality as the
clockevents core still looks exclusively at the (untouched) ->min_delta_ns
and ->max_delta_ns. As soon as this has changed, a followup patch will
purge the initialization of ->min_delta_ns and ->max_delta_ns from these
drivers.

Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Keguang Zhang <keguang.zhang@gmail.com>
Cc: John Crispin <john@phrozen.org>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarNicolai Stange <nicstange@gmail.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 547733c5

arch/mips/alchemy/common/time.c

+3 −1
Original line number Diff line number Diff line
@@ -138,7 +138,9 @@ static int __init alchemy_time_init(unsigned int m2int) 
	cd->shift = 32;

	cd->mult = div_sc(32768, NSEC_PER_SEC, cd->shift);

	cd->max_delta_ns = clockevent_delta2ns(0xffffffff, cd);

	cd->min_delta_ns = clockevent_delta2ns(9, cd);	/* ~0.28ms */

	cd->max_delta_ticks = 0xffffffff;

	cd->min_delta_ns = clockevent_delta2ns(9, cd);

	cd->min_delta_ticks = 9;	/* ~0.28ms */

	clockevents_register_device(cd);

	setup_irq(m2int, &au1x_rtcmatch2_irqaction);

arch/mips/jz4740/time.c

+2 −0
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ void __init plat_time_init(void) 


	clockevent_set_clock(&jz4740_clockevent, clk_rate);

	jz4740_clockevent.min_delta_ns = clockevent_delta2ns(100, &jz4740_clockevent);

	jz4740_clockevent.min_delta_ticks = 100;

	jz4740_clockevent.max_delta_ns = clockevent_delta2ns(0xffff, &jz4740_clockevent);

	jz4740_clockevent.max_delta_ticks = 0xffff;

	jz4740_clockevent.cpumask = cpumask_of(0);



	clockevents_register_device(&jz4740_clockevent);

arch/mips/kernel/cevt-bcm1480.c

+2 −0
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ void sb1480_clockevent_init(void) 
				  CLOCK_EVT_FEAT_ONESHOT;

	clockevent_set_clock(cd, V_SCD_TIMER_FREQ);

	cd->max_delta_ns	= clockevent_delta2ns(0x7fffff, cd);

	cd->max_delta_ticks	= 0x7fffff;

	cd->min_delta_ns	= clockevent_delta2ns(2, cd);

	cd->min_delta_ticks	= 2;

	cd->rating		= 200;

	cd->irq			= irq;

	cd->cpumask		= cpumask_of(cpu);

arch/mips/kernel/cevt-ds1287.c

+2 −0
Original line number Diff line number Diff line
@@ -128,7 +128,9 @@ int __init ds1287_clockevent_init(int irq) 
	cd->irq = irq;

	clockevent_set_clock(cd, 32768);

	cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd);

	cd->max_delta_ticks = 0x7fffffff;

	cd->min_delta_ns = clockevent_delta2ns(0x300, cd);

	cd->min_delta_ticks = 0x300;

	cd->cpumask = cpumask_of(0);



	clockevents_register_device(&ds1287_clockevent);

arch/mips/kernel/cevt-gt641xx.c

+2 −0
Original line number Diff line number Diff line
@@ -152,7 +152,9 @@ static int __init gt641xx_timer0_clockevent_init(void) 
	cd->rating = 200 + gt641xx_base_clock / 10000000;

	clockevent_set_clock(cd, gt641xx_base_clock);

	cd->max_delta_ns = clockevent_delta2ns(0x7fffffff, cd);

	cd->max_delta_ticks = 0x7fffffff;

	cd->min_delta_ns = clockevent_delta2ns(0x300, cd);

	cd->min_delta_ticks = 0x300;

	cd->cpumask = cpumask_of(0);



	clockevents_register_device(&gt641xx_timer0_clockevent);

CRA Git | Maintained and supported by SUSTech CRA and CCSE