From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:32:31 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5D1A106568B; Tue, 24 Nov 2009 16:32:31 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4AC08FC08; Tue, 24 Nov 2009 16:32:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAOGWVWx023769; Tue, 24 Nov 2009 16:32:31 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGWVSs023757; Tue, 24 Nov 2009 16:32:31 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200911241632.nAOGWVSs023757@svn.freebsd.org> From: Warner Losh Date: Tue, 24 Nov 2009 16:32:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199754 - in projects/mips/sys/mips: conf include mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 16:32:32 -0000 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 #include +#include "opt_cputype.h" + #include #include -#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 __FBSDID("$FreeBSD$"); +#include "opt_cputype.h" + #include #include #include 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 __FBSDID("$FreeBSD$"); +#include "opt_cputype.h" + #include #include #include @@ -49,8 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include -#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 #include +#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 #include #include 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 #include +#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 #include 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 __FBSDID("$FreeBSD$"); +#include "opt_cputype.h" + #include #include #include 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 __FBSDID("$FreeBSD$"); +#include "opt_cputype.h" + #include #include #include