[PATCH] powerpc: Cell timebase bug workaround

[Stephen Rothwell]

On Mon, 09 Oct 2006 15:10:22 +1000 Benjamin Herrenschmidt <benh at 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 at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20061009/03cc26c3/attachment.pgp>