public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: khc@pm.waw.pl (Krzysztof Halasa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: fix regression in ixp4xx clocksource
Date: Sun, 26 Jun 2011 15:38:05 +0200	[thread overview]
Message-ID: <m362nspvb6.fsf@intrepid.localdomain> (raw)
In-Reply-To: <20110530084307.GA28953@riccoc20.at.omicron.at> (Richard Cochran's message of "Mon, 30 May 2011 10:43:07 +0200")

> Commit 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868
>
>    clocksource: convert ARM 32-bit up counting clocksources
>
> broke the build for ixp4xx and made big endian operation impossible.
> This commit restores the original behaviour.

So, what do we do with this?
It would be nice to have the fix in the tree before 3.0.
I guess I'll add this if nothing better shows up.

Richard Cochran <richardcochran@gmail.com> writes:

>
> Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
> ---
>  arch/arm/mach-ixp4xx/common.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
> index 74ed81a..0777257 100644
> --- a/arch/arm/mach-ixp4xx/common.c
> +++ b/arch/arm/mach-ixp4xx/common.c
> @@ -419,14 +419,20 @@ static void notrace ixp4xx_update_sched_clock(void)
>  /*
>   * clocksource
>   */
> +
> +static cycle_t ixp4xx_clocksource_read(struct clocksource *c)
> +{
> +	return *IXP4XX_OSTS;
> +}
> +
>  unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
>  EXPORT_SYMBOL(ixp4xx_timer_freq);
>  static void __init ixp4xx_clocksource_init(void)
>  {
>  	init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);
>  
> -	clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32,
> -			clocksource_mmio_readl_up);
> +	clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,
> +			ixp4xx_clocksource_read);
>  }
>  
>  /*

-- 
Krzysztof Halasa

  parent reply	other threads:[~2011-06-26 13:38 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-30  8:43 [PATCH] arm: fix regression in ixp4xx clocksource Richard Cochran
2011-06-01 15:08 ` Krzysztof Halasa
2011-06-01 17:02   ` Richard Cochran
2011-06-06  8:43     ` Krzysztof Halasa
2011-06-01 22:58 ` Russell King - ARM Linux
2011-06-01 23:09   ` Thomas Gleixner
2011-07-04  9:21     ` Thomas Gleixner
2011-07-07  6:59       ` Krzysztof Halasa
2011-06-11  5:15   ` Richard Cochran
2011-06-11 11:22     ` Mikael Pettersson
2011-06-11 12:49       ` Richard Cochran
2011-06-11 13:18         ` Mikael Pettersson
2011-06-26 13:08       ` Krzysztof Halasa
2011-06-12 13:51     ` Russell King - ARM Linux
2011-06-13  5:58       ` Richard Cochran
2011-06-26 13:38 ` Krzysztof Halasa [this message]
2011-06-28 13:10   ` Richard Cochran
  -- strict thread matches above, loose matches on Subject: below --
2011-07-06 21:02 [PATCH] ARM: fix regression in IXP4xx clocksource Krzysztof Halasa
2011-07-06 21:14 ` Russell King - ARM Linux
2011-07-07  7:06   ` Krzysztof Halasa
2011-07-12  8:05 ` Richard Cochran
2011-07-12  8:32   ` Russell King - ARM Linux

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=m362nspvb6.fsf@intrepid.localdomain \
    --to=khc@pm.waw.pl \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox