From: Richard Cochran <richardcochran@gmail.com>
To: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
lkml <linux-kernel@vger.kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: fix regression in IXP4xx clocksource
Date: Tue, 12 Jul 2011 10:05:13 +0200 [thread overview]
Message-ID: <20110712080513.GA2937@riccoc20.at.omicron.at> (raw)
In-Reply-To: <m3liwb15t2.fsf@intrepid.localdomain>
On Wed, Jul 06, 2011 at 11:02:17PM +0200, Krzysztof Halasa wrote:
> From: Richard Cochran <richardcochran@gmail.com>
>
> 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.
I know I nag, but can we *please* have this patch in 3.0?
Big endian IXP really, really does not work without it.
Thanks,
Richard
>
> Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
>
> 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);
> }
>
> /*
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2011-07-12 8:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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=20110712080513.GA2937@riccoc20.at.omicron.at \
--to=richardcochran@gmail.com \
--cc=khc@pm.waw.pl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).