diff options
| author | jmallett <jmallett@FreeBSD.org> | 2012-03-11 06:17:49 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2012-03-11 06:17:49 +0000 |
| commit | 56248d9da883404c78cefac055d0e0e1ae17dbc3 (patch) | |
| tree | af4d9dcf90392eaadc4a3c38e945d006122e33c9 /sys/mips/cavium/ciu.c | |
| parent | 8bd1c57ee7ce29a7f3647cdc3e0c0d52ce1e223f (diff) | |
| parent | 74539243c8f2e35e30bcbed4f81f61738ba9a0e2 (diff) | |
| download | FreeBSD-src-56248d9da883404c78cefac055d0e0e1ae17dbc3.zip FreeBSD-src-56248d9da883404c78cefac055d0e0e1ae17dbc3.tar.gz | |
Merge the Cavium Octeon SDK 2.3.0 Simple Executive code and update FreeBSD to
make use of it where possible.
This primarily brings in support for newer hardware, and FreeBSD is not yet
able to support the abundance of IRQs on new hardware and many features in the
Ethernet driver.
Because of the changes to IRQs in the Simple Executive, we have to maintain our
own list of Octeon IRQs now, which probably can be pared-down and be specific
to the CIU interrupt unit soon, and when other interrupt mechanisms are added
they can maintain their own definitions.
Remove unmasking of interrupts from within the UART device now that the
function used is no longer present in the Simple Executive. The unmasking
seems to have been gratuitous as this is more properly handled by the buses
above the UART device, and seems to work on that basis.
Diffstat (limited to 'sys/mips/cavium/ciu.c')
| -rw-r--r-- | sys/mips/cavium/ciu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c index 3767ec3..dab1621 100644 --- a/sys/mips/cavium/ciu.c +++ b/sys/mips/cavium/ciu.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <machine/intr_machdep.h> #include <contrib/octeon-sdk/cvmx.h> -#include <contrib/octeon-sdk/cvmx-interrupt.h> +#include <mips/cavium/octeon_irq.h> /* * This bus sits between devices/buses and nexus and handles CIU interrupts @@ -53,12 +53,12 @@ __FBSDID("$FreeBSD$"); #define CIU_IRQ_HARD (0) -#define CIU_IRQ_EN0_BEGIN CVMX_IRQ_WORKQ0 -#define CIU_IRQ_EN0_END CVMX_IRQ_BOOTDMA +#define CIU_IRQ_EN0_BEGIN OCTEON_IRQ_WORKQ0 +#define CIU_IRQ_EN0_END OCTEON_IRQ_BOOTDMA #define CIU_IRQ_EN0_COUNT ((CIU_IRQ_EN0_END - CIU_IRQ_EN0_BEGIN) + 1) -#define CIU_IRQ_EN1_BEGIN CVMX_IRQ_WDOG0 -#define CIU_IRQ_EN1_END CVMX_IRQ_DFM +#define CIU_IRQ_EN1_BEGIN OCTEON_IRQ_WDOG0 +#define CIU_IRQ_EN1_END OCTEON_IRQ_DFM #define CIU_IRQ_EN1_COUNT ((CIU_IRQ_EN1_END - CIU_IRQ_EN1_BEGIN) + 1) struct ciu_softc { |
