Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Mar 2012 06:55:17 +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: r232816 - in head/sys: contrib/octeon-sdk mips/cavium
Message-ID:  <201203110655.q2B6tHi0098151@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmallett
Date: Sun Mar 11 06:55:17 2012
New Revision: 232816
URL: http://svn.freebsd.org/changeset/base/232816

Log:
  Disable the Simple Executive's error decoding/reporting code.

Modified:
  head/sys/contrib/octeon-sdk/cvmx-helper.c
  head/sys/contrib/octeon-sdk/cvmx-ipd.c
  head/sys/contrib/octeon-sdk/cvmx-mgmt-port.c
  head/sys/contrib/octeon-sdk/cvmx-pcie.c
  head/sys/contrib/octeon-sdk/cvmx-profiler.c
  head/sys/contrib/octeon-sdk/cvmx-srio.c
  head/sys/contrib/octeon-sdk/cvmx-usb.c
  head/sys/mips/cavium/files.octeon1

Modified: head/sys/contrib/octeon-sdk/cvmx-helper.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-helper.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -87,8 +87,8 @@
 #include "cvmx-version.h"
 #include "cvmx-helper-check-defines.h"
 #include "cvmx-gmx.h"
-#include "cvmx-error.h"
 #if !defined(__FreeBSD__) || !defined(_KERNEL)
+#include "cvmx-error.h"
 #include "cvmx-config.h"
 #endif
 

Modified: head/sys/contrib/octeon-sdk/cvmx-ipd.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-ipd.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-ipd.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -74,8 +74,8 @@
 #include "cvmx-bootmem.h"
 #include "cvmx-version.h"
 #include "cvmx-helper-check-defines.h"
-#include "cvmx-error.h"
 #if !defined(__FreeBSD__) || !defined(_KERNEL)
+#include "cvmx-error.h"
 #include "cvmx-config.h"
 #endif
 

Modified: head/sys/contrib/octeon-sdk/cvmx-mgmt-port.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-mgmt-port.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-mgmt-port.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -56,7 +56,9 @@
 #include "cvmx-mdio.h"
 #include "cvmx-mgmt-port.h"
 #include "cvmx-sysinfo.h"
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 #include "cvmx-error.h"
+#endif
 
 /**
  * Enum of MIX interface modes
@@ -389,7 +391,9 @@ cvmx_mgmt_port_result_t cvmx_mgmt_port_i
             cvmx_write_csr(CVMX_AGL_GMX_DRV_CTL, drv_ctl.u64);
         }
     }
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
     cvmx_error_enable_group(CVMX_ERROR_GROUP_MGMT_PORT, port);
+#endif
     return CVMX_MGMT_PORT_SUCCESS;
 }
 
@@ -408,7 +412,9 @@ cvmx_mgmt_port_result_t cvmx_mgmt_port_s
     if ((port < 0) || (port >= __cvmx_mgmt_port_num_ports()))
         return CVMX_MGMT_PORT_INVALID_PARAM;
 
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
     cvmx_error_disable_group(CVMX_ERROR_GROUP_MGMT_PORT, port);
+#endif
 
     /* Stop packets from comming in */
     cvmx_mgmt_port_disable(port);

Modified: head/sys/contrib/octeon-sdk/cvmx-pcie.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-pcie.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-pcie.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -81,7 +81,9 @@
 #include "cvmx-sysinfo.h"
 #include "cvmx-swap.h"
 #include "cvmx-wqe.h"
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 #include "cvmx-error.h"
+#endif
 #include "cvmx-helper-errata.h"
 #include "cvmx-qlm.h"
 #endif
