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

Commit 7d02093e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-for-linus-cleanups' of... 

Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  avr32: Fix typo in read_persistent_clock()
  sparc: Convert sparc to use read/update_persistent_clock
  cris: Convert cris to use read/update_persistent_clock
  m68k: Convert m68k to use read/update_persistent_clock
  m32r: Convert m32r to use read/update_peristent_clock
  blackfin: Convert blackfin to use read/update_persistent_clock
  ia64: Convert ia64 to use read/update_persistent_clock
  avr32: Convert avr32 to use read/update_persistent_clock
  h8300: Convert h8300 to use read/update_persistent_clock
  frv: Convert frv to use read/update_persistent_clock
  mn10300: Convert mn10300 to use read/update_persistent_clock
  alpha: Convert alpha to use read/update_persistent_clock
  xtensa: Fix unnecessary setting of xtime
  time: Clean up direct xtime usage in xen
parents 6e0b7b2c e9ddbc07

arch/alpha/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ config ARCH_USES_GETTIMEOFFSET 
	bool

	default y



config GENERIC_CMOS_UPDATE

        def_bool y



config ZONE_DMA

	bool

	default y

arch/alpha/kernel/time.c

+47 −54
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ static struct { 
	__u32 last_time;

	/* ticks/cycle * 2^48 */

	unsigned long scaled_ticks_per_cycle;

	/* last time the CMOS clock got updated */

	time_t last_rtc_update;

	/* partial unused tick */

	unsigned long partial_tick;

} state;
@@ -91,6 +89,52 @@ static inline __u32 rpcc(void) 
    return result;

}



int update_persistent_clock(struct timespec now)

{

	return set_rtc_mmss(now.tv_sec);

}



void read_persistent_clock(struct timespec *ts)

{

	unsigned int year, mon, day, hour, min, sec, epoch;



	sec = CMOS_READ(RTC_SECONDS);

	min = CMOS_READ(RTC_MINUTES);

	hour = CMOS_READ(RTC_HOURS);

	day = CMOS_READ(RTC_DAY_OF_MONTH);

	mon = CMOS_READ(RTC_MONTH);

	year = CMOS_READ(RTC_YEAR);



	if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {

		sec = bcd2bin(sec);

		min = bcd2bin(min);

		hour = bcd2bin(hour);

		day = bcd2bin(day);

		mon = bcd2bin(mon);

		year = bcd2bin(year);

	}



	/* PC-like is standard; used for year >= 70 */

	epoch = 1900;

	if (year < 20)

		epoch = 2000;

	else if (year >= 20 && year < 48)

		/* NT epoch */

		epoch = 1980;

	else if (year >= 48 && year < 70)

		/* Digital UNIX epoch */

		epoch = 1952;



	printk(KERN_INFO "Using epoch = %d\n", epoch);



	if ((year += epoch) < 1970)

		year += 100;



	ts->tv_sec = mktime(year, mon, day, hour, min, sec);

}







/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick
@@ -123,19 +167,6 @@ irqreturn_t timer_interrupt(int irq, void *dev) 
	if (nticks)

		do_timer(nticks);



	/*

	 * If we have an externally synchronized Linux clock, then update

	 * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be

	 * called as close as possible to 500 ms before the new second starts.

	 */

	if (ntp_synced()

	    && xtime.tv_sec > state.last_rtc_update + 660

	    && xtime.tv_nsec >= 500000 - ((unsigned) TICK_SIZE) / 2

	    && xtime.tv_nsec <= 500000 + ((unsigned) TICK_SIZE) / 2) {

		int tmp = set_rtc_mmss(xtime.tv_sec);

		state.last_rtc_update = xtime.tv_sec - (tmp ? 600 : 0);

	}



	write_sequnlock(&xtime_lock);



#ifndef CONFIG_SMP
@@ -304,7 +335,7 @@ rpcc_after_update_in_progress(void) 
void __init

time_init(void)

