From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752388AbbLaSJT (ORCPT ); Thu, 31 Dec 2015 13:09:19 -0500 Received: from smtp40.i.mail.ru ([94.100.177.100]:52404 "EHLO smtp40.i.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934AbbLaSJR (ORCPT ); Thu, 31 Dec 2015 13:09:17 -0500 From: Roman Volkov To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Alexey Charkov , Roman Volkov , Tony Prisk , Daniel Lezcano , Thomas Gleixner Subject: [PATCH v2 RESEND 1/3] clocksource/vt8500: Use MIN_OSCR_DELTA from PXA Date: Thu, 31 Dec 2015 21:02:05 +0300 Message-Id: <1451584927-4051-2-git-send-email-v1ron@mail.ru> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1451584927-4051-1-git-send-email-v1ron@mail.ru> References: <1451584927-4051-1-git-send-email-v1ron@mail.ru> X-Mras: Ok Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roman Volkov Since vt8500 and PXA timers are identical, use MIN_OSCR_DELTA from PXA, which is bigger than existing value. It is required to determine the minimum delay which hardware can generate. This commit fixes vt8500 breakage in Linux 4.2 introduced by c6eb3f7 ('hrtimer: Get rid of hrtimer softirq') Signed-off-by: Roman Volkov --- drivers/clocksource/vt8500_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c index a92e94b..dfc3bb4 100644 --- a/drivers/clocksource/vt8500_timer.c +++ b/drivers/clocksource/vt8500_timer.c @@ -50,6 +50,8 @@ #define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t) +#define MIN_OSCR_DELTA 16 + static void __iomem *regbase; static cycle_t vt8500_timer_read(struct clocksource *cs) @@ -80,7 +82,7 @@ static int vt8500_timer_set_next_event(unsigned long cycles, cpu_relax(); writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL); - if ((signed)(alarm - clocksource.read(&clocksource)) <= 16) + if ((signed)(alarm - clocksource.read(&clocksource)) <= MIN_OSCR_DELTA) return -ETIME; writel(1, regbase + TIMER_IER_VAL); @@ -151,7 +153,7 @@ static void __init vt8500_timer_init(struct device_node *np) pr_err("%s: setup_irq failed for %s\n", __func__, clockevent.name); clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ, - 4, 0xf0000000); + MIN_OSCR_DELTA * 2, 0xf0000000); } CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); -- 2.6.2