Эх сурвалжийг харах

m68k: report correct FPU type on ColdFire MMU platforms

Not all ColdFire SoC parts that have an MMU also have an FPU - so set
an FPU type (via m68k_fputype) appropriate for the configured platform.

With this set correctly /proc/cpuinfo will report FPU "none" on devices
that don't have one. And kernel code paths that initialize FPU hardware
will now only execute if an FPU is actually present.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Greg Ungerer 9 жил өмнө
parent
commit
cbd5b982f6

+ 2 - 2
arch/m68k/coldfire/head.S

@@ -280,8 +280,8 @@ _clear_bss:
 	movel	%d0,m68k_cputype		/* Mark us as a ColdFire */
 	movel	#MMU_COLDFIRE,%d0
 	movel	%d0,m68k_mmutype
-	movel	#FPU_COLDFIRE,%d0
-	movel	%d0,m68k_fputype
+	movel	#FPUTYPE,%d0
+	movel	%d0,m68k_fputype		/* Mark FPU type */
 	movel	#MACHINE,%d0
 	movel	%d0,m68k_machtype		/* Mark machine type */
 	lea	init_task,%a2			/* Set "current" init task */

+ 1 - 0
arch/m68k/include/asm/m5441xsim.h

@@ -11,6 +11,7 @@
 #define CPU_INSTR_PER_JIFFY	2
 #define MCF_BUSCLK		(MCF_CLK / 2)
 #define MACHINE			MACH_M5441X
+#define FPUTYPE			0
 
 #include <asm/m54xxacr.h>
 

+ 1 - 0
arch/m68k/include/asm/m54xxsim.h

@@ -9,6 +9,7 @@
 #define	CPU_INSTR_PER_JIFFY	2
 #define	MCF_BUSCLK		(MCF_CLK / 2)
 #define	MACHINE			MACH_M54XX
+#define	FPUTYPE			FPU_COLDFIRE
 
 #include <asm/m54xxacr.h>