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

Commit ba875ba6 authored by John Stultz's avatar John Stultz Committed by Linus Torvalds
Browse files

cris: convert to use arch_gettimeoffset() 



Convert cris to use GENERIC_TIME via the arch_getoffset() infrastructure,
reducing the amount of arch specific code we need to maintain.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56e6943b

arch/cris/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ config RWSEM_GENERIC_SPINLOCK 
config RWSEM_XCHGADD_ALGORITHM

	bool



config GENERIC_TIME

	def_bool y



config ARCH_USES_GETTIMEOFFSET

	def_bool y



config GENERIC_IOMAP

       bool

       default y

arch/cris/kernel/time.c

+2 −66
Original line number Diff line number Diff line
@@ -42,75 +42,11 @@ unsigned long loops_per_usec; 
extern unsigned long do_slow_gettimeoffset(void);

static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset;



/*

 * This version of gettimeofday has near microsecond resolution.

 *

 * Note: Division is quite slow on CRIS and do_gettimeofday is called

 *       rather often. Maybe we should do some kind of approximation here

 *       (a naive approximation would be to divide by 1024).

 */

void do_gettimeofday(struct timeval *tv)

{

	unsigned long flags;

	signed long usec, sec;

	local_irq_save(flags);

	usec = do_gettimeoffset();



        /*

	 * If time_adjust is negative then NTP is slowing the clock

	 * so make sure not to go into next possible interval.

	 * Better to lose some accuracy than have time go backwards..

	 */

	if (unlikely(time_adjust < 0) && usec > tickadj)

		usec = tickadj;



	sec = xtime.tv_sec;

	usec += xtime.tv_nsec / 1000;

	local_irq_restore(flags);



	while (usec >= 1000000) {

		usec -= 1000000;

		sec++;

	}



	tv->tv_sec = sec;

	tv->tv_usec = usec;

}



EXPORT_SYMBOL(do_gettimeofday);



int do_settimeofday(struct timespec *tv)

u32 arch_gettimeoffset(void)

{

	time_t wtm_sec, sec = tv->tv_sec;

	long wtm_nsec, nsec = tv->tv_nsec;



	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)

		return -EINVAL;



	write_seqlock_irq(&xtime_lock);

	/*

	 * This is revolting. We need to set "xtime" correctly. However, the

	 * value in this location is the value at the most recent update of

	 * wall time.  Discover what correction gettimeofday() would have

	 * made, and then undo it!

	 */

	nsec -= do_gettimeoffset() * NSEC_PER_USEC;



	wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);

	wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);



	set_normalized_timespec(&xtime, sec, nsec);

	set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);



	ntp_clear();

	write_sequnlock_irq(&xtime_lock);

	clock_was_set();

	return 0;

	return do_gettimeoffset() * 1000;

}



EXPORT_SYMBOL(do_settimeofday);





/*

 * BUG: This routine does not handle hour overflow properly; it just

 *      sets the minutes. Usually you'll only notice that after reboot!