{

	unsigned int year, mon, day, hour, min, sec, cc1, cc2, epoch;

	unsigned int cc1, cc2;

	unsigned long cycle_freq, tolerance;

	long diff;
@@ -348,43 +379,6 @@ time_init(void) 
	   bogomips yet, but this is close on a 500Mhz box.  */

	__delay(1000000);



	sec = CMOS_READ(RTC_SECONDS);

	min = CMOS_READ(RTC_MINUTES);

	hour = CMOS_READ(RTC_HOURS);

	day = CMOS_READ(RTC_DAY_OF_MONTH);

	mon = CMOS_READ(RTC_MONTH);

	year = CMOS_READ(RTC_YEAR);



	if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {

		sec = bcd2bin(sec);

		min = bcd2bin(min);

		hour = bcd2bin(hour);

		day = bcd2bin(day);

		mon = bcd2bin(mon);

		year = bcd2bin(year);

	}



	/* PC-like is standard; used for year >= 70 */

	epoch = 1900;

	if (year < 20)

		epoch = 2000;

	else if (year >= 20 && year < 48)

		/* NT epoch */

		epoch = 1980;

	else if (year >= 48 && year < 70)

		/* Digital UNIX epoch */

		epoch = 1952;



	printk(KERN_INFO "Using epoch = %d\n", epoch);



	if ((year += epoch) < 1970)

		year += 100;



	xtime.tv_sec = mktime(year, mon, day, hour, min, sec);

	xtime.tv_nsec = 0;



        wall_to_monotonic.tv_sec -= xtime.tv_sec;

        wall_to_monotonic.tv_nsec = 0;



	if (HZ > (1<<16)) {

		extern void __you_loose (void);
@@ -394,7 +388,6 @@ time_init(void) 
	state.last_time = cc1;

	state.scaled_ticks_per_cycle

		= ((unsigned long) HZ << FIX_SHIFT) / cycle_freq;

	state.last_rtc_update = 0;

	state.partial_tick = 0L;



	/* Startup the timer source. */

arch/avr32/kernel/time.c

+6 −6
Original line number Diff line number Diff line
@@ -110,17 +110,17 @@ static struct clock_event_device comparator = { 
	.set_mode	= comparator_mode,

};



void read_persistent_clock(struct timespec *ts)

{

	ts->tv_sec = mktime(2007, 1, 1, 0, 0, 0);

	ts->tv_nsec = 0;

}



void __init time_init(void)

{

	unsigned long counter_hz;

	int ret;



	xtime.tv_sec = mktime(2007, 1, 1, 0, 0, 0);

	xtime.tv_nsec = 0;



	set_normalized_timespec(&wall_to_monotonic,

				-xtime.tv_sec, -xtime.tv_nsec);



	/* figure rate for counter */

	counter_hz = clk_get_rate(boot_cpu_data.clk);

	counter.mult = clocksource_hz2mult(counter_hz, counter.shift);

arch/blackfin/kernel/time-ts.c

+7 −6
Original line number Diff line number Diff line
@@ -353,9 +353,15 @@ void bfin_coretmr_clockevent_init(void) 
#endif /* CONFIG_TICKSOURCE_CORETMR */





void __init time_init(void)

void read_persistent_clock(struct timespec *ts)

{

	time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60;	/* 1 Jan 2007 */

	ts->tv_sec = secs_since_1970;

	ts->tv_nsec = 0;

}



void __init time_init(void)

{



#ifdef CONFIG_RTC_DRV_BFIN

	/* [#2663] hack to filter junk RTC values that would cause
@@ -368,11 +374,6 @@ void __init time_init(void) 
	}

#endif



	/* Initialize xtime. From now on, xtime is updated with timer interrupts */

	xtime.tv_sec = secs_since_1970;

	xtime.tv_nsec = 0;

	set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);



	bfin_cs_cycles_init();

	bfin_cs_gptimer0_init();

arch/blackfin/kernel/time.c

+6 −33
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ u32 arch_gettimeoffset(void) 
}

#endif



static inline int set_rtc_mmss(unsigned long nowtime)

{

	return 0;

}



/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick
@@ -126,29 +121,8 @@ __attribute__((l1_text)) 
#endif

irqreturn_t timer_interrupt(int irq, void *dummy)

{

	/* last time the cmos clock got updated */

	static long last_rtc_update;



	write_seqlock(&xtime_lock);

	do_timer(1);



	/*

	 * If we have an externally synchronized Linux clock, then update

	 * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be

	 * called as close as possible to 500 ms before the new second starts.

	 */

	if (ntp_synced() &&

	    xtime.tv_sec > last_rtc_update + 660 &&

	    (xtime.tv_nsec / NSEC_PER_USEC) >=

	    500000 - ((unsigned)TICK_SIZE) / 2

	    && (xtime.tv_nsec / NSEC_PER_USEC) <=

	    500000 + ((unsigned)TICK_SIZE) / 2) {

		if (set_rtc_mmss(xtime.tv_sec) == 0)

			last_rtc_update = xtime.tv_sec;

		else

			/* Do it again in 60s. */

			last_rtc_update = xtime.tv_sec - 600;

	}

	write_sequnlock(&xtime_lock);



#ifdef CONFIG_IPIPE
@@ -161,10 +135,15 @@ irqreturn_t timer_interrupt(int irq, void *dummy) 
	return IRQ_HANDLED;

}



void __init time_init(void)

void read_persistent_clock(struct timespec *ts)

{

	time_t secs_since_1970 = (365 * 37 + 9) * 24 * 60 * 60;	/* 1 Jan 2007 */

	ts->tv_sec = secs_since_1970;

	ts->tv_nsec = 0;

}



void __init time_init(void)

{

#ifdef CONFIG_RTC_DRV_BFIN

	/* [#2663] hack to filter junk RTC values that would cause

	 * userspace to have to deal with time values greater than
@@ -176,11 +155,5 @@ void __init time_init(void) 
	}

#endif



	/* Initialize xtime. From now on, xtime is updated with timer interrupts */

	xtime.tv_sec = secs_since_1970;

	xtime.tv_nsec = 0;



	wall_to_monotonic.tv_sec = -xtime.tv_sec;



	time_sched_init(timer_interrupt);

}