From: john stultz <johnstul@us.ibm.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>, sparclinux@vger.kernel.org
Subject: [RFC][PATCH 14/14] Convert sparc to read/update_persistent_clock
Date: Wed, 23 Dec 2009 04:16:11 +0000 [thread overview]
Message-ID: <1261541771.3508.76.camel@localhost.localdomain> (raw)
In-Reply-To: <1261541703.3508.75.camel@localhost.localdomain>
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.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
Kconfig | 2 +-
kernel/time_32.c | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
Index: gettimeoffset/arch/sparc/Kconfig
=================================--- gettimeoffset.orig/arch/sparc/Kconfig 2009-12-22 18:50:54.000000000 -0800
+++ gettimeoffset/arch/sparc/Kconfig 2009-12-22 18:51:25.000000000 -0800
@@ -69,7 +69,7 @@ config GENERIC_TIME
config GENERIC_CMOS_UPDATE
bool
- default y if SPARC64
+ default y
config GENERIC_CLOCKEVENTS
bool
Index: gettimeoffset/arch/sparc/kernel/time_32.c
=================================--- gettimeoffset.orig/arch/sparc/kernel/time_32.c 2009-12-22 18:50:54.000000000 -0800
+++ gettimeoffset/arch/sparc/kernel/time_32.c 2009-12-22 18:51:25.000000000 -0800
@@ -76,6 +76,11 @@ EXPORT_SYMBOL(profile_pc);
__volatile__ unsigned int *master_l10_counter;
+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
@@ -99,16 +104,6 @@ static irqreturn_t timer_interrupt(int d
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
WARNING: multiple messages have this Message-ID (diff)
From: john stultz <johnstul@us.ibm.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>, sparclinux@vger.kernel.org
Subject: [RFC][PATCH 14/14] Convert sparc to read/update_persistent_clock
Date: Tue, 22 Dec 2009 20:16:11 -0800 [thread overview]
Message-ID: <1261541771.3508.76.camel@localhost.localdomain> (raw)
In-Reply-To: <1261541703.3508.75.camel@localhost.localdomain>
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.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
Kconfig | 2 +-
kernel/time_32.c | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
Index: gettimeoffset/arch/sparc/Kconfig
===================================================================
--- gettimeoffset.orig/arch/sparc/Kconfig 2009-12-22 18:50:54.000000000 -0800
+++ gettimeoffset/arch/sparc/Kconfig 2009-12-22 18:51:25.000000000 -0800
@@ -69,7 +69,7 @@ config GENERIC_TIME
config GENERIC_CMOS_UPDATE
bool
- default y if SPARC64
+ default y
config GENERIC_CLOCKEVENTS
bool
Index: gettimeoffset/arch/sparc/kernel/time_32.c
===================================================================
--- gettimeoffset.orig/arch/sparc/kernel/time_32.c 2009-12-22 18:50:54.000000000 -0800
+++ gettimeoffset/arch/sparc/kernel/time_32.c 2009-12-22 18:51:25.000000000 -0800
@@ -76,6 +76,11 @@ EXPORT_SYMBOL(profile_pc);
__volatile__ unsigned int *master_l10_counter;
+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
@@ -99,16 +104,6 @@ static irqreturn_t timer_interrupt(int d
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
next prev parent reply other threads:[~2009-12-23 4:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-23 3:59 [RFC][PATCH 0/14] Convert remaining arches to read/update_persistent_clock john stultz
2009-12-23 4:00 ` [RFC][PATCH 1/14] Convert alpha " john stultz
2009-12-23 4:01 ` [RFC][PATCH 2/14] Convert arm " john stultz
2009-12-23 4:01 ` john stultz
2009-12-23 4:03 ` [RFC][PATCH 3/14] Convert avr32 " john stultz
2009-12-23 4:04 ` [RFC][PATCH 4/14] Convert blackfin " john stultz
2009-12-23 4:05 ` [RFC][PATCH 5/14] Convert cris " john stultz
2009-12-23 4:06 ` [RFC][PATCH 6/14] Convert frv " john stultz
2009-12-23 4:08 ` [RFC][PATCH 7/14] Convert h8300 " john stultz
2009-12-23 4:09 ` [RFC][PATCH 8/14] Convert ia64 " john stultz
2009-12-23 4:09 ` john stultz
2009-12-23 4:10 ` [RFC][PATCH 9/14] Convert m32r " john stultz
2009-12-23 4:11 ` [RFC][PATCH 10/14] Convert m68k " john stultz
2009-12-23 4:11 ` john stultz
2009-12-23 4:12 ` [RFC][PATCH 11/14] Convert mn10300 " john stultz
2009-12-23 4:14 ` [RFC][PATCH 12/14] Convert parisc " john stultz
2009-12-23 4:14 ` john stultz
2009-12-23 4:15 ` [RFC][PATCH 13/14] Convert sh " john stultz
2009-12-23 4:15 ` john stultz
2009-12-23 4:16 ` john stultz [this message]
2009-12-23 4:16 ` [RFC][PATCH 14/14] Convert sparc " john stultz
2009-12-24 4:52 ` [RFC][PATCH 14/14] Convert sparc to David Miller
2009-12-24 4:52 ` [RFC][PATCH 14/14] Convert sparc to read/update_persistent_clock David Miller
2010-01-05 16:41 ` Kristoffer Glembo
2010-01-05 16:41 ` Kristoffer Glembo
2010-01-05 17:08 ` [RFC][PATCH 11/14] Convert mn10300 " David Howells
2010-01-05 16:47 ` [RFC][PATCH 6/14] Convert frv " David Howells
2009-12-24 11:09 ` [RFC][PATCH 2/14] Convert arm " Uwe Kleine-König
2009-12-24 11:09 ` Uwe Kleine-König
2009-12-23 5:08 ` [RFC][PATCH 0/14] Convert remaining arches " Paul Mundt
2009-12-23 5:08 ` Paul Mundt
2009-12-23 10:08 ` Geert Uytterhoeven
2009-12-23 10:08 ` [RFC][PATCH 0/14] Convert remaining arches to Geert Uytterhoeven
2009-12-23 22:04 ` [RFC][PATCH 0/14] Convert remaining arches to read/update_persistent_clock john stultz
2009-12-23 22:04 ` [RFC][PATCH 0/14] Convert remaining arches to john stultz
2009-12-24 0:27 ` [RFC][PATCH 0/14] Convert remaining arches to read/update_persistent_clock Dialup Jon Norstog
2009-12-24 0:27 ` Dialup Jon Norstog
2009-12-24 4:54 ` David Miller
2009-12-24 4:54 ` [RFC][PATCH 0/14] Convert remaining arches to David Miller
2009-12-24 5:10 ` [RFC][PATCH 0/14] Convert remaining arches to read/update_persistent_clock Paul Mundt
2009-12-24 5:10 ` Paul Mundt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261541771.3508.76.camel@localhost.localdomain \
--to=johnstul@us.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.