[PATCH] [POWERPC] 4xx: Fix 460GT support to (re-)enable the FPU

[PATCH] [POWERPC] 4xx: Fix 460GT support to (re-)enable the FPU

[Stefan Roese]

Since AMCC now reports that the 460GT *has* an FPU, we should enable it
(again). This patch basically reverts my patch
acb0142bf01c0ebe18f09e37814451ee6a873e27 ([POWERPC] 4xx: Fix 460GT support
to not enable FPU), which disabled the FPU upon AMCC request.

Sorry about the confusion here.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 arch/powerpc/kernel/cpu_setup_44x.S |    1 +
 arch/powerpc/kernel/cputable.c      |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index e3623e3..5465e8d 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -33,6 +33,7 @@ _GLOBAL(__setup_cpu_440grx)
 	mtlr	r4
 	blr
 _GLOBAL(__setup_cpu_460ex)
+_GLOBAL(__setup_cpu_460gt)
 	b	__init_fpu_44x
 _GLOBAL(__setup_cpu_440gx)
 _GLOBAL(__setup_cpu_440spe)
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 36080d4..26ffb44 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -37,6 +37,7 @@ extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
@@ -1415,9 +1416,10 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.pvr_value		= 0x13020000,
 		.cpu_name		= "460GT",
 		.cpu_features		= CPU_FTRS_44X,
-		.cpu_user_features	= COMMON_USER_BOOKE,
+		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
+		.cpu_setup		= __setup_cpu_460gt,
 		.machine_check		= machine_check_440A,
 		.platform		= "ppc440",
 	},
-- 
1.5.5.1

Re: [PATCH] [POWERPC] 4xx: Fix 460GT support to (re-)enable the FPU

[Josh Boyer]

On Fri, 23 May 2008 15:04:56 +0200
Stefan Roese <sr@denx.de> wrote:

> Since AMCC now reports that the 460GT *has* an FPU, we should enable it
> (again). This patch basically reverts my patch
> acb0142bf01c0ebe18f09e37814451ee6a873e27 ([POWERPC] 4xx: Fix 460GT support
> to not enable FPU), which disabled the FPU upon AMCC request.
> 
> Sorry about the confusion here.

I should just be able to use git-revert on that commit then, right?

josh

Re: [PATCH] [POWERPC] 4xx: Fix 460GT support to (re-)enable the FPU

[Stefan Roese]

On Friday 23 May 2008, Josh Boyer wrote:
> > Since AMCC now reports that the 460GT *has* an FPU, we should enable it
> > (again). This patch basically reverts my patch
> > acb0142bf01c0ebe18f09e37814451ee6a873e27 ([POWERPC] 4xx: Fix 460GT
> > support to not enable FPU), which disabled the FPU upon AMCC request.
> >
> > Sorry about the confusion here.
>
> I should just be able to use git-revert on that commit then, right?

Yes, this should do it too.

Best regards,
Stefan