lkml.org 
[lkml]   [2014]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock
On Thu, Dec 19, 2013 at 11:30:13PM +0100, Daniel Lezcano wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
>
> Upstream commit 85dc6ee
>
> The read_sched_clock should return the ~value because the clock is a
> countdown implementation. read_sched_clock() should be the same as
> __apbt_read_clocksource().
>
> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
> 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 4cbae4f..33fd4ff 100644
> --- a/drivers/clocksource/dw_apb_timer_of.c
> +++ b/drivers/clocksource/dw_apb_timer_of.c
> @@ -108,7 +108,7 @@ static void add_clocksource(struct device_node *source_timer)
>
> static u32 read_sched_clock(void)
> {
> - return __raw_readl(sched_io_base);
> + return ~__raw_readl(sched_io_base);
> }
>
> static const struct of_device_id sptimer_ids[] __initconst = {
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

I believe these 2 patches are also applicable to the 3.11 kernel. Unless
there are any objection, I'm queuing it for the next release.

Cheers,
--
Luis


\
 
 \ /
  Last update: 2014-01-07 19:21    [W:0.127 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site