From: Luis Henriques <luis.henriques@canonical.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, dinguyen@altera.com, baruch@tkos.co.il,
tglx@linutronix.de
Subject: Re: [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock
Date: Tue, 7 Jan 2014 17:34:53 +0000 [thread overview]
Message-ID: <20140107173453.GD4383@hercules> (raw)
In-Reply-To: <1387492214-27911-1-git-send-email-daniel.lezcano@linaro.org>
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
prev parent reply other threads:[~2014-01-07 17:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 22:30 [PATCH-3.12.y 1/2] clocksource: dw_apb_timer_of: Fix read_sched_clock Daniel Lezcano
2013-12-19 22:30 ` [PATCH-3.12.y 2/2] clocksource: dw_apb_timer_of: Fix support for dts binding "snps,dw-apb-timer" Daniel Lezcano
2014-01-07 17:34 ` Luis Henriques [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140107173453.GD4383@hercules \
--to=luis.henriques@canonical.com \
--cc=baruch@tkos.co.il \
--cc=daniel.lezcano@linaro.org \
--cc=dinguyen@altera.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.