From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752915AbbCaHX3 (ORCPT ); Tue, 31 Mar 2015 03:23:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54181 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbbCaHXY (ORCPT ); Tue, 31 Mar 2015 03:23:24 -0400 Date: Tue, 31 Mar 2015 00:22:15 -0700 From: tip-bot for Ben Dooks Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, linux-arm-kernel@lists.infradead.org, nicolas.ferre@atmel.com, hpa@zytor.com, dinguyen@opensource.altera.com, daniel.lezcano@linaro.org, ben.dooks@codethink.co.uk Reply-To: linux-arm-kernel@lists.infradead.org, hpa@zytor.com, nicolas.ferre@atmel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, dinguyen@opensource.altera.com, daniel.lezcano@linaro.org, ben.dooks@codethink.co.uk In-Reply-To: <1427746633-9137-10-git-send-email-daniel.lezcano@linaro.org> References: <1427746633-9137-10-git-send-email-daniel.lezcano@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clocksource/drivers/dw_apb_timers_of: Fix IO endianness causing time jumps Git-Commit-ID: 3a10013b6a5975346fe5a8db59500a8d176d64e0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3a10013b6a5975346fe5a8db59500a8d176d64e0 Gitweb: http://git.kernel.org/tip/3a10013b6a5975346fe5a8db59500a8d176d64e0 Author: Ben Dooks AuthorDate: Mon, 30 Mar 2015 22:17:12 +0200 Committer: Ingo Molnar CommitDate: Tue, 31 Mar 2015 09:15:57 +0200 clocksource/drivers/dw_apb_timers_of: Fix IO endianness causing time jumps The dw_apb_timer_of timer is using __raw_readl() to access the timer register, which is causing issues when the system is running in big endian mode. Fix this by using readl_relaxed() which should account for the endian settings. This fixes issues where the time jumps around in the dmesg output due to returnling __le32 values. For an example, these two console lines show time running backwards: [ 49.882572] CPU1: failed to come online [ 43.282457] Brought up 1 CPUs Signed-off-by: Ben Dooks Signed-off-by: Daniel Lezcano Acked-by: Nicolas Ferre Cc: Dinh Nguyen Cc: Linux ARM Kernel Cc: Thomas Gleixner Cc: digetx@gmail.com Cc: hdegoede@redhat.com Cc: laurent.pinchart+renesas@ideasonboard.com Cc: maxime.ripard@free-electrons.com Cc: viresh.kumar@linaro.org Link: http://lkml.kernel.org/r/1427746633-9137-10-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar --- drivers/clocksource/dw_apb_timer_of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index d305fb0..a19a3f6 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -108,7 +108,7 @@ static void __init add_clocksource(struct device_node *source_timer) static u64 notrace read_sched_clock(void) { - return ~__raw_readl(sched_io_base); + return ~readl_relaxed(sched_io_base); } static const struct of_device_id sptimer_ids[] __initconst = {