From b5acc0d618c6fbb37a3010daeb189cd892da4fce Mon Sep 17 00:00:00 2001 From: Juli Mallett Date: Sun, 11 Mar 2012 06:55:17 +0000 Subject: [PATCH] Disable the Simple Executive's error decoding/reporting code. --- sys/contrib/octeon-sdk/cvmx-helper.c | 2 +- sys/contrib/octeon-sdk/cvmx-ipd.c | 2 +- sys/contrib/octeon-sdk/cvmx-mgmt-port.c | 6 ++++++ sys/contrib/octeon-sdk/cvmx-pcie.c | 6 ++++-- sys/contrib/octeon-sdk/cvmx-profiler.c | 2 ++ sys/contrib/octeon-sdk/cvmx-srio.c | 4 +++- sys/contrib/octeon-sdk/cvmx-usb.c | 2 ++ sys/mips/cavium/files.octeon1 | 20 -------------------- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/sys/contrib/octeon-sdk/cvmx-helper.c b/sys/contrib/octeon-sdk/cvmx-helper.c index 309d984148a3..fb270e1bca48 100644 --- a/sys/contrib/octeon-sdk/cvmx-helper.c +++ b/sys/contrib/octeon-sdk/cvmx-helper.c @@ -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 diff --git a/sys/contrib/octeon-sdk/cvmx-ipd.c b/sys/contrib/octeon-sdk/cvmx-ipd.c index 64840c482718..668dbbe16b41 100644 --- a/sys/contrib/octeon-sdk/cvmx-ipd.c +++ b/sys/contrib/octeon-sdk/cvmx-ipd.c @@ -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 diff --git a/sys/contrib/octeon-sdk/cvmx-mgmt-port.c b/sys/contrib/octeon-sdk/cvmx-mgmt-port.c index a5586bf92b1c..19e26c498a67 100644 --- a/sys/contrib/octeon-sdk/cvmx-mgmt-port.c +++ b/sys/contrib/octeon-sdk/cvmx-mgmt-port.c @@ -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_initialize(int port) 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_shutdown(int port) 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); diff --git a/sys/contrib/octeon-sdk/cvmx-pcie.c b/sys/contrib/octeon-sdk/cvmx-pcie.c index 60562cb6e2d8..38764dec13e6 100644 --- a/sys/contrib/octeon-sdk/cvmx-pcie.c +++ b/sys/contrib/octeon-sdk/cvmx-pcie.c @@ -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_port) 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_port) */ 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 */ diff --git a/sys/contrib/octeon-sdk/cvmx-profiler.c b/sys/contrib/octeon-sdk/cvmx-profiler.c index 13dd95a7ee66..88ee3e193d13 100644 --- a/sys/contrib/octeon-sdk/cvmx-profiler.c +++ b/sys/contrib/octeon-sdk/cvmx-profiler.c @@ -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" diff --git a/sys/contrib/octeon-sdk/cvmx-srio.c b/sys/contrib/octeon-sdk/cvmx-srio.c index ed9ba3e6c876..7704e1d13040 100644 --- a/sys/contrib/octeon-sdk/cvmx-srio.c +++ b/sys/contrib/octeon-sdk/cvmx-srio.c @@ -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_srio_initialize_flags_t flags) 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 diff --git a/sys/contrib/octeon-sdk/cvmx-usb.c b/sys/contrib/octeon-sdk/cvmx-usb.c index 6d99dac16f54..6c692b9de0a1 100644 --- a/sys/contrib/octeon-sdk/cvmx-usb.c +++ b/sys/contrib/octeon-sdk/cvmx-usb.c @@ -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 */ diff --git a/sys/mips/cavium/files.octeon1 b/sys/mips/cavium/files.octeon1 index 6222a2648d2d..a6c3b9bc905e 100644 --- a/sys/mips/cavium/files.octeon1 +++ b/sys/mips/cavium/files.octeon1 @@ -57,26 +57,6 @@ mips/cavium/octeon_gpio.c optional gpio 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