diff options
author | jmallett <jmallett@FreeBSD.org> | 2012-03-11 06:55:17 +0000 |
---|---|---|
committer | jmallett <jmallett@FreeBSD.org> | 2012-03-11 06:55:17 +0000 |
commit | b950f897393bcdb05429610285c339e942de5645 (patch) | |
tree | 171eb5bc9113db610070967c9309d9c2fa5a868d /sys/contrib/octeon-sdk | |
parent | cc09f92d5be5d129cc314de180c03e97082592ad (diff) | |
download | FreeBSD-src-b950f897393bcdb05429610285c339e942de5645.zip FreeBSD-src-b950f897393bcdb05429610285c339e942de5645.tar.gz |
Disable the Simple Executive's error decoding/reporting code.
Diffstat (limited to 'sys/contrib/octeon-sdk')
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-helper.c | 2 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-ipd.c | 2 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-mgmt-port.c | 6 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-pcie.c | 6 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-profiler.c | 2 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-srio.c | 4 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-usb.c | 2 |
7 files changed, 19 insertions, 5 deletions
diff --git a/sys/contrib/octeon-sdk/cvmx-helper.c b/sys/contrib/octeon-sdk/cvmx-helper.c index 309d984..fb270e1 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 64840c4..668dbbe 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 a5586bf..19e26c4 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 60562cb..38764de 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 13dd95a..88ee3e1 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 ed9ba3e..7704e1d 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 6d99dac..6c692b9 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 */ |