* [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
@ 2011-06-17 20:55 Jeff Ohlstein
2011-06-20 21:59 ` [stable] " Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Ohlstein @ 2011-06-17 20:55 UTC (permalink / raw)
To: Daniel Walker, Bryan Huntsman, David Brown
Cc: linux-arm-msm, linux-arm-kernel, linux-kernel, Jeff Ohlstein,
stable, Russell King
Some msm targets have timers whose lower bits are unreliable. So, we
present our timers as lower frequency than they actually are, and ignore
the bottom 5 bits on such targets. This compensation was erroneously
removed from the msm_read_timer_count function, so restore it.
This was broken by 94790ec25 "msm: timer: SMP timer support for msm".
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
---
arch/arm/mach-msm/timer.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 38b95e9..608ec4d 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -100,7 +100,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs)
{
struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);
- return readl(clk->global_counter);
+ /*
+ * Shift timer count down by a constant due to unreliable lower bits
+ * on some targets.
+ */
+ return readl(clk->global_counter) >> clk->shift;
}
static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [stable] [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
2011-06-17 20:55 [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count Jeff Ohlstein
@ 2011-06-20 21:59 ` Greg KH
2011-06-20 23:27 ` David Brown
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2011-06-20 21:59 UTC (permalink / raw)
To: Jeff Ohlstein
Cc: Daniel Walker, Bryan Huntsman, David Brown, Russell King,
linux-arm-msm, linux-kernel, stable, linux-arm-kernel
On Fri, Jun 17, 2011 at 01:55:38PM -0700, Jeff Ohlstein wrote:
> Some msm targets have timers whose lower bits are unreliable. So, we
> present our timers as lower frequency than they actually are, and ignore
> the bottom 5 bits on such targets. This compensation was erroneously
> removed from the msm_read_timer_count function, so restore it.
>
> This was broken by 94790ec25 "msm: timer: SMP timer support for msm".
>
> Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
> ---
> arch/arm/mach-msm/timer.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read Documentation/stable_kernel_rules.txt
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
2011-06-20 21:59 ` [stable] " Greg KH
@ 2011-06-20 23:27 ` David Brown
2011-06-21 16:24 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: David Brown @ 2011-06-20 23:27 UTC (permalink / raw)
To: Greg KH
Cc: Jeff Ohlstein, Daniel Walker, Bryan Huntsman, Russell King,
linux-arm-msm, linux-kernel, stable, linux-arm-kernel
On Mon, Jun 20 2011, Greg KH wrote:
> On Fri, Jun 17, 2011 at 01:55:38PM -0700, Jeff Ohlstein wrote:
>> Some msm targets have timers whose lower bits are unreliable. So, we
>> present our timers as lower frequency than they actually are, and ignore
>> the bottom 5 bits on such targets. This compensation was erroneously
>> removed from the msm_read_timer_count function, so restore it.
>>
>> This was broken by 94790ec25 "msm: timer: SMP timer support for msm".
>>
>> Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
>> ---
>> arch/arm/mach-msm/timer.c | 6 +++++-
>> 1 files changed, 5 insertions(+), 1 deletions(-)
>>
>
> <formletter>
>
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree. Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
>
> </formletter>
I don't think this patch was intended for stable in the first place.
Jeff, this is a fix for 3.0-rcx, right?
David
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
2011-06-20 23:27 ` David Brown
@ 2011-06-21 16:24 ` Greg KH
2011-07-05 19:15 ` Jeff Ohlstein
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2011-06-21 16:24 UTC (permalink / raw)
To: David Brown
Cc: Russell King, linux-arm-msm, linux-kernel, Bryan Huntsman,
Jeff Ohlstein, Daniel Walker, stable, linux-arm-kernel
On Mon, Jun 20, 2011 at 04:27:16PM -0700, David Brown wrote:
> On Mon, Jun 20 2011, Greg KH wrote:
>
> > On Fri, Jun 17, 2011 at 01:55:38PM -0700, Jeff Ohlstein wrote:
> >> Some msm targets have timers whose lower bits are unreliable. So, we
> >> present our timers as lower frequency than they actually are, and ignore
> >> the bottom 5 bits on such targets. This compensation was erroneously
> >> removed from the msm_read_timer_count function, so restore it.
> >>
> >> This was broken by 94790ec25 "msm: timer: SMP timer support for msm".
> >>
> >> Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
> >> ---
> >> arch/arm/mach-msm/timer.c | 6 +++++-
> >> 1 files changed, 5 insertions(+), 1 deletions(-)
> >>
> >
> > <formletter>
> >
> > This is not the correct way to submit patches for inclusion in the
> > stable kernel tree. Please read Documentation/stable_kernel_rules.txt
> > for how to do this properly.
> >
> > </formletter>
>
> I don't think this patch was intended for stable in the first place.
> Jeff, this is a fix for 3.0-rcx, right?
Then why was it sent to stable@kernel.org?
confused,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
2011-06-21 16:24 ` Greg KH
@ 2011-07-05 19:15 ` Jeff Ohlstein
2011-07-06 2:45 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Ohlstein @ 2011-07-05 19:15 UTC (permalink / raw)
To: Greg KH
Cc: David Brown, Russell King, linux-arm-msm, linux-kernel,
Bryan Huntsman, Daniel Walker, stable, linux-arm-kernel
Greg KH wrote:
> On Mon, Jun 20, 2011 at 04:27:16PM -0700, David Brown wrote:
>> I don't think this patch was intended for stable in the first place.
>> Jeff, this is a fix for 3.0-rcx, right?
>
> Then why was it sent to stable@kernel.org?
>
> confused,
>
> greg k-h
>
Sorry, this was indeed intended for stable. I will include the Cc: tag
in future patches stable. However, since this was already picked up in
Linus's tree, how should I proceed to get it into stable?
Jeff
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count
2011-07-05 19:15 ` Jeff Ohlstein
@ 2011-07-06 2:45 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-07-06 2:45 UTC (permalink / raw)
To: Jeff Ohlstein
Cc: David Brown, Russell King, linux-arm-msm, linux-kernel,
Bryan Huntsman, Daniel Walker, stable, linux-arm-kernel
On Tue, Jul 05, 2011 at 12:15:41PM -0700, Jeff Ohlstein wrote:
> Greg KH wrote:
> > On Mon, Jun 20, 2011 at 04:27:16PM -0700, David Brown wrote:
> >> I don't think this patch was intended for stable in the first place.
> >> Jeff, this is a fix for 3.0-rcx, right?
> >
> > Then why was it sent to stable@kernel.org?
> >
> > confused,
> >
> > greg k-h
> >
>
> Sorry, this was indeed intended for stable. I will include the Cc: tag
> in future patches stable. However, since this was already picked up in
> Linus's tree, how should I proceed to get it into stable?
Take a look at Documentation/stable_kernel_rules.txt for how to do this
(hint, send the git commit id to stable@kernel.org and let us know what
kernels you want it applied to.)
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-06 2:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-17 20:55 [PATCH v2] msm: timer: compensate for timer shift in msm_read_timer_count Jeff Ohlstein
2011-06-20 21:59 ` [stable] " Greg KH
2011-06-20 23:27 ` David Brown
2011-06-21 16:24 ` Greg KH
2011-07-05 19:15 ` Jeff Ohlstein
2011-07-06 2:45 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox