Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965583AbbLWWFW (ORCPT ); Wed, 23 Dec 2015 17:05:22 -0500 Received: from fallback5.mail.ru ([94.100.181.253]:36422 "EHLO fallback5.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752936AbbLWWFU (ORCPT ); Wed, 23 Dec 2015 17:05:20 -0500 From: Roman Volkov To: Tony Prisk , Daniel Lezcano , Thomas Gleixner , Alexey Charkov Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Roman Volkov Subject: [PATCH v2 1/3] clocksource/vt8500: Use MIN_OSCR_DELTA from PXA Date: Thu, 24 Dec 2015 00:35:09 +0300 Message-Id: <1450906511-342-2-git-send-email-v1ron@mail.ru> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450906511-342-1-git-send-email-v1ron@mail.ru> References: <1450906511-342-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 Content-Length: 1853 Lines: 53 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/