From patchwork Tue Jan 24 00:05:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 6354 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 02F862427F for ; Tue, 24 Jan 2012 00:06:18 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id DB5DFA18070 for ; Tue, 24 Jan 2012 00:06:17 +0000 (UTC) Received: by bkar19 with SMTP id r19so3474661bka.11 for ; Mon, 23 Jan 2012 16:06:17 -0800 (PST) MIME-Version: 1.0 Received: by 10.205.130.12 with SMTP id hk12mr4008020bkc.56.1327363577568; Mon, 23 Jan 2012 16:06:17 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.130.220 with SMTP id u28cs85853bks; Mon, 23 Jan 2012 16:06:17 -0800 (PST) Received: by 10.68.72.70 with SMTP id b6mr25764360pbv.58.1327363575138; Mon, 23 Jan 2012 16:06:15 -0800 (PST) Received: from e32.co.us.ibm.com (e32.co.us.ibm.com. [32.97.110.150]) by mx.google.com with ESMTPS id d6si18396420pbk.191.2012.01.23.16.06.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jan 2012 16:06:15 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.150 as permitted sender) client-ip=32.97.110.150; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.150 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Jan 2012 17:06:13 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 23 Jan 2012 17:06:11 -0700 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 947D83E40050; Mon, 23 Jan 2012 17:06:10 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0O0699r334468; Mon, 23 Jan 2012 19:06:09 -0500 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0O069sZ004321; Mon, 23 Jan 2012 17:06:09 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q0O068ER004215; Mon, 23 Jan 2012 17:06:08 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 8FBC4BFE56; Mon, 23 Jan 2012 16:06:07 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Martin Schwidefsky , linux-s390@vger.kernel.org Subject: [RFC][PATCH 1/3] clocksource: s390: Convert s390 to use clocksource_register_khz Date: Mon, 23 Jan 2012 16:05:48 -0800 Message-Id: <1327363550-19952-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1327363550-19952-1-git-send-email-john.stultz@linaro.org> References: <1327363550-19952-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12012400-3270-0000-0000-0000036FE761 X-Gm-Message-State: ALoCoQn4DUK/2eoZ/w0VL1ZvRpsfcRYvNWw5fu8VeXXhrDFCgPm75pr2BeLJZUvLMAvWw680TIip Converts s390 TOD clock to use clocksource_register_khz The tod freq I calculated seems a bit fast. Need someone to double check me here. CC: Martin Schwidefsky CC: linux-s390@vger.kernel.org Signed-off-by: John Stultz --- arch/s390/kernel/time.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index fa02f44..37e8ec5 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -207,8 +207,6 @@ static struct clocksource clocksource_tod = { .rating = 400, .read = read_tod_clock, .mask = -1ULL, - .mult = 1000, - .shift = 12, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -267,7 +265,16 @@ void __init time_init(void) if (register_external_interrupt(0x1406, timing_alert_interrupt)) panic("Couldn't request external interrupt 0x1406"); - if (clocksource_register(&clocksource_tod) != 0) + /* s390 TOD apparently runs at 4,096,000,000 cycs/sec + * XXX - Brute forced tod freq from: + * 2^shift/mult * NSEC_PER_SEC = cyc/sec + * 2^12 / 1000 * 1000000000 = cyc/sec + * 2^12 * 1000000 = cyc/sec + * 2^12 * 1000 = kcyc/sec + * 1000<<12 = kcyc/sec + * Could be totally wrong. -johnstul + */ + if (clocksource_register_khz(&clocksource_tod, (1000<<12) ) != 0) panic("Could not register TOD clock source"); /* Enable TOD clock interrupts on the boot cpu. */