Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 30 Oct 2012 06:07:31 +0000 (UTC)
From:      Juli Mallett <jmallett@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r242342 - in head/sys: contrib/octeon-sdk mips/cavium
Message-ID:  <201210300607.q9U67VFd028939@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jmallett
Date: Tue Oct 30 06:07:30 2012
New Revision: 242342
URL: http://svn.freebsd.org/changeset/base/242342

Log:
  Speed feature tests and initialize helper configuration that some CPUs require.

Modified:
  head/sys/contrib/octeon-sdk/octeon-feature.c
  head/sys/contrib/octeon-sdk/octeon-feature.h
  head/sys/mips/cavium/files.octeon1
  head/sys/mips/cavium/octeon_machdep.c

Modified: head/sys/contrib/octeon-sdk/octeon-feature.c
==============================================================================
--- head/sys/contrib/octeon-sdk/octeon-feature.c	Tue Oct 30 04:31:32 2012	(r242341)
+++ head/sys/contrib/octeon-sdk/octeon-feature.c	Tue Oct 30 06:07:30 2012	(r242342)
@@ -139,7 +139,7 @@ feature_check:
 	    cvmx_dprintf("unknown error %d.\n", val);
 	    break;
 	}
-#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(__U_BOOT__) && !defined(CVMX_BUILD_FOR_TOOLCHAIN)
+#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(__U_BOOT__) && !defined(CVMX_BUILD_FOR_TOOLCHAIN) && !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 	exit (1);
 #endif
     }

Modified: head/sys/contrib/octeon-sdk/octeon-feature.h
==============================================================================
--- head/sys/contrib/octeon-sdk/octeon-feature.h	Tue Oct 30 04:31:32 2012	(r242341)
+++ head/sys/contrib/octeon-sdk/octeon-feature.h	Tue Oct 30 06:07:30 2012	(r242342)
@@ -281,7 +281,7 @@ extern uint8_t octeon_feature_map[FEATUR
 #if defined(__U_BOOT__) || defined(CVMX_BUILD_FOR_LINUX_HOST) || defined(CVMX_BUILD_FOR_TOOLCHAIN)
 #define octeon_has_feature old_octeon_has_feature
 #else
-#if defined(USE_RUNTIME_MODEL_CHECKS)
+#if defined(USE_RUNTIME_MODEL_CHECKS) || (defined(__FreeBSD__) && defined(_KERNEL))
 static inline int octeon_has_feature(octeon_feature_t feature)
 {
 	int byte, bit;

Modified: head/sys/mips/cavium/files.octeon1
==============================================================================
--- head/sys/mips/cavium/files.octeon1	Tue Oct 30 04:31:32 2012	(r242341)
+++ head/sys/mips/cavium/files.octeon1	Tue Oct 30 06:07:30 2012	(r242342)
@@ -61,6 +61,7 @@ contrib/octeon-sdk/cvmx-clock.c			standa
 contrib/octeon-sdk/cvmx-ebt3000.c		standard
 contrib/octeon-sdk/cvmx-fpa.c			standard
 contrib/octeon-sdk/cvmx-helper.c		standard
+contrib/octeon-sdk/cvmx-helper-cfg.c		standard
 contrib/octeon-sdk/cvmx-helper-board.c		standard
 contrib/octeon-sdk/cvmx-helper-cfg.c		standard
 contrib/octeon-sdk/cvmx-helper-errata.c		standard
@@ -89,6 +90,7 @@ contrib/octeon-sdk/cvmx-sysinfo.c		stand
 contrib/octeon-sdk/cvmx-thunder.c		standard
 contrib/octeon-sdk/cvmx-twsi.c			standard
 contrib/octeon-sdk/cvmx-warn.c			standard
+contrib/octeon-sdk/octeon-feature.c		standard
 contrib/octeon-sdk/octeon-model.c		standard
 
 # HWPMC 

Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c	Tue Oct 30 04:31:32 2012	(r242341)
+++ head/sys/mips/cavium/octeon_machdep.c	Tue Oct 30 06:07:30 2012	(r242342)
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <contrib/octeon-sdk/cvmx.h>
 #include <contrib/octeon-sdk/cvmx-bootmem.h>
 #include <contrib/octeon-sdk/cvmx-ebt3000.h>
+#include <contrib/octeon-sdk/cvmx-helper-cfg.h>
 #include <contrib/octeon-sdk/cvmx-interrupt.h>
 #include <contrib/octeon-sdk/cvmx-version.h>
 
@@ -598,6 +599,10 @@ octeon_boot_params_init(register_t ptr)
 		panic("Your boot loader did not supply a memory descriptor.");
 	cvmx_bootmem_init(cvmx_sysinfo_get()->phy_mem_desc_addr);
 
+	octeon_feature_init();
+
+	__cvmx_helper_cfg_init();
+
         printf("Boot Descriptor Ver: %u -> %u/%u",
                app_desc_ptr->desc_version, octeon_bootinfo->major_version,
 	       octeon_bootinfo->minor_version);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210300607.q9U67VFd028939>