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. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Hirokazu Takata <takata@linux-m32r.org> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <1267675049-12337-11-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Hirokazu Takata <takata@linux-m32r.org> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <1267675049-12337-11-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
John Stultz · Thomas Gleixner
1 parent cb0e996378
Showing 1 changed file with 7 additions and 40 deletions Side-by-side Diff
arch/m32r/kernel/time.c
@@ -106,24 +106,6 @@
 }
  
 /*
- * 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 @@
 #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 @@
 	.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 @@
 		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)
...	...	@@ -106,24 +106,6 @@
106	106	}
107	107
108	108	/*
109		- * In order to set the CMOS clock precisely, set_rtc_mmss has to be
110		- * called 500 ms after the second nowtime has started, because when
111		- * nowtime is written into the registers of the CMOS clock, it will
112		- * jump to the next second precisely 500 ms later. Check the Motorola
113		- * MC146818A or Dallas DS12887 data sheet for details.
114		- *
115		- * BUG: This routine does not handle hour overflow properly; it just
116		- * sets the minutes. Usually you won't notice until after reboot!
117		- */
118		-static inline int set_rtc_mmss(unsigned long nowtime)
119		-{
120		- return 0;
121		-}
122		-
123		-/* last time the cmos clock got updated */
124		-static long last_rtc_update = 0;
125		-
126		-/*
127	109	* timer_interrupt() needs to keep up the real-time clock,
128	110	* as well as call the "do_timer()" routine every clocktick
129	111	*/
...	...	@@ -138,23 +120,6 @@
138	120	#ifndef CONFIG_SMP
139	121	update_process_times(user_mode(get_irq_regs()));
140	122	#endif
141		- /*
142		- * If we have an externally synchronized Linux clock, then update
143		- * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
144		- * called as close as possible to 500 ms before the new second starts.
145		- */
146		- write_seqlock(&xtime_lock);
147		- if (ntp_synced()
148		- && xtime.tv_sec > last_rtc_update + 660
149		- && (xtime.tv_nsec / 1000) >= 500000 - ((unsigned)TICK_SIZE) / 2
150		- && (xtime.tv_nsec / 1000) <= 500000 + ((unsigned)TICK_SIZE) / 2)
151		- {
152		- if (set_rtc_mmss(xtime.tv_sec) == 0)
153		- last_rtc_update = xtime.tv_sec;
154		- else /* do it again in 60 s */
155		- last_rtc_update = xtime.tv_sec - 600;
156		- }
157		- write_sequnlock(&xtime_lock);
158	123	/* As we return to user mode fire off the other CPU schedulers..
159	124	this is basically because we don't yet share IRQ's around.
160	125	This message is rigged to be safe on the 386 - basically it's
...	...	@@ -174,7 +139,7 @@
174	139	.name = "MFT2",
175	140	};
176	141
177		-void __init time_init(void)
	142	+void read_persistent_clock(struct timespec *ts)
178	143	{
179	144	unsigned int epoch, year, mon, day, hour, min, sec;
180	145
181	146
...	...	@@ -194,11 +159,13 @@
194	159	epoch = 1952;
195	160	year += epoch;
196	161
197		- xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
198		- xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
199		- set_normalized_timespec(&wall_to_monotonic,
200		- -xtime.tv_sec, -xtime.tv_nsec);
	162	+ ts->tv_sec = mktime(year, mon, day, hour, min, sec);
	163	+ ts->tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
	164	+}
201	165
	166	+
	167	+void __init time_init(void)
	168	+{
202	169	#if defined(CONFIG_CHIP_M32102) \|\| defined(CONFIG_CHIP_XNUX2) \
203	170	\|\| defined(CONFIG_CHIP_VDEC2) \|\| defined(CONFIG_CHIP_M32700) \
204	171	\|\| defined(CONFIG_CHIP_OPSP) \|\| defined(CONFIG_CHIP_M32104)