From owner-svn-src-head@FreeBSD.ORG Sat Nov 24 02:55:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 033ECD54;
Sat, 24 Nov 2012 02:55:06 +0000 (UTC)
(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DC0298FC08;
Sat, 24 Nov 2012 02:55:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAO2t5AU049716;
Sat, 24 Nov 2012 02:55:05 GMT
(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAO2t5pJ049713;
Sat, 24 Nov 2012 02:55:05 GMT
(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201211240255.qAO2t5pJ049713@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 24 Nov 2012 02:55:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r243473 - head/sys/contrib/octeon-sdk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 02:55:06 -0000
Author: jmallett
Date: Sat Nov 24 02:55:05 2012
New Revision: 243473
URL: http://svnweb.freebsd.org/changeset/base/243473
Log:
o) Have the FreeBSD kernel option "INVARIANTS" trickle down into the Simple
Executive code where similar invariant knobs exist.
o) Make the Simple Executive's warning function print "WARNING: " on the same
line as the warning it is displaying, rather than on a separate line.
Modified:
head/sys/contrib/octeon-sdk/cvmx-pow.h
head/sys/contrib/octeon-sdk/cvmx-warn.c
head/sys/contrib/octeon-sdk/cvmx.h
Modified: head/sys/contrib/octeon-sdk/cvmx-pow.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-pow.h Sat Nov 24 02:41:18 2012 (r243472)
+++ head/sys/contrib/octeon-sdk/cvmx-pow.h Sat Nov 24 02:55:05 2012 (r243473)
@@ -80,9 +80,23 @@
extern "C" {
#endif
-/* Default to having all POW constancy checks turned on */
-#ifndef CVMX_ENABLE_POW_CHECKS
-#define CVMX_ENABLE_POW_CHECKS 1
+#if defined(__FreeBSD__) && defined(_KERNEL)
+ /*
+ * For the FreeBSD kernel, have POW consistency checks depend on
+ * the setting of INVARIANTS.
+ */
+ #ifndef CVMX_ENABLE_POW_CHECKS
+ #ifdef INVARIANTS
+ #define CVMX_ENABLE_POW_CHECKS 1
+ #else
+ #define CVMX_ENABLE_POW_CHECKS 0
+ #endif
+ #endif
+#else
+ /* Default to having all POW constancy checks turned on */
+ #ifndef CVMX_ENABLE_POW_CHECKS
+ #define CVMX_ENABLE_POW_CHECKS 1
+ #endif
#endif
/**
Modified: head/sys/contrib/octeon-sdk/cvmx-warn.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-warn.c Sat Nov 24 02:41:18 2012 (r243472)
+++ head/sys/contrib/octeon-sdk/cvmx-warn.c Sat Nov 24 02:55:05 2012 (r243473)
@@ -77,7 +77,11 @@ void cvmx_warn(const char *format, ...)
printk("WARNING:");
vprintk(format, args);
#else
+#ifdef CVMX_BUILD_FOR_FREEBSD_KERNEL
+ printf("WARNING: ");
+#else
printf("WARNING:\n");
+#endif
vprintf(format, args);
#endif
va_end(args);
Modified: head/sys/contrib/octeon-sdk/cvmx.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx.h Sat Nov 24 02:41:18 2012 (r243472)
+++ head/sys/contrib/octeon-sdk/cvmx.h Sat Nov 24 02:55:05 2012 (r243473)
@@ -53,13 +53,28 @@
/* Control whether simple executive applications use 1-1 TLB mappings to access physical
** memory addresses. This must be disabled to allow large programs that use more than
** the 0x10000000 - 0x20000000 virtual address range.
+**
+** The FreeBSD kernel ifdefs elsewhere should mean that this is never even checked,
+** and so does not need to be defined.
*/
+#if !defined(__FreeBSD__) || !defined(_KERNEL)
#ifndef CVMX_USE_1_TO_1_TLB_MAPPINGS
#define CVMX_USE_1_TO_1_TLB_MAPPINGS 1
#endif
+#endif
-#ifndef CVMX_ENABLE_PARAMETER_CHECKING
-#define CVMX_ENABLE_PARAMETER_CHECKING 1
+#if defined(__FreeBSD__) && defined(_KERNEL)
+ #ifndef CVMX_ENABLE_PARAMETER_CHECKING
+ #ifdef INVARIANTS
+ #define CVMX_ENABLE_PARAMETER_CHECKING 1
+ #else
+ #define CVMX_ENABLE_PARAMETER_CHECKING 0
+ #endif
+ #endif
+#else
+ #ifndef CVMX_ENABLE_PARAMETER_CHECKING
+ #define CVMX_ENABLE_PARAMETER_CHECKING 1
+ #endif
#endif
#ifndef CVMX_ENABLE_DEBUG_PRINTS