@@ -1193,7 +1195,7 @@ int cvmx_pcie_rc_initialize(int pcie_por
         result = __cvmx_pcie_rc_initialize_gen1(pcie_port);
     else
         result = __cvmx_pcie_rc_initialize_gen2(pcie_port);
-#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) || defined(CONFIG_CAVIUM_DECODE_RSL)
+#if (!defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)) || defined(CONFIG_CAVIUM_DECODE_RSL)
     if (result == 0)
         cvmx_error_enable_group(CVMX_ERROR_GROUP_PCI, pcie_port);
 #endif
@@ -1210,7 +1212,7 @@ int cvmx_pcie_rc_initialize(int pcie_por
  */
 int cvmx_pcie_rc_shutdown(int pcie_port)
 {
-#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) || defined(CONFIG_CAVIUM_DECODE_RSL)
+#if (!defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)) || defined(CONFIG_CAVIUM_DECODE_RSL)
     cvmx_error_disable_group(CVMX_ERROR_GROUP_PCI, pcie_port);
 #endif
     /* Wait for all pending operations to complete */

Modified: head/sys/contrib/octeon-sdk/cvmx-profiler.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-profiler.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-profiler.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -51,7 +51,9 @@
 #include "cvmx-coremask.h"
 #include "cvmx-spinlock.h"
 #include "cvmx-atomic.h"
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 #include "cvmx-error.h"
+#endif
 #include "cvmx-asm.h"
 #include "cvmx-bootmem.h"
 #include "cvmx-profiler.h"

Modified: head/sys/contrib/octeon-sdk/cvmx-srio.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-srio.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-srio.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -68,7 +68,9 @@
 #include "cvmx-helper.h"
 #ifndef CVMX_BUILD_FOR_LINUX_HOST
 #include "cvmx-atomic.h"
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 #include "cvmx-error.h"
+#endif
 #include "cvmx-helper-errata.h"
 #endif
 #include "cvmx-qlm.h"
@@ -770,7 +772,7 @@ int cvmx_srio_initialize(int srio_port, 
     cvmx_write_csr(CVMX_SRIOX_INT_REG(srio_port), cvmx_read_csr(CVMX_SRIOX_INT_REG(srio_port)));
 
     /* Enable error reporting */
-#if (!defined(CVMX_BUILD_FOR_LINUX_HOST) && !defined(CVMX_BUILD_FOR_LINUX_KERNEL)) || defined(CONFIG_CAVIUM_DECODE_RSL)
+#if (!defined(CVMX_BUILD_FOR_LINUX_HOST) && !defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)) || defined(CONFIG_CAVIUM_DECODE_RSL)
     cvmx_error_enable_group(CVMX_ERROR_GROUP_SRIO, srio_port);
 #endif
 

Modified: head/sys/contrib/octeon-sdk/cvmx-usb.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-usb.c	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/contrib/octeon-sdk/cvmx-usb.c	Sun Mar 11 06:55:17 2012	(r232816)
@@ -74,8 +74,10 @@
 #include "cvmx-helper-board.h"
 #include "cvmx-csr-db.h"
 #include "cvmx-swap.h"
+#if !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
 #include "cvmx-error.h"
 #endif
+#endif
 
 #define MAX_RETRIES         3   /* Maximum number of times to retry failed transactions */
 #define MAX_PIPES           32  /* Maximum number of pipes that can be open at once */

Modified: head/sys/mips/cavium/files.octeon1
==============================================================================
--- head/sys/mips/cavium/files.octeon1	Sun Mar 11 06:49:31 2012	(r232815)
+++ head/sys/mips/cavium/files.octeon1	Sun Mar 11 06:55:17 2012	(r232816)
@@ -57,26 +57,6 @@ mips/cavium/octeon_gpio.c			optional gpi
 contrib/octeon-sdk/cvmx-cmd-queue.c		standard
 contrib/octeon-sdk/cvmx-bootmem.c		standard
 contrib/octeon-sdk/cvmx-clock.c			standard
-contrib/octeon-sdk/cvmx-error.c			standard
-contrib/octeon-sdk/cvmx-error-custom.c		standard
-contrib/octeon-sdk/cvmx-error-init-cn30xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn31xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn38xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn50xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn52xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn56xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn58xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn61xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn63xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn66xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn68xx.c	standard
-contrib/octeon-sdk/cvmx-error-init-cn68xxp1.c	standard
-contrib/octeon-sdk/cvmx-error-init-cnf71xx.c	standard
 contrib/octeon-sdk/cvmx-fpa.c			standard
 contrib/octeon-sdk/cvmx-helper.c		standard
 contrib/octeon-sdk/cvmx-helper-board.c		standard



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