From patchwork Wed Jul 8 22:29:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Yeryomin X-Patchwork-Id: 493178 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 232FC1409A0 for ; Thu, 9 Jul 2015 08:32:14 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCxr3-0004at-AT; Wed, 08 Jul 2015 22:30:13 +0000 Received: from [213.175.90.140] (helo=mail.pbx.lv) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCxr0-0003Ff-HI for linux-arm-kernel@lists.infradead.org; Wed, 08 Jul 2015 22:30:12 +0000 Received: by mail.pbx.lv (MailSystem, from userid 80) id BE544C11A8; Thu, 9 Jul 2015 01:29:39 +0300 (EEST) To: Arnd Bergmann Subject: Re: [1/2] RTC: Add core rtc support for Gemini Soc devices MIME-Version: 1.0 Date: Thu, 09 Jul 2015 01:29:39 +0300 From: Roman Yeryomin In-Reply-To: <2131951.l0j0CIttAZ@wuerfel> References: <1292339307-14336-2-git-send-email-ulli.kroll@googlemail.com> <2349062.9v3Zz7HPLu@wuerfel> <0701f75c1c42f74fd58845bc0ed41c38@advem.lv> <2131951.l0j0CIttAZ@wuerfel> Message-ID: X-Sender: roman@advem.lv User-Agent: Roundcube Webmail/1.0.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150708_153010_959141_E76FCFDA X-CRM114-Status: GOOD ( 15.27 ) X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felix Fietkau , rtc-linux@googlegroups.com, Linus Walleij , linux-kernel@vger.kernel.org, Alexandre Belloni , Russell King , Hans Ulli Kroll , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On 2015-05-08 19:08, Arnd Bergmann wrote: > On Thursday 07 May 2015 12:03:25 Roman Yeryomin wrote: >> On 2015-05-06 22:22, Arnd Bergmann wrote: >> > On Wednesday 06 May 2015 19:21:21 Roman Yeryomin wrote: >> >> >> >> > Thanks to point that, I'll merge that one which seems clean enough: >> >> > http://git.openwrt.org/?p=openwrt.git;a=blob;f=target/linux/gemini/files/drivers/rtc/rtc-gemini.c;h=587d8122b2fbb1230437eadcce4789a53aa60ee5;hb=4c637410a2a1ab45988e8ca6202554a502102039 >> >> >> >> For 3.18 (and up) to work on gemini 160-gemini-timers.patch is vital. >> >> Without that timers are broken and cpu is super slow. >> > >> > Do you know what part of the patch is the actual bug fix? We should >> > probably >> > merge that separately and mark it for stable backports, while the bulk >> > of that >> > patch seems to just rearrange code. >> > >> > Arnd >> >> Sorry, didn't try to extract the exact lines it but I guess it's that >> part which touches the scheduler clock code. >> Because without that patch sched clock runs at 100Hz instead of 25MHz. >> I can dive into this deeper if you want, I just didn't see the need. > > I think that would be helpful, yes. > OK, here are the minimal changes required (see attachment). Tested on 4.1.1 Let me know if you want me to submit it in some other way. Regards, Roman Reviewed-by: Linus Walleij --- a/arch/arm/mach-gemini/time.c +++ b/arch/arm/mach-gemini/time.c @@ -15,6 +15,7 @@ #include #include #include +#include /* * Register definitions for the timers @@ -34,9 +35,17 @@ #define TIMER_3_CR_ENABLE (1 << 6) #define TIMER_3_CR_CLOCK (1 << 7) #define TIMER_3_CR_INT (1 << 8) +#define TIMER_1_CR_UPDOWN (1 << 9) +#define TIMER_2_CR_UPDOWN (1 << 10) +#define TIMER_3_CR_UPDOWN (1 << 11) static unsigned int tick_rate; +static u64 notrace gemini_read_sched_clock(void) +{ + return readl(TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER3_BASE))); +} + static int gemini_timer_set_next_event(unsigned long cycles, struct clock_event_device *evt) { @@ -155,14 +164,18 @@ void __init gemini_timer_init(void) */ setup_irq(IRQ_TIMER2, &gemini_timer_irq); - /* Enable and use TIMER1 as clock source */ - writel(0xffffffff, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER1_BASE))); - writel(0xffffffff, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER1_BASE))); - writel(TIMER_1_CR_ENABLE, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - if (clocksource_mmio_init(TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER1_BASE)), - "TIMER1", tick_rate, 300, 32, + /* Enable and use TIMER3 as clock source */ + writel(0, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER3_BASE))); + writel(0, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER3_BASE))); + writel(0, TIMER_MATCH1(IO_ADDRESS(GEMINI_TIMER3_BASE))); + writel(0, TIMER_MATCH2(IO_ADDRESS(GEMINI_TIMER3_BASE))); + writel(TIMER_3_CR_ENABLE | TIMER_3_CR_UPDOWN, + TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + if (clocksource_mmio_init(TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER3_BASE)), + "TIMER3", tick_rate, 300, 32, clocksource_mmio_readl_up)) pr_err("timer: failed to initialize gemini clock source\n"); + sched_clock_register(gemini_read_sched_clock, 32, tick_rate); /* Configure and register the clockevent */ clockevents_config_and_register(&gemini_clockevent, tick_rate,