lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mn10300: Convert mn10300 to use read/update_persistent_clock

Browse Source 
This patch converts the mn10300 architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.

I have not built or tested this patch, so help from arch maintainers
would be appreciated.

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1267675049-12337-3-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
John Stultz
2010-03-03 19:57:17 -08:00
committed by Thomas Gleixner
parent 1e871be1aa
commit f7a56575fa
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mn10300/Kconfig
View File

@@ -37,6 +37,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y
config GENERIC_CMOS_UPDATE
def_bool y
config GENERIC_FIND_NEXT_BIT config GENERIC_FIND_NEXT_BIT
def_bool y def_bool y

27
arch/mn10300/kernel/rtc.c
View File

@@ -26,17 +26,15 @@ static long last_rtc_update;
/* time for RTC to update itself in ioclks */ /* time for RTC to update itself in ioclks */
static unsigned long mn10300_rtc_update_period; static unsigned long mn10300_rtc_update_period;
/* void read_persistent_clock(struct timespec *ts)
* read the current RTC time
*/
unsigned long __init get_initial_rtc_time(void)
{ {
struct rtc_time tm; struct rtc_time tm;
get_rtc_time(&tm); get_rtc_time(&tm);
return mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
ts->tv_nsec = 0;
} }
/* /*
@@ -110,24 +108,9 @@ static int set_rtc_mmss(unsigned long nowtime)
return retval; return retval;
} }
void check_rtc_time(void) int update_persistent_clock(struct timespec now)
{ {
/* the RTC clock just finished ticking over again this second return set_rtc_mms(now.tv_sec);
* - if we have an externally synchronized Linux clock, then update
* RTC 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 ((time_status & STA_UNSYNC) == 0 &&
xtime.tv_sec > last_rtc_update + 660 &&
xtime.tv_nsec / 1000 >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
xtime.tv_nsec / 1000 <= 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;
}
} }
/* /*

4
arch/mn10300/kernel/time.c
View File

@@ -111,7 +111,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
/* advance the kernel's time tracking system */ /* advance the kernel's time tracking system */
profile_tick(CPU_PROFILING); profile_tick(CPU_PROFILING);
do_timer(1); do_timer(1);
check_rtc_time();
} }
write_sequnlock(&xtime_lock); write_sequnlock(&xtime_lock);
@@ -139,9 +138,6 @@ void __init time_init(void)
" (calibrated against RTC)\n", " (calibrated against RTC)\n",
MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100); MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100);
xtime.tv_sec = get_initial_rtc_time();
xtime.tv_nsec = 0;
mn10300_last_tsc = TMTSCBC; mn10300_last_tsc = TMTSCBC;
/* use timer 0 & 1 cascaded to tick at as close to HZ as possible */ /* use timer 0 & 1 cascaded to tick at as close to HZ as possible */