diff mbox

[4/7] clocksource: dw_apb_timer_of: make IO endian agnostic

Message ID 1427282610-10350-5-git-send-email-ben.dooks@codethink.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Ben Dooks March 25, 2015, 11:23 a.m. UTC
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 <ben.dooks@codethink.co.uk>
--
CC: Daniel Lezcano <daniel.lezcano@linaro.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Linux ARM Kernel <linux-arm-kernel@lists.infradead.org>
CC: Dinh Nguyen <dinguyen@opensource.altera.com>
---
 drivers/clocksource/dw_apb_timer_of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Lezcano March 26, 2015, 9:43 a.m. UTC | #1
On 03/25/2015 12:23 PM, Ben Dooks wrote:
> 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 <ben.dooks@codethink.co.uk>

Hi Ben,

Through which tree this patch is supposed to go ?


> --
> CC: Daniel Lezcano <daniel.lezcano@linaro.org>
> CC: Thomas Gleixner <tglx@linutronix.de>
> CC: Linux ARM Kernel <linux-arm-kernel@lists.infradead.org>
> CC: Dinh Nguyen <dinguyen@opensource.altera.com>
> ---
>   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 = {
>
Ben Dooks March 26, 2015, 10:56 a.m. UTC | #2
On 26/03/15 09:43, Daniel Lezcano wrote:
> On 03/25/2015 12:23 PM, Ben Dooks wrote:
>> 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 <ben.dooks@codethink.co.uk>
> 
> Hi Ben,
> 
> Through which tree this patch is supposed to go ?

I think yours is probably the best one for it, it doesn't depend
on anything else in the series.
Daniel Lezcano March 26, 2015, 10:58 a.m. UTC | #3
On 03/26/2015 11:56 AM, Ben Dooks wrote:
> On 26/03/15 09:43, Daniel Lezcano wrote:
>> On 03/25/2015 12:23 PM, Ben Dooks wrote:
>>> 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 <ben.dooks@codethink.co.uk>
>>
>> Hi Ben,
>>
>> Through which tree this patch is supposed to go ?
>
> I think yours is probably the best one for it, it doesn't depend
> on anything else in the series.

Ok, thanks.

   -- Daniel
diff mbox

Patch

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 = {