diff options
| author | jmallett <jmallett@FreeBSD.org> | 2010-11-28 08:18:16 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2010-11-28 08:18:16 +0000 |
| commit | cdfefa0ba06939d897cb0d1f5987a4d0996ea3ef (patch) | |
| tree | 0a50a5816f02b42087de787ad200f1eb12f29144 /sys/mips/cavium/octe | |
| parent | 4b7c147940d7db81a4434262cf5cb2f5cd0102f2 (diff) | |
| parent | 76ef03b9cb287a0817808454c8b27cbcce5243d3 (diff) | |
| download | FreeBSD-src-cdfefa0ba06939d897cb0d1f5987a4d0996ea3ef.zip FreeBSD-src-cdfefa0ba06939d897cb0d1f5987a4d0996ea3ef.tar.gz | |
Merge Cavium Octeon SDK 2.0 Simple Executive; this brings some fixes and new
facilities as well as support for the Octeon 2 family of SoCs.
XXX Note that with our antediluvian assembler, we can't support some Octeon 2
instructions and fall back to using the old ones instead.
Diffstat (limited to 'sys/mips/cavium/octe')
| -rw-r--r-- | sys/mips/cavium/octe/ethernet.c | 15 | ||||
| -rw-r--r-- | sys/mips/cavium/octe/wrapper-cvmx-includes.h | 1 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c index 1f2809c..812fc01 100644 --- a/sys/mips/cavium/octe/ethernet.c +++ b/sys/mips/cavium/octe/ethernet.c @@ -462,8 +462,6 @@ void cvm_oct_cleanup_module(void) /* Disable POW interrupt */ cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0); - cvmx_ipd_disable(); - #if 0 /* Free the interrupt handler */ free_irq(8 + pow_receive_group, cvm_oct_device); @@ -471,7 +469,8 @@ void cvm_oct_cleanup_module(void) callout_stop(&cvm_oct_poll_timer); cvm_oct_rx_shutdown(); - cvmx_pko_disable(); + + cvmx_helper_shutdown_packet_io_global(); /* Free the ethernet devices */ for (port = 0; port < TOTAL_NUMBER_OF_PORTS; port++) { @@ -486,14 +485,4 @@ void cvm_oct_cleanup_module(void) cvm_oct_device[port] = NULL; } } - - cvmx_pko_shutdown(); - - cvmx_ipd_free_ptr(); - - /* Free the HW pools */ - cvm_oct_mem_empty_fpa(CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, num_packet_buffers); - cvm_oct_mem_empty_fpa(CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, num_packet_buffers); - if (CVMX_FPA_OUTPUT_BUFFER_POOL != CVMX_FPA_PACKET_POOL) - cvm_oct_mem_empty_fpa(CVMX_FPA_OUTPUT_BUFFER_POOL, CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128); } diff --git a/sys/mips/cavium/octe/wrapper-cvmx-includes.h b/sys/mips/cavium/octe/wrapper-cvmx-includes.h index bc69505..f59a924 100644 --- a/sys/mips/cavium/octe/wrapper-cvmx-includes.h +++ b/sys/mips/cavium/octe/wrapper-cvmx-includes.h @@ -34,7 +34,6 @@ AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR W #include <contrib/octeon-sdk/cvmx.h> #include <contrib/octeon-sdk/cvmx-version.h> #include <contrib/octeon-sdk/cvmx-atomic.h> -#include <contrib/octeon-sdk/cvmx-ciu.h> #include <contrib/octeon-sdk/cvmx-pip.h> #include <contrib/octeon-sdk/cvmx-ipd.h> #include <contrib/octeon-sdk/cvmx-pko.h> |
