From patchwork Wed Dec 23 04:16:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 41650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 08FBAB7BC0 for ; Wed, 23 Dec 2009 15:16:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753116AbZLWEQX (ORCPT ); Tue, 22 Dec 2009 23:16:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753088AbZLWEQX (ORCPT ); Tue, 22 Dec 2009 23:16:23 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:54733 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbZLWEQW (ORCPT ); Tue, 22 Dec 2009 23:16:22 -0500 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e34.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nBN4Ahmr001641; Tue, 22 Dec 2009 21:10:43 -0700 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nBN4GHZ1131966; Tue, 22 Dec 2009 21:16:17 -0700 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nBN4IBod022888; Tue, 22 Dec 2009 21:18:12 -0700 Received: from [9.65.31.230] (sig-9-65-31-230.mts.ibm.com [9.65.31.230]) by d03av06.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nBN4I8nG022854; Tue, 22 Dec 2009 21:18:09 -0700 Subject: [RFC][PATCH 14/14] Convert sparc to read/update_persistent_clock From: john stultz To: lkml Cc: "David S. Miller" , sparclinux@vger.kernel.org In-Reply-To: <1261541703.3508.75.camel@localhost.localdomain> References: <1261540762.3508.61.camel@localhost.localdomain> <1261540826.3508.62.camel@localhost.localdomain> <1261540902.3508.63.camel@localhost.localdomain> <1261540988.3508.64.camel@localhost.localdomain> <1261541054.3508.65.camel@localhost.localdomain> <1261541130.3508.66.camel@localhost.localdomain> <1261541188.3508.67.camel@localhost.localdomain> <1261541286.3508.69.camel@localhost.localdomain> <1261541342.3508.70.camel@localhost.localdomain> <1261541415.3508.71.camel@localhost.localdomain> <1261541491.3508.72.camel@localhost.localdomain> <1261541567.3508.73.camel@localhost.localdomain> <1261541643.3508.74.camel@localhost.localdomain> <1261541703.3508.75.camel@localhost.localdomain> Date: Tue, 22 Dec 2009 20:16:11 -0800 Message-ID: <1261541771.3508.76.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 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 Acked-by: David S. Miller --- Kconfig | 2 +- kernel/time_32.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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