Convert remaining arches to use read/update_persistent_clock
Subsystems (6)
cover Convert remaining arches to use read/update_persistent_clock
A number of arches have moved over to using the generic read_persisitent_clock or update_persisitent_clock implementations instead of manipulating xtime themselves.
This patchset tries to convert the remaining arches over and will allow for further generic timekeeping cleanups.
There is some issues where the RTC/persistent clock is behind a bus that requires irqs to access. This patch is not trying to handle those cases, and instead is just using whatever method was used at time_init to initialize xtime.
I sent this set out back in December to only a bit of discussion (many thanks to the testers who provided feedback!). But I wanted to send it out again to try to get this moving again.
Any feedback or comments would be appreciated.
thanks
-john
John Stultz (14):
alpha: Convert alpha to use read/update_persistent_clock
mn10300: Convert mn10300 to use read/update_persistent_clock
frv: Convert frv to use read/update_persistent_clock
parisc: Convert parisc to use read/update_persistent_clock
h8300: Convert h8300 to use read/update_persistent_clock
avr32: Convert avr32 to use read/update_persistent_clock
ia64: Convert ia64 to use read/update_persistent_clock
sh: Convert sh to use read/update_persistent_clock
blackfin: Convert blackfin to use read/update_persistent_clock
m32r: Convert m32r to use read/update_peristent_clock
m68k: Convert m68k to use read/update_persistent_clock
sparc: Convert sparc to use read/update_persistent_clock
cris: Convert cris to use read/update_persistent_clock
arm: Convert arm to use read_persistent_clock
arch/alpha/Kconfig | 3 + arch/alpha/kernel/time.c | 101 ++++++++++++++++++-------------------- arch/arm/Kconfig | 3 + arch/arm/kernel/time.c | 7 +++ arch/avr32/kernel/time.c | 12 ++-- arch/blackfin/kernel/time-ts.c | 13 +++-- arch/blackfin/kernel/time.c | 39 ++------------ arch/cris/Kconfig | 3 + arch/cris/arch-v10/kernel/time.c | 37 +------------- arch/cris/arch-v32/kernel/time.c | 40 +-------------- arch/cris/kernel/time.c | 20 ++++--- arch/frv/kernel/time.c | 34 +++---------- arch/h8300/kernel/time.c | 10 +++- arch/ia64/kernel/time.c | 12 ++--- arch/m32r/kernel/time.c | 47 +++--------------- arch/m68k/kernel/time.c | 11 +++-- arch/mn10300/Kconfig | 3 + arch/mn10300/kernel/rtc.c | 27 ++-------- arch/mn10300/kernel/time.c | 4 -- arch/parisc/kernel/time.c | 29 +++++------ arch/sh/kernel/time.c | 6 +-- arch/sparc/Kconfig | 2 +- arch/sparc/kernel/time_32.c | 15 ++---- 23 files changed, 158 insertions(+), 320 deletions(-)
PATCH 1/14 alpha: Convert alpha to use read/update_persistent_clock
This patch converts the alpha 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.
--- arch/alpha/Kconfig | 3 + arch/alpha/kernel/time.c | 101 +++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 54 deletions(-)
arch/alpha/Kconfig +3 -0
@@ -54,6 +54,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
137 lines not on this page · raw message
Signature · 1 line
1.6.0.4
PATCH 2/14 mn10300: Convert mn10300 to use read/update_persistent_clock
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.
--- arch/mn10300/Kconfig | 3 +++ arch/mn10300/kernel/rtc.c | 27 +++++---------------------- arch/mn10300/kernel/time.c | 4 ---- 3 files changed, 8 insertions(+), 26 deletions(-)
arch/mn10300/Kconfig +3 -0
@@ -37,6 +37,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ config GENERIC_CALIBRATE_DELAY def_bool y +config GENERIC_CMOS_UPDATE + def_bool y + config GENERIC_FIND_NEXT_BIT def_bool y
arch/mn10300/kernel/rtc.c +5 -22
@@ -26,17 +26,15 @@ static long last_rtc_update;/* time for RTC to update itself in ioclks */ static unsigned long mn10300_rtc_update_period; -/* -* read the current RTC time -*/ -unsigned long __init get_initial_rtc_time (void ) +void read_persistent_clock (struct timespec *ts) {struct 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); + ts->tv_nsec =0 ; }/*
@@ -110,24 +108,9 @@ static int set_rtc_mmss(unsigned long nowtime)return retval; } -void check_rtc_time (void ) +int update_persistent_clock (struct timespec now) { -/* the RTC clock just finished ticking over again this second -* - 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 ; - } +return set_rtc_mms (now.tv_sec); }/*
arch/mn10300/kernel/time.c +0 -4
@@ -111,7 +111,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)/* advance the kernel's time tracking system */ profile_tick (CPU_PROFILING );do_timer (1 ); -check_rtc_time (); }write_sequnlock (&xtime_lock);
@@ -139,9 +138,6 @@ void __init time_init(void)" (calibrated against RTC)\n" , MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100); - xtime.tv_sec =get_initial_rtc_time (); - xtime.tv_nsec =0 ; - mn10300_last_tsc =TMTSCBC ;/* use timer 0 & 1 cascaded to tick at as close to HZ as possible */
Signature · 1 line
1.6.0.4
PATCH 3/14 frv: Convert frv to use read/update_persistent_clock
This patch converts the frv 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.
--- arch/frv/kernel/time.c | 34 +++++++--------------------------- 1 files changed, 7 insertions(+), 27 deletions(-)
arch/frv/kernel/time.c +7 -27
@@ -48,20 +48,12 @@ static struct irqaction timer_irq = { .name = "timer", }; -static inline int set_rtc_mmss (unsigned long nowtime) -{ -return -1 ; -} -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick */ static irqreturn_t timer_interrupt (int irq,void *dummy) { -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ; -profile_tick (CPU_PROFILING );/* * Here we are in the timer irq handler. We just have irqs locally
@@ -74,22 +66,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)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 /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 - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - } -#ifdef CONFIG_HEARTBEAT static unsigned short n; n++;
@@ -119,7 +95,8 @@ void time_divisor_init(void)__set_TCSR_DATA (0 , base >>8 ); } -void time_init (void ) + +void read_persistent_clock (struct timespec *ts) {unsigned int year, mon, day, hour, min, sec;
@@ -135,9 +112,12 @@ void time_init(void)if ((year +=1900 ) <1970 ) year +=100 ; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec =0 ; + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec =0 ; +} +void time_init (void ) +{/* install scheduling interrupt handler */ setup_irq (IRQ_CPU_TIMER0 , &timer_irq);
Signature · 1 line
1.6.0.4
PATCH 4/14 parisc: Convert parisc to use read/update_persistent_clock
This patch converts the parisc 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.
--- arch/parisc/kernel/time.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-)
arch/parisc/kernel/time.c +13 -16
@@ -250,9 +250,21 @@ static int __init rtc_init(void) }module_init (rtc_init); -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {static struct pdc_tod tod_data; +if (pdc_tod_read (&tod_data) ==0 ) { + ts->tv_sec = tod_data.tod_sec; + ts->tv_nsec = tod_data.tod_usec *1000 ; + }else { +printk (KERN_ERR "Error reading tod clock\n" ); + ts->tv_sec =0 ; + ts->tv_nsec =0 ; + } +} + +void __init time_init (void ) +{unsigned long current_cr16_khz; clocktick = (100 *PAGE0 ->mem_10msec) /HZ ;
@@ -264,19 +276,4 @@ void __init time_init(void) clocksource_cr16.mult =clocksource_khz2mult (current_cr16_khz, clocksource_cr16.shift);clocksource_register (&clocksource_cr16); - -if (pdc_tod_read (&tod_data) ==0 ) { -unsigned long flags; - -write_seqlock_irqsave (&xtime_lock, flags); - xtime.tv_sec = tod_data.tod_sec; - xtime.tv_nsec = tod_data.tod_usec *1000 ; -set_normalized_timespec (&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); -write_sequnlock_irqrestore (&xtime_lock, flags); - }else { -printk (KERN_ERR "Error reading tod clock\n" ); - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; - } }
Signature · 1 line
1.6.0.4
PATCH 5/14 h8300: Convert h8300 to use read/update_persistent_clock
This patch converts the h8300 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.
--- arch/h8300/kernel/time.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
arch/h8300/kernel/time.c +7 -3
@@ -41,7 +41,7 @@ void h8300_timer_tick(void)update_process_times (user_mode (get_irq_regs ())); } -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {unsigned int year, mon, day, hour, min, sec;
@@ -56,8 +56,12 @@ void __init time_init(void)#endif if ((year +=1900 ) <1970 ) year +=100 ; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec =0 ; + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec =0 ; +} + +void __init time_init (void ) +{h8300_timer_setup (); }
Signature · 1 line
1.6.0.4
PATCH 6/14 avr32: Convert avr32 to use read/update_persistent_clock
This patch converts the avr32 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.
--- arch/avr32/kernel/time.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/avr32/kernel/time.c +6 -6
@@ -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);
Signature · 1 line
1.6.0.4
PATCH 7/14 ia64: Convert ia64 to use read/update_persistent_clock
This patch converts the ia64 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.
--- arch/ia64/kernel/time.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
arch/ia64/kernel/time.c +5 -7
@@ -430,18 +430,16 @@ static int __init rtc_init(void) }module_init (rtc_init); +void read_persistent_clock (struct timespec *ts) +{ +efi_gettimeofday (ts); +} +void __init time_init (void ) {register_percpu_irq (IA64_TIMER_VECTOR , &timer_irqaction); -efi_gettimeofday (&xtime);ia64_init_itm (); - -/* -* Initialize wall_to_monotonic such that adding it to xtime will yield zero, the -* tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); }/*
Signature · 1 line
1.6.0.4
PATCH 8/14 sh: Convert sh to use read/update_persistent_clock
This patch converts the sh 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.
--- arch/sh/kernel/time.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
arch/sh/kernel/time.c +1 -5
@@ -39,12 +39,12 @@ static int null_rtc_set_time(const time_t secs)void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time;int (*rtc_sh_set_time)(const time_t ) = null_rtc_set_time; -#ifdef CONFIG_GENERIC_CMOS_UPDATE void read_persistent_clock (struct timespec *ts) {rtc_sh_get_time (ts); } +#ifdef CONFIG_GENERIC_CMOS_UPDATE int update_persistent_clock (struct timespec now) {return rtc_sh_set_time (now.tv_sec);
@@ -113,9 +113,5 @@ void __init time_init(void)hwblk_init ();clk_init (); -rtc_sh_get_time (&xtime); -set_normalized_timespec (&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - late_time_init = sh_late_time_init; }
Signature · 1 line
1.6.0.4
PATCH 9/14 blackfin: Convert blackfin to use read/update_persistent_clock
This patch converts the blackfin 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.
--- arch/blackfin/kernel/time-ts.c | 13 +++++++------ arch/blackfin/kernel/time.c | 39 ++++++--------------------------------- 2 files changed, 13 insertions(+), 39 deletions(-)
arch/blackfin/kernel/time-ts.c +7 -6
@@ -348,9 +348,15 @@ static int __init bfin_clockevent_init(void)return 0 ; } -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
@@ -363,11 +369,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 ();bfin_clockevent_init ();
arch/blackfin/kernel/time.c +6 -33
@@ -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); }
Signature · 1 line
1.6.0.4
PATCH 10/14 m32r: Convert m32r to use read/update_peristent_clock
This patch converts the m32r 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.
--- arch/m32r/kernel/time.c | 47 +++++++---------------------------------------- 1 files changed, 7 insertions(+), 40 deletions(-)
arch/m32r/kernel/time.c +7 -40
@@ -106,24 +106,6 @@ u32 arch_gettimeoffset(void) }/* -* In order to set the CMOS clock precisely, set_rtc_mmss has to be -* called 500 ms after the second nowtime has started, because when -* nowtime is written into the registers of the CMOS clock, it will -* jump to the next second precisely 500 ms later. Check the Motorola -* MC146818A or Dallas DS12887 data sheet for details. -* -* BUG: This routine does not handle hour overflow properly; it just -* sets the minutes. Usually you won't notice until after reboot! -*/ -static inline int set_rtc_mmss (unsigned long nowtime) -{ -return 0 ; -} - -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ; - -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick */
@@ -138,23 +120,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif -/* -* 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. -*/ -write_seqlock (&xtime_lock); -if (ntp_synced () - && 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 60 s */ - last_rtc_update = xtime.tv_sec -600 ; - } -write_sequnlock (&xtime_lock);/* As we return to user mode fire off the other CPU schedulers.. this is basically because we don't yet share IRQ's around. This message is rigged to be safe on the 386 - basically it's
@@ -174,7 +139,7 @@ static struct irqaction irq0 = { .name = "MFT2", }; -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {unsigned int epoch, year, mon, day, hour, min, sec;
@@ -194,11 +159,13 @@ void __init time_init(void) epoch =1952 ; year += epoch; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec = (INITIAL_JIFFIES %HZ ) * (NSEC_PER_SEC /HZ ); -set_normalized_timespec (&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec = (INITIAL_JIFFIES %HZ ) * (NSEC_PER_SEC /HZ ); +} + +void __init time_init (void ) +{#if defined(CONFIG_CHIP_M32102 ) || defined(CONFIG_CHIP_XNUX2 ) \ || defined(CONFIG_CHIP_VDEC2 ) || defined(CONFIG_CHIP_M32700 ) \ || defined(CONFIG_CHIP_OPSP ) || defined(CONFIG_CHIP_M32104 )
Signature · 1 line
1.6.0.4
PATCH 11/14 m68k: Convert m68k to use read/update_persistent_clock
This patch converts the m68k 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.
--- arch/m68k/kernel/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
arch/m68k/kernel/time.c +7 -4
@@ -73,21 +73,24 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)return IRQ_HANDLED ; } -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {struct rtc_time time; + ts->tv_sec =0 ; + ts->tv_nsec =0 ;if (mach_hwclk) {mach_hwclk (0 , &time);if ((time.tm_year +=1900 ) <1970 ) time.tm_year +=100 ; - xtime.tv_sec =mktime (time.tm_year, time.tm_mon, time.tm_mday, + ts->tv_sec =mktime (time.tm_year, time.tm_mon, time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec); - xtime.tv_nsec =0 ; } - wall_to_monotonic.tv_sec = -xtime.tv_sec; +} +void __init time_init (void ) +{mach_sched_init (timer_interrupt); }
Signature · 1 line
1.6.0.4
PATCH 12/14 sparc: Convert sparc to use read/update_persistent_clock
This patch converts the sparc 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.
--- arch/sparc/Kconfig | 2 +- arch/sparc/kernel/time_32.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-)
arch/sparc/Kconfig +1 -1
@@ -72,7 +72,7 @@ config ARCH_USES_GETTIMEOFFSET config GENERIC_CMOS_UPDATE bool - default y if SPARC64 + default y config GENERIC_CLOCKEVENTS bool
arch/sparc/kernel/time_32.c +5 -10
@@ -78,6 +78,11 @@ __volatile__ unsigned int *master_l10_counter;u32 (*do_arch_gettimeoffset)(void); +int update_persistent_clock (struct timespec now) +{ +return set_rtc_mmss (now.tv_sec); +} +/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick
@@ -101,16 +106,6 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)do_timer (1 ); -/* Determine when to update the Mostek clock. */ -if (ntp_synced () && - 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 - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - }write_sequnlock (&xtime_lock);#ifndef CONFIG_SMP
Signature · 1 line
1.6.0.4
PATCH 13/14 cris: Convert cris to use read/update_persistent_clock
This patch converts the cris 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.
--- arch/cris/Kconfig | 3 ++ arch/cris/arch-v10/kernel/time.c | 37 +--------------------------------- arch/cris/arch-v32/kernel/time.c | 40 +------------------------------------ arch/cris/kernel/time.c | 20 ++++++++++-------- 4 files changed, 18 insertions(+), 82 deletions(-)
arch/cris/Kconfig +3 -0
@@ -20,6 +20,9 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool +config GENERIC_CMOS_UPDATE + def_bool y + config GENERIC_IOMAP bool default y
arch/cris/arch-v10/kernel/time.c +2 -35
@@ -26,7 +26,6 @@/* it will make jiffies at 96 hz instead of 100 hz though */ #undef USE_CASCADE_TIMERS -extern void update_xtime_from_cmos (void );extern int set_rtc_mmss (unsigned long nowtime);extern int have_rtc;
@@ -188,8 +187,6 @@ stop_watchdog(void)#endif } -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ;/* * timer_interrupt() needs to keep up the real-time clock,
@@ -232,24 +229,6 @@ timer_interrupt(int irq, void *dev_id)do_timer (1 );cris_do_profile (regs);/* Save profiling information */ - -/* -* 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. -* -* The division here is not time critical since it will run once in -* 11 minutes -*/ -if (ntp_synced () && - xtime.tv_sec > last_rtc_update +660 && - (xtime.tv_nsec /1000 ) >=500000 - (tick_nsec /1000 ) /2 && - (xtime.tv_nsec /1000 ) <=500000 + (tick_nsec /1000 ) /2 ) { -if (set_rtc_mmss (xtime.tv_sec) ==0 ) - last_rtc_update = xtime.tv_sec; -else - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - }return IRQ_HANDLED ; }
@@ -274,22 +253,10 @@ time_init(void)*/ loops_per_usec =50 ; -if (RTC_INIT () <0 ) { -/* no RTC, start at 1980 */ - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; +if (RTC_INIT () <0 ) have_rtc =0 ; - }else { -/* get the current time */ +else have_rtc =1 ; -update_xtime_from_cmos (); - } - -/* -* Initialize wall_to_monotonic such that adding it to xtime will yield zero, the -* tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);/* Setup the etrax timers * Base frequency is 25000 hz, divider 250 -> 100 HZ
arch/cris/arch-v32/kernel/time.c +2 -38
@@ -44,7 +44,6 @@ unsigned long timer_regs[NR_CPUS] =#endif }; -extern void update_xtime_from_cmos (void );extern int set_rtc_mmss (unsigned long nowtime);extern int have_rtc;
@@ -198,9 +197,6 @@ handle_watchdog_bite(struct pt_regs* regs)#endif } -/* Last time the cmos clock got updated. */ -static long last_rtc_update =0 ; -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick.
@@ -238,25 +234,6 @@ timer_interrupt(int irq, void *dev_id)/* Call the real timer interrupt handler */ 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. -* -* The division here is not time critical since it will run once in -* 11 minutes -*/ -if ((time_status &STA_UNSYNC ) ==0 && - xtime.tv_sec > last_rtc_update +660 && - (xtime.tv_nsec /1000 ) >=500000 - (tick_nsec /1000 ) /2 && - (xtime.tv_nsec /1000 ) <=500000 + (tick_nsec /1000 ) /2 ) { -if (set_rtc_mmss (xtime.tv_sec) ==0 ) - last_rtc_update = xtime.tv_sec; -else -/* Do it again in 60 s */ - last_rtc_update = xtime.tv_sec -600 ; - }return IRQ_HANDLED ; }
@@ -309,23 +286,10 @@ time_init(void)*/ loops_per_usec =50 ; -if (RTC_INIT () <0 ) { -/* No RTC, start at 1980 */ - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; +if (RTC_INIT () <0 ) have_rtc =0 ; - }else { -/* Get the current time */ +else have_rtc =1 ; -update_xtime_from_cmos (); - } - -/* -* Initialize wall_to_monotonic such that adding it to -* xtime will yield zero, the tv_nsec field must be normalized -* (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);/* Start CPU local timer. */ cris_timer_init ();
arch/cris/kernel/time.c +11 -9
@@ -162,6 +162,8 @@ unsigned longget_cmos_time (void) {unsigned int year, mon, day, hour, min, sec; +if (!have_rtc) +return 0 ; sec =CMOS_READ (RTC_SECONDS ); min =CMOS_READ (RTC_MINUTES );
@@ -183,19 +185,19 @@ get_cmos_time(void)return mktime (year, mon, day, hour, min, sec); } -/* update xtime from the CMOS settings. used when /dev/rtc gets a SET_TIME. -* TODO: this doesn't reset the fancy NTP phase stuff as do_settimeofday does. -*/ -void -update_xtime_from_cmos (void ) +int update_persistent_clock (struct timespec now) { -if (have_rtc) { - xtime.tv_sec =get_cmos_time (); - xtime.tv_nsec =0 ; - } +return set_rtc_mmss (now.tv_sec); } +void read_persistent_clock (struct timespec *ts) +{ + ts->tv_sec =get_cmos_time (); + ts->tv_nsec =0 ; +} + +extern void cris_profile_sample (struct pt_regs * regs);void
Signature · 1 line
1.6.0.4
PATCH 14/14 arm: Convert arm to use read_persistent_clock
This patch converts the arm 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.
Also removes a direct xtime access, replacing it with current_kernel_time()
I have not built or tested this patch, so help from arch maintainers would be appreciated.
--- arch/arm/Kconfig | 3 +++ arch/arm/kernel/time.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/Kconfig +3 -0
@@ -43,6 +43,9 @@ config GENERIC_GPIO config GENERIC_TIME bool +config GENERIC_CMOS_UPDATE + def_bool y + config GENERIC_CLOCKEVENTS bool
arch/arm/kernel/time.c +7 -0
@@ -79,6 +79,13 @@ static unsigned long dummy_gettimeoffset(void) }#endif +int update_persistent_clock (struct timespec now) +{ +if (set_rtc ==NULL ) +return -1 ; +return set_rtc (now); +} +#ifdef CONFIG_LEDS_TIMER static inline void do_leds (void ) {
Signature · 1 line
1.6.0.4
Re: [PATCH 14/14] arm: Convert arm to use read_persistent_clock
Quoted 4 lines · John Stultz
This patch converts the arm architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future.
Have you checked Linus' latest tree? set_rtc() no longer exists there.
Re: [PATCH 14/14] arm: Convert arm to use read_persistent_clock
Quoted 7 lines · Russell King - ARM Linux
Quoted 4 lines · John Stultz
This patch converts the arm architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future.Have you checked Linus' latest tree?
set_rtc()no longer exists there.
Ah. Thanks for pointing that out. I'll go ahead and drop the patch.
Thanks again!
-john
[tip:timers/cleanup] cris: Convert cris to use read/update_persistent_clock
In reply to John StultzCommit-ID: 8eff8a5c1d3a1de7a2d173e0effc6cc9bcbb5177 Gitweb: http://git.kernel.org/tip/8eff8a5c1d3a1de7a2d173e0effc6cc9bcbb5177 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:28 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:13 +0100
cris: Convert cris to use read/update_persistent_clock
This patch converts the cris 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.
LKML-Reference: <[email protected]>
--- arch/cris/Kconfig | 3 ++ arch/cris/arch-v10/kernel/time.c | 37 +--------------------------------- arch/cris/arch-v32/kernel/time.c | 40 +------------------------------------ arch/cris/kernel/time.c | 20 ++++++++++-------- 4 files changed, 18 insertions(+), 82 deletions(-)
arch/cris/Kconfig +3 -0
@@ -23,6 +23,9 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_TIME def_bool y +config GENERIC_CMOS_UPDATE + def_bool y + config ARCH_USES_GETTIMEOFFSET def_bool y
arch/cris/arch-v10/kernel/time.c +2 -35
@@ -26,7 +26,6 @@/* it will make jiffies at 96 hz instead of 100 hz though */ #undef USE_CASCADE_TIMERS -extern void update_xtime_from_cmos (void );extern int set_rtc_mmss (unsigned long nowtime);extern int have_rtc;
@@ -188,8 +187,6 @@ stop_watchdog(void)#endif } -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ;/* * timer_interrupt() needs to keep up the real-time clock,
@@ -232,24 +229,6 @@ timer_interrupt(int irq, void *dev_id)do_timer (1 );cris_do_profile (regs);/* Save profiling information */ - -/* -* 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. -* -* The division here is not time critical since it will run once in -* 11 minutes -*/ -if (ntp_synced () && - xtime.tv_sec > last_rtc_update +660 && - (xtime.tv_nsec /1000 ) >=500000 - (tick_nsec /1000 ) /2 && - (xtime.tv_nsec /1000 ) <=500000 + (tick_nsec /1000 ) /2 ) { -if (set_rtc_mmss (xtime.tv_sec) ==0 ) - last_rtc_update = xtime.tv_sec; -else - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - }return IRQ_HANDLED ; }
@@ -274,22 +253,10 @@ time_init(void)*/ loops_per_usec =50 ; -if (RTC_INIT () <0 ) { -/* no RTC, start at 1980 */ - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; +if (RTC_INIT () <0 ) have_rtc =0 ; - }else { -/* get the current time */ +else have_rtc =1 ; -update_xtime_from_cmos (); - } - -/* -* Initialize wall_to_monotonic such that adding it to xtime will yield zero, the -* tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);/* Setup the etrax timers * Base frequency is 25000 hz, divider 250 -> 100 HZ
arch/cris/arch-v32/kernel/time.c +2 -38
@@ -44,7 +44,6 @@ unsigned long timer_regs[NR_CPUS] =#endif }; -extern void update_xtime_from_cmos (void );extern int set_rtc_mmss (unsigned long nowtime);extern int have_rtc;
@@ -198,9 +197,6 @@ handle_watchdog_bite(struct pt_regs* regs)#endif } -/* Last time the cmos clock got updated. */ -static long last_rtc_update =0 ; -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick.
@@ -238,25 +234,6 @@ timer_interrupt(int irq, void *dev_id)/* Call the real timer interrupt handler */ 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. -* -* The division here is not time critical since it will run once in -* 11 minutes -*/ -if ((time_status &STA_UNSYNC ) ==0 && - xtime.tv_sec > last_rtc_update +660 && - (xtime.tv_nsec /1000 ) >=500000 - (tick_nsec /1000 ) /2 && - (xtime.tv_nsec /1000 ) <=500000 + (tick_nsec /1000 ) /2 ) { -if (set_rtc_mmss (xtime.tv_sec) ==0 ) - last_rtc_update = xtime.tv_sec; -else -/* Do it again in 60 s */ - last_rtc_update = xtime.tv_sec -600 ; - }return IRQ_HANDLED ; }
@@ -309,23 +286,10 @@ time_init(void)*/ loops_per_usec =50 ; -if (RTC_INIT () <0 ) { -/* No RTC, start at 1980 */ - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; +if (RTC_INIT () <0 ) have_rtc =0 ; - }else { -/* Get the current time */ +else have_rtc =1 ; -update_xtime_from_cmos (); - } - -/* -* Initialize wall_to_monotonic such that adding it to -* xtime will yield zero, the tv_nsec field must be normalized -* (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);/* Start CPU local timer. */ cris_timer_init ();
arch/cris/kernel/time.c +11 -9
@@ -98,6 +98,8 @@ unsigned longget_cmos_time (void) {unsigned int year, mon, day, hour, min, sec; +if (!have_rtc) +return 0 ; sec =CMOS_READ (RTC_SECONDS ); min =CMOS_READ (RTC_MINUTES );
@@ -119,19 +121,19 @@ get_cmos_time(void)return mktime (year, mon, day, hour, min, sec); } -/* update xtime from the CMOS settings. used when /dev/rtc gets a SET_TIME. -* TODO: this doesn't reset the fancy NTP phase stuff as do_settimeofday does. -*/ -void -update_xtime_from_cmos (void ) +int update_persistent_clock (struct timespec now) { -if (have_rtc) { - xtime.tv_sec =get_cmos_time (); - xtime.tv_nsec =0 ; - } +return set_rtc_mmss (now.tv_sec); } +void read_persistent_clock (struct timespec *ts) +{ + ts->tv_sec =get_cmos_time (); + ts->tv_nsec =0 ; +} + +extern void cris_profile_sample (struct pt_regs * regs);void
Re: [PATCH 12/14] sparc: Convert sparc to use read/update_persistent_clock
In reply to John StultzFrom: John Stultz <[email protected]>
Date: Wed, 3 Mar 2010 19:57:27 -0800
Quoted 9 lines
This patch converts the sparc architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, 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.
Cc David S. Miller" <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by John Stultz <[email protected]>
Here's a version that compiles, you have to get rid of the now unused variably last_rtc_update since we build with -Werror, and you can also add my:
Also, you'll reach more sparc developers by CC:'ing [email protected] on your patches :-)
arch/sparc/Kconfig +1 -1
@@ -72,7 +72,7 @@ config ARCH_USES_GETTIMEOFFSET config GENERIC_CMOS_UPDATE bool - default y if SPARC64 + default y config GENERIC_CLOCKEVENTS bool
arch/sparc/kernel/time_32.c +5 -13
@@ -78,6 +78,11 @@ __volatile__ unsigned int *master_l10_counter;u32 (*do_arch_gettimeoffset)(void); +int update_persistent_clock (struct timespec now) +{ +return set_rtc_mmss (now.tv_sec); +} +/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick
@@ -87,9 +92,6 @@ u32 (*do_arch_gettimeoffset)(void);static irqreturn_t timer_interrupt (int dummy,void *dev_id) { -/* last time the cmos clock got updated */ -static long last_rtc_update; -#ifndef CONFIG_SMP profile_tick (CPU_PROFILING );#endif
@@ -101,16 +103,6 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id)do_timer (1 ); -/* Determine when to update the Mostek clock. */ -if (ntp_synced () && - 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 - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - }write_sequnlock (&xtime_lock);#ifndef CONFIG_SMP
[tip:timers/cleanup] m68k: Convert m68k to use read/update_persistent_clock
In reply to John StultzCommit-ID: ffbcad49e79cd82428010b44a87401446ea7f370 Gitweb: http://git.kernel.org/tip/ffbcad49e79cd82428010b44a87401446ea7f370 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:26 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:13 +0100
m68k: Convert m68k to use read/update_persistent_clock
This patch converts the m68k 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.
LKML-Reference: <[email protected]>
--- arch/m68k/kernel/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
arch/m68k/kernel/time.c +7 -4
@@ -73,21 +73,24 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)return IRQ_HANDLED ; } -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {struct rtc_time time; + ts->tv_sec =0 ; + ts->tv_nsec =0 ;if (mach_hwclk) {mach_hwclk (0 , &time);if ((time.tm_year +=1900 ) <1970 ) time.tm_year +=100 ; - xtime.tv_sec =mktime (time.tm_year, time.tm_mon, time.tm_mday, + ts->tv_sec =mktime (time.tm_year, time.tm_mon, time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec); - xtime.tv_nsec =0 ; } - wall_to_monotonic.tv_sec = -xtime.tv_sec; +} +void __init time_init (void ) +{mach_sched_init (timer_interrupt); }
[tip:timers/cleanup] m32r: Convert m32r to use read/update_peristent_clock
In reply to John StultzCommit-ID: 944694716d6ea3c274a73c830bf33e194bad4bcd Gitweb: http://git.kernel.org/tip/944694716d6ea3c274a73c830bf33e194bad4bcd Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:25 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:12 +0100
m32r: Convert m32r to use read/update_peristent_clock
This patch converts the m32r 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.
LKML-Reference: <[email protected]>
--- arch/m32r/kernel/time.c | 47 +++++++---------------------------------------- 1 files changed, 7 insertions(+), 40 deletions(-)
arch/m32r/kernel/time.c +7 -40
@@ -106,24 +106,6 @@ u32 arch_gettimeoffset(void) }/* -* In order to set the CMOS clock precisely, set_rtc_mmss has to be -* called 500 ms after the second nowtime has started, because when -* nowtime is written into the registers of the CMOS clock, it will -* jump to the next second precisely 500 ms later. Check the Motorola -* MC146818A or Dallas DS12887 data sheet for details. -* -* BUG: This routine does not handle hour overflow properly; it just -* sets the minutes. Usually you won't notice until after reboot! -*/ -static inline int set_rtc_mmss (unsigned long nowtime) -{ -return 0 ; -} - -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ; - -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick */
@@ -138,23 +120,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif -/* -* 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. -*/ -write_seqlock (&xtime_lock); -if (ntp_synced () - && 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 60 s */ - last_rtc_update = xtime.tv_sec -600 ; - } -write_sequnlock (&xtime_lock);/* As we return to user mode fire off the other CPU schedulers.. this is basically because we don't yet share IRQ's around. This message is rigged to be safe on the 386 - basically it's
@@ -174,7 +139,7 @@ static struct irqaction irq0 = { .name = "MFT2", }; -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {unsigned int epoch, year, mon, day, hour, min, sec;
@@ -194,11 +159,13 @@ void __init time_init(void) epoch =1952 ; year += epoch; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec = (INITIAL_JIFFIES %HZ ) * (NSEC_PER_SEC /HZ ); -set_normalized_timespec (&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec = (INITIAL_JIFFIES %HZ ) * (NSEC_PER_SEC /HZ ); +} + +void __init time_init (void ) +{#if defined(CONFIG_CHIP_M32102 ) || defined(CONFIG_CHIP_XNUX2 ) \ || defined(CONFIG_CHIP_VDEC2 ) || defined(CONFIG_CHIP_M32700 ) \ || defined(CONFIG_CHIP_OPSP ) || defined(CONFIG_CHIP_M32104 )
Re: [PATCH 09/14] blackfin: Convert blackfin to use read/update_persistent_clock
In reply to John StultzQuoted 3 lines · John Stultz
This patch converts the blackfin architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, 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.
Blackfin builds & boots with generic clockevents and w/out
did you want me to merge it for 2.6.35 or should it go through with your patchset ?
-mike
Re: [PATCH 09/14] blackfin: Convert blackfin to use read/update_persistent_clock
Quoted 7 lines · Mike Frysinger
Quoted 3 lines · John Stultz
This patch converts the blackfin architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, 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.
Blackfin builds & boots with generic clockevents and w/out
Acked-by Mike Frysinger <[email protected]>
Cool!
Quoted 2 lines
did you want me to merge it for 2.6.35 or should it go through with your patchset ?
I'd say go ahead and merge it.
thanks
-john
Re: [PATCH 09/14] blackfin: Convert blackfin to use read/update_persistent_clock
Quoted 9 lines · john stultz
Quoted 7 lines · Mike Frysinger
Quoted 3 lines · John Stultz
This patch converts the blackfin architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, 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.
Blackfin builds & boots with generic clockevents and w/out
Acked-by Mike Frysinger <[email protected]>
Quoted 6 lines
Cool!
Quoted 2 lines
did you want me to merge it for 2.6.35 or should it go through with your patchset ?
I'd say go ahead and merge it.
will do
-mike
[tip:timers/cleanup] blackfin: Convert blackfin to use read/update_persistent_clock
In reply to John StultzCommit-ID: cb0e996378900fa05d5c779d6bfa52d55ebc3407 Gitweb: http://git.kernel.org/tip/cb0e996378900fa05d5c779d6bfa52d55ebc3407 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:24 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:12 +0100
blackfin: Convert blackfin to use read/update_persistent_clock
This patch converts the blackfin 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.
LKML-Reference: <[email protected]>
--- arch/blackfin/kernel/time-ts.c | 13 +++++++------ arch/blackfin/kernel/time.c | 39 ++++++--------------------------------- 2 files changed, 13 insertions(+), 39 deletions(-)
arch/blackfin/kernel/time-ts.c +7 -6
@@ -348,9 +348,15 @@ static int __init bfin_clockevent_init(void)return 0 ; } -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
@@ -363,11 +369,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 ();bfin_clockevent_init ();
arch/blackfin/kernel/time.c +6 -33
@@ -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); }
Re: [PATCH 08/14] sh: Convert sh to use read/update_persistent_clock
In reply to John StultzQuoted 5 lines · John Stultz
This patch converts the sh architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future.
Quoted 7 lines
I have not built or tested this patch, so help from arch maintainers would be appreciated.
Cc Paul Mundt <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by John Stultz <[email protected]>
Looks fine to me, I'll apply it, thanks.
[tip:timers/cleanup] ia64: Convert ia64 to use read/update_persistent_clock
In reply to John StultzCommit-ID: 6ffdc5774a9ef80e58db398a8307d5b2db2644ce Gitweb: http://git.kernel.org/tip/6ffdc5774a9ef80e58db398a8307d5b2db2644ce Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:22 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:11 +0100
ia64: Convert ia64 to use read/update_persistent_clock
This patch converts the ia64 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.
LKML-Reference: <[email protected]>
--- arch/ia64/kernel/time.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
arch/ia64/kernel/time.c +5 -7
@@ -430,18 +430,16 @@ static int __init rtc_init(void) }module_init (rtc_init); +void read_persistent_clock (struct timespec *ts) +{ +efi_gettimeofday (ts); +} +void __init time_init (void ) {register_percpu_irq (IA64_TIMER_VECTOR , &timer_irqaction); -efi_gettimeofday (&xtime);ia64_init_itm (); - -/* -* Initialize wall_to_monotonic such that adding it to xtime will yield zero, the -* tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC). -*/ -set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); }/*
[tip:timers/cleanup] avr32: Convert avr32 to use read/update_persistent_clock
In reply to John StultzCommit-ID: e2032a4a7237e97cd2ee36e2d806c5742ace189f Gitweb: http://git.kernel.org/tip/e2032a4a7237e97cd2ee36e2d806c5742ace189f Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:21 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:10 +0100
avr32: Convert avr32 to use read/update_persistent_clock
This patch converts the avr32 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.
LKML-Reference: <[email protected]>
--- arch/avr32/kernel/time.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/avr32/kernel/time.c +6 -6
@@ -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);
[tip:timers/cleanup] h8300: Convert h8300 to use read/update_persistent_clock
In reply to John StultzCommit-ID: 12833c1e373ad2b12667ca159d335fae29968473 Gitweb: http://git.kernel.org/tip/12833c1e373ad2b12667ca159d335fae29968473 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:20 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:10 +0100
h8300: Convert h8300 to use read/update_persistent_clock
This patch converts the h8300 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.
LKML-Reference: <[email protected]>
--- arch/h8300/kernel/time.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
arch/h8300/kernel/time.c +7 -3
@@ -41,7 +41,7 @@ void h8300_timer_tick(void)update_process_times (user_mode (get_irq_regs ())); } -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {unsigned int year, mon, day, hour, min, sec;
@@ -56,8 +56,12 @@ void __init time_init(void)#endif if ((year +=1900 ) <1970 ) year +=100 ; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec =0 ; + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec =0 ; +} + +void __init time_init (void ) +{h8300_timer_setup (); }
Re: [PATCH 04/14] parisc: Convert parisc to use read/update_persistent_clock
In reply to John StultzQuoted 3 lines · John Stultz
This patch converts the parisc architecture to use the generic
read_persistent_clockandupdate_persistent_clockinterfaces, 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.
Works nicely.
Thanks, John.
Quoted 58 lines
Cc Kyle McMartin<[email protected]>Cc Helge Deller<[email protected]>Cc Thomas Gleixner<[email protected]>Cc Andrew Morton<[email protected]>Signed-off-by John Stultz<[email protected]>--- arch/parisc/kernel/time.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-)arch/parisc/kernel/time.c +13
-16@@ -250,9 +250,21 @@ static int __init rtc_init(void) }module_init (rtc_init); -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) {static struct pdc_tod tod_data; +if (pdc_tod_read (&tod_data) ==0 ) { + ts->tv_sec = tod_data.tod_sec; + ts->tv_nsec = tod_data.tod_usec *1000 ; + }else { +printk (KERN_ERR "Error reading tod clock\n" ); + ts->tv_sec =0 ; + ts->tv_nsec =0 ; + } +} + +void __init time_init (void ) +{unsigned long current_cr16_khz; clocktick = (100 *PAGE0 ->mem_10msec) /HZ ;@@ -264,19 +276,4 @@ void __init time_init(void) clocksource_cr16.mult =clocksource_khz2mult (current_cr16_khz, clocksource_cr16.shift);clocksource_register (&clocksource_cr16); - -if (pdc_tod_read (&tod_data) ==0 ) { -unsigned long flags; - -write_seqlock_irqsave (&xtime_lock, flags); - xtime.tv_sec = tod_data.tod_sec; - xtime.tv_nsec = tod_data.tod_usec *1000 ; -set_normalized_timespec (&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); -write_sequnlock_irqrestore (&xtime_lock, flags); - }else { -printk (KERN_ERR "Error reading tod clock\n" ); - xtime.tv_sec =0 ; - xtime.tv_nsec =0 ; - } }
Re: [PATCH 04/14] parisc: Convert parisc to use read/update_persistent_clock
Quoted 6 lines · Helge Deller
Works nicely.
Thanks, John.
Acked-by Helge Deller <[email protected]>
Thanks Helge, added your annotation.
regards, Kyle
[tip:timers/cleanup] frv: Convert frv to use read/update_persistent_clock
In reply to John StultzCommit-ID: 739b27116a0e6903d6c85d6769e69f43d8fa4128 Gitweb: http://git.kernel.org/tip/739b27116a0e6903d6c85d6769e69f43d8fa4128 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:18 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:09 +0100
frv: Convert frv to use read/update_persistent_clock
This patch converts the frv 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.
LKML-Reference: <[email protected]>
--- arch/frv/kernel/time.c | 34 +++++++--------------------------- 1 files changed, 7 insertions(+), 27 deletions(-)
arch/frv/kernel/time.c +7 -27
@@ -48,20 +48,12 @@ static struct irqaction timer_irq = { .name = "timer", }; -static inline int set_rtc_mmss (unsigned long nowtime) -{ -return -1 ; -} -/* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick */ static irqreturn_t timer_interrupt (int irq,void *dummy) { -/* last time the cmos clock got updated */ -static long last_rtc_update =0 ; -profile_tick (CPU_PROFILING );/* * Here we are in the timer irq handler. We just have irqs locally
@@ -74,22 +66,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)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 /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 - last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ - } -#ifdef CONFIG_HEARTBEAT static unsigned short n; n++;
@@ -119,7 +95,8 @@ void time_divisor_init(void)__set_TCSR_DATA (0 , base >>8 ); } -void time_init (void ) + +void read_persistent_clock (struct timespec *ts) {unsigned int year, mon, day, hour, min, sec;
@@ -135,9 +112,12 @@ void time_init(void)if ((year +=1900 ) <1970 ) year +=100 ; - xtime.tv_sec =mktime (year, mon, day, hour, min, sec); - xtime.tv_nsec =0 ; + ts->tv_sec =mktime (year, mon, day, hour, min, sec); + ts->tv_nsec =0 ; +} +void time_init (void ) +{/* install scheduling interrupt handler */ setup_irq (IRQ_CPU_TIMER0 , &timer_irq);
[tip:timers/cleanup] mn10300: Convert mn10300 to use read/update_persistent_clock
In reply to John StultzCommit-ID: f7a56575fa4e62e94a644f72ef8c5d423c073982 Gitweb: http://git.kernel.org/tip/f7a56575fa4e62e94a644f72ef8c5d423c073982 Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:17 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:09 +0100
mn10300: Convert mn10300 to use read/update_persistent_clock
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.
LKML-Reference: <[email protected]>
--- arch/mn10300/Kconfig | 3 +++ arch/mn10300/kernel/rtc.c | 27 +++++---------------------- arch/mn10300/kernel/time.c | 4 ---- 3 files changed, 8 insertions(+), 26 deletions(-)
arch/mn10300/Kconfig +3 -0
@@ -37,6 +37,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ config GENERIC_CALIBRATE_DELAY def_bool y +config GENERIC_CMOS_UPDATE + def_bool y + config GENERIC_FIND_NEXT_BIT def_bool y
arch/mn10300/kernel/rtc.c +5 -22
@@ -26,17 +26,15 @@ static long last_rtc_update;/* time for RTC to update itself in ioclks */ static unsigned long mn10300_rtc_update_period; -/* -* read the current RTC time -*/ -unsigned long __init get_initial_rtc_time (void ) +void read_persistent_clock (struct timespec *ts) {struct 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); + ts->tv_nsec =0 ; }/*
@@ -110,24 +108,9 @@ static int set_rtc_mmss(unsigned long nowtime)return retval; } -void check_rtc_time (void ) +int update_persistent_clock (struct timespec now) { -/* the RTC clock just finished ticking over again this second -* - 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 ; - } +return set_rtc_mms (now.tv_sec); }/*
arch/mn10300/kernel/time.c +0 -4
@@ -111,7 +111,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)/* advance the kernel's time tracking system */ profile_tick (CPU_PROFILING );do_timer (1 ); -check_rtc_time (); }write_sequnlock (&xtime_lock);
@@ -139,9 +138,6 @@ void __init time_init(void)" (calibrated against RTC)\n" , MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100); - xtime.tv_sec =get_initial_rtc_time (); - xtime.tv_nsec =0 ; - mn10300_last_tsc =TMTSCBC ;/* use timer 0 & 1 cascaded to tick at as close to HZ as possible */
[tip:timers/cleanup] alpha: Convert alpha to use read/update_persistent_clock
In reply to John StultzCommit-ID: 1e871be1aa97babb467a929d6adcb1960659928b Gitweb: http://git.kernel.org/tip/1e871be1aa97babb467a929d6adcb1960659928b Author: John Stultz <[email protected]> AuthorDate: Wed, 3 Mar 2010 19:57:16 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 13 Mar 2010 01:14:08 +0100
alpha: Convert alpha to use read/update_persistent_clock
This patch converts the alpha 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.
LKML-Reference: <[email protected]>
--- arch/alpha/Kconfig | 3 + arch/alpha/kernel/time.c | 101 +++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 54 deletions(-)
arch/alpha/Kconfig +3 -0
@@ -54,6 +54,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
137 lines not on this page · raw message