From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
Paul Mackerras <paulus@samba.org>
Subject: Re: [PATCH] powerpc: Cell timebase bug workaround
Date: Mon, 9 Oct 2006 16:56:29 +1000 [thread overview]
Message-ID: <20061009165629.4fa5813a.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1160370623.14601.42.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 2417 bytes --]
On Mon, 09 Oct 2006 15:10:22 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> Index: linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S
> ===================================================================
> --- linux-work.orig/arch/powerpc/kernel/vdso64/gettimeofday.S 2006-10-06 13:47:54.000000000 +1000
> +++ linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S 2006-10-09 13:28:54.000000000 +1000
> @@ -11,6 +11,8 @@
> * as published by the Free Software Foundation; either version
> * 2 of the License, or (at your option) any later version.
> */
> +
> +#include <linux/config.h>
You don't need that (in fact someone just remoed them all).
> #ifdef __ASSEMBLY__
>
> -#define BEGIN_FTR_SECTION 98:
> +#define BEGIN_FTR_SECTION_NESTED(label) label:
> +#define BEGIN_FTR_SECTION BEGIN_FTR_SECTION_NESTED(98)
>
> #ifndef __powerpc64__
> -#define END_FTR_SECTION(msk, val) \
> +#define END_FTR_SECTION_NESTED(msk, val, label) \
> 99: \
> .section __ftr_fixup,"a"; \
> .align 2; \
> .long msk; \
> .long val; \
> - .long 98b; \
> + .long label##b; \
> .long 99b; \
> .previous
> #else /* __powerpc64__ */
> -#define END_FTR_SECTION(msk, val) \
> +#define END_FTR_SECTION_NESTED(msk, val, label) \
> 99: \
> .section __ftr_fixup,"a"; \
> .align 3; \
> .llong msk; \
> .llong val; \
> - .llong 98b; \
> + .llong label##b; \
> .llong 99b; \
> .previous
> #endif /* __powerpc64__ */
>
> +#define END_FTR_SECTION(msk, val) \
> + END_FTR_SECTION_NESTED(msk, val, 98)
> +
The above should be in a separate patch.
> +#ifdef CONFIG_PPC_CELL
> +#define MFTB(dest) \
> + mftb dest; \
> +BEGIN_FTR_SECTION; \
> + cmpwi dest,0; \
> + bne+ 97f; \
> + mftb dest; \
> +97: \
> +END_FTR_SECTION_IFSET(CPU_FTR_CELL_TB_BUG)
Why not branch back to the mftb if the lower word is zero (this would
also take care of the very unlikely "hitting the bug more than once" case
and the "normal" case would then not have to branch at all. (And it uses
one less instruction.)
> +#ifdef CONFIG_PPC_CELL
> +#define mftb() ({unsigned long rval; \
> + asm volatile( \
> + " mftb %0;\n" \
> + "98: cmpwi %0,0;\n" \
> + " bne+ 99f;\n" \
> + " mftb %0;\n" \
> + "99:\n" \
Ditto.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-10-09 6:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-09 5:10 [PATCH] powerpc: Cell timebase bug workaround Benjamin Herrenschmidt
2006-10-09 6:56 ` Stephen Rothwell [this message]
2006-10-09 7:05 ` Benjamin Herrenschmidt
2006-10-09 8:36 ` Stephen Rothwell
2006-10-09 8:57 ` Benjamin Herrenschmidt
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=20061009165629.4fa5813a.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.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).