svn commit: r199754 - in projects/mips/sys/mips: conf include mips

[Warner Losh]

Author: imp
Date: Tue Nov 24 16:32:31 2009
New Revision: 199754
URL: http://svn.freebsd.org/changeset/base/199754

Log:
  Include opt_cputype.h for all .c and .S files referencing TARGET_OCTEON.
  Spell ld script name right.
  
  # for the most part, we need to enhance infrastructure to obviate the need
  # for such an intrusive option.

Modified:
  projects/mips/sys/mips/conf/OCTEON1
  projects/mips/sys/mips/include/cpufunc.h
  projects/mips/sys/mips/mips/cache.c
  projects/mips/sys/mips/mips/cache_mipsNN.c
  projects/mips/sys/mips/mips/cpu.c
  projects/mips/sys/mips/mips/exception.S
  projects/mips/sys/mips/mips/pm_machdep.c
  projects/mips/sys/mips/mips/psraccess.S
  projects/mips/sys/mips/mips/support.S
  projects/mips/sys/mips/mips/tick.c
  projects/mips/sys/mips/mips/vm_machdep.c

Modified: projects/mips/sys/mips/conf/OCTEON1
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/conf/OCTEON1	Tue Nov 24 16:32:31 2009	(r199754)
@@ -22,7 +22,7 @@ cpu		CPU_MIPS4KC
 ident		OCTEON1
 
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon.64
+makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1.64
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""

Modified: projects/mips/sys/mips/include/cpufunc.h
==============================================================================
--- projects/mips/sys/mips/include/cpufunc.h	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/include/cpufunc.h	Tue Nov 24 16:32:31 2009	(r199754)
@@ -208,12 +208,13 @@ mips_wr_ ## n ## s(uint32_t a0)					\
 #ifdef TARGET_OCTEON
 static __inline void mips_sync_icache (void)
 {
-    __asm __volatile (
-        ".set mips64\n"
-        ".word 0x041f0000\n"
-        "nop\n"
-        ".set mips0\n"
-        : : );
+	__asm __volatile (
+		".set push\n"
+		".set mips64\n"
+		".word 0x041f0000\n"		/* xxx ICACHE */
+		"nop\n"
+		".set pop\n"
+		: : );
 }
 #endif
 

Modified: projects/mips/sys/mips/mips/cache.c
==============================================================================
--- projects/mips/sys/mips/mips/cache.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/cache.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -73,11 +73,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/systm.h>
 
+#include "opt_cputype.h"
+
 #include <machine/cpuinfo.h>
 #include <machine/cache.h>
 
-#include "opt_cputype.h"
-
 struct mips_cache_ops mips_cache_ops;
 
 void

Modified: projects/mips/sys/mips/mips/cache_mipsNN.c
==============================================================================
--- projects/mips/sys/mips/mips/cache_mipsNN.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/cache_mipsNN.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -38,6 +38,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_cputype.h"
+
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>

Modified: projects/mips/sys/mips/mips/cpu.c
==============================================================================
--- projects/mips/sys/mips/mips/cpu.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/cpu.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_cputype.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -49,8 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/pte.h>
 #include <machine/hwfunc.h>
 
-#include "opt_cputype.h"
-
 static struct mips_cpuinfo cpuinfo;
 
 union	cpuprid cpu_id;

Modified: projects/mips/sys/mips/mips/exception.S
==============================================================================
--- projects/mips/sys/mips/mips/exception.S	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/exception.S	Tue Nov 24 16:32:31 2009	(r199754)
@@ -62,6 +62,8 @@
 #include <machine/cpuregs.h>
 #include <machine/pte.h>
 
+#include "opt_cputype.h"
+
 #include "assym.s"
 
 #if defined(ISA_MIPS32)

Modified: projects/mips/sys/mips/mips/pm_machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/pm_machdep.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/pm_machdep.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -39,6 +39,8 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
+#include "opt_cputype.h"
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: projects/mips/sys/mips/mips/psraccess.S
==============================================================================
--- projects/mips/sys/mips/mips/psraccess.S	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/psraccess.S	Tue Nov 24 16:32:31 2009	(r199754)
@@ -41,6 +41,8 @@
 #include <machine/cpu.h>
 #include <machine/regnum.h>
 
+#include "opt_cputype.h"
+
 #include "assym.s"
 
 /*

Modified: projects/mips/sys/mips/mips/support.S
==============================================================================
--- projects/mips/sys/mips/mips/support.S	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/support.S	Tue Nov 24 16:32:31 2009	(r199754)
@@ -55,6 +55,7 @@
  *	assembly language support routines.
  */
 
+#include "opt_cputype.h"
 #include "opt_ddb.h"
 #include <sys/errno.h>
 #include <machine/asm.h>

Modified: projects/mips/sys/mips/mips/tick.c
==============================================================================
--- projects/mips/sys/mips/mips/tick.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/tick.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -33,6 +33,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_cputype.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>

Modified: projects/mips/sys/mips/mips/vm_machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/vm_machdep.c	Tue Nov 24 16:30:29 2009	(r199753)
+++ projects/mips/sys/mips/mips/vm_machdep.c	Tue Nov 24 16:32:31 2009	(r199754)
@@ -41,6 +41,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_cputype.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>