Merge branch 'core/xen' into x86/urgent

52 files changed, 11298 insertions, 112 deletions

diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 023866c0c102..7897f05e3165 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,4 +1,3 @@
 include include/asm-generic/Kbuild.asm
 
 header-y += cachectl.h sgidefs.h sysmips.h
-header-y += swab.h
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
index c996c3b4d074..1b332e15ab52 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -50,7 +50,7 @@
 static __inline__ void atomic_add(int i, atomic_t * v)
 {
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -62,7 +62,7 @@ static __inline__ void atomic_add(int i, atomic_t * v)
                 : "=&r" (temp), "=m" (v->counter)
                 : "Ir" (i), "m" (v->counter));
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -95,7 +95,7 @@ static __inline__ void atomic_add(int i, atomic_t * v)
 static __inline__ void atomic_sub(int i, atomic_t * v)
 {
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -107,7 +107,7 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
                 : "=&r" (temp), "=m" (v->counter)
                 : "Ir" (i), "m" (v->counter));
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -135,12 +135,12 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
  */
 static __inline__ int atomic_add_return(int i, atomic_t * v)
 {
-        unsigned long result;
+        int result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -154,7 +154,7 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -187,12 +187,12 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
 
 static __inline__ int atomic_sub_return(int i, atomic_t * v)
 {
-        unsigned long result;
+        int result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -206,7 +206,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -247,12 +247,12 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
  */
 static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
 {
-        unsigned long result;
+        int result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -270,7 +270,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                int temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -429,7 +429,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 static __inline__ void atomic64_add(long i, atomic64_t * v)
 {
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -441,7 +441,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
                 : "=&r" (temp), "=m" (v->counter)
                 : "Ir" (i), "m" (v->counter));
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -474,7 +474,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
 static __inline__ void atomic64_sub(long i, atomic64_t * v)
 {
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -486,7 +486,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
                 : "=&r" (temp), "=m" (v->counter)
                 : "Ir" (i), "m" (v->counter));
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -514,12 +514,12 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
  */
 static __inline__ long atomic64_add_return(long i, atomic64_t * v)
 {
-        unsigned long result;
+        long result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -533,7 +533,7 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -566,12 +566,12 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
 
 static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
 {
-        unsigned long result;
+        long result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -585,7 +585,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -626,12 +626,12 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
  */
 static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
 {
-        unsigned long result;
+        long result;
 
         smp_llsc_mb();
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
@@ -649,7 +649,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (cpu_has_llsc) {
-                unsigned long temp;
+                long temp;
 
                 __asm__ __volatile__(
                 "       .set    mips3                                   \n"
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h
index 607b71830707..9579051ff1c7 100644
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/asm/byteorder.h
@@ -8,8 +8,6 @@
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H
 
-#include <asm/swab.h>
-
 #if defined(__MIPSEB__)
 #include <linux/byteorder/big_endian.h>
 #elif defined(__MIPSEL__)
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 12d12dfe73c0..a0d14f85b781 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -38,6 +38,9 @@
 #ifndef cpu_has_tx39_cache
 #define cpu_has_tx39_cache      (cpu_data[0].options & MIPS_CPU_TX39_CACHE)
 #endif
+#ifndef cpu_has_octeon_cache
+#define cpu_has_octeon_cache    0
+#endif
 #ifndef cpu_has_fpu
 #define cpu_has_fpu             (current_cpu_data.options & MIPS_CPU_FPU)
 #define raw_cpu_has_fpu         (raw_current_cpu_data.options & MIPS_CPU_FPU)
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 229a786101d9..c018727c7ddc 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -33,6 +33,7 @@
 #define PRID_COMP_TOSHIBA       0x070000
 #define PRID_COMP_LSI           0x080000
 #define PRID_COMP_LEXRA         0x0b0000
+#define PRID_COMP_CAVIUM        0x0d0000
 
 
 /*
@@ -114,6 +115,18 @@
 #define PRID_IMP_BCM3302        0x9000
 
 /*
+ * These are the PRID's for when 23:16 == PRID_COMP_CAVIUM
+ */
+
+#define PRID_IMP_CAVIUM_CN38XX 0x0000
+#define PRID_IMP_CAVIUM_CN31XX 0x0100
+#define PRID_IMP_CAVIUM_CN30XX 0x0200
+#define PRID_IMP_CAVIUM_CN58XX 0x0300
+#define PRID_IMP_CAVIUM_CN56XX 0x0400
+#define PRID_IMP_CAVIUM_CN50XX 0x0600
+#define PRID_IMP_CAVIUM_CN52XX 0x0700
+
+/*
  * Definitions for 7:0 on legacy processors
  */
 
@@ -203,6 +216,7 @@ enum cpu_type_enum {
          * MIPS64 class processors
          */
         CPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,
+        CPU_CAVIUM_OCTEON,
 
         CPU_LAST
 };
diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h
index 2de638f84c86..43baed16a109 100644
--- a/arch/mips/include/asm/hazards.h
+++ b/arch/mips/include/asm/hazards.h
@@ -42,7 +42,7 @@ ASMMACRO(_ehb,
 /*
  * TLB hazards
  */
-#if defined(CONFIG_CPU_MIPSR2)
+#if defined(CONFIG_CPU_MIPSR2) && !defined(CONFIG_CPU_CAVIUM_OCTEON)
 
 /*
  * MIPSR2 defines ehb for hazard avoidance
@@ -138,7 +138,7 @@ do {									\
                 __instruction_hazard();                                 \
 } while (0)
 
-#elif defined(CONFIG_CPU_R10000)
+#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_CAVIUM_OCTEON)
 
 /*
  * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 501a40b9f18d..436878e4e063 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -295,6 +295,12 @@ static inline void iounmap(const volatile void __iomem *addr)
 #undef __IS_KSEG1
 }
 
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+#define war_octeon_io_reorder_wmb()             wmb()
+#else
+#define war_octeon_io_reorder_wmb()             do { } while (0)
+#endif
+
 #define __BUILD_MEMORY_SINGLE(pfx, bwlq, type, irq)                     \
                                                                         \
 static inline void pfx##write##bwlq(type val,                           \
@@ -303,6 +309,8 @@ static inline void pfx##write##bwlq(type val,				\
         volatile type *__mem;                                           \
         type __val;                                                     \
                                                                         \
+        war_octeon_io_reorder_wmb();                                    \
+                                                                        \
         __mem = (void *)__swizzle_addr_##bwlq((unsigned long)(mem));    \
                                                                         \
         __val = pfx##ioswab##bwlq(__mem, val);                          \
@@ -370,6 +378,8 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port)	\
         volatile type *__addr;                                          \
         type __val;                                                     \
                                                                         \
+        war_octeon_io_reorder_wmb();                                    \
+                                                                        \
         __addr = (void *)__swizzle_addr_##bwlq(mips_io_port_base + port); \
                                                                         \
         __val = pfx##ioswab##bwlq(__addr, val);                         \
@@ -504,8 +514,12 @@ BUILDSTRING(q, u64)
 #endif
 
 
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+#define mmiowb() wmb()
+#else
 /* Depends on MIPS II instruction set */
 #define mmiowb() asm volatile ("sync" ::: "memory")
+#endif
 
 static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
 {
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index 0d302bad4492..62f91f50b5b5 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -91,14 +91,57 @@ static inline u32 au_readl(unsigned long reg)
         return *(volatile u32 *)reg;
 }
 
+/* Early Au1000 have a write-only SYS_CPUPLL register. */
+static inline int au1xxx_cpu_has_pll_wo(void)
+{
+        switch (read_c0_prid()) {
+        case 0x00030100:        /* Au1000 DA */
+        case 0x00030201:        /* Au1000 HA */
+        case 0x00030202:        /* Au1000 HB */
+                return 1;
+        }
+        return 0;
+}
+
+/* does CPU need CONFIG[OD] set to fix tons of errata? */
+static inline int au1xxx_cpu_needs_config_od(void)
+{
+        /*
+         * c0_config.od (bit 19) was write only (and read as 0) on the
+         * early revisions of Alchemy SOCs.  It disables the bus trans-
+         * action overlapping and needs to be set to fix various errata.
+         */
+        switch (read_c0_prid()) {
+        case 0x00030100: /* Au1000 DA */
+        case 0x00030201: /* Au1000 HA */
+        case 0x00030202: /* Au1000 HB */
+        case 0x01030200: /* Au1500 AB */
+        /*
+         * Au1100/Au1200 errata actually keep silence about this bit,
+         * so we set it just in case for those revisions that require
+         * it to be set according to the (now gone) cpu_table.
+         */
+        case 0x02030200: /* Au1100 AB */
+        case 0x02030201: /* Au1100 BA */
+        case 0x02030202: /* Au1100 BC */
+        case 0x04030201: /* Au1200 AC */
+                return 1;
+        }
+        return 0;
+}
 
 /* arch/mips/au1000/common/clocks.c */
 extern void set_au1x00_speed(unsigned int new_freq);
 extern unsigned int get_au1x00_speed(void);
 extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
 extern unsigned long get_au1x00_uart_baud_base(void);
-extern void set_au1x00_lcd_clock(void);
-extern unsigned int get_au1x00_lcd_clock(void);
+extern unsigned long au1xxx_calc_clock(void);
+
+/* PM: arch/mips/alchemy/common/sleeper.S, power.c, irq.c */
+void au1xxx_save_and_sleep(void);
+void au_sleep(void);
+void save_au1xxx_intctl(void);
+void restore_au1xxx_intctl(void);
 
 /*
  * Every board describes its IRQ mapping with this table.
@@ -109,10 +152,11 @@ struct au1xxx_irqmap {
         int     im_request;
 };
 
-/*
- * init_IRQ looks for a table with this name.
- */
-extern struct au1xxx_irqmap au1xxx_irq_map[];
+/* core calls this function to let boards initialize other IRQ sources */
+void board_init_irq(void);
+
+/* boards call this to register additional (GPIO) interrupts */
+void au1xxx_setup_irqmap(struct au1xxx_irqmap *map, int count);
 
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
@@ -505,15 +549,6 @@ extern struct au1xxx_irqmap au1xxx_irq_map[];
 
 #define IC1_TESTBIT             0xB1800080
 
-/* Interrupt Configuration Modes */
-#define INTC_INT_DISABLED               0x0
-#define INTC_INT_RISE_EDGE              0x1
-#define INTC_INT_FALL_EDGE              0x2
-#define INTC_INT_RISE_AND_FALL_EDGE     0x3
-#define INTC_INT_HIGH_LEVEL             0x5
-#define INTC_INT_LOW_LEVEL              0x6
-#define INTC_INT_HIGH_AND_LOW_LEVEL     0x7
-
 /* Interrupt Numbers */
 /* Au1000 */
 #ifdef CONFIG_SOC_AU1000
@@ -1525,6 +1560,10 @@ enum soc_au1200_ints {
 #define SYS_SLPPWR              0xB1900078
 #define SYS_SLEEP               0xB190007C
 
+#define SYS_WAKEMSK_D2          (1 << 9)
+#define SYS_WAKEMSK_M2          (1 << 8)
+#define SYS_WAKEMSK_GPIO(x)     (1 << (x))
+
 /* Clock Controller */
 #define SYS_FREQCTRL0           0xB1900020
 #  define SYS_FC_FRDIV2_BIT     22
@@ -1749,24 +1788,4 @@ static AU1X00_SYS * const sys = (AU1X00_SYS *)SYS_BASE;
 
 #endif
 
-/*
- * Processor information based on PRID.
- * Copied from PowerPC.
- */
-#ifndef _LANGUAGE_ASSEMBLY
-struct cpu_spec {
-        /* CPU is matched via (PRID & prid_mask) == prid_value */
-        unsigned int    prid_mask;
-        unsigned int    prid_value;
-
-        char            *cpu_name;
-        unsigned char   cpu_od;         /* Set Config[OD] */
-        unsigned char   cpu_bclk;       /* Enable BCLK switching */
-        unsigned char   cpu_pll_wo;     /* sys_cpupll reg. write-only */
-};
-
-extern struct cpu_spec  cpu_specs[];
-extern struct cpu_spec  *cur_cpu_spec[];
-#endif
-
 #endif
diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
index 44a67bf05dc1..06f68f43800a 100644
--- a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
+++ b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
@@ -357,6 +357,11 @@ u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr);
 u32 au1xxx_ddma_add_device(dbdev_tab_t *dev);
 extern void au1xxx_ddma_del_device(u32 devid);
 void *au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp);
+#ifdef CONFIG_PM
+void au1xxx_dbdma_suspend(void);
+void au1xxx_dbdma_resume(void);
+#endif
+
 
 /*
  * Some compatibilty macros -- needed to make changes to API
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
new file mode 100644
index 000000000000..04ce6e6569da
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -0,0 +1,78 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2004 Cavium Networks
+ */
+#ifndef __ASM_MACH_CAVIUM_OCTEON_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_CAVIUM_OCTEON_CPU_FEATURE_OVERRIDES_H
+
+#include <linux/types.h>
+#include <asm/mipsregs.h>
+
+/*
+ * Cavium Octeons are MIPS64v2 processors
+ */
+#define cpu_dcache_line_size()  128
+#define cpu_icache_line_size()  128
+
+
+#define cpu_has_4kex            1
+#define cpu_has_3k_cache        0
+#define cpu_has_4k_cache        0
+#define cpu_has_tx39_cache      0
+#define cpu_has_fpu             0
+#define cpu_has_counter         1
+#define cpu_has_watch           1
+#define cpu_has_divec           1
+#define cpu_has_vce             0
+#define cpu_has_cache_cdex_p    0
+#define cpu_has_cache_cdex_s    0
+#define cpu_has_prefetch        1
+
+/*
+ * We should disable LL/SC on non SMP systems as it is faster to
+ * disable interrupts for atomic access than a LL/SC.  Unfortunatly we
+ * cannot as this breaks asm/futex.h
+ */
+#define cpu_has_llsc            1
+#define cpu_has_vtag_icache     1
+#define cpu_has_dc_aliases      0
+#define cpu_has_ic_fills_f_dc   0
+#define cpu_has_64bits          1
+#define cpu_has_octeon_cache    1
+#define cpu_has_saa             octeon_has_saa()
+#define cpu_has_mips32r1        0
+#define cpu_has_mips32r2        0
+#define cpu_has_mips64r1        0
+#define cpu_has_mips64r2        1
+#define cpu_has_dsp             0
+#define cpu_has_mipsmt          0
+#define cpu_has_userlocal       0
+#define cpu_has_vint            0
+#define cpu_has_veic            0
+#define ARCH_HAS_READ_CURRENT_TIMER 1
+#define ARCH_HAS_IRQ_PER_CPU    1
+#define ARCH_HAS_SPINLOCK_PREFETCH 1
+#define spin_lock_prefetch(x) prefetch(x)
+#define PREFETCH_STRIDE 128
+
+static inline int read_current_timer(unsigned long *result)
+{
+        asm volatile ("rdhwr %0,$31\n"
+#ifndef CONFIG_64BIT
+                      "\tsll %0, 0"
+#endif
+                      : "=r" (*result));
+        return 0;
+}
+
+static inline int octeon_has_saa(void)
+{
+        int id;
+        asm volatile ("mfc0 %0, $15,0" : "=r" (id));
+        return id >= 0x000d0300;
+}
+
+#endif
diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
new file mode 100644
index 000000000000..f30fce92aabb
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
@@ -0,0 +1,64 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2006  Ralf Baechle <ralf@linux-mips.org>
+ *
+ *
+ * Similar to mach-generic/dma-coherence.h except
+ * plat_device_is_coherent hard coded to return 1.
+ *
+ */
+#ifndef __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H
+#define __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H
+
+struct device;
+
+dma_addr_t octeon_map_dma_mem(struct device *, void *, size_t);
+void octeon_unmap_dma_mem(struct device *, dma_addr_t);
+
+static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
+        size_t size)
+{
+        return octeon_map_dma_mem(dev, addr, size);
+}
+
+static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
+        struct page *page)
+{
+        return octeon_map_dma_mem(dev, page_address(page), PAGE_SIZE);
+}
+
+static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+{
+        return dma_addr;
+}
+
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
+{
+        octeon_unmap_dma_mem(dev, dma_addr);
+}
+
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        mb();
+}
+
+static inline int plat_device_is_coherent(struct device *dev)
+{
+        return 1;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return dma_addr == -1;
+}
+
+#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/include/asm/mach-cavium-octeon/irq.h
new file mode 100644
index 000000000000..d32220fbf4f1
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h
@@ -0,0 +1,244 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2004-2008 Cavium Networks
+ */
+#ifndef __OCTEON_IRQ_H__
+#define __OCTEON_IRQ_H__
+
+#define NR_IRQS OCTEON_IRQ_LAST
+#define MIPS_CPU_IRQ_BASE OCTEON_IRQ_SW0
+
+/* 0 - 7 represent the i8259 master */
+#define OCTEON_IRQ_I8259M0      0
+#define OCTEON_IRQ_I8259M1      1
+#define OCTEON_IRQ_I8259M2      2
+#define OCTEON_IRQ_I8259M3      3
+#define OCTEON_IRQ_I8259M4      4
+#define OCTEON_IRQ_I8259M5      5
+#define OCTEON_IRQ_I8259M6      6
+#define OCTEON_IRQ_I8259M7      7
+/* 8 - 15 represent the i8259 slave */
+#define OCTEON_IRQ_I8259S0      8
+#define OCTEON_IRQ_I8259S1      9
+#define OCTEON_IRQ_I8259S2      10
+#define OCTEON_IRQ_I8259S3      11
+#define OCTEON_IRQ_I8259S4      12
+#define OCTEON_IRQ_I8259S5      13
+#define OCTEON_IRQ_I8259S6      14
+#define OCTEON_IRQ_I8259S7      15
+/* 16 - 23 represent the 8 MIPS standard interrupt sources */
+#define OCTEON_IRQ_SW0          16
+#define OCTEON_IRQ_SW1          17
+#define OCTEON_IRQ_CIU0         18
+#define OCTEON_IRQ_CIU1         19
+#define OCTEON_IRQ_CIU4         20
+#define OCTEON_IRQ_5            21
+#define OCTEON_IRQ_PERF         22
+#define OCTEON_IRQ_TIMER        23
+/* 24 - 87 represent the sources in CIU_INTX_EN0 */
+#define OCTEON_IRQ_WORKQ0       24
+#define OCTEON_IRQ_WORKQ1       25
+#define OCTEON_IRQ_WORKQ2       26
+#define OCTEON_IRQ_WORKQ3       27
+#define OCTEON_IRQ_WORKQ4       28
+#define OCTEON_IRQ_WORKQ5       29
+#define OCTEON_IRQ_WORKQ6       30
+#define OCTEON_IRQ_WORKQ7       31
+#define OCTEON_IRQ_WORKQ8       32
+#define OCTEON_IRQ_WORKQ9       33
+#define OCTEON_IRQ_WORKQ10      34
+#define OCTEON_IRQ_WORKQ11      35
+#define OCTEON_IRQ_WORKQ12      36
+#define OCTEON_IRQ_WORKQ13      37
+#define OCTEON_IRQ_WORKQ14      38
+#define OCTEON_IRQ_WORKQ15      39
+#define OCTEON_IRQ_GPIO0        40
+#define OCTEON_IRQ_GPIO1        41
+#define OCTEON_IRQ_GPIO2        42
+#define OCTEON_IRQ_GPIO3        43
+#define OCTEON_IRQ_GPIO4        44
+#define OCTEON_IRQ_GPIO5        45
+#define OCTEON_IRQ_GPIO6        46
+#define OCTEON_IRQ_GPIO7        47
+#define OCTEON_IRQ_GPIO8        48
+#define OCTEON_IRQ_GPIO9        49
+#define OCTEON_IRQ_GPIO10       50
+#define OCTEON_IRQ_GPIO11       51
+#define OCTEON_IRQ_GPIO12       52
+#define OCTEON_IRQ_GPIO13       53
+#define OCTEON_IRQ_GPIO14       54
+#define OCTEON_IRQ_GPIO15       55
+#define OCTEON_IRQ_MBOX0        56
+#define OCTEON_IRQ_MBOX1        57
+#define OCTEON_IRQ_UART0        58
+#define OCTEON_IRQ_UART1        59
+#define OCTEON_IRQ_PCI_INT0     60
+#define OCTEON_IRQ_PCI_INT1     61
+#define OCTEON_IRQ_PCI_INT2     62
+#define OCTEON_IRQ_PCI_INT3     63
+#define OCTEON_IRQ_PCI_MSI0     64
+#define OCTEON_IRQ_PCI_MSI1     65
+#define OCTEON_IRQ_PCI_MSI2     66
+#define OCTEON_IRQ_PCI_MSI3     67
+#define OCTEON_IRQ_RESERVED68   68      /* Summary of CIU_INT_SUM1 */
+#define OCTEON_IRQ_TWSI         69
+#define OCTEON_IRQ_RML          70
+#define OCTEON_IRQ_TRACE        71
+#define OCTEON_IRQ_GMX_DRP0     72
+#define OCTEON_IRQ_GMX_DRP1     73
+#define OCTEON_IRQ_IPD_DRP      74
+#define OCTEON_IRQ_KEY_ZERO     75
+#define OCTEON_IRQ_TIMER0       76
+#define OCTEON_IRQ_TIMER1       77
+#define OCTEON_IRQ_TIMER2       78
+#define OCTEON_IRQ_TIMER3       79
+#define OCTEON_IRQ_USB0         80
+#define OCTEON_IRQ_PCM          81
+#define OCTEON_IRQ_MPI          82
+#define OCTEON_IRQ_TWSI2        83
+#define OCTEON_IRQ_POWIQ        84
+#define OCTEON_IRQ_IPDPPTHR     85
+#define OCTEON_IRQ_MII0         86
+#define OCTEON_IRQ_BOOTDMA      87
+/* 88 - 151 represent the sources in CIU_INTX_EN1 */
+#define OCTEON_IRQ_WDOG0        88
+#define OCTEON_IRQ_WDOG1        89
+#define OCTEON_IRQ_WDOG2        90
+#define OCTEON_IRQ_WDOG3        91
+#define OCTEON_IRQ_WDOG4        92
+#define OCTEON_IRQ_WDOG5        93
+#define OCTEON_IRQ_WDOG6        94
+#define OCTEON_IRQ_WDOG7        95
+#define OCTEON_IRQ_WDOG8        96
+#define OCTEON_IRQ_WDOG9        97
+#define OCTEON_IRQ_WDOG10       98
+#define OCTEON_IRQ_WDOG11       99
+#define OCTEON_IRQ_WDOG12       100
+#define OCTEON_IRQ_WDOG13       101
+#define OCTEON_IRQ_WDOG14       102
+#define OCTEON_IRQ_WDOG15       103
+#define OCTEON_IRQ_UART2        104
+#define OCTEON_IRQ_USB1         105
+#define OCTEON_IRQ_MII1         106
+#define OCTEON_IRQ_RESERVED107  107
+#define OCTEON_IRQ_RESERVED108  108
+#define OCTEON_IRQ_RESERVED109  109
+#define OCTEON_IRQ_RESERVED110  110
+#define OCTEON_IRQ_RESERVED111  111
+#define OCTEON_IRQ_RESERVED112  112
+#define OCTEON_IRQ_RESERVED113  113
+#define OCTEON_IRQ_RESERVED114  114
+#define OCTEON_IRQ_RESERVED115  115
+#define OCTEON_IRQ_RESERVED116  116
+#define OCTEON_IRQ_RESERVED117  117
+#define OCTEON_IRQ_RESERVED118  118
+#define OCTEON_IRQ_RESERVED119  119
+#define OCTEON_IRQ_RESERVED120  120
+#define OCTEON_IRQ_RESERVED121  121
+#define OCTEON_IRQ_RESERVED122  122
+#define OCTEON_IRQ_RESERVED123  123
+#define OCTEON_IRQ_RESERVED124  124
+#define OCTEON_IRQ_RESERVED125  125
+#define OCTEON_IRQ_RESERVED126  126
+#define OCTEON_IRQ_RESERVED127  127
+#define OCTEON_IRQ_RESERVED128  128
+#define OCTEON_IRQ_RESERVED129  129
+#define OCTEON_IRQ_RESERVED130  130
+#define OCTEON_IRQ_RESERVED131  131
+#define OCTEON_IRQ_RESERVED132  132
+#define OCTEON_IRQ_RESERVED133  133
+#define OCTEON_IRQ_RESERVED134  134
+#define OCTEON_IRQ_RESERVED135  135
+#define OCTEON_IRQ_RESERVED136  136
+#define OCTEON_IRQ_RESERVED137  137
+#define OCTEON_IRQ_RESERVED138  138
+#define OCTEON_IRQ_RESERVED139  139
+#define OCTEON_IRQ_RESERVED140  140
+#define OCTEON_IRQ_RESERVED141  141
+#define OCTEON_IRQ_RESERVED142  142
+#define OCTEON_IRQ_RESERVED143  143
+#define OCTEON_IRQ_RESERVED144  144
+#define OCTEON_IRQ_RESERVED145  145
+#define OCTEON_IRQ_RESERVED146  146
+#define OCTEON_IRQ_RESERVED147  147
+#define OCTEON_IRQ_RESERVED148  148
+#define OCTEON_IRQ_RESERVED149  149
+#define OCTEON_IRQ_RESERVED150  150
+#define OCTEON_IRQ_RESERVED151  151
+
+#ifdef CONFIG_PCI_MSI
+/* 152 - 215 represent the MSI interrupts 0-63 */
+#define OCTEON_IRQ_MSI_BIT0     152
+#define OCTEON_IRQ_MSI_BIT1     153
+#define OCTEON_IRQ_MSI_BIT2     154
+#define OCTEON_IRQ_MSI_BIT3     155
+#define OCTEON_IRQ_MSI_BIT4     156
+#define OCTEON_IRQ_MSI_BIT5     157
+#define OCTEON_IRQ_MSI_BIT6     158
+#define OCTEON_IRQ_MSI_BIT7     159
+#define OCTEON_IRQ_MSI_BIT8     160
+#define OCTEON_IRQ_MSI_BIT9     161
+#define OCTEON_IRQ_MSI_BIT10    162
+#define OCTEON_IRQ_MSI_BIT11    163
+#define OCTEON_IRQ_MSI_BIT12    164
+#define OCTEON_IRQ_MSI_BIT13    165
+#define OCTEON_IRQ_MSI_BIT14    166
+#define OCTEON_IRQ_MSI_BIT15    167
+#define OCTEON_IRQ_MSI_BIT16    168
+#define OCTEON_IRQ_MSI_BIT17    169
+#define OCTEON_IRQ_MSI_BIT18    170
+#define OCTEON_IRQ_MSI_BIT19    171
+#define OCTEON_IRQ_MSI_BIT20    172
+#define OCTEON_IRQ_MSI_BIT21    173
+#define OCTEON_IRQ_MSI_BIT22    174
+#define OCTEON_IRQ_MSI_BIT23    175
+#define OCTEON_IRQ_MSI_BIT24    176
+#define OCTEON_IRQ_MSI_BIT25    177
+#define OCTEON_IRQ_MSI_BIT26    178
+#define OCTEON_IRQ_MSI_BIT27    179
+#define OCTEON_IRQ_MSI_BIT28    180
+#define OCTEON_IRQ_MSI_BIT29    181
+#define OCTEON_IRQ_MSI_BIT30    182
+#define OCTEON_IRQ_MSI_BIT31    183
+#define OCTEON_IRQ_MSI_BIT32    184
+#define OCTEON_IRQ_MSI_BIT33    185
+#define OCTEON_IRQ_MSI_BIT34    186
+#define OCTEON_IRQ_MSI_BIT35    187
+#define OCTEON_IRQ_MSI_BIT36    188
+#define OCTEON_IRQ_MSI_BIT37    189
+#define OCTEON_IRQ_MSI_BIT38    190
+#define OCTEON_IRQ_MSI_BIT39    191
+#define OCTEON_IRQ_MSI_BIT40    192
+#define OCTEON_IRQ_MSI_BIT41    193
+#define OCTEON_IRQ_MSI_BIT42    194
+#define OCTEON_IRQ_MSI_BIT43    195
+#define OCTEON_IRQ_MSI_BIT44    196
+#define OCTEON_IRQ_MSI_BIT45    197
+#define OCTEON_IRQ_MSI_BIT46    198
+#define OCTEON_IRQ_MSI_BIT47    199
+#define OCTEON_IRQ_MSI_BIT48    200
+#define OCTEON_IRQ_MSI_BIT49    201
+#define OCTEON_IRQ_MSI_BIT50    202
+#define OCTEON_IRQ_MSI_BIT51    203
+#define OCTEON_IRQ_MSI_BIT52    204
+#define OCTEON_IRQ_MSI_BIT53    205
+#define OCTEON_IRQ_MSI_BIT54    206
+#define OCTEON_IRQ_MSI_BIT55    207
+#define OCTEON_IRQ_MSI_BIT56    208
+#define OCTEON_IRQ_MSI_BIT57    209
+#define OCTEON_IRQ_MSI_BIT58    210
+#define OCTEON_IRQ_MSI_BIT59    211
+#define OCTEON_IRQ_MSI_BIT60    212
+#define OCTEON_IRQ_MSI_BIT61    213
+#define OCTEON_IRQ_MSI_BIT62    214
+#define OCTEON_IRQ_MSI_BIT63    215
+
+#define OCTEON_IRQ_LAST         216
+#else
+#define OCTEON_IRQ_LAST         152
+#endif
+
+#endif
diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
new file mode 100644
index 000000000000..0b2b5eb22e9b
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
@@ -0,0 +1,131 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2005-2008 Cavium Networks, Inc
+ */
+#ifndef __ASM_MACH_CAVIUM_OCTEON_KERNEL_ENTRY_H
+#define __ASM_MACH_CAVIUM_OCTEON_KERNEL_ENTRY_H
+
+
+#define CP0_CYCLE_COUNTER $9, 6
+#define CP0_CVMCTL_REG $9, 7
+#define CP0_CVMMEMCTL_REG $11,7
+#define CP0_PRID_REG $15, 0
+#define CP0_PRID_OCTEON_PASS1 0x000d0000
+#define CP0_PRID_OCTEON_CN30XX 0x000d0200
+
+.macro  kernel_entry_setup
+        # Registers set by bootloader:
+        # (only 32 bits set by bootloader, all addresses are physical
+        # addresses, and need to have the appropriate memory region set
+        # by the kernel
+        # a0 = argc
+        # a1 = argv (kseg0 compat addr)
+        # a2 = 1 if init core, zero otherwise
+        # a3 = address of boot descriptor block
+        .set push
+        .set arch=octeon
+        # Read the cavium mem control register
+        dmfc0   v0, CP0_CVMMEMCTL_REG
+        # Clear the lower 6 bits, the CVMSEG size
+        dins    v0, $0, 0, 6
+        ori     v0, CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE
+        dmtc0   v0, CP0_CVMMEMCTL_REG   # Write the cavium mem control register
+        dmfc0   v0, CP0_CVMCTL_REG      # Read the cavium control register
+#ifdef CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED
+        # Disable unaligned load/store support but leave HW fixup enabled
+        or  v0, v0, 0x5001
+        xor v0, v0, 0x1001
+#else
+        # Disable unaligned load/store and HW fixup support
+        or  v0, v0, 0x5001
+        xor v0, v0, 0x5001
+#endif
+        # Read the processor ID register
+        mfc0 v1, CP0_PRID_REG
+        # Disable instruction prefetching (Octeon Pass1 errata)
+        or  v0, v0, 0x2000
+        # Skip reenable of prefetching for Octeon Pass1
+        beq v1, CP0_PRID_OCTEON_PASS1, skip
+        nop
+        # Reenable instruction prefetching, not on Pass1
+        xor v0, v0, 0x2000
+        # Strip off pass number off of processor id
+        srl v1, 8
+        sll v1, 8
+        # CN30XX needs some extra stuff turned off for better performance
+        bne v1, CP0_PRID_OCTEON_CN30XX, skip
+        nop
+        # CN30XX Use random Icache replacement
+        or  v0, v0, 0x400
+        # CN30XX Disable instruction prefetching
+        or  v0, v0, 0x2000
+skip:
+        # Write the cavium control register
+        dmtc0   v0, CP0_CVMCTL_REG
+        sync
+        # Flush dcache after config change
+        cache   9, 0($0)
+        # Get my core id
+        rdhwr   v0, $0
+        # Jump the master to kernel_entry
+        bne     a2, zero, octeon_main_processor
+        nop
+
+#ifdef CONFIG_SMP
+
+        #
+        # All cores other than the master need to wait here for SMP bootstrap
+        # to begin
+        #
+
+        # This is the variable where the next core to boot os stored
+        PTR_LA  t0, octeon_processor_boot
+octeon_spin_wait_boot:
+        # Get the core id of the next to be booted
+        LONG_L  t1, (t0)
+        # Keep looping if it isn't me
+        bne t1, v0, octeon_spin_wait_boot
+        nop
+        # Get my GP from the global variable
+        PTR_LA  t0, octeon_processor_gp
+        LONG_L  gp, (t0)
+        # Get my SP from the global variable
+        PTR_LA  t0, octeon_processor_sp
+        LONG_L  sp, (t0)
+        # Set the SP global variable to zero so the master knows we've started
+        LONG_S  zero, (t0)
+#ifdef __OCTEON__
+        syncw
+        syncw
+#else
+        sync
+#endif
+        # Jump to the normal Linux SMP entry point
+        j   smp_bootstrap
+        nop
+#else /* CONFIG_SMP */
+
+        #
+        # Someone tried to boot SMP with a non SMP kernel. All extra cores
+        # will halt here.
+        #
+octeon_wait_forever:
+        wait
+        b   octeon_wait_forever
+        nop
+
+#endif /* CONFIG_SMP */
+octeon_main_processor:
+        .set pop
+.endm
+
+/*
+ * Do SMP slave processor setup necessary before we can savely execute C code.
+ */
+        .macro  smp_slave_setup
+        .endm
+
+#endif /* __ASM_MACH_CAVIUM_OCTEON_KERNEL_ENTRY_H */
diff --git a/arch/mips/include/asm/mach-cavium-octeon/war.h b/arch/mips/include/asm/mach-cavium-octeon/war.h
new file mode 100644
index 000000000000..c4712d7cc81d
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/war.h
@@ -0,0 +1,26 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
+ * Copyright (C) 2008 Cavium Networks <support@caviumnetworks.com>
+ */
+#ifndef __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H
+#define __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR     0
+#define R4600_V1_HIT_CACHEOP_WAR        0
+#define R4600_V2_HIT_CACHEOP_WAR        0
+#define R5432_CP0_INTERRUPT_WAR         0
+#define BCM1250_M3_WAR                  0
+#define SIBYTE_1956_WAR                 0
+#define MIPS4K_ICACHE_REFILL_WAR        0
+#define MIPS_CACHE_SYNC_WAR             0
+#define TX49XX_ICACHE_INDEX_INV_WAR     0
+#define RM9000_CDEX_SMP_WAR             0
+#define ICACHE_REFILLS_WORKAROUND_WAR   0
+#define R10000_LLSC_WAR                 0
+#define MIPS34K_MISSED_ITLB_WAR         0
+
+#endif /* __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H */
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h
index 76e04e7feb84..36c611b6c597 100644
--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
+++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
@@ -28,10 +28,34 @@ static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
         return dma_addr;
 }
 
-static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
 {
 }
 
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        /*
+         * we fall back to GFP_DMA when the mask isn't all 1s,
+         * so we can't guarantee allocations that must be
+         * within a tighter range than GFP_DMA..
+         */
+        if (mask < DMA_BIT_MASK(24))
+                return 0;
+
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        return;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return 0;
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
 #ifdef CONFIG_DMA_COHERENT
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h
index ed7e6222dc15..4c21bfca10c3 100644
--- a/arch/mips/include/asm/mach-ip27/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h
@@ -38,10 +38,34 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
         return dma_addr & ~(0xffUL << 56);
 }
 
-static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
 {
 }
 
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        /*
+         * we fall back to GFP_DMA when the mask isn't all 1s,
+         * so we can't guarantee allocations that must be
+         * within a tighter range than GFP_DMA..
+         */
+        if (mask < DMA_BIT_MASK(24))
+                return 0;
+
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        return;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return 0;
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 1;               /* IP27 non-cohernet mode is unsupported */
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h
index a5511ebb2d53..7ae40f4b1c80 100644
--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
@@ -60,10 +60,34 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
         return addr;
 }
 
-static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
 {
 }
 
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        /*
+         * we fall back to GFP_DMA when the mask isn't all 1s,
+         * so we can't guarantee allocations that must be
+         * within a tighter range than GFP_DMA..
+         */
+        if (mask < DMA_BIT_MASK(24))
+                return 0;
+
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        return;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return 0;
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 0;               /* IP32 is non-cohernet */
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h
index d66979a124a8..1c7cd27efa7b 100644
--- a/arch/mips/include/asm/mach-jazz/dma-coherence.h
+++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h
@@ -27,11 +27,35 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
         return vdma_log2phys(dma_addr);
 }
 
-static void plat_unmap_dma_mem(dma_addr_t dma_addr)
+static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
 {
         vdma_free(dma_addr);
 }
 
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        /*
+         * we fall back to GFP_DMA when the mask isn't all 1s,
+         * so we can't guarantee allocations that must be
+         * within a tighter range than GFP_DMA..
+         */
+        if (mask < DMA_BIT_MASK(24))
+                return 0;
+
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        return;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return 0;
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 0;
diff --git a/arch/mips/include/asm/mach-lemote/dma-coherence.h b/arch/mips/include/asm/mach-lemote/dma-coherence.h
index 7e914777ebc4..38fad7dfe7da 100644
--- a/arch/mips/include/asm/mach-lemote/dma-coherence.h
+++ b/arch/mips/include/asm/mach-lemote/dma-coherence.h
@@ -30,10 +30,34 @@ static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
         return dma_addr & 0x7fffffff;
 }
 
-static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
 {
 }
 
+static inline int plat_dma_supported(struct device *dev, u64 mask)
+{
+        /*
+         * we fall back to GFP_DMA when the mask isn't all 1s,
+         * so we can't guarantee allocations that must be
+         * within a tighter range than GFP_DMA..
+         */
+        if (mask < DMA_BIT_MASK(24))
+                return 0;
+
+        return 1;
+}
+
+static inline void plat_extra_sync_for_device(struct device *dev)
+{
+        return;
+}
+
+static inline int plat_dma_mapping_error(struct device *dev,
+                                         dma_addr_t dma_addr)
+{
+        return 0;
+}
+
 static inline int plat_device_is_coherent(struct device *dev)
 {
         return 0;
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h
index b5cf6457305a..3cb50d17b62d 100644
--- a/arch/mips/include/asm/mach-rc32434/gpio.h
+++ b/arch/mips/include/asm/mach-rc32434/gpio.h
@@ -80,11 +80,8 @@ struct rb532_gpio_reg {
 /* Compact Flash GPIO pin */
 #define CF_GPIO_NUM             13
 
-extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val);
-extern unsigned get_434_reg(unsigned reg_offs);
-extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask);
-extern unsigned char get_latch_u5(void);
 extern void rb532_gpio_set_ilevel(int bit, unsigned gpio);
 extern void rb532_gpio_set_istat(int bit, unsigned gpio);
+extern void rb532_gpio_set_func(unsigned gpio);
 
 #endif /* _RC32434_GPIO_H_ */
diff --git a/arch/mips/include/asm/mach-rc32434/irq.h b/arch/mips/include/asm/mach-rc32434/irq.h
index 56738d8ec4e2..023a5b100ed0 100644
--- a/arch/mips/include/asm/mach-rc32434/irq.h
+++ b/arch/mips/include/asm/mach-rc32434/irq.h
@@ -30,4 +30,7 @@
 #define ETH0_RX_OVR_IRQ         (GROUP3_IRQ_BASE + 9)
 #define ETH0_TX_UND_IRQ         (GROUP3_IRQ_BASE + 10)
 
+#define GPIO_MAPPED_IRQ_BASE    GROUP4_IRQ_BASE
+#define GPIO_MAPPED_IRQ_GROUP   4
+
 #endif  /* __ASM_RC32434_IRQ_H */
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h
index f25a84916703..6dc5f8df1f3e 100644
--- a/arch/mips/include/asm/mach-rc32434/rb.h
+++ b/arch/mips/include/asm/mach-rc32434/rb.h
@@ -83,4 +83,7 @@ struct mpmc_device {
         void __iomem    *base;
 };
 
+extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask);
+extern unsigned char get_latch_u5(void);
+
 #endif  /* __ASM_RC32434_RB_H */
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 9316324d070d..0417516503f6 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1000,6 +1000,26 @@ do {									\
 #define read_c0_ebase()         __read_32bit_c0_register($15, 1)
 #define write_c0_ebase(val)     __write_32bit_c0_register($15, 1, val)
 
+
+/* Cavium OCTEON (cnMIPS) */
+#define read_c0_cvmcount()      __read_ulong_c0_register($9, 6)
+#define write_c0_cvmcount(val)  __write_ulong_c0_register($9, 6, val)
+
+#define read_c0_cvmctl()        __read_64bit_c0_register($9, 7)
+#define write_c0_cvmctl(val)    __write_64bit_c0_register($9, 7, val)
+
+#define read_c0_cvmmemctl()     __read_64bit_c0_register($11, 7)
+#define write_c0_cvmmemctl(val) __write_64bit_c0_register($11, 7, val)
+/*
+ * The cacheerr registers are not standardized.  On OCTEON, they are
+ * 64 bits wide.
+ */
+#define read_octeon_c0_icacheerr()      __read_64bit_c0_register($27, 0)
+#define write_octeon_c0_icacheerr(val)  __write_64bit_c0_register($27, 0, val)
+
+#define read_octeon_c0_dcacheerr()      __read_64bit_c0_register($27, 1)
+#define write_octeon_c0_dcacheerr(val)  __write_64bit_c0_register($27, 1, val)
+
 /*
  * Macros to access the floating point coprocessor control registers
  */
@@ -1008,6 +1028,8 @@ do {									\
         __asm__ __volatile__(                                   \
         ".set\tpush\n\t"                                        \
         ".set\treorder\n\t"                                     \
+        /* gas fails to assemble cfc1 for some archs (octeon).*/ \
+        ".set\tmips1\n\t"                                       \
         "cfc1\t%0,"STR(source)"\n\t"                            \
         ".set\tpop"                                             \
         : "=r" (__res));                                        \
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index e2e09b2cd265..d94085a3eafb 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -116,6 +116,8 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_PROC_FAMILY "SB1 "
 #elif defined CONFIG_CPU_LOONGSON2
 #define MODULE_PROC_FAMILY "LOONGSON2 "
+#elif defined CONFIG_CPU_CAVIUM_OCTEON
+#define MODULE_PROC_FAMILY "OCTEON "
 #else
 #error MODULE_PROC_FAMILY undefined for your processor configuration
 #endif
diff --git a/arch/mips/include/asm/octeon/cvmx-asm.h b/arch/mips/include/asm/octeon/cvmx-asm.h
new file mode 100644
index 000000000000..b21d3fc1ef91
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-asm.h
@@ -0,0 +1,128 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ *
+ * This is file defines ASM primitives for the executive.
+ */
+#ifndef __CVMX_ASM_H__
+#define __CVMX_ASM_H__
+
+#include "octeon-model.h"
+
+/* other useful stuff */
+#define CVMX_SYNC asm volatile ("sync" : : : "memory")
+/* String version of SYNCW macro for using in inline asm constructs */
+#define CVMX_SYNCW_STR "syncw\nsyncw\n"
+#ifdef __OCTEON__
+
+/* Deprecated, will be removed in future release */
+#define CVMX_SYNCIO asm volatile ("nop")
+
+#define CVMX_SYNCIOBDMA asm volatile ("synciobdma" : : : "memory")
+
+/* Deprecated, will be removed in future release */
+#define CVMX_SYNCIOALL asm volatile ("nop")
+
+/*
+ * We actually use two syncw instructions in a row when we need a write
+ * memory barrier. This is because the CN3XXX series of Octeons have
+ * errata Core-401. This can cause a single syncw to not enforce
+ * ordering under very rare conditions. Even if it is rare, better safe
+ * than sorry.
+ */
+#define CVMX_SYNCW asm volatile ("syncw\n\tsyncw" : : : "memory")
+
+/*
+ * Define new sync instructions to be normal SYNC instructions for
+ * operating systems that use threads.
+ */
+#define CVMX_SYNCWS CVMX_SYNCW
+#define CVMX_SYNCS  CVMX_SYNC
+#define CVMX_SYNCWS_STR CVMX_SYNCW_STR
+#else
+/*
+ * Not using a Cavium compiler, always use the slower sync so the
+ * assembler stays happy.
+ */
+/* Deprecated, will be removed in future release */
+#define CVMX_SYNCIO asm volatile ("nop")
+
+#define CVMX_SYNCIOBDMA asm volatile ("sync" : : : "memory")
+
+/* Deprecated, will be removed in future release */
+#define CVMX_SYNCIOALL asm volatile ("nop")
+
+#define CVMX_SYNCW asm volatile ("sync" : : : "memory")
+#define CVMX_SYNCWS CVMX_SYNCW
+#define CVMX_SYNCS  CVMX_SYNC
+#define CVMX_SYNCWS_STR CVMX_SYNCW_STR
+#endif
+
+/*
+ * CVMX_PREPARE_FOR_STORE makes each byte of the block unpredictable
+ * (actually old value or zero) until that byte is stored to (by this or
+ * another processor. Note that the value of each byte is not only
+ * unpredictable, but may also change again - up until the point when one
+ * of the cores stores to the byte.
+ */
+#define CVMX_PREPARE_FOR_STORE(address, offset) \
+        asm volatile ("pref 30, " CVMX_TMP_STR(offset) "(%[rbase])" : : \
+        [rbase] "d" (address))
+/*
+ * This is a command headed to the L2 controller to tell it to clear
+ * its dirty bit for a block. Basically, SW is telling HW that the
+ * current version of the block will not be used.
+ */
+#define CVMX_DONT_WRITE_BACK(address, offset) \
+        asm volatile ("pref 29, " CVMX_TMP_STR(offset) "(%[rbase])" : : \
+        [rbase] "d" (address))
+
+/* flush stores, invalidate entire icache */
+#define CVMX_ICACHE_INVALIDATE \
+        { CVMX_SYNC; asm volatile ("synci 0($0)" : : ); }
+
+/* flush stores, invalidate entire icache */
+#define CVMX_ICACHE_INVALIDATE2 \
+        { CVMX_SYNC; asm volatile ("cache 0, 0($0)" : : ); }
+
+/* complete prefetches, invalidate entire dcache */
+#define CVMX_DCACHE_INVALIDATE \
+        { CVMX_SYNC; asm volatile ("cache 9, 0($0)" : : ); }
+
+
+#define CVMX_POP(result, input) \
+        asm ("pop %[rd],%[rs]" : [rd] "=d" (result) : [rs] "d" (input))
+#define CVMX_DPOP(result, input) \
+        asm ("dpop %[rd],%[rs]" : [rd] "=d" (result) : [rs] "d" (input))
+
+/* some new cop0-like stuff */
+#define CVMX_RDHWR(result, regstr) \
+        asm volatile ("rdhwr %[rt],$" CVMX_TMP_STR(regstr) : [rt] "=d" (result))
+#define CVMX_RDHWRNV(result, regstr) \
+        asm ("rdhwr %[rt],$" CVMX_TMP_STR(regstr) : [rt] "=d" (result))
+#endif /* __CVMX_ASM_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
new file mode 100644
index 000000000000..692989acd8a9
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -0,0 +1,262 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ * Header file containing the ABI with the bootloader.
+ */
+
+#ifndef __CVMX_BOOTINFO_H__
+#define __CVMX_BOOTINFO_H__
+
+/*
+ * Current major and minor versions of the CVMX bootinfo block that is
+ * passed from the bootloader to the application.  This is versioned
+ * so that applications can properly handle multiple bootloader
+ * versions.
+ */
+#define CVMX_BOOTINFO_MAJ_VER 1
+#define CVMX_BOOTINFO_MIN_VER 2
+
+#if (CVMX_BOOTINFO_MAJ_VER == 1)
+#define CVMX_BOOTINFO_OCTEON_SERIAL_LEN 20
+/*
+ * This structure is populated by the bootloader.  For binary
+ * compatibility the only changes that should be made are
+ * adding members to the end of the structure, and the minor
+ * version should be incremented at that time.
+ * If an incompatible change is made, the major version
+ * must be incremented, and the minor version should be reset
+ * to 0.
+ */
+struct cvmx_bootinfo {
+        uint32_t major_version;
+        uint32_t minor_version;
+
+        uint64_t stack_top;
+        uint64_t heap_base;
+        uint64_t heap_end;
+        uint64_t desc_vaddr;
+
+        uint32_t exception_base_addr;
+        uint32_t stack_size;
+        uint32_t flags;
+        uint32_t core_mask;
+        /* DRAM size in megabytes */
+        uint32_t dram_size;
+        /* physical address of free memory descriptor block*/
+        uint32_t phy_mem_desc_addr;
+        /* used to pass flags from app to debugger */
+        uint32_t debugger_flags_base_addr;
+
+        /* CPU clock speed, in hz */
+        uint32_t eclock_hz;
+
+        /* DRAM clock speed, in hz */
+        uint32_t dclock_hz;
+
+        uint32_t reserved0;
+        uint16_t board_type;
+        uint8_t board_rev_major;
+        uint8_t board_rev_minor;
+        uint16_t reserved1;
+        uint8_t reserved2;
+        uint8_t reserved3;
+        char board_serial_number[CVMX_BOOTINFO_OCTEON_SERIAL_LEN];
+        uint8_t mac_addr_base[6];
+        uint8_t mac_addr_count;
+#if (CVMX_BOOTINFO_MIN_VER >= 1)
+        /*
+         * Several boards support compact flash on the Octeon boot
+         * bus.  The CF memory spaces may be mapped to different
+         * addresses on different boards.  These are the physical
+         * addresses, so care must be taken to use the correct
+         * XKPHYS/KSEG0 addressing depending on the application's
+         * ABI.  These values will be 0 if CF is not present.
+         */
+        uint64_t compact_flash_common_base_addr;
+        uint64_t compact_flash_attribute_base_addr;
+        /*
+         * Base address of the LED display (as on EBT3000 board)
+         * This will be 0 if LED display not present.
+         */
+        uint64_t led_display_base_addr;
+#endif
+#if (CVMX_BOOTINFO_MIN_VER >= 2)
+        /* DFA reference clock in hz (if applicable)*/
+        uint32_t dfa_ref_clock_hz;
+
+        /*
+         * flags indicating various configuration options.  These
+         * flags supercede the 'flags' variable and should be used
+         * instead if available.
+         */
+        uint32_t config_flags;
+#endif
+
+};
+
+#define CVMX_BOOTINFO_CFG_FLAG_PCI_HOST                 (1ull << 0)
+#define CVMX_BOOTINFO_CFG_FLAG_PCI_TARGET               (1ull << 1)
+#define CVMX_BOOTINFO_CFG_FLAG_DEBUG                    (1ull << 2)
+#define CVMX_BOOTINFO_CFG_FLAG_NO_MAGIC                 (1ull << 3)
+/* This flag is set if the TLB mappings are not contained in the
+ * 0x10000000 - 0x20000000 boot bus region. */
+#define CVMX_BOOTINFO_CFG_FLAG_OVERSIZE_TLB_MAPPING     (1ull << 4)
+#define CVMX_BOOTINFO_CFG_FLAG_BREAK                    (1ull << 5)
+
+#endif /*   (CVMX_BOOTINFO_MAJ_VER == 1) */
+
+/* Type defines for board and chip types */
+enum cvmx_board_types_enum {
+        CVMX_BOARD_TYPE_NULL = 0,
+        CVMX_BOARD_TYPE_SIM = 1,
+        CVMX_BOARD_TYPE_EBT3000 = 2,
+        CVMX_BOARD_TYPE_KODAMA = 3,
+        CVMX_BOARD_TYPE_NIAGARA = 4,
+        CVMX_BOARD_TYPE_NAC38 = 5,      /* formerly NAO38 */
+        CVMX_BOARD_TYPE_THUNDER = 6,
+        CVMX_BOARD_TYPE_TRANTOR = 7,
+        CVMX_BOARD_TYPE_EBH3000 = 8,
+        CVMX_BOARD_TYPE_EBH3100 = 9,
+        CVMX_BOARD_TYPE_HIKARI = 10,
+        CVMX_BOARD_TYPE_CN3010_EVB_HS5 = 11,
+        CVMX_BOARD_TYPE_CN3005_EVB_HS5 = 12,
+        CVMX_BOARD_TYPE_KBP = 13,
+        /* Deprecated, CVMX_BOARD_TYPE_CN3010_EVB_HS5 supports the CN3020 */
+        CVMX_BOARD_TYPE_CN3020_EVB_HS5 = 14,
+        CVMX_BOARD_TYPE_EBT5800 = 15,
+        CVMX_BOARD_TYPE_NICPRO2 = 16,
+        CVMX_BOARD_TYPE_EBH5600 = 17,
+        CVMX_BOARD_TYPE_EBH5601 = 18,
+        CVMX_BOARD_TYPE_EBH5200 = 19,
+        CVMX_BOARD_TYPE_BBGW_REF = 20,
+        CVMX_BOARD_TYPE_NIC_XLE_4G = 21,
+        CVMX_BOARD_TYPE_EBT5600 = 22,
+        CVMX_BOARD_TYPE_EBH5201 = 23,
+        CVMX_BOARD_TYPE_MAX,
+
+        /*
+         * The range from CVMX_BOARD_TYPE_MAX to
+         * CVMX_BOARD_TYPE_CUST_DEFINED_MIN is reserved for future
+         * SDK use.
+         */
+
+        /*
+         * Set aside a range for customer boards.  These numbers are managed
+         * by Cavium.
+         */
+        CVMX_BOARD_TYPE_CUST_DEFINED_MIN = 10000,
+        CVMX_BOARD_TYPE_CUST_WSX16 = 10001,
+        CVMX_BOARD_TYPE_CUST_NS0216 = 10002,
+        CVMX_BOARD_TYPE_CUST_NB5 = 10003,
+        CVMX_BOARD_TYPE_CUST_WMR500 = 10004,
+        CVMX_BOARD_TYPE_CUST_DEFINED_MAX = 20000,
+
+        /*
+         * Set aside a range for customer private use.  The SDK won't
+         * use any numbers in this range.
+         */
+        CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
+        CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
+
+        /* The remaining range is reserved for future use. */
+};
+
+enum cvmx_chip_types_enum {
+        CVMX_CHIP_TYPE_NULL = 0,
+        CVMX_CHIP_SIM_TYPE_DEPRECATED = 1,
+        CVMX_CHIP_TYPE_OCTEON_SAMPLE = 2,
+        CVMX_CHIP_TYPE_MAX,
+};
+
+/* Compatability alias for NAC38 name change, planned to be removed
+ * from SDK 1.7 */
+#define CVMX_BOARD_TYPE_NAO38   CVMX_BOARD_TYPE_NAC38
+
+/* Functions to return string based on type */
+#define ENUM_BRD_TYPE_CASE(x) \
+        case x: return(#x + 16);        /* Skip CVMX_BOARD_TYPE_ */
+static inline const char *cvmx_board_type_to_string(enum
+                                                    cvmx_board_types_enum type)
+{
+        switch (type) {
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NULL)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_SIM)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT3000)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KODAMA)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIAGARA)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NAC38)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_THUNDER)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_TRANTOR)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH3000)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH3100)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_HIKARI)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CN3010_EVB_HS5)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CN3005_EVB_HS5)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KBP)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CN3020_EVB_HS5)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5800)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NICPRO2)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5600)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5601)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5200)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_BBGW_REF)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC_XLE_4G)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5600)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5201)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_MAX)
+
+                        /* Customer boards listed here */
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DEFINED_MIN)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_WSX16)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_NS0216)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_NB5)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_WMR500)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DEFINED_MAX)
+
+                    /* Customer private range */
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
+        }
+        return "Unsupported Board";
+}
+
+#define ENUM_CHIP_TYPE_CASE(x) \
+        case x: return(#x + 15);        /* Skip CVMX_CHIP_TYPE */
+static inline const char *cvmx_chip_type_to_string(enum
+                                                   cvmx_chip_types_enum type)
+{
+        switch (type) {
+                ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_NULL)
+                    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_SIM_TYPE_DEPRECATED)
+                    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_OCTEON_SAMPLE)
+                    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_MAX)
+        }
+        return "Unsupported Chip";
+}
+
+#endif /* __CVMX_BOOTINFO_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-bootmem.h b/arch/mips/include/asm/octeon/cvmx-bootmem.h
new file mode 100644
index 000000000000..1cbe4b55889d
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-bootmem.h
@@ -0,0 +1,288 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ * Simple allocate only memory allocator.  Used to allocate memory at
+ * application start time.
+ */
+
+#ifndef __CVMX_BOOTMEM_H__
+#define __CVMX_BOOTMEM_H__
+/* Must be multiple of 8, changing breaks ABI */
+#define CVMX_BOOTMEM_NAME_LEN 128
+
+/* Can change without breaking ABI */
+#define CVMX_BOOTMEM_NUM_NAMED_BLOCKS 64
+
+/* minimum alignment of bootmem alloced blocks */
+#define CVMX_BOOTMEM_ALIGNMENT_SIZE     (16ull)
+
+/* Flags for cvmx_bootmem_phy_mem* functions */
+/* Allocate from end of block instead of beginning */
+#define CVMX_BOOTMEM_FLAG_END_ALLOC    (1 << 0)
+
+/* Don't do any locking. */
+#define CVMX_BOOTMEM_FLAG_NO_LOCKING   (1 << 1)
+
+/* First bytes of each free physical block of memory contain this structure,
+ * which is used to maintain the free memory list.  Since the bootloader is
+ * only 32 bits, there is a union providing 64 and 32 bit versions.  The
+ * application init code converts addresses to 64 bit addresses before the
+ * application starts.
+ */
+struct cvmx_bootmem_block_header {
+        /*
+         * Note: these are referenced from assembly routines in the
+         * bootloader, so this structure should not be changed
+         * without changing those routines as well.
+         */
+        uint64_t next_block_addr;
+        uint64_t size;
+
+};
+
+/*
+ * Structure for named memory blocks.  Number of descriptors available
+ * can be changed without affecting compatiblity, but name length
+ * changes require a bump in the bootmem descriptor version Note: This
+ * structure must be naturally 64 bit aligned, as a single memory
+ * image will be used by both 32 and 64 bit programs.
+ */
+struct cvmx_bootmem_named_block_desc {
+        /* Base address of named block */
+        uint64_t base_addr;
+        /*
+         * Size actually allocated for named block (may differ from
+         * requested).
+         */
+        uint64_t size;
+        /* name of named block */
+        char name[CVMX_BOOTMEM_NAME_LEN];
+};
+
+/* Current descriptor versions */
+/* CVMX bootmem descriptor major version */
+#define CVMX_BOOTMEM_DESC_MAJ_VER   3
+
+/* CVMX bootmem descriptor minor version */
+#define CVMX_BOOTMEM_DESC_MIN_VER   0
+
+/* First three members of cvmx_bootmem_desc_t are left in original
+ * positions for backwards compatibility.
+ */
+struct cvmx_bootmem_desc {
+        /* spinlock to control access to list */
+        uint32_t lock;
+        /* flags for indicating various conditions */
+        uint32_t flags;
+        uint64_t head_addr;
+
+        /* Incremented when incompatible changes made */
+        uint32_t major_version;
+
+        /*
+         * Incremented changed when compatible changes made, reset to
+         * zero when major incremented.
+         */
+        uint32_t minor_version;
+
+        uint64_t app_data_addr;
+        uint64_t app_data_size;
+
+        /* number of elements in named blocks array */
+        uint32_t named_block_num_blocks;
+
+        /* length of name array in bootmem blocks */
+        uint32_t named_block_name_len;
+        /* address of named memory block descriptors */
+        uint64_t named_block_array_addr;
+
+};
+
+/**
+ * Initialize the boot alloc memory structures. This is
+ * normally called inside of cvmx_user_app_init()
+ *
+ * @mem_desc_ptr:       Address of the free memory list
+ */
+extern int cvmx_bootmem_init(void *mem_desc_ptr);
+
+/**
+ * Allocate a block of memory from the free list that was passed
+ * to the application by the bootloader.
+ * This is an allocate-only algorithm, so freeing memory is not possible.
+ *
+ * @size:      Size in bytes of block to allocate
+ * @alignment: Alignment required - must be power of 2
+ *
+ * Returns pointer to block of memory, NULL on error
+ */
+extern void *cvmx_bootmem_alloc(uint64_t size, uint64_t alignment);
+
+/**
+ * Allocate a block of memory from the free list that was
+ * passed to the application by the bootloader at a specific
+ * address. This is an allocate-only algorithm, so
+ * freeing memory is not possible. Allocation will fail if
+ * memory cannot be allocated at the specified address.
+ *
+ * @size:      Size in bytes of block to allocate
+ * @address:   Physical address to allocate memory at.  If this memory is not
+ *                  available, the allocation fails.
+ * @alignment: Alignment required - must be power of 2
+ * Returns pointer to block of memory, NULL on error
+ */
+extern void *cvmx_bootmem_alloc_address(uint64_t size, uint64_t address,
+                                        uint64_t alignment);
+
+/**
+ * Allocate a block of memory from the free list that was
+ * passed to the application by the bootloader within a specified
+ * address range. This is an allocate-only algorithm, so
+ * freeing memory is not possible. Allocation will fail if
+ * memory cannot be allocated in the requested range.
+ *
+ * @size:      Size in bytes of block to allocate
+ * @min_addr:  defines the minimum address of the range
+ * @max_addr:  defines the maximum address of the range
+ * @alignment: Alignment required - must be power of 2
+ * Returns pointer to block of memory, NULL on error
+ */
+extern void *cvmx_bootmem_alloc_range(uint64_t size, uint64_t alignment,
+                                      uint64_t min_addr, uint64_t max_addr);
+
+/**
+ * Frees a previously allocated named bootmem block.
+ *
+ * @name:   name of block to free
+ *
+ * Returns 0 on failure,
+ *         !0 on success
+ */
+extern int cvmx_bootmem_free_named(char *name);
+
+/**
+ * Finds a named bootmem block by name.
+ *
+ * @name:   name of block to free
+ *
+ * Returns pointer to named block descriptor on success
+ *         0 on failure
+ */
+struct cvmx_bootmem_named_block_desc *cvmx_bootmem_find_named_block(char *name);
+
+/**
+ * Allocates a block of physical memory from the free list, at
+ * (optional) requested address and alignment.
+ *
+ * @req_size: size of region to allocate.  All requests are rounded up
+ *            to be a multiple CVMX_BOOTMEM_ALIGNMENT_SIZE bytes size
+ *
+ * @address_min: Minimum address that block can occupy.
+ *
+ * @address_max: Specifies the maximum address_min (inclusive) that
+ *               the allocation can use.
+ *
+ * @alignment: Requested alignment of the block.  If this alignment
+ *             cannot be met, the allocation fails.  This must be a
+ *             power of 2.  (Note: Alignment of
+ *             CVMX_BOOTMEM_ALIGNMENT_SIZE bytes is required, and
+ *             internally enforced.  Requested alignments of less than
+ *             CVMX_BOOTMEM_ALIGNMENT_SIZE are set to
+ *             CVMX_BOOTMEM_ALIGNMENT_SIZE.)
+ *
+ * @flags:     Flags to control options for the allocation.
+ *
+ * Returns physical address of block allocated, or -1 on failure
+ */
+int64_t cvmx_bootmem_phy_alloc(uint64_t req_size, uint64_t address_min,
+                               uint64_t address_max, uint64_t alignment,
+                               uint32_t flags);
+
+/**
+ * Finds a named memory block by name.
+ * Also used for finding an unused entry in the named block table.
+ *
+ * @name: Name of memory block to find.  If NULL pointer given, then
+ *        finds unused descriptor, if available.
+ *
+ * @flags: Flags to control options for the allocation.
+ *
+ * Returns Pointer to memory block descriptor, NULL if not found.
+ *         If NULL returned when name parameter is NULL, then no memory
+ *         block descriptors are available.
+ */
+struct cvmx_bootmem_named_block_desc *
+cvmx_bootmem_phy_named_block_find(char *name, uint32_t flags);
+
+/**
+ * Frees a named block.
+ *
+ * @name:   name of block to free
+ * @flags:  flags for passing options
+ *
+ * Returns 0 on failure
+ *         1 on success
+ */
+int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags);
+
+/**
+ * Frees a block to the bootmem allocator list.  This must
+ * be used with care, as the size provided must match the size
+ * of the block that was allocated, or the list will become
+ * corrupted.
+ *
+ * IMPORTANT:  This is only intended to be used as part of named block
+ * frees and initial population of the free memory list.
+ *                                                      *
+ *
+ * @phy_addr: physical address of block
+ * @size:     size of block in bytes.
+ * @flags:    flags for passing options
+ *
+ * Returns 1 on success,
+ *         0 on failure
+ */
+int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags);
+
+/**
+ * Locks the bootmem allocator.  This is useful in certain situations
+ * where multiple allocations must be made without being interrupted.
+ * This should be used with the CVMX_BOOTMEM_FLAG_NO_LOCKING flag.
+ *
+ */
+void cvmx_bootmem_lock(void);
+
+/**
+ * Unlocks the bootmem allocator.  This is useful in certain situations
+ * where multiple allocations must be made without being interrupted.
+ * This should be used with the CVMX_BOOTMEM_FLAG_NO_LOCKING flag.
+ *
+ */
+void cvmx_bootmem_unlock(void);
+
+#endif /*   __CVMX_BOOTMEM_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-ciu-defs.h b/arch/mips/include/asm/octeon/cvmx-ciu-defs.h
new file mode 100644
index 000000000000..f8f05b7764b7
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-ciu-defs.h
@@ -0,0 +1,1616 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_CIU_DEFS_H__
+#define __CVMX_CIU_DEFS_H__
+
+#define CVMX_CIU_BIST \
+         CVMX_ADD_IO_SEG(0x0001070000000730ull)
+#define CVMX_CIU_DINT \
+         CVMX_ADD_IO_SEG(0x0001070000000720ull)
+#define CVMX_CIU_FUSE \
+         CVMX_ADD_IO_SEG(0x0001070000000728ull)
+#define CVMX_CIU_GSTOP \
+         CVMX_ADD_IO_SEG(0x0001070000000710ull)
+#define CVMX_CIU_INTX_EN0(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000200ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN0_W1C(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000002200ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN0_W1S(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000006200ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN1(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000208ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN1_W1C(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000002208ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN1_W1S(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000006208ull + (((offset) & 63) * 16))
+#define CVMX_CIU_INTX_EN4_0(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000C80ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_EN4_0_W1C(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000002C80ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_EN4_0_W1S(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000006C80ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_EN4_1(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000C88ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_EN4_1_W1C(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000002C88ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_EN4_1_W1S(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000006C88ull + (((offset) & 15) * 16))
+#define CVMX_CIU_INTX_SUM0(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000000ull + (((offset) & 63) * 8))
+#define CVMX_CIU_INTX_SUM4(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000C00ull + (((offset) & 15) * 8))
+#define CVMX_CIU_INT_SUM1 \
+         CVMX_ADD_IO_SEG(0x0001070000000108ull)
+#define CVMX_CIU_MBOX_CLRX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000680ull + (((offset) & 15) * 8))
+#define CVMX_CIU_MBOX_SETX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000600ull + (((offset) & 15) * 8))
+#define CVMX_CIU_NMI \
+         CVMX_ADD_IO_SEG(0x0001070000000718ull)
+#define CVMX_CIU_PCI_INTA \
+         CVMX_ADD_IO_SEG(0x0001070000000750ull)
+#define CVMX_CIU_PP_DBG \
+         CVMX_ADD_IO_SEG(0x0001070000000708ull)
+#define CVMX_CIU_PP_POKEX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000580ull + (((offset) & 15) * 8))
+#define CVMX_CIU_PP_RST \
+         CVMX_ADD_IO_SEG(0x0001070000000700ull)
+#define CVMX_CIU_QLM_DCOK \
+         CVMX_ADD_IO_SEG(0x0001070000000760ull)
+#define CVMX_CIU_QLM_JTGC \
+         CVMX_ADD_IO_SEG(0x0001070000000768ull)
+#define CVMX_CIU_QLM_JTGD \
+         CVMX_ADD_IO_SEG(0x0001070000000770ull)
+#define CVMX_CIU_SOFT_BIST \
+         CVMX_ADD_IO_SEG(0x0001070000000738ull)
+#define CVMX_CIU_SOFT_PRST \
+         CVMX_ADD_IO_SEG(0x0001070000000748ull)
+#define CVMX_CIU_SOFT_PRST1 \
+         CVMX_ADD_IO_SEG(0x0001070000000758ull)
+#define CVMX_CIU_SOFT_RST \
+         CVMX_ADD_IO_SEG(0x0001070000000740ull)
+#define CVMX_CIU_TIMX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000480ull + (((offset) & 3) * 8))
+#define CVMX_CIU_WDOGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000500ull + (((offset) & 15) * 8))
+
+union cvmx_ciu_bist {
+        uint64_t u64;
+        struct cvmx_ciu_bist_s {
+                uint64_t reserved_4_63:60;
+                uint64_t bist:4;
+        } s;
+        struct cvmx_ciu_bist_s cn30xx;
+        struct cvmx_ciu_bist_s cn31xx;
+        struct cvmx_ciu_bist_s cn38xx;
+        struct cvmx_ciu_bist_s cn38xxp2;
+        struct cvmx_ciu_bist_cn50xx {
+                uint64_t reserved_2_63:62;
+                uint64_t bist:2;
+        } cn50xx;
+        struct cvmx_ciu_bist_cn52xx {
+                uint64_t reserved_3_63:61;
+                uint64_t bist:3;
+        } cn52xx;
+        struct cvmx_ciu_bist_cn52xx cn52xxp1;
+        struct cvmx_ciu_bist_s cn56xx;
+        struct cvmx_ciu_bist_s cn56xxp1;
+        struct cvmx_ciu_bist_s cn58xx;
+        struct cvmx_ciu_bist_s cn58xxp1;
+};
+
+union cvmx_ciu_dint {
+        uint64_t u64;
+        struct cvmx_ciu_dint_s {
+                uint64_t reserved_16_63:48;
+                uint64_t dint:16;
+        } s;
+        struct cvmx_ciu_dint_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t dint:1;
+        } cn30xx;
+        struct cvmx_ciu_dint_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t dint:2;
+        } cn31xx;
+        struct cvmx_ciu_dint_s cn38xx;
+        struct cvmx_ciu_dint_s cn38xxp2;
+        struct cvmx_ciu_dint_cn31xx cn50xx;
+        struct cvmx_ciu_dint_cn52xx {
+                uint64_t reserved_4_63:60;
+                uint64_t dint:4;
+        } cn52xx;
+        struct cvmx_ciu_dint_cn52xx cn52xxp1;
+        struct cvmx_ciu_dint_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t dint:12;
+        } cn56xx;
+        struct cvmx_ciu_dint_cn56xx cn56xxp1;
+        struct cvmx_ciu_dint_s cn58xx;
+        struct cvmx_ciu_dint_s cn58xxp1;
+};
+
+union cvmx_ciu_fuse {
+        uint64_t u64;
+        struct cvmx_ciu_fuse_s {
+                uint64_t reserved_16_63:48;
+                uint64_t fuse:16;
+        } s;
+        struct cvmx_ciu_fuse_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t fuse:1;
+        } cn30xx;
+        struct cvmx_ciu_fuse_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t fuse:2;
+        } cn31xx;
+        struct cvmx_ciu_fuse_s cn38xx;
+        struct cvmx_ciu_fuse_s cn38xxp2;
+        struct cvmx_ciu_fuse_cn31xx cn50xx;
+        struct cvmx_ciu_fuse_cn52xx {
+                uint64_t reserved_4_63:60;
+                uint64_t fuse:4;
+        } cn52xx;
+        struct cvmx_ciu_fuse_cn52xx cn52xxp1;
+        struct cvmx_ciu_fuse_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t fuse:12;
+        } cn56xx;
+        struct cvmx_ciu_fuse_cn56xx cn56xxp1;
+        struct cvmx_ciu_fuse_s cn58xx;
+        struct cvmx_ciu_fuse_s cn58xxp1;
+};
+
+union cvmx_ciu_gstop {
+        uint64_t u64;
+        struct cvmx_ciu_gstop_s {
+                uint64_t reserved_1_63:63;
+                uint64_t gstop:1;
+        } s;
+        struct cvmx_ciu_gstop_s cn30xx;
+        struct cvmx_ciu_gstop_s cn31xx;
+        struct cvmx_ciu_gstop_s cn38xx;
+        struct cvmx_ciu_gstop_s cn38xxp2;
+        struct cvmx_ciu_gstop_s cn50xx;
+        struct cvmx_ciu_gstop_s cn52xx;
+        struct cvmx_ciu_gstop_s cn52xxp1;
+        struct cvmx_ciu_gstop_s cn56xx;
+        struct cvmx_ciu_gstop_s cn56xxp1;
+        struct cvmx_ciu_gstop_s cn58xx;
+        struct cvmx_ciu_gstop_s cn58xxp1;
+};
+
+union cvmx_ciu_intx_en0 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en0_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en0_cn30xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t reserved_47_47:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn30xx;
+        struct cvmx_ciu_intx_en0_cn31xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn31xx;
+        struct cvmx_ciu_intx_en0_cn38xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn38xx;
+        struct cvmx_ciu_intx_en0_cn38xx cn38xxp2;
+        struct cvmx_ciu_intx_en0_cn30xx cn50xx;
+        struct cvmx_ciu_intx_en0_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en0_cn52xx cn52xxp1;
+        struct cvmx_ciu_intx_en0_cn56xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn56xx;
+        struct cvmx_ciu_intx_en0_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_en0_cn38xx cn58xx;
+        struct cvmx_ciu_intx_en0_cn38xx cn58xxp1;
+};
+
+union cvmx_ciu_intx_en0_w1c {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en0_w1c_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en0_w1c_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en0_w1c_s cn56xx;
+        struct cvmx_ciu_intx_en0_w1c_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en0_w1s {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en0_w1s_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en0_w1s_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en0_w1s_s cn56xx;
+        struct cvmx_ciu_intx_en0_w1s_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en1 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en1_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en1_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t wdog:1;
+        } cn30xx;
+        struct cvmx_ciu_intx_en1_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t wdog:2;
+        } cn31xx;
+        struct cvmx_ciu_intx_en1_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn38xx;
+        struct cvmx_ciu_intx_en1_cn38xx cn38xxp2;
+        struct cvmx_ciu_intx_en1_cn31xx cn50xx;
+        struct cvmx_ciu_intx_en1_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en1_cn52xxp1 {
+                uint64_t reserved_19_63:45;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xxp1;
+        struct cvmx_ciu_intx_en1_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en1_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_en1_cn38xx cn58xx;
+        struct cvmx_ciu_intx_en1_cn38xx cn58xxp1;
+};
+
+union cvmx_ciu_intx_en1_w1c {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en1_w1c_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en1_w1c_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en1_w1c_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en1_w1c_cn58xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en1_w1s {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en1_w1s_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en1_w1s_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en1_w1s_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en1_w1s_cn58xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en4_0 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_0_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en4_0_cn50xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t reserved_47_47:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn50xx;
+        struct cvmx_ciu_intx_en4_0_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_0_cn52xx cn52xxp1;
+        struct cvmx_ciu_intx_en4_0_cn56xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn56xx;
+        struct cvmx_ciu_intx_en4_0_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_en4_0_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+        struct cvmx_ciu_intx_en4_0_cn58xx cn58xxp1;
+};
+
+union cvmx_ciu_intx_en4_0_w1c {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_0_w1c_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en4_0_w1c_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_0_w1c_s cn56xx;
+        struct cvmx_ciu_intx_en4_0_w1c_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en4_0_w1s {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_0_w1s_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_en4_0_w1s_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_0_w1s_s cn56xx;
+        struct cvmx_ciu_intx_en4_0_w1s_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t reserved_44_44:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en4_1 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_1_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en4_1_cn50xx {
+                uint64_t reserved_2_63:62;
+                uint64_t wdog:2;
+        } cn50xx;
+        struct cvmx_ciu_intx_en4_1_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_1_cn52xxp1 {
+                uint64_t reserved_19_63:45;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xxp1;
+        struct cvmx_ciu_intx_en4_1_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en4_1_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_en4_1_cn58xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn58xx;
+        struct cvmx_ciu_intx_en4_1_cn58xx cn58xxp1;
+};
+
+union cvmx_ciu_intx_en4_1_w1c {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_1_w1c_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en4_1_w1c_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_1_w1c_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en4_1_w1c_cn58xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_en4_1_w1s {
+        uint64_t u64;
+        struct cvmx_ciu_intx_en4_1_w1s_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_intx_en4_1_w1s_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_intx_en4_1_w1s_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_intx_en4_1_w1s_cn58xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn58xx;
+};
+
+union cvmx_ciu_intx_sum0 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_sum0_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_sum0_cn30xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t reserved_47_47:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn30xx;
+        struct cvmx_ciu_intx_sum0_cn31xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn31xx;
+        struct cvmx_ciu_intx_sum0_cn38xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn38xx;
+        struct cvmx_ciu_intx_sum0_cn38xx cn38xxp2;
+        struct cvmx_ciu_intx_sum0_cn30xx cn50xx;
+        struct cvmx_ciu_intx_sum0_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_sum0_cn52xx cn52xxp1;
+        struct cvmx_ciu_intx_sum0_cn56xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn56xx;
+        struct cvmx_ciu_intx_sum0_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_sum0_cn38xx cn58xx;
+        struct cvmx_ciu_intx_sum0_cn38xx cn58xxp1;
+};
+
+union cvmx_ciu_intx_sum4 {
+        uint64_t u64;
+        struct cvmx_ciu_intx_sum4_s {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } s;
+        struct cvmx_ciu_intx_sum4_cn50xx {
+                uint64_t reserved_59_63:5;
+                uint64_t mpi:1;
+                uint64_t pcm:1;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t reserved_47_47:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn50xx;
+        struct cvmx_ciu_intx_sum4_cn52xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t reserved_51_51:1;
+                uint64_t ipd_drp:1;
+                uint64_t reserved_49_49:1;
+                uint64_t gmx_drp:1;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn52xx;
+        struct cvmx_ciu_intx_sum4_cn52xx cn52xxp1;
+        struct cvmx_ciu_intx_sum4_cn56xx {
+                uint64_t bootdma:1;
+                uint64_t mii:1;
+                uint64_t ipdppthr:1;
+                uint64_t powiq:1;
+                uint64_t twsi2:1;
+                uint64_t reserved_57_58:2;
+                uint64_t usb:1;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn56xx;
+        struct cvmx_ciu_intx_sum4_cn56xx cn56xxp1;
+        struct cvmx_ciu_intx_sum4_cn58xx {
+                uint64_t reserved_56_63:8;
+                uint64_t timer:4;
+                uint64_t key_zero:1;
+                uint64_t ipd_drp:1;
+                uint64_t gmx_drp:2;
+                uint64_t trace:1;
+                uint64_t rml:1;
+                uint64_t twsi:1;
+                uint64_t wdog_sum:1;
+                uint64_t pci_msi:4;
+                uint64_t pci_int:4;
+                uint64_t uart:2;
+                uint64_t mbox:2;
+                uint64_t gpio:16;
+                uint64_t workq:16;
+        } cn58xx;
+        struct cvmx_ciu_intx_sum4_cn58xx cn58xxp1;
+};
+
+union cvmx_ciu_int_sum1 {
+        uint64_t u64;
+        struct cvmx_ciu_int_sum1_s {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t wdog:16;
+        } s;
+        struct cvmx_ciu_int_sum1_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t wdog:1;
+        } cn30xx;
+        struct cvmx_ciu_int_sum1_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t wdog:2;
+        } cn31xx;
+        struct cvmx_ciu_int_sum1_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t wdog:16;
+        } cn38xx;
+        struct cvmx_ciu_int_sum1_cn38xx cn38xxp2;
+        struct cvmx_ciu_int_sum1_cn31xx cn50xx;
+        struct cvmx_ciu_int_sum1_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t nand:1;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xx;
+        struct cvmx_ciu_int_sum1_cn52xxp1 {
+                uint64_t reserved_19_63:45;
+                uint64_t mii1:1;
+                uint64_t usb1:1;
+                uint64_t uart2:1;
+                uint64_t reserved_4_15:12;
+                uint64_t wdog:4;
+        } cn52xxp1;
+        struct cvmx_ciu_int_sum1_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t wdog:12;
+        } cn56xx;
+        struct cvmx_ciu_int_sum1_cn56xx cn56xxp1;
+        struct cvmx_ciu_int_sum1_cn38xx cn58xx;
+        struct cvmx_ciu_int_sum1_cn38xx cn58xxp1;
+};
+
+union cvmx_ciu_mbox_clrx {
+        uint64_t u64;
+        struct cvmx_ciu_mbox_clrx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t bits:32;
+        } s;
+        struct cvmx_ciu_mbox_clrx_s cn30xx;
+        struct cvmx_ciu_mbox_clrx_s cn31xx;
+        struct cvmx_ciu_mbox_clrx_s cn38xx;
+        struct cvmx_ciu_mbox_clrx_s cn38xxp2;
+        struct cvmx_ciu_mbox_clrx_s cn50xx;
+        struct cvmx_ciu_mbox_clrx_s cn52xx;
+        struct cvmx_ciu_mbox_clrx_s cn52xxp1;
+        struct cvmx_ciu_mbox_clrx_s cn56xx;
+        struct cvmx_ciu_mbox_clrx_s cn56xxp1;
+        struct cvmx_ciu_mbox_clrx_s cn58xx;
+        struct cvmx_ciu_mbox_clrx_s cn58xxp1;
+};
+
+union cvmx_ciu_mbox_setx {
+        uint64_t u64;
+        struct cvmx_ciu_mbox_setx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t bits:32;
+        } s;
+        struct cvmx_ciu_mbox_setx_s cn30xx;
+        struct cvmx_ciu_mbox_setx_s cn31xx;
+        struct cvmx_ciu_mbox_setx_s cn38xx;
+        struct cvmx_ciu_mbox_setx_s cn38xxp2;
+        struct cvmx_ciu_mbox_setx_s cn50xx;
+        struct cvmx_ciu_mbox_setx_s cn52xx;
+        struct cvmx_ciu_mbox_setx_s cn52xxp1;
+        struct cvmx_ciu_mbox_setx_s cn56xx;
+        struct cvmx_ciu_mbox_setx_s cn56xxp1;
+        struct cvmx_ciu_mbox_setx_s cn58xx;
+        struct cvmx_ciu_mbox_setx_s cn58xxp1;
+};
+
+union cvmx_ciu_nmi {
+        uint64_t u64;
+        struct cvmx_ciu_nmi_s {
+                uint64_t reserved_16_63:48;
+                uint64_t nmi:16;
+        } s;
+        struct cvmx_ciu_nmi_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t nmi:1;
+        } cn30xx;
+        struct cvmx_ciu_nmi_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t nmi:2;
+        } cn31xx;
+        struct cvmx_ciu_nmi_s cn38xx;
+        struct cvmx_ciu_nmi_s cn38xxp2;
+        struct cvmx_ciu_nmi_cn31xx cn50xx;
+        struct cvmx_ciu_nmi_cn52xx {
+                uint64_t reserved_4_63:60;
+                uint64_t nmi:4;
+        } cn52xx;
+        struct cvmx_ciu_nmi_cn52xx cn52xxp1;
+        struct cvmx_ciu_nmi_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t nmi:12;
+        } cn56xx;
+        struct cvmx_ciu_nmi_cn56xx cn56xxp1;
+        struct cvmx_ciu_nmi_s cn58xx;
+        struct cvmx_ciu_nmi_s cn58xxp1;
+};
+
+union cvmx_ciu_pci_inta {
+        uint64_t u64;
+        struct cvmx_ciu_pci_inta_s {
+                uint64_t reserved_2_63:62;
+                uint64_t intr:2;
+        } s;
+        struct cvmx_ciu_pci_inta_s cn30xx;
+        struct cvmx_ciu_pci_inta_s cn31xx;
+        struct cvmx_ciu_pci_inta_s cn38xx;
+        struct cvmx_ciu_pci_inta_s cn38xxp2;
+        struct cvmx_ciu_pci_inta_s cn50xx;
+        struct cvmx_ciu_pci_inta_s cn52xx;
+        struct cvmx_ciu_pci_inta_s cn52xxp1;
+        struct cvmx_ciu_pci_inta_s cn56xx;
+        struct cvmx_ciu_pci_inta_s cn56xxp1;
+        struct cvmx_ciu_pci_inta_s cn58xx;
+        struct cvmx_ciu_pci_inta_s cn58xxp1;
+};
+
+union cvmx_ciu_pp_dbg {
+        uint64_t u64;
+        struct cvmx_ciu_pp_dbg_s {
+                uint64_t reserved_16_63:48;
+                uint64_t ppdbg:16;
+        } s;
+        struct cvmx_ciu_pp_dbg_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t ppdbg:1;
+        } cn30xx;
+        struct cvmx_ciu_pp_dbg_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t ppdbg:2;
+        } cn31xx;
+        struct cvmx_ciu_pp_dbg_s cn38xx;
+        struct cvmx_ciu_pp_dbg_s cn38xxp2;
+        struct cvmx_ciu_pp_dbg_cn31xx cn50xx;
+        struct cvmx_ciu_pp_dbg_cn52xx {
+                uint64_t reserved_4_63:60;
+                uint64_t ppdbg:4;
+        } cn52xx;
+        struct cvmx_ciu_pp_dbg_cn52xx cn52xxp1;
+        struct cvmx_ciu_pp_dbg_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t ppdbg:12;
+        } cn56xx;
+        struct cvmx_ciu_pp_dbg_cn56xx cn56xxp1;
+        struct cvmx_ciu_pp_dbg_s cn58xx;
+        struct cvmx_ciu_pp_dbg_s cn58xxp1;
+};
+
+union cvmx_ciu_pp_pokex {
+        uint64_t u64;
+        struct cvmx_ciu_pp_pokex_s {
+                uint64_t reserved_0_63:64;
+        } s;
+        struct cvmx_ciu_pp_pokex_s cn30xx;
+        struct cvmx_ciu_pp_pokex_s cn31xx;
+        struct cvmx_ciu_pp_pokex_s cn38xx;
+        struct cvmx_ciu_pp_pokex_s cn38xxp2;
+        struct cvmx_ciu_pp_pokex_s cn50xx;
+        struct cvmx_ciu_pp_pokex_s cn52xx;
+        struct cvmx_ciu_pp_pokex_s cn52xxp1;
+        struct cvmx_ciu_pp_pokex_s cn56xx;
+        struct cvmx_ciu_pp_pokex_s cn56xxp1;
+        struct cvmx_ciu_pp_pokex_s cn58xx;
+        struct cvmx_ciu_pp_pokex_s cn58xxp1;
+};
+
+union cvmx_ciu_pp_rst {
+        uint64_t u64;
+        struct cvmx_ciu_pp_rst_s {
+                uint64_t reserved_16_63:48;
+                uint64_t rst:15;
+                uint64_t rst0:1;
+        } s;
+        struct cvmx_ciu_pp_rst_cn30xx {
+                uint64_t reserved_1_63:63;
+                uint64_t rst0:1;
+        } cn30xx;
+        struct cvmx_ciu_pp_rst_cn31xx {
+                uint64_t reserved_2_63:62;
+                uint64_t rst:1;
+                uint64_t rst0:1;
+        } cn31xx;
+        struct cvmx_ciu_pp_rst_s cn38xx;
+        struct cvmx_ciu_pp_rst_s cn38xxp2;
+        struct cvmx_ciu_pp_rst_cn31xx cn50xx;
+        struct cvmx_ciu_pp_rst_cn52xx {
+                uint64_t reserved_4_63:60;
+                uint64_t rst:3;
+                uint64_t rst0:1;
+        } cn52xx;
+        struct cvmx_ciu_pp_rst_cn52xx cn52xxp1;
+        struct cvmx_ciu_pp_rst_cn56xx {
+                uint64_t reserved_12_63:52;
+                uint64_t rst:11;
+                uint64_t rst0:1;
+        } cn56xx;
+        struct cvmx_ciu_pp_rst_cn56xx cn56xxp1;
+        struct cvmx_ciu_pp_rst_s cn58xx;
+        struct cvmx_ciu_pp_rst_s cn58xxp1;
+};
+
+union cvmx_ciu_qlm_dcok {
+        uint64_t u64;
+        struct cvmx_ciu_qlm_dcok_s {
+                uint64_t reserved_4_63:60;
+                uint64_t qlm_dcok:4;
+        } s;
+        struct cvmx_ciu_qlm_dcok_cn52xx {
+                uint64_t reserved_2_63:62;
+                uint64_t qlm_dcok:2;
+        } cn52xx;
+        struct cvmx_ciu_qlm_dcok_cn52xx cn52xxp1;
+        struct cvmx_ciu_qlm_dcok_s cn56xx;
+        struct cvmx_ciu_qlm_dcok_s cn56xxp1;
+};
+
+union cvmx_ciu_qlm_jtgc {
+        uint64_t u64;
+        struct cvmx_ciu_qlm_jtgc_s {
+                uint64_t reserved_11_63:53;
+                uint64_t clk_div:3;
+                uint64_t reserved_6_7:2;
+                uint64_t mux_sel:2;
+                uint64_t bypass:4;
+        } s;
+        struct cvmx_ciu_qlm_jtgc_cn52xx {
+                uint64_t reserved_11_63:53;
+                uint64_t clk_div:3;
+                uint64_t reserved_5_7:3;
+                uint64_t mux_sel:1;
+                uint64_t reserved_2_3:2;
+                uint64_t bypass:2;
+        } cn52xx;
+        struct cvmx_ciu_qlm_jtgc_cn52xx cn52xxp1;
+        struct cvmx_ciu_qlm_jtgc_s cn56xx;
+        struct cvmx_ciu_qlm_jtgc_s cn56xxp1;
+};
+
+union cvmx_ciu_qlm_jtgd {
+        uint64_t u64;
+        struct cvmx_ciu_qlm_jtgd_s {
+                uint64_t capture:1;
+                uint64_t shift:1;
+                uint64_t update:1;
+                uint64_t reserved_44_60:17;
+                uint64_t select:4;
+                uint64_t reserved_37_39:3;
+                uint64_t shft_cnt:5;
+                uint64_t shft_reg:32;
+        } s;
+        struct cvmx_ciu_qlm_jtgd_cn52xx {
+                uint64_t capture:1;
+                uint64_t shift:1;
+                uint64_t update:1;
+                uint64_t reserved_42_60:19;
+                uint64_t select:2;
+                uint64_t reserved_37_39:3;
+                uint64_t shft_cnt:5;
+                uint64_t shft_reg:32;
+        } cn52xx;
+        struct cvmx_ciu_qlm_jtgd_cn52xx cn52xxp1;
+        struct cvmx_ciu_qlm_jtgd_s cn56xx;
+        struct cvmx_ciu_qlm_jtgd_cn56xxp1 {
+                uint64_t capture:1;
+                uint64_t shift:1;
+                uint64_t update:1;
+                uint64_t reserved_37_60:24;
+                uint64_t shft_cnt:5;
+                uint64_t shft_reg:32;
+        } cn56xxp1;
+};
+
+union cvmx_ciu_soft_bist {
+        uint64_t u64;
+        struct cvmx_ciu_soft_bist_s {
+                uint64_t reserved_1_63:63;
+                uint64_t soft_bist:1;
+        } s;
+        struct cvmx_ciu_soft_bist_s cn30xx;
+        struct cvmx_ciu_soft_bist_s cn31xx;
+        struct cvmx_ciu_soft_bist_s cn38xx;
+        struct cvmx_ciu_soft_bist_s cn38xxp2;
+        struct cvmx_ciu_soft_bist_s cn50xx;
+        struct cvmx_ciu_soft_bist_s cn52xx;
+        struct cvmx_ciu_soft_bist_s cn52xxp1;
+        struct cvmx_ciu_soft_bist_s cn56xx;
+        struct cvmx_ciu_soft_bist_s cn56xxp1;
+        struct cvmx_ciu_soft_bist_s cn58xx;
+        struct cvmx_ciu_soft_bist_s cn58xxp1;
+};
+
+union cvmx_ciu_soft_prst {
+        uint64_t u64;
+        struct cvmx_ciu_soft_prst_s {
+                uint64_t reserved_3_63:61;
+                uint64_t host64:1;
+                uint64_t npi:1;
+                uint64_t soft_prst:1;
+        } s;
+        struct cvmx_ciu_soft_prst_s cn30xx;
+        struct cvmx_ciu_soft_prst_s cn31xx;
+        struct cvmx_ciu_soft_prst_s cn38xx;
+        struct cvmx_ciu_soft_prst_s cn38xxp2;
+        struct cvmx_ciu_soft_prst_s cn50xx;
+        struct cvmx_ciu_soft_prst_cn52xx {
+                uint64_t reserved_1_63:63;
+                uint64_t soft_prst:1;
+        } cn52xx;
+        struct cvmx_ciu_soft_prst_cn52xx cn52xxp1;
+        struct cvmx_ciu_soft_prst_cn52xx cn56xx;
+        struct cvmx_ciu_soft_prst_cn52xx cn56xxp1;
+        struct cvmx_ciu_soft_prst_s cn58xx;
+        struct cvmx_ciu_soft_prst_s cn58xxp1;
+};
+
+union cvmx_ciu_soft_prst1 {
+        uint64_t u64;
+        struct cvmx_ciu_soft_prst1_s {
+                uint64_t reserved_1_63:63;
+                uint64_t soft_prst:1;
+        } s;
+        struct cvmx_ciu_soft_prst1_s cn52xx;
+        struct cvmx_ciu_soft_prst1_s cn52xxp1;
+        struct cvmx_ciu_soft_prst1_s cn56xx;
+        struct cvmx_ciu_soft_prst1_s cn56xxp1;
+};
+
+union cvmx_ciu_soft_rst {
+        uint64_t u64;
+        struct cvmx_ciu_soft_rst_s {
+                uint64_t reserved_1_63:63;
+                uint64_t soft_rst:1;
+        } s;
+        struct cvmx_ciu_soft_rst_s cn30xx;
+        struct cvmx_ciu_soft_rst_s cn31xx;
+        struct cvmx_ciu_soft_rst_s cn38xx;
+        struct cvmx_ciu_soft_rst_s cn38xxp2;
+        struct cvmx_ciu_soft_rst_s cn50xx;
+        struct cvmx_ciu_soft_rst_s cn52xx;
+        struct cvmx_ciu_soft_rst_s cn52xxp1;
+        struct cvmx_ciu_soft_rst_s cn56xx;
+        struct cvmx_ciu_soft_rst_s cn56xxp1;
+        struct cvmx_ciu_soft_rst_s cn58xx;
+        struct cvmx_ciu_soft_rst_s cn58xxp1;
+};
+
+union cvmx_ciu_timx {
+        uint64_t u64;
+        struct cvmx_ciu_timx_s {
+                uint64_t reserved_37_63:27;
+                uint64_t one_shot:1;
+                uint64_t len:36;
+        } s;
+        struct cvmx_ciu_timx_s cn30xx;
+        struct cvmx_ciu_timx_s cn31xx;
+        struct cvmx_ciu_timx_s cn38xx;
+        struct cvmx_ciu_timx_s cn38xxp2;
+        struct cvmx_ciu_timx_s cn50xx;
+        struct cvmx_ciu_timx_s cn52xx;
+        struct cvmx_ciu_timx_s cn52xxp1;
+        struct cvmx_ciu_timx_s cn56xx;
+        struct cvmx_ciu_timx_s cn56xxp1;
+        struct cvmx_ciu_timx_s cn58xx;
+        struct cvmx_ciu_timx_s cn58xxp1;
+};
+
+union cvmx_ciu_wdogx {
+        uint64_t u64;
+        struct cvmx_ciu_wdogx_s {
+                uint64_t reserved_46_63:18;
+                uint64_t gstopen:1;
+                uint64_t dstop:1;
+                uint64_t cnt:24;
+                uint64_t len:16;
+                uint64_t state:2;
+                uint64_t mode:2;
+        } s;
+        struct cvmx_ciu_wdogx_s cn30xx;
+        struct cvmx_ciu_wdogx_s cn31xx;
+        struct cvmx_ciu_wdogx_s cn38xx;
+        struct cvmx_ciu_wdogx_s cn38xxp2;
+        struct cvmx_ciu_wdogx_s cn50xx;
+        struct cvmx_ciu_wdogx_s cn52xx;
+        struct cvmx_ciu_wdogx_s cn52xxp1;
+        struct cvmx_ciu_wdogx_s cn56xx;
+        struct cvmx_ciu_wdogx_s cn56xxp1;
+        struct cvmx_ciu_wdogx_s cn58xx;
+        struct cvmx_ciu_wdogx_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-gpio-defs.h b/arch/mips/include/asm/octeon/cvmx-gpio-defs.h
new file mode 100644
index 000000000000..5fdd6ba48a05
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-gpio-defs.h
@@ -0,0 +1,219 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_GPIO_DEFS_H__
+#define __CVMX_GPIO_DEFS_H__
+
+#define CVMX_GPIO_BIT_CFGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000800ull + (((offset) & 15) * 8))
+#define CVMX_GPIO_BOOT_ENA \
+         CVMX_ADD_IO_SEG(0x00010700000008A8ull)
+#define CVMX_GPIO_CLK_GENX(offset) \
+         CVMX_ADD_IO_SEG(0x00010700000008C0ull + (((offset) & 3) * 8))
+#define CVMX_GPIO_DBG_ENA \
+         CVMX_ADD_IO_SEG(0x00010700000008A0ull)
+#define CVMX_GPIO_INT_CLR \
+         CVMX_ADD_IO_SEG(0x0001070000000898ull)
+#define CVMX_GPIO_RX_DAT \
+         CVMX_ADD_IO_SEG(0x0001070000000880ull)
+#define CVMX_GPIO_TX_CLR \
+         CVMX_ADD_IO_SEG(0x0001070000000890ull)
+#define CVMX_GPIO_TX_SET \
+         CVMX_ADD_IO_SEG(0x0001070000000888ull)
+#define CVMX_GPIO_XBIT_CFGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001070000000900ull + (((offset) & 31) * 8) - 8 * 16)
+
+union cvmx_gpio_bit_cfgx {
+        uint64_t u64;
+        struct cvmx_gpio_bit_cfgx_s {
+                uint64_t reserved_15_63:49;
+                uint64_t clk_gen:1;
+                uint64_t clk_sel:2;
+                uint64_t fil_sel:4;
+                uint64_t fil_cnt:4;
+                uint64_t int_type:1;
+                uint64_t int_en:1;
+                uint64_t rx_xor:1;
+                uint64_t tx_oe:1;
+        } s;
+        struct cvmx_gpio_bit_cfgx_cn30xx {
+                uint64_t reserved_12_63:52;
+                uint64_t fil_sel:4;
+                uint64_t fil_cnt:4;
+                uint64_t int_type:1;
+                uint64_t int_en:1;
+                uint64_t rx_xor:1;
+                uint64_t tx_oe:1;
+        } cn30xx;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn31xx;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn38xx;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn38xxp2;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn50xx;
+        struct cvmx_gpio_bit_cfgx_s cn52xx;
+        struct cvmx_gpio_bit_cfgx_s cn52xxp1;
+        struct cvmx_gpio_bit_cfgx_s cn56xx;
+        struct cvmx_gpio_bit_cfgx_s cn56xxp1;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn58xx;
+        struct cvmx_gpio_bit_cfgx_cn30xx cn58xxp1;
+};
+
+union cvmx_gpio_boot_ena {
+        uint64_t u64;
+        struct cvmx_gpio_boot_ena_s {
+                uint64_t reserved_12_63:52;
+                uint64_t boot_ena:4;
+                uint64_t reserved_0_7:8;
+        } s;
+        struct cvmx_gpio_boot_ena_s cn30xx;
+        struct cvmx_gpio_boot_ena_s cn31xx;
+        struct cvmx_gpio_boot_ena_s cn50xx;
+};
+
+union cvmx_gpio_clk_genx {
+        uint64_t u64;
+        struct cvmx_gpio_clk_genx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t n:32;
+        } s;
+        struct cvmx_gpio_clk_genx_s cn52xx;
+        struct cvmx_gpio_clk_genx_s cn52xxp1;
+        struct cvmx_gpio_clk_genx_s cn56xx;
+        struct cvmx_gpio_clk_genx_s cn56xxp1;
+};
+
+union cvmx_gpio_dbg_ena {
+        uint64_t u64;
+        struct cvmx_gpio_dbg_ena_s {
+                uint64_t reserved_21_63:43;
+                uint64_t dbg_ena:21;
+        } s;
+        struct cvmx_gpio_dbg_ena_s cn30xx;
+        struct cvmx_gpio_dbg_ena_s cn31xx;
+        struct cvmx_gpio_dbg_ena_s cn50xx;
+};
+
+union cvmx_gpio_int_clr {
+        uint64_t u64;
+        struct cvmx_gpio_int_clr_s {
+                uint64_t reserved_16_63:48;
+                uint64_t type:16;
+        } s;
+        struct cvmx_gpio_int_clr_s cn30xx;
+        struct cvmx_gpio_int_clr_s cn31xx;
+        struct cvmx_gpio_int_clr_s cn38xx;
+        struct cvmx_gpio_int_clr_s cn38xxp2;
+        struct cvmx_gpio_int_clr_s cn50xx;
+        struct cvmx_gpio_int_clr_s cn52xx;
+        struct cvmx_gpio_int_clr_s cn52xxp1;
+        struct cvmx_gpio_int_clr_s cn56xx;
+        struct cvmx_gpio_int_clr_s cn56xxp1;
+        struct cvmx_gpio_int_clr_s cn58xx;
+        struct cvmx_gpio_int_clr_s cn58xxp1;
+};
+
+union cvmx_gpio_rx_dat {
+        uint64_t u64;
+        struct cvmx_gpio_rx_dat_s {
+                uint64_t reserved_24_63:40;
+                uint64_t dat:24;
+        } s;
+        struct cvmx_gpio_rx_dat_s cn30xx;
+        struct cvmx_gpio_rx_dat_s cn31xx;
+        struct cvmx_gpio_rx_dat_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t dat:16;
+        } cn38xx;
+        struct cvmx_gpio_rx_dat_cn38xx cn38xxp2;
+        struct cvmx_gpio_rx_dat_s cn50xx;
+        struct cvmx_gpio_rx_dat_cn38xx cn52xx;
+        struct cvmx_gpio_rx_dat_cn38xx cn52xxp1;
+        struct cvmx_gpio_rx_dat_cn38xx cn56xx;
+        struct cvmx_gpio_rx_dat_cn38xx cn56xxp1;
+        struct cvmx_gpio_rx_dat_cn38xx cn58xx;
+        struct cvmx_gpio_rx_dat_cn38xx cn58xxp1;
+};
+
+union cvmx_gpio_tx_clr {
+        uint64_t u64;
+        struct cvmx_gpio_tx_clr_s {
+                uint64_t reserved_24_63:40;
+                uint64_t clr:24;
+        } s;
+        struct cvmx_gpio_tx_clr_s cn30xx;
+        struct cvmx_gpio_tx_clr_s cn31xx;
+        struct cvmx_gpio_tx_clr_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t clr:16;
+        } cn38xx;
+        struct cvmx_gpio_tx_clr_cn38xx cn38xxp2;
+        struct cvmx_gpio_tx_clr_s cn50xx;
+        struct cvmx_gpio_tx_clr_cn38xx cn52xx;
+        struct cvmx_gpio_tx_clr_cn38xx cn52xxp1;
+        struct cvmx_gpio_tx_clr_cn38xx cn56xx;
+        struct cvmx_gpio_tx_clr_cn38xx cn56xxp1;
+        struct cvmx_gpio_tx_clr_cn38xx cn58xx;
+        struct cvmx_gpio_tx_clr_cn38xx cn58xxp1;
+};
+
+union cvmx_gpio_tx_set {
+        uint64_t u64;
+        struct cvmx_gpio_tx_set_s {
+                uint64_t reserved_24_63:40;
+                uint64_t set:24;
+        } s;
+        struct cvmx_gpio_tx_set_s cn30xx;
+        struct cvmx_gpio_tx_set_s cn31xx;
+        struct cvmx_gpio_tx_set_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t set:16;
+        } cn38xx;
+        struct cvmx_gpio_tx_set_cn38xx cn38xxp2;
+        struct cvmx_gpio_tx_set_s cn50xx;
+        struct cvmx_gpio_tx_set_cn38xx cn52xx;
+        struct cvmx_gpio_tx_set_cn38xx cn52xxp1;
+        struct cvmx_gpio_tx_set_cn38xx cn56xx;
+        struct cvmx_gpio_tx_set_cn38xx cn56xxp1;
+        struct cvmx_gpio_tx_set_cn38xx cn58xx;
+        struct cvmx_gpio_tx_set_cn38xx cn58xxp1;
+};
+
+union cvmx_gpio_xbit_cfgx {
+        uint64_t u64;
+        struct cvmx_gpio_xbit_cfgx_s {
+                uint64_t reserved_12_63:52;
+                uint64_t fil_sel:4;
+                uint64_t fil_cnt:4;
+                uint64_t reserved_2_3:2;
+                uint64_t rx_xor:1;
+                uint64_t tx_oe:1;
+        } s;
+        struct cvmx_gpio_xbit_cfgx_s cn30xx;
+        struct cvmx_gpio_xbit_cfgx_s cn31xx;
+        struct cvmx_gpio_xbit_cfgx_s cn50xx;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-iob-defs.h b/arch/mips/include/asm/octeon/cvmx-iob-defs.h
new file mode 100644
index 000000000000..0ee36baec500
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-iob-defs.h
@@ -0,0 +1,530 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_IOB_DEFS_H__
+#define __CVMX_IOB_DEFS_H__
+
+#define CVMX_IOB_BIST_STATUS \
+         CVMX_ADD_IO_SEG(0x00011800F00007F8ull)
+#define CVMX_IOB_CTL_STATUS \
+         CVMX_ADD_IO_SEG(0x00011800F0000050ull)
+#define CVMX_IOB_DWB_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000028ull)
+#define CVMX_IOB_FAU_TIMEOUT \
+         CVMX_ADD_IO_SEG(0x00011800F0000000ull)
+#define CVMX_IOB_I2C_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000010ull)
+#define CVMX_IOB_INB_CONTROL_MATCH \
+         CVMX_ADD_IO_SEG(0x00011800F0000078ull)
+#define CVMX_IOB_INB_CONTROL_MATCH_ENB \
+         CVMX_ADD_IO_SEG(0x00011800F0000088ull)
+#define CVMX_IOB_INB_DATA_MATCH \
+         CVMX_ADD_IO_SEG(0x00011800F0000070ull)
+#define CVMX_IOB_INB_DATA_MATCH_ENB \
+         CVMX_ADD_IO_SEG(0x00011800F0000080ull)
+#define CVMX_IOB_INT_ENB \
+         CVMX_ADD_IO_SEG(0x00011800F0000060ull)
+#define CVMX_IOB_INT_SUM \
+         CVMX_ADD_IO_SEG(0x00011800F0000058ull)
+#define CVMX_IOB_N2C_L2C_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000020ull)
+#define CVMX_IOB_N2C_RSP_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000008ull)
+#define CVMX_IOB_OUTB_COM_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000040ull)
+#define CVMX_IOB_OUTB_CONTROL_MATCH \
+         CVMX_ADD_IO_SEG(0x00011800F0000098ull)
+#define CVMX_IOB_OUTB_CONTROL_MATCH_ENB \
+         CVMX_ADD_IO_SEG(0x00011800F00000A8ull)
+#define CVMX_IOB_OUTB_DATA_MATCH \
+         CVMX_ADD_IO_SEG(0x00011800F0000090ull)
+#define CVMX_IOB_OUTB_DATA_MATCH_ENB \
+         CVMX_ADD_IO_SEG(0x00011800F00000A0ull)
+#define CVMX_IOB_OUTB_FPA_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000048ull)
+#define CVMX_IOB_OUTB_REQ_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000038ull)
+#define CVMX_IOB_P2C_REQ_PRI_CNT \
+         CVMX_ADD_IO_SEG(0x00011800F0000018ull)
+#define CVMX_IOB_PKT_ERR \
+         CVMX_ADD_IO_SEG(0x00011800F0000068ull)
+
+union cvmx_iob_bist_status {
+        uint64_t u64;
+        struct cvmx_iob_bist_status_s {
+                uint64_t reserved_18_63:46;
+                uint64_t icnrcb:1;
+                uint64_t icr0:1;
+                uint64_t icr1:1;
+                uint64_t icnr1:1;
+                uint64_t icnr0:1;
+                uint64_t ibdr0:1;
+                uint64_t ibdr1:1;
+                uint64_t ibr0:1;
+                uint64_t ibr1:1;
+                uint64_t icnrt:1;
+                uint64_t ibrq0:1;
+                uint64_t ibrq1:1;
+                uint64_t icrn0:1;
+                uint64_t icrn1:1;
+                uint64_t icrp0:1;
+                uint64_t icrp1:1;
+                uint64_t ibd:1;
+                uint64_t icd:1;
+        } s;
+        struct cvmx_iob_bist_status_s cn30xx;
+        struct cvmx_iob_bist_status_s cn31xx;
+        struct cvmx_iob_bist_status_s cn38xx;
+        struct cvmx_iob_bist_status_s cn38xxp2;
+        struct cvmx_iob_bist_status_s cn50xx;
+        struct cvmx_iob_bist_status_s cn52xx;
+        struct cvmx_iob_bist_status_s cn52xxp1;
+        struct cvmx_iob_bist_status_s cn56xx;
+        struct cvmx_iob_bist_status_s cn56xxp1;
+        struct cvmx_iob_bist_status_s cn58xx;
+        struct cvmx_iob_bist_status_s cn58xxp1;
+};
+
+union cvmx_iob_ctl_status {
+        uint64_t u64;
+        struct cvmx_iob_ctl_status_s {
+                uint64_t reserved_5_63:59;
+                uint64_t outb_mat:1;
+                uint64_t inb_mat:1;
+                uint64_t pko_enb:1;
+                uint64_t dwb_enb:1;
+                uint64_t fau_end:1;
+        } s;
+        struct cvmx_iob_ctl_status_s cn30xx;
+        struct cvmx_iob_ctl_status_s cn31xx;
+        struct cvmx_iob_ctl_status_s cn38xx;
+        struct cvmx_iob_ctl_status_s cn38xxp2;
+        struct cvmx_iob_ctl_status_s cn50xx;
+        struct cvmx_iob_ctl_status_s cn52xx;
+        struct cvmx_iob_ctl_status_s cn52xxp1;
+        struct cvmx_iob_ctl_status_s cn56xx;
+        struct cvmx_iob_ctl_status_s cn56xxp1;
+        struct cvmx_iob_ctl_status_s cn58xx;
+        struct cvmx_iob_ctl_status_s cn58xxp1;
+};
+
+union cvmx_iob_dwb_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_dwb_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_dwb_pri_cnt_s cn38xx;
+        struct cvmx_iob_dwb_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_dwb_pri_cnt_s cn52xx;
+        struct cvmx_iob_dwb_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_dwb_pri_cnt_s cn56xx;
+        struct cvmx_iob_dwb_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_dwb_pri_cnt_s cn58xx;
+        struct cvmx_iob_dwb_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_fau_timeout {
+        uint64_t u64;
+        struct cvmx_iob_fau_timeout_s {
+                uint64_t reserved_13_63:51;
+                uint64_t tout_enb:1;
+                uint64_t tout_val:12;
+        } s;
+        struct cvmx_iob_fau_timeout_s cn30xx;
+        struct cvmx_iob_fau_timeout_s cn31xx;
+        struct cvmx_iob_fau_timeout_s cn38xx;
+        struct cvmx_iob_fau_timeout_s cn38xxp2;
+        struct cvmx_iob_fau_timeout_s cn50xx;
+        struct cvmx_iob_fau_timeout_s cn52xx;
+        struct cvmx_iob_fau_timeout_s cn52xxp1;
+        struct cvmx_iob_fau_timeout_s cn56xx;
+        struct cvmx_iob_fau_timeout_s cn56xxp1;
+        struct cvmx_iob_fau_timeout_s cn58xx;
+        struct cvmx_iob_fau_timeout_s cn58xxp1;
+};
+
+union cvmx_iob_i2c_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_i2c_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_i2c_pri_cnt_s cn38xx;
+        struct cvmx_iob_i2c_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_i2c_pri_cnt_s cn52xx;
+        struct cvmx_iob_i2c_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_i2c_pri_cnt_s cn56xx;
+        struct cvmx_iob_i2c_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_i2c_pri_cnt_s cn58xx;
+        struct cvmx_iob_i2c_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_inb_control_match {
+        uint64_t u64;
+        struct cvmx_iob_inb_control_match_s {
+                uint64_t reserved_29_63:35;
+                uint64_t mask:8;
+                uint64_t opc:4;
+                uint64_t dst:9;
+                uint64_t src:8;
+        } s;
+        struct cvmx_iob_inb_control_match_s cn30xx;
+        struct cvmx_iob_inb_control_match_s cn31xx;
+        struct cvmx_iob_inb_control_match_s cn38xx;
+        struct cvmx_iob_inb_control_match_s cn38xxp2;
+        struct cvmx_iob_inb_control_match_s cn50xx;
+        struct cvmx_iob_inb_control_match_s cn52xx;
+        struct cvmx_iob_inb_control_match_s cn52xxp1;
+        struct cvmx_iob_inb_control_match_s cn56xx;
+        struct cvmx_iob_inb_control_match_s cn56xxp1;
+        struct cvmx_iob_inb_control_match_s cn58xx;
+        struct cvmx_iob_inb_control_match_s cn58xxp1;
+};
+
+union cvmx_iob_inb_control_match_enb {
+        uint64_t u64;
+        struct cvmx_iob_inb_control_match_enb_s {
+                uint64_t reserved_29_63:35;
+                uint64_t mask:8;
+                uint64_t opc:4;
+                uint64_t dst:9;
+                uint64_t src:8;
+        } s;
+        struct cvmx_iob_inb_control_match_enb_s cn30xx;
+        struct cvmx_iob_inb_control_match_enb_s cn31xx;
+        struct cvmx_iob_inb_control_match_enb_s cn38xx;
+        struct cvmx_iob_inb_control_match_enb_s cn38xxp2;
+        struct cvmx_iob_inb_control_match_enb_s cn50xx;
+        struct cvmx_iob_inb_control_match_enb_s cn52xx;
+        struct cvmx_iob_inb_control_match_enb_s cn52xxp1;
+        struct cvmx_iob_inb_control_match_enb_s cn56xx;
+        struct cvmx_iob_inb_control_match_enb_s cn56xxp1;
+        struct cvmx_iob_inb_control_match_enb_s cn58xx;
+        struct cvmx_iob_inb_control_match_enb_s cn58xxp1;
+};
+
+union cvmx_iob_inb_data_match {
+        uint64_t u64;
+        struct cvmx_iob_inb_data_match_s {
+                uint64_t data:64;
+        } s;
+        struct cvmx_iob_inb_data_match_s cn30xx;
+        struct cvmx_iob_inb_data_match_s cn31xx;
+        struct cvmx_iob_inb_data_match_s cn38xx;
+        struct cvmx_iob_inb_data_match_s cn38xxp2;
+        struct cvmx_iob_inb_data_match_s cn50xx;
+        struct cvmx_iob_inb_data_match_s cn52xx;
+        struct cvmx_iob_inb_data_match_s cn52xxp1;
+        struct cvmx_iob_inb_data_match_s cn56xx;
+        struct cvmx_iob_inb_data_match_s cn56xxp1;
+        struct cvmx_iob_inb_data_match_s cn58xx;
+        struct cvmx_iob_inb_data_match_s cn58xxp1;
+};
+
+union cvmx_iob_inb_data_match_enb {
+        uint64_t u64;
+        struct cvmx_iob_inb_data_match_enb_s {
+                uint64_t data:64;
+        } s;
+        struct cvmx_iob_inb_data_match_enb_s cn30xx;
+        struct cvmx_iob_inb_data_match_enb_s cn31xx;
+        struct cvmx_iob_inb_data_match_enb_s cn38xx;
+        struct cvmx_iob_inb_data_match_enb_s cn38xxp2;
+        struct cvmx_iob_inb_data_match_enb_s cn50xx;
+        struct cvmx_iob_inb_data_match_enb_s cn52xx;
+        struct cvmx_iob_inb_data_match_enb_s cn52xxp1;
+        struct cvmx_iob_inb_data_match_enb_s cn56xx;
+        struct cvmx_iob_inb_data_match_enb_s cn56xxp1;
+        struct cvmx_iob_inb_data_match_enb_s cn58xx;
+        struct cvmx_iob_inb_data_match_enb_s cn58xxp1;
+};
+
+union cvmx_iob_int_enb {
+        uint64_t u64;
+        struct cvmx_iob_int_enb_s {
+                uint64_t reserved_6_63:58;
+                uint64_t p_dat:1;
+                uint64_t np_dat:1;
+                uint64_t p_eop:1;
+                uint64_t p_sop:1;
+                uint64_t np_eop:1;
+                uint64_t np_sop:1;
+        } s;
+        struct cvmx_iob_int_enb_cn30xx {
+                uint64_t reserved_4_63:60;
+                uint64_t p_eop:1;
+                uint64_t p_sop:1;
+                uint64_t np_eop:1;
+                uint64_t np_sop:1;
+        } cn30xx;
+        struct cvmx_iob_int_enb_cn30xx cn31xx;
+        struct cvmx_iob_int_enb_cn30xx cn38xx;
+        struct cvmx_iob_int_enb_cn30xx cn38xxp2;
+        struct cvmx_iob_int_enb_s cn50xx;
+        struct cvmx_iob_int_enb_s cn52xx;
+        struct cvmx_iob_int_enb_s cn52xxp1;
+        struct cvmx_iob_int_enb_s cn56xx;
+        struct cvmx_iob_int_enb_s cn56xxp1;
+        struct cvmx_iob_int_enb_s cn58xx;
+        struct cvmx_iob_int_enb_s cn58xxp1;
+};
+
+union cvmx_iob_int_sum {
+        uint64_t u64;
+        struct cvmx_iob_int_sum_s {
+                uint64_t reserved_6_63:58;
+                uint64_t p_dat:1;
+                uint64_t np_dat:1;
+                uint64_t p_eop:1;
+                uint64_t p_sop:1;
+                uint64_t np_eop:1;
+                uint64_t np_sop:1;
+        } s;
+        struct cvmx_iob_int_sum_cn30xx {
+                uint64_t reserved_4_63:60;
+                uint64_t p_eop:1;
+                uint64_t p_sop:1;
+                uint64_t np_eop:1;
+                uint64_t np_sop:1;
+        } cn30xx;
+        struct cvmx_iob_int_sum_cn30xx cn31xx;
+        struct cvmx_iob_int_sum_cn30xx cn38xx;
+        struct cvmx_iob_int_sum_cn30xx cn38xxp2;
+        struct cvmx_iob_int_sum_s cn50xx;
+        struct cvmx_iob_int_sum_s cn52xx;
+        struct cvmx_iob_int_sum_s cn52xxp1;
+        struct cvmx_iob_int_sum_s cn56xx;
+        struct cvmx_iob_int_sum_s cn56xxp1;
+        struct cvmx_iob_int_sum_s cn58xx;
+        struct cvmx_iob_int_sum_s cn58xxp1;
+};
+
+union cvmx_iob_n2c_l2c_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn38xx;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn52xx;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn56xx;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn58xx;
+        struct cvmx_iob_n2c_l2c_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_n2c_rsp_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn38xx;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn52xx;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn56xx;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn58xx;
+        struct cvmx_iob_n2c_rsp_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_outb_com_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_outb_com_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_outb_com_pri_cnt_s cn38xx;
+        struct cvmx_iob_outb_com_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_outb_com_pri_cnt_s cn52xx;
+        struct cvmx_iob_outb_com_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_outb_com_pri_cnt_s cn56xx;
+        struct cvmx_iob_outb_com_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_outb_com_pri_cnt_s cn58xx;
+        struct cvmx_iob_outb_com_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_outb_control_match {
+        uint64_t u64;
+        struct cvmx_iob_outb_control_match_s {
+                uint64_t reserved_26_63:38;
+                uint64_t mask:8;
+                uint64_t eot:1;
+                uint64_t dst:8;
+                uint64_t src:9;
+        } s;
+        struct cvmx_iob_outb_control_match_s cn30xx;
+        struct cvmx_iob_outb_control_match_s cn31xx;
+        struct cvmx_iob_outb_control_match_s cn38xx;
+        struct cvmx_iob_outb_control_match_s cn38xxp2;
+        struct cvmx_iob_outb_control_match_s cn50xx;
+        struct cvmx_iob_outb_control_match_s cn52xx;
+        struct cvmx_iob_outb_control_match_s cn52xxp1;
+        struct cvmx_iob_outb_control_match_s cn56xx;
+        struct cvmx_iob_outb_control_match_s cn56xxp1;
+        struct cvmx_iob_outb_control_match_s cn58xx;
+        struct cvmx_iob_outb_control_match_s cn58xxp1;
+};
+
+union cvmx_iob_outb_control_match_enb {
+        uint64_t u64;
+        struct cvmx_iob_outb_control_match_enb_s {
+                uint64_t reserved_26_63:38;
+                uint64_t mask:8;
+                uint64_t eot:1;
+                uint64_t dst:8;
+                uint64_t src:9;
+        } s;
+        struct cvmx_iob_outb_control_match_enb_s cn30xx;
+        struct cvmx_iob_outb_control_match_enb_s cn31xx;
+        struct cvmx_iob_outb_control_match_enb_s cn38xx;
+        struct cvmx_iob_outb_control_match_enb_s cn38xxp2;
+        struct cvmx_iob_outb_control_match_enb_s cn50xx;
+        struct cvmx_iob_outb_control_match_enb_s cn52xx;
+        struct cvmx_iob_outb_control_match_enb_s cn52xxp1;
+        struct cvmx_iob_outb_control_match_enb_s cn56xx;
+        struct cvmx_iob_outb_control_match_enb_s cn56xxp1;
+        struct cvmx_iob_outb_control_match_enb_s cn58xx;
+        struct cvmx_iob_outb_control_match_enb_s cn58xxp1;
+};
+
+union cvmx_iob_outb_data_match {
+        uint64_t u64;
+        struct cvmx_iob_outb_data_match_s {
+                uint64_t data:64;
+        } s;
+        struct cvmx_iob_outb_data_match_s cn30xx;
+        struct cvmx_iob_outb_data_match_s cn31xx;
+        struct cvmx_iob_outb_data_match_s cn38xx;
+        struct cvmx_iob_outb_data_match_s cn38xxp2;
+        struct cvmx_iob_outb_data_match_s cn50xx;
+        struct cvmx_iob_outb_data_match_s cn52xx;
+        struct cvmx_iob_outb_data_match_s cn52xxp1;
+        struct cvmx_iob_outb_data_match_s cn56xx;
+        struct cvmx_iob_outb_data_match_s cn56xxp1;
+        struct cvmx_iob_outb_data_match_s cn58xx;
+        struct cvmx_iob_outb_data_match_s cn58xxp1;
+};
+
+union cvmx_iob_outb_data_match_enb {
+        uint64_t u64;
+        struct cvmx_iob_outb_data_match_enb_s {
+                uint64_t data:64;
+        } s;
+        struct cvmx_iob_outb_data_match_enb_s cn30xx;
+        struct cvmx_iob_outb_data_match_enb_s cn31xx;
+        struct cvmx_iob_outb_data_match_enb_s cn38xx;
+        struct cvmx_iob_outb_data_match_enb_s cn38xxp2;
+        struct cvmx_iob_outb_data_match_enb_s cn50xx;
+        struct cvmx_iob_outb_data_match_enb_s cn52xx;
+        struct cvmx_iob_outb_data_match_enb_s cn52xxp1;
+        struct cvmx_iob_outb_data_match_enb_s cn56xx;
+        struct cvmx_iob_outb_data_match_enb_s cn56xxp1;
+        struct cvmx_iob_outb_data_match_enb_s cn58xx;
+        struct cvmx_iob_outb_data_match_enb_s cn58xxp1;
+};
+
+union cvmx_iob_outb_fpa_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_outb_fpa_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn38xx;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn52xx;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn56xx;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn58xx;
+        struct cvmx_iob_outb_fpa_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_outb_req_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_outb_req_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_outb_req_pri_cnt_s cn38xx;
+        struct cvmx_iob_outb_req_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_outb_req_pri_cnt_s cn52xx;
+        struct cvmx_iob_outb_req_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_outb_req_pri_cnt_s cn56xx;
+        struct cvmx_iob_outb_req_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_outb_req_pri_cnt_s cn58xx;
+        struct cvmx_iob_outb_req_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_p2c_req_pri_cnt {
+        uint64_t u64;
+        struct cvmx_iob_p2c_req_pri_cnt_s {
+                uint64_t reserved_16_63:48;
+                uint64_t cnt_enb:1;
+                uint64_t cnt_val:15;
+        } s;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn38xx;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn38xxp2;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn52xx;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn52xxp1;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn56xx;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn56xxp1;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn58xx;
+        struct cvmx_iob_p2c_req_pri_cnt_s cn58xxp1;
+};
+
+union cvmx_iob_pkt_err {
+        uint64_t u64;
+        struct cvmx_iob_pkt_err_s {
+                uint64_t reserved_6_63:58;
+                uint64_t port:6;
+        } s;
+        struct cvmx_iob_pkt_err_s cn30xx;
+        struct cvmx_iob_pkt_err_s cn31xx;
+        struct cvmx_iob_pkt_err_s cn38xx;
+        struct cvmx_iob_pkt_err_s cn38xxp2;
+        struct cvmx_iob_pkt_err_s cn50xx;
+        struct cvmx_iob_pkt_err_s cn52xx;
+        struct cvmx_iob_pkt_err_s cn52xxp1;
+        struct cvmx_iob_pkt_err_s cn56xx;
+        struct cvmx_iob_pkt_err_s cn56xxp1;
+        struct cvmx_iob_pkt_err_s cn58xx;
+        struct cvmx_iob_pkt_err_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-ipd-defs.h b/arch/mips/include/asm/octeon/cvmx-ipd-defs.h
new file mode 100644
index 000000000000..f8b8fc657d2c
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-ipd-defs.h
@@ -0,0 +1,877 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_IPD_DEFS_H__
+#define __CVMX_IPD_DEFS_H__
+
+#define CVMX_IPD_1ST_MBUFF_SKIP \
+         CVMX_ADD_IO_SEG(0x00014F0000000000ull)
+#define CVMX_IPD_1st_NEXT_PTR_BACK \
+         CVMX_ADD_IO_SEG(0x00014F0000000150ull)
+#define CVMX_IPD_2nd_NEXT_PTR_BACK \
+         CVMX_ADD_IO_SEG(0x00014F0000000158ull)
+#define CVMX_IPD_BIST_STATUS \
+         CVMX_ADD_IO_SEG(0x00014F00000007F8ull)
+#define CVMX_IPD_BP_PRT_RED_END \
+         CVMX_ADD_IO_SEG(0x00014F0000000328ull)
+#define CVMX_IPD_CLK_COUNT \
+         CVMX_ADD_IO_SEG(0x00014F0000000338ull)
+#define CVMX_IPD_CTL_STATUS \
+         CVMX_ADD_IO_SEG(0x00014F0000000018ull)
+#define CVMX_IPD_INT_ENB \
+         CVMX_ADD_IO_SEG(0x00014F0000000160ull)
+#define CVMX_IPD_INT_SUM \
+         CVMX_ADD_IO_SEG(0x00014F0000000168ull)
+#define CVMX_IPD_NOT_1ST_MBUFF_SKIP \
+         CVMX_ADD_IO_SEG(0x00014F0000000008ull)
+#define CVMX_IPD_PACKET_MBUFF_SIZE \
+         CVMX_ADD_IO_SEG(0x00014F0000000010ull)
+#define CVMX_IPD_PKT_PTR_VALID \
+         CVMX_ADD_IO_SEG(0x00014F0000000358ull)
+#define CVMX_IPD_PORTX_BP_PAGE_CNT(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000028ull + (((offset) & 63) * 8))
+#define CVMX_IPD_PORTX_BP_PAGE_CNT2(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000368ull + (((offset) & 63) * 8) - 8 * 36)
+#define CVMX_IPD_PORT_BP_COUNTERS2_PAIRX(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000388ull + (((offset) & 63) * 8) - 8 * 36)
+#define CVMX_IPD_PORT_BP_COUNTERS_PAIRX(offset) \
+         CVMX_ADD_IO_SEG(0x00014F00000001B8ull + (((offset) & 63) * 8))
+#define CVMX_IPD_PORT_QOS_INTX(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000808ull + (((offset) & 7) * 8))
+#define CVMX_IPD_PORT_QOS_INT_ENBX(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000848ull + (((offset) & 7) * 8))
+#define CVMX_IPD_PORT_QOS_X_CNT(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000888ull + (((offset) & 511) * 8))
+#define CVMX_IPD_PRC_HOLD_PTR_FIFO_CTL \
+         CVMX_ADD_IO_SEG(0x00014F0000000348ull)
+#define CVMX_IPD_PRC_PORT_PTR_FIFO_CTL \
+         CVMX_ADD_IO_SEG(0x00014F0000000350ull)
+#define CVMX_IPD_PTR_COUNT \
+         CVMX_ADD_IO_SEG(0x00014F0000000320ull)
+#define CVMX_IPD_PWP_PTR_FIFO_CTL \
+         CVMX_ADD_IO_SEG(0x00014F0000000340ull)
+#define CVMX_IPD_QOS0_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F0000000178ull)
+#define CVMX_IPD_QOS1_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F0000000180ull)
+#define CVMX_IPD_QOS2_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F0000000188ull)
+#define CVMX_IPD_QOS3_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F0000000190ull)
+#define CVMX_IPD_QOS4_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F0000000198ull)
+#define CVMX_IPD_QOS5_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F00000001A0ull)
+#define CVMX_IPD_QOS6_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F00000001A8ull)
+#define CVMX_IPD_QOS7_RED_MARKS \
+         CVMX_ADD_IO_SEG(0x00014F00000001B0ull)
+#define CVMX_IPD_QOSX_RED_MARKS(offset) \
+         CVMX_ADD_IO_SEG(0x00014F0000000178ull + (((offset) & 7) * 8))
+#define CVMX_IPD_QUE0_FREE_PAGE_CNT \
+         CVMX_ADD_IO_SEG(0x00014F0000000330ull)
+#define CVMX_IPD_RED_PORT_ENABLE \
+         CVMX_ADD_IO_SEG(0x00014F00000002D8ull)
+#define CVMX_IPD_RED_PORT_ENABLE2 \
+         CVMX_ADD_IO_SEG(0x00014F00000003A8ull)
+#define CVMX_IPD_RED_QUE0_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F00000002E0ull)
+#define CVMX_IPD_RED_QUE1_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F00000002E8ull)
+#define CVMX_IPD_RED_QUE2_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F00000002F0ull)
+#define CVMX_IPD_RED_QUE3_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F00000002F8ull)
+#define CVMX_IPD_RED_QUE4_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F0000000300ull)
+#define CVMX_IPD_RED_QUE5_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F0000000308ull)
+#define CVMX_IPD_RED_QUE6_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F0000000310ull)
+#define CVMX_IPD_RED_QUE7_PARAM \
+         CVMX_ADD_IO_SEG(0x00014F0000000318ull)
+#define CVMX_IPD_RED_QUEX_PARAM(offset) \
+         CVMX_ADD_IO_SEG(0x00014F00000002E0ull + (((offset) & 7) * 8))
+#define CVMX_IPD_SUB_PORT_BP_PAGE_CNT \
+         CVMX_ADD_IO_SEG(0x00014F0000000148ull)
+#define CVMX_IPD_SUB_PORT_FCS \
+         CVMX_ADD_IO_SEG(0x00014F0000000170ull)
+#define CVMX_IPD_SUB_PORT_QOS_CNT \
+         CVMX_ADD_IO_SEG(0x00014F0000000800ull)
+#define CVMX_IPD_WQE_FPA_QUEUE \
+         CVMX_ADD_IO_SEG(0x00014F0000000020ull)
+#define CVMX_IPD_WQE_PTR_VALID \
+         CVMX_ADD_IO_SEG(0x00014F0000000360ull)
+
+union cvmx_ipd_1st_mbuff_skip {
+        uint64_t u64;
+        struct cvmx_ipd_1st_mbuff_skip_s {
+                uint64_t reserved_6_63:58;
+                uint64_t skip_sz:6;
+        } s;
+        struct cvmx_ipd_1st_mbuff_skip_s cn30xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn31xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn38xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn38xxp2;
+        struct cvmx_ipd_1st_mbuff_skip_s cn50xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn52xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn52xxp1;
+        struct cvmx_ipd_1st_mbuff_skip_s cn56xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn56xxp1;
+        struct cvmx_ipd_1st_mbuff_skip_s cn58xx;
+        struct cvmx_ipd_1st_mbuff_skip_s cn58xxp1;
+};
+
+union cvmx_ipd_1st_next_ptr_back {
+        uint64_t u64;
+        struct cvmx_ipd_1st_next_ptr_back_s {
+                uint64_t reserved_4_63:60;
+                uint64_t back:4;
+        } s;
+        struct cvmx_ipd_1st_next_ptr_back_s cn30xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn31xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn38xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn38xxp2;
+        struct cvmx_ipd_1st_next_ptr_back_s cn50xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn52xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn52xxp1;
+        struct cvmx_ipd_1st_next_ptr_back_s cn56xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn56xxp1;
+        struct cvmx_ipd_1st_next_ptr_back_s cn58xx;
+        struct cvmx_ipd_1st_next_ptr_back_s cn58xxp1;
+};
+
+union cvmx_ipd_2nd_next_ptr_back {
+        uint64_t u64;
+        struct cvmx_ipd_2nd_next_ptr_back_s {
+                uint64_t reserved_4_63:60;
+                uint64_t back:4;
+        } s;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn30xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn31xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn38xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn38xxp2;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn50xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn52xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn52xxp1;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn56xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn56xxp1;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn58xx;
+        struct cvmx_ipd_2nd_next_ptr_back_s cn58xxp1;
+};
+
+union cvmx_ipd_bist_status {
+        uint64_t u64;
+        struct cvmx_ipd_bist_status_s {
+                uint64_t reserved_18_63:46;
+                uint64_t csr_mem:1;
+                uint64_t csr_ncmd:1;
+                uint64_t pwq_wqed:1;
+                uint64_t pwq_wp1:1;
+                uint64_t pwq_pow:1;
+                uint64_t ipq_pbe1:1;
+                uint64_t ipq_pbe0:1;
+                uint64_t pbm3:1;
+                uint64_t pbm2:1;
+                uint64_t pbm1:1;
+                uint64_t pbm0:1;
+                uint64_t pbm_word:1;
+                uint64_t pwq1:1;
+                uint64_t pwq0:1;
+                uint64_t prc_off:1;
+                uint64_t ipd_old:1;
+                uint64_t ipd_new:1;
+                uint64_t pwp:1;
+        } s;
+        struct cvmx_ipd_bist_status_cn30xx {
+                uint64_t reserved_16_63:48;
+                uint64_t pwq_wqed:1;
+                uint64_t pwq_wp1:1;
+                uint64_t pwq_pow:1;
+                uint64_t ipq_pbe1:1;
+                uint64_t ipq_pbe0:1;
+                uint64_t pbm3:1;
+                uint64_t pbm2:1;
+                uint64_t pbm1:1;
+                uint64_t pbm0:1;
+                uint64_t pbm_word:1;
+                uint64_t pwq1:1;
+                uint64_t pwq0:1;
+                uint64_t prc_off:1;
+                uint64_t ipd_old:1;
+                uint64_t ipd_new:1;
+                uint64_t pwp:1;
+        } cn30xx;
+        struct cvmx_ipd_bist_status_cn30xx cn31xx;
+        struct cvmx_ipd_bist_status_cn30xx cn38xx;
+        struct cvmx_ipd_bist_status_cn30xx cn38xxp2;
+        struct cvmx_ipd_bist_status_cn30xx cn50xx;
+        struct cvmx_ipd_bist_status_s cn52xx;
+        struct cvmx_ipd_bist_status_s cn52xxp1;
+        struct cvmx_ipd_bist_status_s cn56xx;
+        struct cvmx_ipd_bist_status_s cn56xxp1;
+        struct cvmx_ipd_bist_status_cn30xx cn58xx;
+        struct cvmx_ipd_bist_status_cn30xx cn58xxp1;
+};
+
+union cvmx_ipd_bp_prt_red_end {
+        uint64_t u64;
+        struct cvmx_ipd_bp_prt_red_end_s {
+                uint64_t reserved_40_63:24;
+                uint64_t prt_enb:40;
+        } s;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx {
+                uint64_t reserved_36_63:28;
+                uint64_t prt_enb:36;
+        } cn30xx;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn31xx;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn38xx;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn38xxp2;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn50xx;
+        struct cvmx_ipd_bp_prt_red_end_s cn52xx;
+        struct cvmx_ipd_bp_prt_red_end_s cn52xxp1;
+        struct cvmx_ipd_bp_prt_red_end_s cn56xx;
+        struct cvmx_ipd_bp_prt_red_end_s cn56xxp1;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn58xx;
+        struct cvmx_ipd_bp_prt_red_end_cn30xx cn58xxp1;
+};
+
+union cvmx_ipd_clk_count {
+        uint64_t u64;
+        struct cvmx_ipd_clk_count_s {
+                uint64_t clk_cnt:64;
+        } s;
+        struct cvmx_ipd_clk_count_s cn30xx;
+        struct cvmx_ipd_clk_count_s cn31xx;
+        struct cvmx_ipd_clk_count_s cn38xx;
+        struct cvmx_ipd_clk_count_s cn38xxp2;
+        struct cvmx_ipd_clk_count_s cn50xx;
+        struct cvmx_ipd_clk_count_s cn52xx;
+        struct cvmx_ipd_clk_count_s cn52xxp1;
+        struct cvmx_ipd_clk_count_s cn56xx;
+        struct cvmx_ipd_clk_count_s cn56xxp1;
+        struct cvmx_ipd_clk_count_s cn58xx;
+        struct cvmx_ipd_clk_count_s cn58xxp1;
+};
+
+union cvmx_ipd_ctl_status {
+        uint64_t u64;
+        struct cvmx_ipd_ctl_status_s {
+                uint64_t reserved_15_63:49;
+                uint64_t no_wptr:1;
+                uint64_t pq_apkt:1;
+                uint64_t pq_nabuf:1;
+                uint64_t ipd_full:1;
+                uint64_t pkt_off:1;
+                uint64_t len_m8:1;
+                uint64_t reset:1;
+                uint64_t addpkt:1;
+                uint64_t naddbuf:1;
+                uint64_t pkt_lend:1;
+                uint64_t wqe_lend:1;
+                uint64_t pbp_en:1;
+                uint64_t opc_mode:2;
+                uint64_t ipd_en:1;
+        } s;
+        struct cvmx_ipd_ctl_status_cn30xx {
+                uint64_t reserved_10_63:54;
+                uint64_t len_m8:1;
+                uint64_t reset:1;
+                uint64_t addpkt:1;
+                uint64_t naddbuf:1;
+                uint64_t pkt_lend:1;
+                uint64_t wqe_lend:1;
+                uint64_t pbp_en:1;
+                uint64_t opc_mode:2;
+                uint64_t ipd_en:1;
+        } cn30xx;
+        struct cvmx_ipd_ctl_status_cn30xx cn31xx;
+        struct cvmx_ipd_ctl_status_cn30xx cn38xx;
+        struct cvmx_ipd_ctl_status_cn38xxp2 {
+                uint64_t reserved_9_63:55;
+                uint64_t reset:1;
+                uint64_t addpkt:1;
+                uint64_t naddbuf:1;
+                uint64_t pkt_lend:1;
+                uint64_t wqe_lend:1;
+                uint64_t pbp_en:1;
+                uint64_t opc_mode:2;
+                uint64_t ipd_en:1;
+        } cn38xxp2;
+        struct cvmx_ipd_ctl_status_s cn50xx;
+        struct cvmx_ipd_ctl_status_s cn52xx;
+        struct cvmx_ipd_ctl_status_s cn52xxp1;
+        struct cvmx_ipd_ctl_status_s cn56xx;
+        struct cvmx_ipd_ctl_status_s cn56xxp1;
+        struct cvmx_ipd_ctl_status_cn58xx {
+                uint64_t reserved_12_63:52;
+                uint64_t ipd_full:1;
+                uint64_t pkt_off:1;
+                uint64_t len_m8:1;
+                uint64_t reset:1;
+                uint64_t addpkt:1;
+                uint64_t naddbuf:1;
+                uint64_t pkt_lend:1;
+                uint64_t wqe_lend:1;
+                uint64_t pbp_en:1;
+                uint64_t opc_mode:2;
+                uint64_t ipd_en:1;
+        } cn58xx;
+        struct cvmx_ipd_ctl_status_cn58xx cn58xxp1;
+};
+
+union cvmx_ipd_int_enb {
+        uint64_t u64;
+        struct cvmx_ipd_int_enb_s {
+                uint64_t reserved_12_63:52;
+                uint64_t pq_sub:1;
+                uint64_t pq_add:1;
+                uint64_t bc_ovr:1;
+                uint64_t d_coll:1;
+                uint64_t c_coll:1;
+                uint64_t cc_ovr:1;
+                uint64_t dc_ovr:1;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } s;
+        struct cvmx_ipd_int_enb_cn30xx {
+                uint64_t reserved_5_63:59;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } cn30xx;
+        struct cvmx_ipd_int_enb_cn30xx cn31xx;
+        struct cvmx_ipd_int_enb_cn38xx {
+                uint64_t reserved_10_63:54;
+                uint64_t bc_ovr:1;
+                uint64_t d_coll:1;
+                uint64_t c_coll:1;
+                uint64_t cc_ovr:1;
+                uint64_t dc_ovr:1;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } cn38xx;
+        struct cvmx_ipd_int_enb_cn30xx cn38xxp2;
+        struct cvmx_ipd_int_enb_cn38xx cn50xx;
+        struct cvmx_ipd_int_enb_s cn52xx;
+        struct cvmx_ipd_int_enb_s cn52xxp1;
+        struct cvmx_ipd_int_enb_s cn56xx;
+        struct cvmx_ipd_int_enb_s cn56xxp1;
+        struct cvmx_ipd_int_enb_cn38xx cn58xx;
+        struct cvmx_ipd_int_enb_cn38xx cn58xxp1;
+};
+
+union cvmx_ipd_int_sum {
+        uint64_t u64;
+        struct cvmx_ipd_int_sum_s {
+                uint64_t reserved_12_63:52;
+                uint64_t pq_sub:1;
+                uint64_t pq_add:1;
+                uint64_t bc_ovr:1;
+                uint64_t d_coll:1;
+                uint64_t c_coll:1;
+                uint64_t cc_ovr:1;
+                uint64_t dc_ovr:1;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } s;
+        struct cvmx_ipd_int_sum_cn30xx {
+                uint64_t reserved_5_63:59;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } cn30xx;
+        struct cvmx_ipd_int_sum_cn30xx cn31xx;
+        struct cvmx_ipd_int_sum_cn38xx {
+                uint64_t reserved_10_63:54;
+                uint64_t bc_ovr:1;
+                uint64_t d_coll:1;
+                uint64_t c_coll:1;
+                uint64_t cc_ovr:1;
+                uint64_t dc_ovr:1;
+                uint64_t bp_sub:1;
+                uint64_t prc_par3:1;
+                uint64_t prc_par2:1;
+                uint64_t prc_par1:1;
+                uint64_t prc_par0:1;
+        } cn38xx;
+        struct cvmx_ipd_int_sum_cn30xx cn38xxp2;
+        struct cvmx_ipd_int_sum_cn38xx cn50xx;
+        struct cvmx_ipd_int_sum_s cn52xx;
+        struct cvmx_ipd_int_sum_s cn52xxp1;
+        struct cvmx_ipd_int_sum_s cn56xx;
+        struct cvmx_ipd_int_sum_s cn56xxp1;
+        struct cvmx_ipd_int_sum_cn38xx cn58xx;
+        struct cvmx_ipd_int_sum_cn38xx cn58xxp1;
+};
+
+union cvmx_ipd_not_1st_mbuff_skip {
+        uint64_t u64;
+        struct cvmx_ipd_not_1st_mbuff_skip_s {
+                uint64_t reserved_6_63:58;
+                uint64_t skip_sz:6;
+        } s;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn30xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn31xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn38xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn38xxp2;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn50xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn52xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn52xxp1;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn56xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn56xxp1;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn58xx;
+        struct cvmx_ipd_not_1st_mbuff_skip_s cn58xxp1;
+};
+
+union cvmx_ipd_packet_mbuff_size {
+        uint64_t u64;
+        struct cvmx_ipd_packet_mbuff_size_s {
+                uint64_t reserved_12_63:52;
+                uint64_t mb_size:12;
+        } s;
+        struct cvmx_ipd_packet_mbuff_size_s cn30xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn31xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn38xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn38xxp2;
+        struct cvmx_ipd_packet_mbuff_size_s cn50xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn52xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn52xxp1;
+        struct cvmx_ipd_packet_mbuff_size_s cn56xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn56xxp1;
+        struct cvmx_ipd_packet_mbuff_size_s cn58xx;
+        struct cvmx_ipd_packet_mbuff_size_s cn58xxp1;
+};
+
+union cvmx_ipd_pkt_ptr_valid {
+        uint64_t u64;
+        struct cvmx_ipd_pkt_ptr_valid_s {
+                uint64_t reserved_29_63:35;
+                uint64_t ptr:29;
+        } s;
+        struct cvmx_ipd_pkt_ptr_valid_s cn30xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn31xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn38xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn50xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn52xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn52xxp1;
+        struct cvmx_ipd_pkt_ptr_valid_s cn56xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn56xxp1;
+        struct cvmx_ipd_pkt_ptr_valid_s cn58xx;
+        struct cvmx_ipd_pkt_ptr_valid_s cn58xxp1;
+};
+
+union cvmx_ipd_portx_bp_page_cnt {
+        uint64_t u64;
+        struct cvmx_ipd_portx_bp_page_cnt_s {
+                uint64_t reserved_18_63:46;
+                uint64_t bp_enb:1;
+                uint64_t page_cnt:17;
+        } s;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn30xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn31xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn38xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn38xxp2;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn50xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn52xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn52xxp1;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn56xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn56xxp1;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn58xx;
+        struct cvmx_ipd_portx_bp_page_cnt_s cn58xxp1;
+};
+
+union cvmx_ipd_portx_bp_page_cnt2 {
+        uint64_t u64;
+        struct cvmx_ipd_portx_bp_page_cnt2_s {
+                uint64_t reserved_18_63:46;
+                uint64_t bp_enb:1;
+                uint64_t page_cnt:17;
+        } s;
+        struct cvmx_ipd_portx_bp_page_cnt2_s cn52xx;
+        struct cvmx_ipd_portx_bp_page_cnt2_s cn52xxp1;
+        struct cvmx_ipd_portx_bp_page_cnt2_s cn56xx;
+        struct cvmx_ipd_portx_bp_page_cnt2_s cn56xxp1;
+};
+
+union cvmx_ipd_port_bp_counters2_pairx {
+        uint64_t u64;
+        struct cvmx_ipd_port_bp_counters2_pairx_s {
+                uint64_t reserved_25_63:39;
+                uint64_t cnt_val:25;
+        } s;
+        struct cvmx_ipd_port_bp_counters2_pairx_s cn52xx;
+        struct cvmx_ipd_port_bp_counters2_pairx_s cn52xxp1;
+        struct cvmx_ipd_port_bp_counters2_pairx_s cn56xx;
+        struct cvmx_ipd_port_bp_counters2_pairx_s cn56xxp1;
+};
+
+union cvmx_ipd_port_bp_counters_pairx {
+        uint64_t u64;
+        struct cvmx_ipd_port_bp_counters_pairx_s {
+                uint64_t reserved_25_63:39;
+                uint64_t cnt_val:25;
+        } s;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn30xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn31xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn38xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn38xxp2;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn50xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn52xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn52xxp1;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn56xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn56xxp1;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn58xx;
+        struct cvmx_ipd_port_bp_counters_pairx_s cn58xxp1;
+};
+
+union cvmx_ipd_port_qos_x_cnt {
+        uint64_t u64;
+        struct cvmx_ipd_port_qos_x_cnt_s {
+                uint64_t wmark:32;
+                uint64_t cnt:32;
+        } s;
+        struct cvmx_ipd_port_qos_x_cnt_s cn52xx;
+        struct cvmx_ipd_port_qos_x_cnt_s cn52xxp1;
+        struct cvmx_ipd_port_qos_x_cnt_s cn56xx;
+        struct cvmx_ipd_port_qos_x_cnt_s cn56xxp1;
+};
+
+union cvmx_ipd_port_qos_intx {
+        uint64_t u64;
+        struct cvmx_ipd_port_qos_intx_s {
+                uint64_t intr:64;
+        } s;
+        struct cvmx_ipd_port_qos_intx_s cn52xx;
+        struct cvmx_ipd_port_qos_intx_s cn52xxp1;
+        struct cvmx_ipd_port_qos_intx_s cn56xx;
+        struct cvmx_ipd_port_qos_intx_s cn56xxp1;
+};
+
+union cvmx_ipd_port_qos_int_enbx {
+        uint64_t u64;
+        struct cvmx_ipd_port_qos_int_enbx_s {
+                uint64_t enb:64;
+        } s;
+        struct cvmx_ipd_port_qos_int_enbx_s cn52xx;
+        struct cvmx_ipd_port_qos_int_enbx_s cn52xxp1;
+        struct cvmx_ipd_port_qos_int_enbx_s cn56xx;
+        struct cvmx_ipd_port_qos_int_enbx_s cn56xxp1;
+};
+
+union cvmx_ipd_prc_hold_ptr_fifo_ctl {
+        uint64_t u64;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s {
+                uint64_t reserved_39_63:25;
+                uint64_t max_pkt:3;
+                uint64_t praddr:3;
+                uint64_t ptr:29;
+                uint64_t cena:1;
+                uint64_t raddr:3;
+        } s;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn30xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn31xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn38xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn50xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn52xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn52xxp1;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn56xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn56xxp1;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn58xx;
+        struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn58xxp1;
+};
+
+union cvmx_ipd_prc_port_ptr_fifo_ctl {
+        uint64_t u64;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s {
+                uint64_t reserved_44_63:20;
+                uint64_t max_pkt:7;
+                uint64_t ptr:29;
+                uint64_t cena:1;
+                uint64_t raddr:7;
+        } s;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn30xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn31xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn38xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn50xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn52xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn52xxp1;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn56xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn56xxp1;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn58xx;
+        struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn58xxp1;
+};
+
+union cvmx_ipd_ptr_count {
+        uint64_t u64;
+        struct cvmx_ipd_ptr_count_s {
+                uint64_t reserved_19_63:45;
+                uint64_t pktv_cnt:1;
+                uint64_t wqev_cnt:1;
+                uint64_t pfif_cnt:3;
+                uint64_t pkt_pcnt:7;
+                uint64_t wqe_pcnt:7;
+        } s;
+        struct cvmx_ipd_ptr_count_s cn30xx;
+        struct cvmx_ipd_ptr_count_s cn31xx;
+        struct cvmx_ipd_ptr_count_s cn38xx;
+        struct cvmx_ipd_ptr_count_s cn38xxp2;
+        struct cvmx_ipd_ptr_count_s cn50xx;
+        struct cvmx_ipd_ptr_count_s cn52xx;
+        struct cvmx_ipd_ptr_count_s cn52xxp1;
+        struct cvmx_ipd_ptr_count_s cn56xx;
+        struct cvmx_ipd_ptr_count_s cn56xxp1;
+        struct cvmx_ipd_ptr_count_s cn58xx;
+        struct cvmx_ipd_ptr_count_s cn58xxp1;
+};
+
+union cvmx_ipd_pwp_ptr_fifo_ctl {
+        uint64_t u64;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s {
+                uint64_t reserved_61_63:3;
+                uint64_t max_cnts:7;
+                uint64_t wraddr:8;
+                uint64_t praddr:8;
+                uint64_t ptr:29;
+                uint64_t cena:1;
+                uint64_t raddr:8;
+        } s;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn30xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn31xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn38xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn50xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn52xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn52xxp1;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn56xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn56xxp1;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn58xx;
+        struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn58xxp1;
+};
+
+union cvmx_ipd_qosx_red_marks {
+        uint64_t u64;
+        struct cvmx_ipd_qosx_red_marks_s {
+                uint64_t drop:32;
+                uint64_t pass:32;
+        } s;
+        struct cvmx_ipd_qosx_red_marks_s cn30xx;
+        struct cvmx_ipd_qosx_red_marks_s cn31xx;
+        struct cvmx_ipd_qosx_red_marks_s cn38xx;
+        struct cvmx_ipd_qosx_red_marks_s cn38xxp2;
+        struct cvmx_ipd_qosx_red_marks_s cn50xx;
+        struct cvmx_ipd_qosx_red_marks_s cn52xx;
+        struct cvmx_ipd_qosx_red_marks_s cn52xxp1;
+        struct cvmx_ipd_qosx_red_marks_s cn56xx;
+        struct cvmx_ipd_qosx_red_marks_s cn56xxp1;
+        struct cvmx_ipd_qosx_red_marks_s cn58xx;
+        struct cvmx_ipd_qosx_red_marks_s cn58xxp1;
+};
+
+union cvmx_ipd_que0_free_page_cnt {
+        uint64_t u64;
+        struct cvmx_ipd_que0_free_page_cnt_s {
+                uint64_t reserved_32_63:32;
+                uint64_t q0_pcnt:32;
+        } s;
+        struct cvmx_ipd_que0_free_page_cnt_s cn30xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn31xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn38xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn38xxp2;
+        struct cvmx_ipd_que0_free_page_cnt_s cn50xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn52xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn52xxp1;
+        struct cvmx_ipd_que0_free_page_cnt_s cn56xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn56xxp1;
+        struct cvmx_ipd_que0_free_page_cnt_s cn58xx;
+        struct cvmx_ipd_que0_free_page_cnt_s cn58xxp1;
+};
+
+union cvmx_ipd_red_port_enable {
+        uint64_t u64;
+        struct cvmx_ipd_red_port_enable_s {
+                uint64_t prb_dly:14;
+                uint64_t avg_dly:14;
+                uint64_t prt_enb:36;
+        } s;
+        struct cvmx_ipd_red_port_enable_s cn30xx;
+        struct cvmx_ipd_red_port_enable_s cn31xx;
+        struct cvmx_ipd_red_port_enable_s cn38xx;
+        struct cvmx_ipd_red_port_enable_s cn38xxp2;
+        struct cvmx_ipd_red_port_enable_s cn50xx;
+        struct cvmx_ipd_red_port_enable_s cn52xx;
+        struct cvmx_ipd_red_port_enable_s cn52xxp1;
+        struct cvmx_ipd_red_port_enable_s cn56xx;
+        struct cvmx_ipd_red_port_enable_s cn56xxp1;
+        struct cvmx_ipd_red_port_enable_s cn58xx;
+        struct cvmx_ipd_red_port_enable_s cn58xxp1;
+};
+
+union cvmx_ipd_red_port_enable2 {
+        uint64_t u64;
+        struct cvmx_ipd_red_port_enable2_s {
+                uint64_t reserved_4_63:60;
+                uint64_t prt_enb:4;
+        } s;
+        struct cvmx_ipd_red_port_enable2_s cn52xx;
+        struct cvmx_ipd_red_port_enable2_s cn52xxp1;
+        struct cvmx_ipd_red_port_enable2_s cn56xx;
+        struct cvmx_ipd_red_port_enable2_s cn56xxp1;
+};
+
+union cvmx_ipd_red_quex_param {
+        uint64_t u64;
+        struct cvmx_ipd_red_quex_param_s {
+                uint64_t reserved_49_63:15;
+                uint64_t use_pcnt:1;
+                uint64_t new_con:8;
+                uint64_t avg_con:8;
+                uint64_t prb_con:32;
+        } s;
+        struct cvmx_ipd_red_quex_param_s cn30xx;
+        struct cvmx_ipd_red_quex_param_s cn31xx;
+        struct cvmx_ipd_red_quex_param_s cn38xx;
+        struct cvmx_ipd_red_quex_param_s cn38xxp2;
+        struct cvmx_ipd_red_quex_param_s cn50xx;
+        struct cvmx_ipd_red_quex_param_s cn52xx;
+        struct cvmx_ipd_red_quex_param_s cn52xxp1;
+        struct cvmx_ipd_red_quex_param_s cn56xx;
+        struct cvmx_ipd_red_quex_param_s cn56xxp1;
+        struct cvmx_ipd_red_quex_param_s cn58xx;
+        struct cvmx_ipd_red_quex_param_s cn58xxp1;
+};
+
+union cvmx_ipd_sub_port_bp_page_cnt {
+        uint64_t u64;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s {
+                uint64_t reserved_31_63:33;
+                uint64_t port:6;
+                uint64_t page_cnt:25;
+        } s;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn30xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn31xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn38xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn38xxp2;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn50xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn52xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn52xxp1;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn56xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn56xxp1;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn58xx;
+        struct cvmx_ipd_sub_port_bp_page_cnt_s cn58xxp1;
+};
+
+union cvmx_ipd_sub_port_fcs {
+        uint64_t u64;
+        struct cvmx_ipd_sub_port_fcs_s {
+                uint64_t reserved_40_63:24;
+                uint64_t port_bit2:4;
+                uint64_t reserved_32_35:4;
+                uint64_t port_bit:32;
+        } s;
+        struct cvmx_ipd_sub_port_fcs_cn30xx {
+                uint64_t reserved_3_63:61;
+                uint64_t port_bit:3;
+        } cn30xx;
+        struct cvmx_ipd_sub_port_fcs_cn30xx cn31xx;
+        struct cvmx_ipd_sub_port_fcs_cn38xx {
+                uint64_t reserved_32_63:32;
+                uint64_t port_bit:32;
+        } cn38xx;
+        struct cvmx_ipd_sub_port_fcs_cn38xx cn38xxp2;
+        struct cvmx_ipd_sub_port_fcs_cn30xx cn50xx;
+        struct cvmx_ipd_sub_port_fcs_s cn52xx;
+        struct cvmx_ipd_sub_port_fcs_s cn52xxp1;
+        struct cvmx_ipd_sub_port_fcs_s cn56xx;
+        struct cvmx_ipd_sub_port_fcs_s cn56xxp1;
+        struct cvmx_ipd_sub_port_fcs_cn38xx cn58xx;
+        struct cvmx_ipd_sub_port_fcs_cn38xx cn58xxp1;
+};
+
+union cvmx_ipd_sub_port_qos_cnt {
+        uint64_t u64;
+        struct cvmx_ipd_sub_port_qos_cnt_s {
+                uint64_t reserved_41_63:23;
+                uint64_t port_qos:9;
+                uint64_t cnt:32;
+        } s;
+        struct cvmx_ipd_sub_port_qos_cnt_s cn52xx;
+        struct cvmx_ipd_sub_port_qos_cnt_s cn52xxp1;
+        struct cvmx_ipd_sub_port_qos_cnt_s cn56xx;
+        struct cvmx_ipd_sub_port_qos_cnt_s cn56xxp1;
+};
+
+union cvmx_ipd_wqe_fpa_queue {
+        uint64_t u64;
+        struct cvmx_ipd_wqe_fpa_queue_s {
+                uint64_t reserved_3_63:61;
+                uint64_t wqe_pool:3;
+        } s;
+        struct cvmx_ipd_wqe_fpa_queue_s cn30xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn31xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn38xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn38xxp2;
+        struct cvmx_ipd_wqe_fpa_queue_s cn50xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn52xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn52xxp1;
+        struct cvmx_ipd_wqe_fpa_queue_s cn56xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn56xxp1;
+        struct cvmx_ipd_wqe_fpa_queue_s cn58xx;
+        struct cvmx_ipd_wqe_fpa_queue_s cn58xxp1;
+};
+
+union cvmx_ipd_wqe_ptr_valid {
+        uint64_t u64;
+        struct cvmx_ipd_wqe_ptr_valid_s {
+                uint64_t reserved_29_63:35;
+                uint64_t ptr:29;
+        } s;
+        struct cvmx_ipd_wqe_ptr_valid_s cn30xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn31xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn38xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn50xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn52xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn52xxp1;
+        struct cvmx_ipd_wqe_ptr_valid_s cn56xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn56xxp1;
+        struct cvmx_ipd_wqe_ptr_valid_s cn58xx;
+        struct cvmx_ipd_wqe_ptr_valid_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-l2c-defs.h b/arch/mips/include/asm/octeon/cvmx-l2c-defs.h
new file mode 100644
index 000000000000..337583842b51
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-l2c-defs.h
@@ -0,0 +1,963 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_L2C_DEFS_H__
+#define __CVMX_L2C_DEFS_H__
+
+#define CVMX_L2C_BST0 \
+         CVMX_ADD_IO_SEG(0x00011800800007F8ull)
+#define CVMX_L2C_BST1 \
+         CVMX_ADD_IO_SEG(0x00011800800007F0ull)
+#define CVMX_L2C_BST2 \
+         CVMX_ADD_IO_SEG(0x00011800800007E8ull)
+#define CVMX_L2C_CFG \
+         CVMX_ADD_IO_SEG(0x0001180080000000ull)
+#define CVMX_L2C_DBG \
+         CVMX_ADD_IO_SEG(0x0001180080000030ull)
+#define CVMX_L2C_DUT \
+         CVMX_ADD_IO_SEG(0x0001180080000050ull)
+#define CVMX_L2C_GRPWRR0 \
+         CVMX_ADD_IO_SEG(0x00011800800000C8ull)
+#define CVMX_L2C_GRPWRR1 \
+         CVMX_ADD_IO_SEG(0x00011800800000D0ull)
+#define CVMX_L2C_INT_EN \
+         CVMX_ADD_IO_SEG(0x0001180080000100ull)
+#define CVMX_L2C_INT_STAT \
+         CVMX_ADD_IO_SEG(0x00011800800000F8ull)
+#define CVMX_L2C_LCKBASE \
+         CVMX_ADD_IO_SEG(0x0001180080000058ull)
+#define CVMX_L2C_LCKOFF \
+         CVMX_ADD_IO_SEG(0x0001180080000060ull)
+#define CVMX_L2C_LFB0 \
+         CVMX_ADD_IO_SEG(0x0001180080000038ull)
+#define CVMX_L2C_LFB1 \
+         CVMX_ADD_IO_SEG(0x0001180080000040ull)
+#define CVMX_L2C_LFB2 \
+         CVMX_ADD_IO_SEG(0x0001180080000048ull)
+#define CVMX_L2C_LFB3 \
+         CVMX_ADD_IO_SEG(0x00011800800000B8ull)
+#define CVMX_L2C_OOB \
+         CVMX_ADD_IO_SEG(0x00011800800000D8ull)
+#define CVMX_L2C_OOB1 \
+         CVMX_ADD_IO_SEG(0x00011800800000E0ull)
+#define CVMX_L2C_OOB2 \
+         CVMX_ADD_IO_SEG(0x00011800800000E8ull)
+#define CVMX_L2C_OOB3 \
+         CVMX_ADD_IO_SEG(0x00011800800000F0ull)
+#define CVMX_L2C_PFC0 \
+         CVMX_ADD_IO_SEG(0x0001180080000098ull)
+#define CVMX_L2C_PFC1 \
+         CVMX_ADD_IO_SEG(0x00011800800000A0ull)
+#define CVMX_L2C_PFC2 \
+         CVMX_ADD_IO_SEG(0x00011800800000A8ull)
+#define CVMX_L2C_PFC3 \
+         CVMX_ADD_IO_SEG(0x00011800800000B0ull)
+#define CVMX_L2C_PFCTL \
+         CVMX_ADD_IO_SEG(0x0001180080000090ull)
+#define CVMX_L2C_PFCX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180080000098ull + (((offset) & 3) * 8))
+#define CVMX_L2C_PPGRP \
+         CVMX_ADD_IO_SEG(0x00011800800000C0ull)
+#define CVMX_L2C_SPAR0 \
+         CVMX_ADD_IO_SEG(0x0001180080000068ull)
+#define CVMX_L2C_SPAR1 \
+         CVMX_ADD_IO_SEG(0x0001180080000070ull)
+#define CVMX_L2C_SPAR2 \
+         CVMX_ADD_IO_SEG(0x0001180080000078ull)
+#define CVMX_L2C_SPAR3 \
+         CVMX_ADD_IO_SEG(0x0001180080000080ull)
+#define CVMX_L2C_SPAR4 \
+         CVMX_ADD_IO_SEG(0x0001180080000088ull)
+
+union cvmx_l2c_bst0 {
+        uint64_t u64;
+        struct cvmx_l2c_bst0_s {
+                uint64_t reserved_24_63:40;
+                uint64_t dtbnk:1;
+                uint64_t wlb_msk:4;
+                uint64_t dtcnt:13;
+                uint64_t dt:1;
+                uint64_t stin_msk:1;
+                uint64_t wlb_dat:4;
+        } s;
+        struct cvmx_l2c_bst0_cn30xx {
+                uint64_t reserved_23_63:41;
+                uint64_t wlb_msk:4;
+                uint64_t reserved_15_18:4;
+                uint64_t dtcnt:9;
+                uint64_t dt:1;
+                uint64_t reserved_4_4:1;
+                uint64_t wlb_dat:4;
+        } cn30xx;
+        struct cvmx_l2c_bst0_cn31xx {
+                uint64_t reserved_23_63:41;
+                uint64_t wlb_msk:4;
+                uint64_t reserved_16_18:3;
+                uint64_t dtcnt:10;
+                uint64_t dt:1;
+                uint64_t stin_msk:1;
+                uint64_t wlb_dat:4;
+        } cn31xx;
+        struct cvmx_l2c_bst0_cn38xx {
+                uint64_t reserved_19_63:45;
+                uint64_t dtcnt:13;
+                uint64_t dt:1;
+                uint64_t stin_msk:1;
+                uint64_t wlb_dat:4;
+        } cn38xx;
+        struct cvmx_l2c_bst0_cn38xx cn38xxp2;
+        struct cvmx_l2c_bst0_cn50xx {
+                uint64_t reserved_24_63:40;
+                uint64_t dtbnk:1;
+                uint64_t wlb_msk:4;
+                uint64_t reserved_16_18:3;
+                uint64_t dtcnt:10;
+                uint64_t dt:1;
+                uint64_t stin_msk:1;
+                uint64_t wlb_dat:4;
+        } cn50xx;
+        struct cvmx_l2c_bst0_cn50xx cn52xx;
+        struct cvmx_l2c_bst0_cn50xx cn52xxp1;
+        struct cvmx_l2c_bst0_s cn56xx;
+        struct cvmx_l2c_bst0_s cn56xxp1;
+        struct cvmx_l2c_bst0_s cn58xx;
+        struct cvmx_l2c_bst0_s cn58xxp1;
+};
+
+union cvmx_l2c_bst1 {
+        uint64_t u64;
+        struct cvmx_l2c_bst1_s {
+                uint64_t reserved_9_63:55;
+                uint64_t l2t:9;
+        } s;
+        struct cvmx_l2c_bst1_cn30xx {
+                uint64_t reserved_16_63:48;
+                uint64_t vwdf:4;
+                uint64_t lrf:2;
+                uint64_t vab_vwcf:1;
+                uint64_t reserved_5_8:4;
+                uint64_t l2t:5;
+        } cn30xx;
+        struct cvmx_l2c_bst1_cn30xx cn31xx;
+        struct cvmx_l2c_bst1_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t vwdf:4;
+                uint64_t lrf:2;
+                uint64_t vab_vwcf:1;
+                uint64_t l2t:9;
+        } cn38xx;
+        struct cvmx_l2c_bst1_cn38xx cn38xxp2;
+        struct cvmx_l2c_bst1_cn38xx cn50xx;
+        struct cvmx_l2c_bst1_cn52xx {
+                uint64_t reserved_19_63:45;
+                uint64_t plc2:1;
+                uint64_t plc1:1;
+                uint64_t plc0:1;
+                uint64_t vwdf:4;
+                uint64_t reserved_11_11:1;
+                uint64_t ilc:1;
+                uint64_t vab_vwcf:1;
+                uint64_t l2t:9;
+        } cn52xx;
+        struct cvmx_l2c_bst1_cn52xx cn52xxp1;
+        struct cvmx_l2c_bst1_cn56xx {
+                uint64_t reserved_24_63:40;
+                uint64_t plc2:1;
+                uint64_t plc1:1;
+                uint64_t plc0:1;
+                uint64_t ilc:1;
+                uint64_t vwdf1:4;
+                uint64_t vwdf0:4;
+                uint64_t vab_vwcf1:1;
+                uint64_t reserved_10_10:1;
+                uint64_t vab_vwcf0:1;
+                uint64_t l2t:9;
+        } cn56xx;
+        struct cvmx_l2c_bst1_cn56xx cn56xxp1;
+        struct cvmx_l2c_bst1_cn38xx cn58xx;
+        struct cvmx_l2c_bst1_cn38xx cn58xxp1;
+};
+
+union cvmx_l2c_bst2 {
+        uint64_t u64;
+        struct cvmx_l2c_bst2_s {
+                uint64_t reserved_16_63:48;
+                uint64_t mrb:4;
+                uint64_t reserved_4_11:8;
+                uint64_t ipcbst:1;
+                uint64_t picbst:1;
+                uint64_t xrdmsk:1;
+                uint64_t xrddat:1;
+        } s;
+        struct cvmx_l2c_bst2_cn30xx {
+                uint64_t reserved_16_63:48;
+                uint64_t mrb:4;
+                uint64_t rmdf:4;
+                uint64_t reserved_4_7:4;
+                uint64_t ipcbst:1;
+                uint64_t reserved_2_2:1;
+                uint64_t xrdmsk:1;
+                uint64_t xrddat:1;
+        } cn30xx;
+        struct cvmx_l2c_bst2_cn30xx cn31xx;
+        struct cvmx_l2c_bst2_cn38xx {
+                uint64_t reserved_16_63:48;
+                uint64_t mrb:4;
+                uint64_t rmdf:4;
+                uint64_t rhdf:4;
+                uint64_t ipcbst:1;
+                uint64_t picbst:1;
+                uint64_t xrdmsk:1;
+                uint64_t xrddat:1;
+        } cn38xx;
+        struct cvmx_l2c_bst2_cn38xx cn38xxp2;
+        struct cvmx_l2c_bst2_cn30xx cn50xx;
+        struct cvmx_l2c_bst2_cn30xx cn52xx;
+        struct cvmx_l2c_bst2_cn30xx cn52xxp1;
+        struct cvmx_l2c_bst2_cn56xx {
+                uint64_t reserved_16_63:48;
+                uint64_t mrb:4;
+                uint64_t rmdb:4;
+                uint64_t rhdb:4;
+                uint64_t ipcbst:1;
+                uint64_t picbst:1;
+                uint64_t xrdmsk:1;
+                uint64_t xrddat:1;
+        } cn56xx;
+        struct cvmx_l2c_bst2_cn56xx cn56xxp1;
+        struct cvmx_l2c_bst2_cn56xx cn58xx;
+        struct cvmx_l2c_bst2_cn56xx cn58xxp1;
+};
+
+union cvmx_l2c_cfg {
+        uint64_t u64;
+        struct cvmx_l2c_cfg_s {
+                uint64_t reserved_20_63:44;
+                uint64_t bstrun:1;
+                uint64_t lbist:1;
+                uint64_t xor_bank:1;
+                uint64_t dpres1:1;
+                uint64_t dpres0:1;
+                uint64_t dfill_dis:1;
+                uint64_t fpexp:4;
+                uint64_t fpempty:1;
+                uint64_t fpen:1;
+                uint64_t idxalias:1;
+                uint64_t mwf_crd:4;
+                uint64_t rsp_arb_mode:1;
+                uint64_t rfb_arb_mode:1;
+                uint64_t lrf_arb_mode:1;
+        } s;
+        struct cvmx_l2c_cfg_cn30xx {
+                uint64_t reserved_14_63:50;
+                uint64_t fpexp:4;
+                uint64_t fpempty:1;
+                uint64_t fpen:1;
+                uint64_t idxalias:1;
+                uint64_t mwf_crd:4;
+                uint64_t rsp_arb_mode:1;
+                uint64_t rfb_arb_mode:1;
+                uint64_t lrf_arb_mode:1;
+        } cn30xx;
+        struct cvmx_l2c_cfg_cn30xx cn31xx;
+        struct cvmx_l2c_cfg_cn30xx cn38xx;
+        struct cvmx_l2c_cfg_cn30xx cn38xxp2;
+        struct cvmx_l2c_cfg_cn50xx {
+                uint64_t reserved_20_63:44;
+                uint64_t bstrun:1;
+                uint64_t lbist:1;
+                uint64_t reserved_14_17:4;
+                uint64_t fpexp:4;
+                uint64_t fpempty:1;
+                uint64_t fpen:1;
+                uint64_t idxalias:1;
+                uint64_t mwf_crd:4;
+                uint64_t rsp_arb_mode:1;
+                uint64_t rfb_arb_mode:1;
+                uint64_t lrf_arb_mode:1;
+        } cn50xx;
+        struct cvmx_l2c_cfg_cn50xx cn52xx;
+        struct cvmx_l2c_cfg_cn50xx cn52xxp1;
+        struct cvmx_l2c_cfg_s cn56xx;
+        struct cvmx_l2c_cfg_s cn56xxp1;
+        struct cvmx_l2c_cfg_cn58xx {
+                uint64_t reserved_20_63:44;
+                uint64_t bstrun:1;
+                uint64_t lbist:1;
+                uint64_t reserved_15_17:3;
+                uint64_t dfill_dis:1;
+                uint64_t fpexp:4;
+                uint64_t fpempty:1;
+                uint64_t fpen:1;
+                uint64_t idxalias:1;
+                uint64_t mwf_crd:4;
+                uint64_t rsp_arb_mode:1;
+                uint64_t rfb_arb_mode:1;
+                uint64_t lrf_arb_mode:1;
+        } cn58xx;
+        struct cvmx_l2c_cfg_cn58xxp1 {
+                uint64_t reserved_15_63:49;
+                uint64_t dfill_dis:1;
+                uint64_t fpexp:4;
+                uint64_t fpempty:1;
+                uint64_t fpen:1;
+                uint64_t idxalias:1;
+                uint64_t mwf_crd:4;
+                uint64_t rsp_arb_mode:1;
+                uint64_t rfb_arb_mode:1;
+                uint64_t lrf_arb_mode:1;
+        } cn58xxp1;
+};
+
+union cvmx_l2c_dbg {
+        uint64_t u64;
+        struct cvmx_l2c_dbg_s {
+                uint64_t reserved_15_63:49;
+                uint64_t lfb_enum:4;
+                uint64_t lfb_dmp:1;
+                uint64_t ppnum:4;
+                uint64_t set:3;
+                uint64_t finv:1;
+                uint64_t l2d:1;
+                uint64_t l2t:1;
+        } s;
+        struct cvmx_l2c_dbg_cn30xx {
+                uint64_t reserved_13_63:51;
+                uint64_t lfb_enum:2;
+                uint64_t lfb_dmp:1;
+                uint64_t reserved_5_9:5;
+                uint64_t set:2;
+                uint64_t finv:1;
+                uint64_t l2d:1;
+                uint64_t l2t:1;
+        } cn30xx;
+        struct cvmx_l2c_dbg_cn31xx {
+                uint64_t reserved_14_63:50;
+                uint64_t lfb_enum:3;
+                uint64_t lfb_dmp:1;
+                uint64_t reserved_7_9:3;
+                uint64_t ppnum:1;
+                uint64_t reserved_5_5:1;
+                uint64_t set:2;
+                uint64_t finv:1;
+                uint64_t l2d:1;
+                uint64_t l2t:1;
+        } cn31xx;
+        struct cvmx_l2c_dbg_s cn38xx;
+        struct cvmx_l2c_dbg_s cn38xxp2;
+        struct cvmx_l2c_dbg_cn50xx {
+                uint64_t reserved_14_63:50;
+                uint64_t lfb_enum:3;
+                uint64_t lfb_dmp:1;
+                uint64_t reserved_7_9:3;
+                uint64_t ppnum:1;
+                uint64_t set:3;
+                uint64_t finv:1;
+                uint64_t l2d:1;
+                uint64_t l2t:1;
+        } cn50xx;
+        struct cvmx_l2c_dbg_cn52xx {
+                uint64_t reserved_14_63:50;
+                uint64_t lfb_enum:3;
+                uint64_t lfb_dmp:1;
+                uint64_t reserved_8_9:2;
+                uint64_t ppnum:2;
+                uint64_t set:3;
+                uint64_t finv:1;
+                uint64_t l2d:1;
+                uint64_t l2t:1;
+        } cn52xx;
+        struct cvmx_l2c_dbg_cn52xx cn52xxp1;
+        struct cvmx_l2c_dbg_s cn56xx;
+        struct cvmx_l2c_dbg_s cn56xxp1;
+        struct cvmx_l2c_dbg_s cn58xx;
+        struct cvmx_l2c_dbg_s cn58xxp1;
+};
+
+union cvmx_l2c_dut {
+        uint64_t u64;
+        struct cvmx_l2c_dut_s {
+                uint64_t reserved_32_63:32;
+                uint64_t dtena:1;
+                uint64_t reserved_30_30:1;
+                uint64_t dt_vld:1;
+                uint64_t dt_tag:29;
+        } s;
+        struct cvmx_l2c_dut_s cn30xx;
+        struct cvmx_l2c_dut_s cn31xx;
+        struct cvmx_l2c_dut_s cn38xx;
+        struct cvmx_l2c_dut_s cn38xxp2;
+        struct cvmx_l2c_dut_s cn50xx;
+        struct cvmx_l2c_dut_s cn52xx;
+        struct cvmx_l2c_dut_s cn52xxp1;
+        struct cvmx_l2c_dut_s cn56xx;
+        struct cvmx_l2c_dut_s cn56xxp1;
+        struct cvmx_l2c_dut_s cn58xx;
+        struct cvmx_l2c_dut_s cn58xxp1;
+};
+
+union cvmx_l2c_grpwrr0 {
+        uint64_t u64;
+        struct cvmx_l2c_grpwrr0_s {
+                uint64_t plc1rmsk:32;
+                uint64_t plc0rmsk:32;
+        } s;
+        struct cvmx_l2c_grpwrr0_s cn52xx;
+        struct cvmx_l2c_grpwrr0_s cn52xxp1;
+        struct cvmx_l2c_grpwrr0_s cn56xx;
+        struct cvmx_l2c_grpwrr0_s cn56xxp1;
+};
+
+union cvmx_l2c_grpwrr1 {
+        uint64_t u64;
+        struct cvmx_l2c_grpwrr1_s {
+                uint64_t ilcrmsk:32;
+                uint64_t plc2rmsk:32;
+        } s;
+        struct cvmx_l2c_grpwrr1_s cn52xx;
+        struct cvmx_l2c_grpwrr1_s cn52xxp1;
+        struct cvmx_l2c_grpwrr1_s cn56xx;
+        struct cvmx_l2c_grpwrr1_s cn56xxp1;
+};
+
+union cvmx_l2c_int_en {
+        uint64_t u64;
+        struct cvmx_l2c_int_en_s {
+                uint64_t reserved_9_63:55;
+                uint64_t lck2ena:1;
+                uint64_t lckena:1;
+                uint64_t l2ddeden:1;
+                uint64_t l2dsecen:1;
+                uint64_t l2tdeden:1;
+                uint64_t l2tsecen:1;
+                uint64_t oob3en:1;
+                uint64_t oob2en:1;
+                uint64_t oob1en:1;
+        } s;
+        struct cvmx_l2c_int_en_s cn52xx;
+        struct cvmx_l2c_int_en_s cn52xxp1;
+        struct cvmx_l2c_int_en_s cn56xx;
+        struct cvmx_l2c_int_en_s cn56xxp1;
+};
+
+union cvmx_l2c_int_stat {
+        uint64_t u64;
+        struct cvmx_l2c_int_stat_s {
+                uint64_t reserved_9_63:55;
+                uint64_t lck2:1;
+                uint64_t lck:1;
+                uint64_t l2dded:1;
+                uint64_t l2dsec:1;
+                uint64_t l2tded:1;
+                uint64_t l2tsec:1;
+                uint64_t oob3:1;
+                uint64_t oob2:1;
+                uint64_t oob1:1;
+        } s;
+        struct cvmx_l2c_int_stat_s cn52xx;
+        struct cvmx_l2c_int_stat_s cn52xxp1;
+        struct cvmx_l2c_int_stat_s cn56xx;
+        struct cvmx_l2c_int_stat_s cn56xxp1;
+};
+
+union cvmx_l2c_lckbase {
+        uint64_t u64;
+        struct cvmx_l2c_lckbase_s {
+                uint64_t reserved_31_63:33;
+                uint64_t lck_base:27;
+                uint64_t reserved_1_3:3;
+                uint64_t lck_ena:1;
+        } s;
+        struct cvmx_l2c_lckbase_s cn30xx;
+        struct cvmx_l2c_lckbase_s cn31xx;
+        struct cvmx_l2c_lckbase_s cn38xx;
+        struct cvmx_l2c_lckbase_s cn38xxp2;
+        struct cvmx_l2c_lckbase_s cn50xx;
+        struct cvmx_l2c_lckbase_s cn52xx;
+        struct cvmx_l2c_lckbase_s cn52xxp1;
+        struct cvmx_l2c_lckbase_s cn56xx;
+        struct cvmx_l2c_lckbase_s cn56xxp1;
+        struct cvmx_l2c_lckbase_s cn58xx;
+        struct cvmx_l2c_lckbase_s cn58xxp1;
+};
+
+union cvmx_l2c_lckoff {
+        uint64_t u64;
+        struct cvmx_l2c_lckoff_s {
+                uint64_t reserved_10_63:54;
+                uint64_t lck_offset:10;
+        } s;
+        struct cvmx_l2c_lckoff_s cn30xx;
+        struct cvmx_l2c_lckoff_s cn31xx;
+        struct cvmx_l2c_lckoff_s cn38xx;
+        struct cvmx_l2c_lckoff_s cn38xxp2;
+        struct cvmx_l2c_lckoff_s cn50xx;
+        struct cvmx_l2c_lckoff_s cn52xx;
+        struct cvmx_l2c_lckoff_s cn52xxp1;
+        struct cvmx_l2c_lckoff_s cn56xx;
+        struct cvmx_l2c_lckoff_s cn56xxp1;
+        struct cvmx_l2c_lckoff_s cn58xx;
+        struct cvmx_l2c_lckoff_s cn58xxp1;
+};
+
+union cvmx_l2c_lfb0 {
+        uint64_t u64;
+        struct cvmx_l2c_lfb0_s {
+                uint64_t reserved_32_63:32;
+                uint64_t stcpnd:1;
+                uint64_t stpnd:1;
+                uint64_t stinv:1;
+                uint64_t stcfl:1;
+                uint64_t vam:1;
+                uint64_t inxt:4;
+                uint64_t itl:1;
+                uint64_t ihd:1;
+                uint64_t set:3;
+                uint64_t vabnum:4;
+                uint64_t sid:9;
+                uint64_t cmd:4;
+                uint64_t vld:1;
+        } s;
+        struct cvmx_l2c_lfb0_cn30xx {
+                uint64_t reserved_32_63:32;
+                uint64_t stcpnd:1;
+                uint64_t stpnd:1;
+                uint64_t stinv:1;
+                uint64_t stcfl:1;
+                uint64_t vam:1;
+                uint64_t reserved_25_26:2;
+                uint64_t inxt:2;
+                uint64_t itl:1;
+                uint64_t ihd:1;
+                uint64_t reserved_20_20:1;
+                uint64_t set:2;
+                uint64_t reserved_16_17:2;
+                uint64_t vabnum:2;
+                uint64_t sid:9;
+                uint64_t cmd:4;
+                uint64_t vld:1;
+        } cn30xx;
+        struct cvmx_l2c_lfb0_cn31xx {
+                uint64_t reserved_32_63:32;
+                uint64_t stcpnd:1;
+                uint64_t stpnd:1;
+                uint64_t stinv:1;
+                uint64_t stcfl:1;
+                uint64_t vam:1;
+                uint64_t reserved_26_26:1;
+                uint64_t inxt:3;
+                uint64_t itl:1;
+                uint64_t ihd:1;
+                uint64_t reserved_20_20:1;
+                uint64_t set:2;
+                uint64_t reserved_17_17:1;
+                uint64_t vabnum:3;
+                uint64_t sid:9;
+                uint64_t cmd:4;
+                uint64_t vld:1;
+        } cn31xx;
+        struct cvmx_l2c_lfb0_s cn38xx;
+        struct cvmx_l2c_lfb0_s cn38xxp2;
+        struct cvmx_l2c_lfb0_cn50xx {
+                uint64_t reserved_32_63:32;
+                uint64_t stcpnd:1;
+                uint64_t stpnd:1;
+                uint64_t stinv:1;
+                uint64_t stcfl:1;
+                uint64_t vam:1;
+                uint64_t reserved_26_26:1;
+                uint64_t inxt:3;
+                uint64_t itl:1;
+                uint64_t ihd:1;
+                uint64_t set:3;
+                uint64_t reserved_17_17:1;
+                uint64_t vabnum:3;
+                uint64_t sid:9;
+                uint64_t cmd:4;
+                uint64_t vld:1;
+        } cn50xx;
+        struct cvmx_l2c_lfb0_cn50xx cn52xx;
+        struct cvmx_l2c_lfb0_cn50xx cn52xxp1;
+        struct cvmx_l2c_lfb0_s cn56xx;
+        struct cvmx_l2c_lfb0_s cn56xxp1;
+        struct cvmx_l2c_lfb0_s cn58xx;
+        struct cvmx_l2c_lfb0_s cn58xxp1;
+};
+
+union cvmx_l2c_lfb1 {
+        uint64_t u64;
+        struct cvmx_l2c_lfb1_s {
+                uint64_t reserved_19_63:45;
+                uint64_t dsgoing:1;
+                uint64_t bid:2;
+                uint64_t wtrsp:1;
+                uint64_t wtdw:1;
+                uint64_t wtdq:1;
+                uint64_t wtwhp:1;
+                uint64_t wtwhf:1;
+                uint64_t wtwrm:1;
+                uint64_t wtstm:1;
+                uint64_t wtrda:1;
+                uint64_t wtstdt:1;
+                uint64_t wtstrsp:1;
+                uint64_t wtstrsc:1;
+                uint64_t wtvtm:1;
+                uint64_t wtmfl:1;
+                uint64_t prbrty:1;
+                uint64_t wtprb:1;
+                uint64_t vld:1;
+        } s;
+        struct cvmx_l2c_lfb1_s cn30xx;
+        struct cvmx_l2c_lfb1_s cn31xx;
+        struct cvmx_l2c_lfb1_s cn38xx;
+        struct cvmx_l2c_lfb1_s cn38xxp2;
+        struct cvmx_l2c_lfb1_s cn50xx;
+        struct cvmx_l2c_lfb1_s cn52xx;
+        struct cvmx_l2c_lfb1_s cn52xxp1;
+        struct cvmx_l2c_lfb1_s cn56xx;
+        struct cvmx_l2c_lfb1_s cn56xxp1;
+        struct cvmx_l2c_lfb1_s cn58xx;
+        struct cvmx_l2c_lfb1_s cn58xxp1;
+};
+
+union cvmx_l2c_lfb2 {
+        uint64_t u64;
+        struct cvmx_l2c_lfb2_s {
+                uint64_t reserved_0_63:64;
+        } s;
+        struct cvmx_l2c_lfb2_cn30xx {
+                uint64_t reserved_27_63:37;
+                uint64_t lfb_tag:19;
+                uint64_t lfb_idx:8;
+        } cn30xx;
+        struct cvmx_l2c_lfb2_cn31xx {
+                uint64_t reserved_27_63:37;
+                uint64_t lfb_tag:17;
+                uint64_t lfb_idx:10;
+        } cn31xx;
+        struct cvmx_l2c_lfb2_cn31xx cn38xx;
+        struct cvmx_l2c_lfb2_cn31xx cn38xxp2;
+        struct cvmx_l2c_lfb2_cn50xx {
+                uint64_t reserved_27_63:37;
+                uint64_t lfb_tag:20;
+                uint64_t lfb_idx:7;
+        } cn50xx;
+        struct cvmx_l2c_lfb2_cn52xx {
+                uint64_t reserved_27_63:37;
+                uint64_t lfb_tag:18;
+                uint64_t lfb_idx:9;
+        } cn52xx;
+        struct cvmx_l2c_lfb2_cn52xx cn52xxp1;
+        struct cvmx_l2c_lfb2_cn56xx {
+                uint64_t reserved_27_63:37;
+                uint64_t lfb_tag:16;
+                uint64_t lfb_idx:11;
+        } cn56xx;
+        struct cvmx_l2c_lfb2_cn56xx cn56xxp1;
+        struct cvmx_l2c_lfb2_cn56xx cn58xx;
+        struct cvmx_l2c_lfb2_cn56xx cn58xxp1;
+};
+
+union cvmx_l2c_lfb3 {
+        uint64_t u64;
+        struct cvmx_l2c_lfb3_s {
+                uint64_t reserved_5_63:59;
+                uint64_t stpartdis:1;
+                uint64_t lfb_hwm:4;
+        } s;
+        struct cvmx_l2c_lfb3_cn30xx {
+                uint64_t reserved_5_63:59;
+                uint64_t stpartdis:1;
+                uint64_t reserved_2_3:2;
+                uint64_t lfb_hwm:2;
+        } cn30xx;
+        struct cvmx_l2c_lfb3_cn31xx {
+                uint64_t reserved_5_63:59;
+                uint64_t stpartdis:1;
+                uint64_t reserved_3_3:1;
+                uint64_t lfb_hwm:3;
+        } cn31xx;
+        struct cvmx_l2c_lfb3_s cn38xx;
+        struct cvmx_l2c_lfb3_s cn38xxp2;
+        struct cvmx_l2c_lfb3_cn31xx cn50xx;
+        struct cvmx_l2c_lfb3_cn31xx cn52xx;
+        struct cvmx_l2c_lfb3_cn31xx cn52xxp1;
+        struct cvmx_l2c_lfb3_s cn56xx;
+        struct cvmx_l2c_lfb3_s cn56xxp1;
+        struct cvmx_l2c_lfb3_s cn58xx;
+        struct cvmx_l2c_lfb3_s cn58xxp1;
+};
+
+union cvmx_l2c_oob {
+        uint64_t u64;
+        struct cvmx_l2c_oob_s {
+                uint64_t reserved_2_63:62;
+                uint64_t dwbena:1;
+                uint64_t stena:1;
+        } s;
+        struct cvmx_l2c_oob_s cn52xx;
+        struct cvmx_l2c_oob_s cn52xxp1;
+        struct cvmx_l2c_oob_s cn56xx;
+        struct cvmx_l2c_oob_s cn56xxp1;
+};
+
+union cvmx_l2c_oob1 {
+        uint64_t u64;
+        struct cvmx_l2c_oob1_s {
+                uint64_t fadr:27;
+                uint64_t fsrc:1;
+                uint64_t reserved_34_35:2;
+                uint64_t sadr:14;
+                uint64_t reserved_14_19:6;
+                uint64_t size:14;
+        } s;
+        struct cvmx_l2c_oob1_s cn52xx;
+        struct cvmx_l2c_oob1_s cn52xxp1;
+        struct cvmx_l2c_oob1_s cn56xx;
+        struct cvmx_l2c_oob1_s cn56xxp1;
+};
+
+union cvmx_l2c_oob2 {
+        uint64_t u64;
+        struct cvmx_l2c_oob2_s {
+                uint64_t fadr:27;
+                uint64_t fsrc:1;
+                uint64_t reserved_34_35:2;
+                uint64_t sadr:14;
+                uint64_t reserved_14_19:6;
+                uint64_t size:14;
+        } s;
+        struct cvmx_l2c_oob2_s cn52xx;
+        struct cvmx_l2c_oob2_s cn52xxp1;
+        struct cvmx_l2c_oob2_s cn56xx;
+        struct cvmx_l2c_oob2_s cn56xxp1;
+};
+
+union cvmx_l2c_oob3 {
+        uint64_t u64;
+        struct cvmx_l2c_oob3_s {
+                uint64_t fadr:27;
+                uint64_t fsrc:1;
+                uint64_t reserved_34_35:2;
+                uint64_t sadr:14;
+                uint64_t reserved_14_19:6;
+                uint64_t size:14;
+        } s;
+        struct cvmx_l2c_oob3_s cn52xx;
+        struct cvmx_l2c_oob3_s cn52xxp1;
+        struct cvmx_l2c_oob3_s cn56xx;
+        struct cvmx_l2c_oob3_s cn56xxp1;
+};
+
+union cvmx_l2c_pfcx {
+        uint64_t u64;
+        struct cvmx_l2c_pfcx_s {
+                uint64_t reserved_36_63:28;
+                uint64_t pfcnt0:36;
+        } s;
+        struct cvmx_l2c_pfcx_s cn30xx;
+        struct cvmx_l2c_pfcx_s cn31xx;
+        struct cvmx_l2c_pfcx_s cn38xx;
+        struct cvmx_l2c_pfcx_s cn38xxp2;
+        struct cvmx_l2c_pfcx_s cn50xx;
+        struct cvmx_l2c_pfcx_s cn52xx;
+        struct cvmx_l2c_pfcx_s cn52xxp1;
+        struct cvmx_l2c_pfcx_s cn56xx;
+        struct cvmx_l2c_pfcx_s cn56xxp1;
+        struct cvmx_l2c_pfcx_s cn58xx;
+        struct cvmx_l2c_pfcx_s cn58xxp1;
+};
+
+union cvmx_l2c_pfctl {
+        uint64_t u64;
+        struct cvmx_l2c_pfctl_s {
+                uint64_t reserved_36_63:28;
+                uint64_t cnt3rdclr:1;
+                uint64_t cnt2rdclr:1;
+                uint64_t cnt1rdclr:1;
+                uint64_t cnt0rdclr:1;
+                uint64_t cnt3ena:1;
+                uint64_t cnt3clr:1;
+                uint64_t cnt3sel:6;
+                uint64_t cnt2ena:1;
+                uint64_t cnt2clr:1;
+                uint64_t cnt2sel:6;
+                uint64_t cnt1ena:1;
+                uint64_t cnt1clr:1;
+                uint64_t cnt1sel:6;
+                uint64_t cnt0ena:1;
+                uint64_t cnt0clr:1;
+                uint64_t cnt0sel:6;
+        } s;
+        struct cvmx_l2c_pfctl_s cn30xx;
+        struct cvmx_l2c_pfctl_s cn31xx;
+        struct cvmx_l2c_pfctl_s cn38xx;
+        struct cvmx_l2c_pfctl_s cn38xxp2;
+        struct cvmx_l2c_pfctl_s cn50xx;
+        struct cvmx_l2c_pfctl_s cn52xx;
+        struct cvmx_l2c_pfctl_s cn52xxp1;
+        struct cvmx_l2c_pfctl_s cn56xx;
+        struct cvmx_l2c_pfctl_s cn56xxp1;
+        struct cvmx_l2c_pfctl_s cn58xx;
+        struct cvmx_l2c_pfctl_s cn58xxp1;
+};
+
+union cvmx_l2c_ppgrp {
+        uint64_t u64;
+        struct cvmx_l2c_ppgrp_s {
+                uint64_t reserved_24_63:40;
+                uint64_t pp11grp:2;
+                uint64_t pp10grp:2;
+                uint64_t pp9grp:2;
+                uint64_t pp8grp:2;
+                uint64_t pp7grp:2;
+                uint64_t pp6grp:2;
+                uint64_t pp5grp:2;
+                uint64_t pp4grp:2;
+                uint64_t pp3grp:2;
+                uint64_t pp2grp:2;
+                uint64_t pp1grp:2;
+                uint64_t pp0grp:2;
+        } s;
+        struct cvmx_l2c_ppgrp_cn52xx {
+                uint64_t reserved_8_63:56;
+                uint64_t pp3grp:2;
+                uint64_t pp2grp:2;
+                uint64_t pp1grp:2;
+                uint64_t pp0grp:2;
+        } cn52xx;
+        struct cvmx_l2c_ppgrp_cn52xx cn52xxp1;
+        struct cvmx_l2c_ppgrp_s cn56xx;
+        struct cvmx_l2c_ppgrp_s cn56xxp1;
+};
+
+union cvmx_l2c_spar0 {
+        uint64_t u64;
+        struct cvmx_l2c_spar0_s {
+                uint64_t reserved_32_63:32;
+                uint64_t umsk3:8;
+                uint64_t umsk2:8;
+                uint64_t umsk1:8;
+                uint64_t umsk0:8;
+        } s;
+        struct cvmx_l2c_spar0_cn30xx {
+                uint64_t reserved_4_63:60;
+                uint64_t umsk0:4;
+        } cn30xx;
+        struct cvmx_l2c_spar0_cn31xx {
+                uint64_t reserved_12_63:52;
+                uint64_t umsk1:4;
+                uint64_t reserved_4_7:4;
+                uint64_t umsk0:4;
+        } cn31xx;
+        struct cvmx_l2c_spar0_s cn38xx;
+        struct cvmx_l2c_spar0_s cn38xxp2;
+        struct cvmx_l2c_spar0_cn50xx {
+                uint64_t reserved_16_63:48;
+                uint64_t umsk1:8;
+                uint64_t umsk0:8;
+        } cn50xx;
+        struct cvmx_l2c_spar0_s cn52xx;
+        struct cvmx_l2c_spar0_s cn52xxp1;
+        struct cvmx_l2c_spar0_s cn56xx;
+        struct cvmx_l2c_spar0_s cn56xxp1;
+        struct cvmx_l2c_spar0_s cn58xx;
+        struct cvmx_l2c_spar0_s cn58xxp1;
+};
+
+union cvmx_l2c_spar1 {
+        uint64_t u64;
+        struct cvmx_l2c_spar1_s {
+                uint64_t reserved_32_63:32;
+                uint64_t umsk7:8;
+                uint64_t umsk6:8;
+                uint64_t umsk5:8;
+                uint64_t umsk4:8;
+        } s;
+        struct cvmx_l2c_spar1_s cn38xx;
+        struct cvmx_l2c_spar1_s cn38xxp2;
+        struct cvmx_l2c_spar1_s cn56xx;
+        struct cvmx_l2c_spar1_s cn56xxp1;
+        struct cvmx_l2c_spar1_s cn58xx;
+        struct cvmx_l2c_spar1_s cn58xxp1;
+};
+
+union cvmx_l2c_spar2 {
+        uint64_t u64;
+        struct cvmx_l2c_spar2_s {
+                uint64_t reserved_32_63:32;
+                uint64_t umsk11:8;
+                uint64_t umsk10:8;
+                uint64_t umsk9:8;
+                uint64_t umsk8:8;
+        } s;
+        struct cvmx_l2c_spar2_s cn38xx;
+        struct cvmx_l2c_spar2_s cn38xxp2;
+        struct cvmx_l2c_spar2_s cn56xx;
+        struct cvmx_l2c_spar2_s cn56xxp1;
+        struct cvmx_l2c_spar2_s cn58xx;
+        struct cvmx_l2c_spar2_s cn58xxp1;
+};
+
+union cvmx_l2c_spar3 {
+        uint64_t u64;
+        struct cvmx_l2c_spar3_s {
+                uint64_t reserved_32_63:32;
+                uint64_t umsk15:8;
+                uint64_t umsk14:8;
+                uint64_t umsk13:8;
+                uint64_t umsk12:8;
+        } s;
+        struct cvmx_l2c_spar3_s cn38xx;
+        struct cvmx_l2c_spar3_s cn38xxp2;
+        struct cvmx_l2c_spar3_s cn58xx;
+        struct cvmx_l2c_spar3_s cn58xxp1;
+};
+
+union cvmx_l2c_spar4 {
+        uint64_t u64;
+        struct cvmx_l2c_spar4_s {
+                uint64_t reserved_8_63:56;
+                uint64_t umskiob:8;
+        } s;
+        struct cvmx_l2c_spar4_cn30xx {
+                uint64_t reserved_4_63:60;
+                uint64_t umskiob:4;
+        } cn30xx;
+        struct cvmx_l2c_spar4_cn30xx cn31xx;
+        struct cvmx_l2c_spar4_s cn38xx;
+        struct cvmx_l2c_spar4_s cn38xxp2;
+        struct cvmx_l2c_spar4_s cn50xx;
+        struct cvmx_l2c_spar4_s cn52xx;
+        struct cvmx_l2c_spar4_s cn52xxp1;
+        struct cvmx_l2c_spar4_s cn56xx;
+        struct cvmx_l2c_spar4_s cn56xxp1;
+        struct cvmx_l2c_spar4_s cn58xx;
+        struct cvmx_l2c_spar4_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-l2c.h b/arch/mips/include/asm/octeon/cvmx-l2c.h
new file mode 100644
index 000000000000..2a8c0902ea50
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-l2c.h
@@ -0,0 +1,325 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ *
+ * Interface to the Level 2 Cache (L2C) control, measurement, and debugging
+ * facilities.
+ */
+
+#ifndef __CVMX_L2C_H__
+#define __CVMX_L2C_H__
+
+/* Deprecated macro, use function */
+#define CVMX_L2_ASSOC     cvmx_l2c_get_num_assoc()
+
+/* Deprecated macro, use function */
+#define CVMX_L2_SET_BITS  cvmx_l2c_get_set_bits()
+
+/* Deprecated macro, use function */
+#define CVMX_L2_SETS      cvmx_l2c_get_num_sets()
+
+#define CVMX_L2C_IDX_ADDR_SHIFT 7  /* based on 128 byte cache line size */
+#define CVMX_L2C_IDX_MASK       (cvmx_l2c_get_num_sets() - 1)
+
+/* Defines for index aliasing computations */
+#define CVMX_L2C_TAG_ADDR_ALIAS_SHIFT \
+        (CVMX_L2C_IDX_ADDR_SHIFT + cvmx_l2c_get_set_bits())
+
+#define CVMX_L2C_ALIAS_MASK \
+        (CVMX_L2C_IDX_MASK << CVMX_L2C_TAG_ADDR_ALIAS_SHIFT)
+
+union cvmx_l2c_tag {
+        uint64_t u64;
+        struct {
+                uint64_t reserved:28;
+                uint64_t V:1;   /* Line valid */
+                uint64_t D:1;   /* Line dirty */
+                uint64_t L:1;   /* Line locked */
+                uint64_t U:1;   /* Use, LRU eviction */
+                uint64_t addr:32;       /* Phys mem (not all bits valid) */
+        } s;
+};
+
+  /* L2C Performance Counter events. */
+enum cvmx_l2c_event {
+        CVMX_L2C_EVENT_CYCLES = 0,
+        CVMX_L2C_EVENT_INSTRUCTION_MISS = 1,
+        CVMX_L2C_EVENT_INSTRUCTION_HIT = 2,
+        CVMX_L2C_EVENT_DATA_MISS = 3,
+        CVMX_L2C_EVENT_DATA_HIT = 4,
+        CVMX_L2C_EVENT_MISS = 5,
+        CVMX_L2C_EVENT_HIT = 6,
+        CVMX_L2C_EVENT_VICTIM_HIT = 7,
+        CVMX_L2C_EVENT_INDEX_CONFLICT = 8,
+        CVMX_L2C_EVENT_TAG_PROBE = 9,
+        CVMX_L2C_EVENT_TAG_UPDATE = 10,
+        CVMX_L2C_EVENT_TAG_COMPLETE = 11,
+        CVMX_L2C_EVENT_TAG_DIRTY = 12,
+        CVMX_L2C_EVENT_DATA_STORE_NOP = 13,
+        CVMX_L2C_EVENT_DATA_STORE_READ = 14,
+        CVMX_L2C_EVENT_DATA_STORE_WRITE = 15,
+        CVMX_L2C_EVENT_FILL_DATA_VALID = 16,
+        CVMX_L2C_EVENT_WRITE_REQUEST = 17,
+        CVMX_L2C_EVENT_READ_REQUEST = 18,
+        CVMX_L2C_EVENT_WRITE_DATA_VALID = 19,
+        CVMX_L2C_EVENT_XMC_NOP = 20,
+        CVMX_L2C_EVENT_XMC_LDT = 21,
+        CVMX_L2C_EVENT_XMC_LDI = 22,
+        CVMX_L2C_EVENT_XMC_LDD = 23,
+        CVMX_L2C_EVENT_XMC_STF = 24,
+        CVMX_L2C_EVENT_XMC_STT = 25,
+        CVMX_L2C_EVENT_XMC_STP = 26,
+        CVMX_L2C_EVENT_XMC_STC = 27,
+        CVMX_L2C_EVENT_XMC_DWB = 28,
+        CVMX_L2C_EVENT_XMC_PL2 = 29,
+        CVMX_L2C_EVENT_XMC_PSL1 = 30,
+        CVMX_L2C_EVENT_XMC_IOBLD = 31,
+        CVMX_L2C_EVENT_XMC_IOBST = 32,
+        CVMX_L2C_EVENT_XMC_IOBDMA = 33,
+        CVMX_L2C_EVENT_XMC_IOBRSP = 34,
+        CVMX_L2C_EVENT_XMC_BUS_VALID = 35,
+        CVMX_L2C_EVENT_XMC_MEM_DATA = 36,
+        CVMX_L2C_EVENT_XMC_REFL_DATA = 37,
+        CVMX_L2C_EVENT_XMC_IOBRSP_DATA = 38,
+        CVMX_L2C_EVENT_RSC_NOP = 39,
+        CVMX_L2C_EVENT_RSC_STDN = 40,
+        CVMX_L2C_EVENT_RSC_FILL = 41,
+        CVMX_L2C_EVENT_RSC_REFL = 42,
+        CVMX_L2C_EVENT_RSC_STIN = 43,
+        CVMX_L2C_EVENT_RSC_SCIN = 44,
+        CVMX_L2C_EVENT_RSC_SCFL = 45,
+        CVMX_L2C_EVENT_RSC_SCDN = 46,
+        CVMX_L2C_EVENT_RSC_DATA_VALID = 47,
+        CVMX_L2C_EVENT_RSC_VALID_FILL = 48,
+        CVMX_L2C_EVENT_RSC_VALID_STRSP = 49,
+        CVMX_L2C_EVENT_RSC_VALID_REFL = 50,
+        CVMX_L2C_EVENT_LRF_REQ = 51,
+        CVMX_L2C_EVENT_DT_RD_ALLOC = 52,
+        CVMX_L2C_EVENT_DT_WR_INVAL = 53
+};
+
+/**
+ * Configure one of the four L2 Cache performance counters to capture event
+ * occurences.
+ *
+ * @counter:        The counter to configure. Range 0..3.
+ * @event:          The type of L2 Cache event occurrence to count.
+ * @clear_on_read:  When asserted, any read of the performance counter
+ *                       clears the counter.
+ *
+ * The routine does not clear the counter.
+ */
+void cvmx_l2c_config_perf(uint32_t counter,
+                          enum cvmx_l2c_event event, uint32_t clear_on_read);
+/**
+ * Read the given L2 Cache performance counter. The counter must be configured
+ * before reading, but this routine does not enforce this requirement.
+ *
+ * @counter:  The counter to configure. Range 0..3.
+ *
+ * Returns The current counter value.
+ */
+uint64_t cvmx_l2c_read_perf(uint32_t counter);
+
+/**
+ * Return the L2 Cache way partitioning for a given core.
+ *
+ * @core:  The core processor of interest.
+ *
+ * Returns    The mask specifying the partitioning. 0 bits in mask indicates
+ *              the cache 'ways' that a core can evict from.
+ *            -1 on error
+ */
+int cvmx_l2c_get_core_way_partition(uint32_t core);
+
+/**
+ * Partitions the L2 cache for a core
+ *
+ * @core:  The core that the partitioning applies to.
+ *
+ * @mask: The partitioning of the ways expressed as a binary mask. A 0
+ *        bit allows the core to evict cache lines from a way, while a
+ *        1 bit blocks the core from evicting any lines from that
+ *        way. There must be at least one allowed way (0 bit) in the
+ *        mask.
+ *
+ * If any ways are blocked for all cores and the HW blocks, then those
+ * ways will never have any cache lines evicted from them.  All cores
+ * and the hardware blocks are free to read from all ways regardless
+ * of the partitioning.
+ */
+int cvmx_l2c_set_core_way_partition(uint32_t core, uint32_t mask);
+
+/**
+ * Return the L2 Cache way partitioning for the hw blocks.
+ *
+ * Returns    The mask specifying the reserved way. 0 bits in mask indicates
+ *              the cache 'ways' that a core can evict from.
+ *            -1 on error
+ */
+int cvmx_l2c_get_hw_way_partition(void);
+
+/**
+ * Partitions the L2 cache for the hardware blocks.
+ *
+ * @mask: The partitioning of the ways expressed as a binary mask. A 0
+ *        bit allows the core to evict cache lines from a way, while a
+ *        1 bit blocks the core from evicting any lines from that
+ *        way. There must be at least one allowed way (0 bit) in the
+ *        mask.
+ *
+ * If any ways are blocked for all cores and the HW blocks, then those
+ * ways will never have any cache lines evicted from them.  All cores
+ * and the hardware blocks are free to read from all ways regardless
+ * of the partitioning.
+ */
+int cvmx_l2c_set_hw_way_partition(uint32_t mask);
+
+/**
+ * Locks a line in the L2 cache at the specified physical address
+ *
+ * @addr:   physical address of line to lock
+ *
+ * Returns 0 on success,
+ *         1 if line not locked.
+ */
+int cvmx_l2c_lock_line(uint64_t addr);
+
+/**
+ * Locks a specified memory region in the L2 cache.
+ *
+ * Note that if not all lines can be locked, that means that all
+ * but one of the ways (associations) available to the locking
+ * core are locked.  Having only 1 association available for
+ * normal caching may have a significant adverse affect on performance.
+ * Care should be taken to ensure that enough of the L2 cache is left
+ * unlocked to allow for normal caching of DRAM.
+ *
+ * @start:  Physical address of the start of the region to lock
+ * @len:    Length (in bytes) of region to lock
+ *
+ * Returns Number of requested lines that where not locked.
+ *         0 on success (all locked)
+ */
+int cvmx_l2c_lock_mem_region(uint64_t start, uint64_t len);
+
+/**
+ * Unlock and flush a cache line from the L2 cache.
+ * IMPORTANT: Must only be run by one core at a time due to use
+ * of L2C debug features.
+ * Note that this function will flush a matching but unlocked cache line.
+ * (If address is not in L2, no lines are flushed.)
+ *
+ * @address: Physical address to unlock
+ *
+ * Returns 0: line not unlocked
+ *         1: line unlocked
+ */
+int cvmx_l2c_unlock_line(uint64_t address);
+
+/**
+ * Unlocks a region of memory that is locked in the L2 cache
+ *
+ * @start:  start physical address
+ * @len:    length (in bytes) to unlock
+ *
+ * Returns Number of locked lines that the call unlocked
+ */
+int cvmx_l2c_unlock_mem_region(uint64_t start, uint64_t len);
+
+/**
+ * Read the L2 controller tag for a given location in L2
+ *
+ * @association:
+ *               Which association to read line from
+ * @index:  Which way to read from.
+ *
+ * Returns l2c tag structure for line requested.
+ */
+union cvmx_l2c_tag cvmx_l2c_get_tag(uint32_t association, uint32_t index);
+
+/* Wrapper around deprecated old function name */
+static inline union cvmx_l2c_tag cvmx_get_l2c_tag(uint32_t association,
+                                              uint32_t index)
+{
+        return cvmx_l2c_get_tag(association, index);
+}
+
+/**
+ * Returns the cache index for a given physical address
+ *
+ * @addr:   physical address
+ *
+ * Returns L2 cache index
+ */
+uint32_t cvmx_l2c_address_to_index(uint64_t addr);
+
+/**
+ * Flushes (and unlocks) the entire L2 cache.
+ * IMPORTANT: Must only be run by one core at a time due to use
+ * of L2C debug features.
+ */
+void cvmx_l2c_flush(void);
+
+/**
+ *
+ * Returns Returns the size of the L2 cache in bytes,
+ * -1 on error (unrecognized model)
+ */
+int cvmx_l2c_get_cache_size_bytes(void);
+
+/**
+ * Return the number of sets in the L2 Cache
+ *
+ * Returns
+ */
+int cvmx_l2c_get_num_sets(void);
+
+/**
+ * Return log base 2 of the number of sets in the L2 cache
+ * Returns
+ */
+int cvmx_l2c_get_set_bits(void);
+/**
+ * Return the number of associations in the L2 Cache
+ *
+ * Returns
+ */
+int cvmx_l2c_get_num_assoc(void);
+
+/**
+ * Flush a line from the L2 cache
+ * This should only be called from one core at a time, as this routine
+ * sets the core to the 'debug' core in order to flush the line.
+ *
+ * @assoc:  Association (or way) to flush
+ * @index:  Index to flush
+ */
+void cvmx_l2c_flush_line(uint32_t assoc, uint32_t index);
+
+#endif /* __CVMX_L2C_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-l2d-defs.h b/arch/mips/include/asm/octeon/cvmx-l2d-defs.h
new file mode 100644
index 000000000000..d7102d455e1b
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-l2d-defs.h
@@ -0,0 +1,369 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_L2D_DEFS_H__
+#define __CVMX_L2D_DEFS_H__
+
+#define CVMX_L2D_BST0 \
+         CVMX_ADD_IO_SEG(0x0001180080000780ull)
+#define CVMX_L2D_BST1 \
+         CVMX_ADD_IO_SEG(0x0001180080000788ull)
+#define CVMX_L2D_BST2 \
+         CVMX_ADD_IO_SEG(0x0001180080000790ull)
+#define CVMX_L2D_BST3 \
+         CVMX_ADD_IO_SEG(0x0001180080000798ull)
+#define CVMX_L2D_ERR \
+         CVMX_ADD_IO_SEG(0x0001180080000010ull)
+#define CVMX_L2D_FADR \
+         CVMX_ADD_IO_SEG(0x0001180080000018ull)
+#define CVMX_L2D_FSYN0 \
+         CVMX_ADD_IO_SEG(0x0001180080000020ull)
+#define CVMX_L2D_FSYN1 \
+         CVMX_ADD_IO_SEG(0x0001180080000028ull)
+#define CVMX_L2D_FUS0 \
+         CVMX_ADD_IO_SEG(0x00011800800007A0ull)
+#define CVMX_L2D_FUS1 \
+         CVMX_ADD_IO_SEG(0x00011800800007A8ull)
+#define CVMX_L2D_FUS2 \
+         CVMX_ADD_IO_SEG(0x00011800800007B0ull)
+#define CVMX_L2D_FUS3 \
+         CVMX_ADD_IO_SEG(0x00011800800007B8ull)
+
+union cvmx_l2d_bst0 {
+        uint64_t u64;
+        struct cvmx_l2d_bst0_s {
+                uint64_t reserved_35_63:29;
+                uint64_t ftl:1;
+                uint64_t q0stat:34;
+        } s;
+        struct cvmx_l2d_bst0_s cn30xx;
+        struct cvmx_l2d_bst0_s cn31xx;
+        struct cvmx_l2d_bst0_s cn38xx;
+        struct cvmx_l2d_bst0_s cn38xxp2;
+        struct cvmx_l2d_bst0_s cn50xx;
+        struct cvmx_l2d_bst0_s cn52xx;
+        struct cvmx_l2d_bst0_s cn52xxp1;
+        struct cvmx_l2d_bst0_s cn56xx;
+        struct cvmx_l2d_bst0_s cn56xxp1;
+        struct cvmx_l2d_bst0_s cn58xx;
+        struct cvmx_l2d_bst0_s cn58xxp1;
+};
+
+union cvmx_l2d_bst1 {
+        uint64_t u64;
+        struct cvmx_l2d_bst1_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q1stat:34;
+        } s;
+        struct cvmx_l2d_bst1_s cn30xx;
+        struct cvmx_l2d_bst1_s cn31xx;
+        struct cvmx_l2d_bst1_s cn38xx;
+        struct cvmx_l2d_bst1_s cn38xxp2;
+        struct cvmx_l2d_bst1_s cn50xx;
+        struct cvmx_l2d_bst1_s cn52xx;
+        struct cvmx_l2d_bst1_s cn52xxp1;
+        struct cvmx_l2d_bst1_s cn56xx;
+        struct cvmx_l2d_bst1_s cn56xxp1;
+        struct cvmx_l2d_bst1_s cn58xx;
+        struct cvmx_l2d_bst1_s cn58xxp1;
+};
+
+union cvmx_l2d_bst2 {
+        uint64_t u64;
+        struct cvmx_l2d_bst2_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q2stat:34;
+        } s;
+        struct cvmx_l2d_bst2_s cn30xx;
+        struct cvmx_l2d_bst2_s cn31xx;
+        struct cvmx_l2d_bst2_s cn38xx;
+        struct cvmx_l2d_bst2_s cn38xxp2;
+        struct cvmx_l2d_bst2_s cn50xx;
+        struct cvmx_l2d_bst2_s cn52xx;
+        struct cvmx_l2d_bst2_s cn52xxp1;
+        struct cvmx_l2d_bst2_s cn56xx;
+        struct cvmx_l2d_bst2_s cn56xxp1;
+        struct cvmx_l2d_bst2_s cn58xx;
+        struct cvmx_l2d_bst2_s cn58xxp1;
+};
+
+union cvmx_l2d_bst3 {
+        uint64_t u64;
+        struct cvmx_l2d_bst3_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q3stat:34;
+        } s;
+        struct cvmx_l2d_bst3_s cn30xx;
+        struct cvmx_l2d_bst3_s cn31xx;
+        struct cvmx_l2d_bst3_s cn38xx;
+        struct cvmx_l2d_bst3_s cn38xxp2;
+        struct cvmx_l2d_bst3_s cn50xx;
+        struct cvmx_l2d_bst3_s cn52xx;
+        struct cvmx_l2d_bst3_s cn52xxp1;
+        struct cvmx_l2d_bst3_s cn56xx;
+        struct cvmx_l2d_bst3_s cn56xxp1;
+        struct cvmx_l2d_bst3_s cn58xx;
+        struct cvmx_l2d_bst3_s cn58xxp1;
+};
+
+union cvmx_l2d_err {
+        uint64_t u64;
+        struct cvmx_l2d_err_s {
+                uint64_t reserved_6_63:58;
+                uint64_t bmhclsel:1;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } s;
+        struct cvmx_l2d_err_s cn30xx;
+        struct cvmx_l2d_err_s cn31xx;
+        struct cvmx_l2d_err_s cn38xx;
+        struct cvmx_l2d_err_s cn38xxp2;
+        struct cvmx_l2d_err_s cn50xx;
+        struct cvmx_l2d_err_s cn52xx;
+        struct cvmx_l2d_err_s cn52xxp1;
+        struct cvmx_l2d_err_s cn56xx;
+        struct cvmx_l2d_err_s cn56xxp1;
+        struct cvmx_l2d_err_s cn58xx;
+        struct cvmx_l2d_err_s cn58xxp1;
+};
+
+union cvmx_l2d_fadr {
+        uint64_t u64;
+        struct cvmx_l2d_fadr_s {
+                uint64_t reserved_19_63:45;
+                uint64_t fadru:1;
+                uint64_t fowmsk:4;
+                uint64_t fset:3;
+                uint64_t fadr:11;
+        } s;
+        struct cvmx_l2d_fadr_cn30xx {
+                uint64_t reserved_18_63:46;
+                uint64_t fowmsk:4;
+                uint64_t reserved_13_13:1;
+                uint64_t fset:2;
+                uint64_t reserved_9_10:2;
+                uint64_t fadr:9;
+        } cn30xx;
+        struct cvmx_l2d_fadr_cn31xx {
+                uint64_t reserved_18_63:46;
+                uint64_t fowmsk:4;
+                uint64_t reserved_13_13:1;
+                uint64_t fset:2;
+                uint64_t reserved_10_10:1;
+                uint64_t fadr:10;
+        } cn31xx;
+        struct cvmx_l2d_fadr_cn38xx {
+                uint64_t reserved_18_63:46;
+                uint64_t fowmsk:4;
+                uint64_t fset:3;
+                uint64_t fadr:11;
+        } cn38xx;
+        struct cvmx_l2d_fadr_cn38xx cn38xxp2;
+        struct cvmx_l2d_fadr_cn50xx {
+                uint64_t reserved_18_63:46;
+                uint64_t fowmsk:4;
+                uint64_t fset:3;
+                uint64_t reserved_8_10:3;
+                uint64_t fadr:8;
+        } cn50xx;
+        struct cvmx_l2d_fadr_cn52xx {
+                uint64_t reserved_18_63:46;
+                uint64_t fowmsk:4;
+                uint64_t fset:3;
+                uint64_t reserved_10_10:1;
+                uint64_t fadr:10;
+        } cn52xx;
+        struct cvmx_l2d_fadr_cn52xx cn52xxp1;
+        struct cvmx_l2d_fadr_s cn56xx;
+        struct cvmx_l2d_fadr_s cn56xxp1;
+        struct cvmx_l2d_fadr_s cn58xx;
+        struct cvmx_l2d_fadr_s cn58xxp1;
+};
+
+union cvmx_l2d_fsyn0 {
+        uint64_t u64;
+        struct cvmx_l2d_fsyn0_s {
+                uint64_t reserved_20_63:44;
+                uint64_t fsyn_ow1:10;
+                uint64_t fsyn_ow0:10;
+        } s;
+        struct cvmx_l2d_fsyn0_s cn30xx;
+        struct cvmx_l2d_fsyn0_s cn31xx;
+        struct cvmx_l2d_fsyn0_s cn38xx;
+        struct cvmx_l2d_fsyn0_s cn38xxp2;
+        struct cvmx_l2d_fsyn0_s cn50xx;
+        struct cvmx_l2d_fsyn0_s cn52xx;
+        struct cvmx_l2d_fsyn0_s cn52xxp1;
+        struct cvmx_l2d_fsyn0_s cn56xx;
+        struct cvmx_l2d_fsyn0_s cn56xxp1;
+        struct cvmx_l2d_fsyn0_s cn58xx;
+        struct cvmx_l2d_fsyn0_s cn58xxp1;
+};
+
+union cvmx_l2d_fsyn1 {
+        uint64_t u64;
+        struct cvmx_l2d_fsyn1_s {
+                uint64_t reserved_20_63:44;
+                uint64_t fsyn_ow3:10;
+                uint64_t fsyn_ow2:10;
+        } s;
+        struct cvmx_l2d_fsyn1_s cn30xx;
+        struct cvmx_l2d_fsyn1_s cn31xx;
+        struct cvmx_l2d_fsyn1_s cn38xx;
+        struct cvmx_l2d_fsyn1_s cn38xxp2;
+        struct cvmx_l2d_fsyn1_s cn50xx;
+        struct cvmx_l2d_fsyn1_s cn52xx;
+        struct cvmx_l2d_fsyn1_s cn52xxp1;
+        struct cvmx_l2d_fsyn1_s cn56xx;
+        struct cvmx_l2d_fsyn1_s cn56xxp1;
+        struct cvmx_l2d_fsyn1_s cn58xx;
+        struct cvmx_l2d_fsyn1_s cn58xxp1;
+};
+
+union cvmx_l2d_fus0 {
+        uint64_t u64;
+        struct cvmx_l2d_fus0_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q0fus:34;
+        } s;
+        struct cvmx_l2d_fus0_s cn30xx;
+        struct cvmx_l2d_fus0_s cn31xx;
+        struct cvmx_l2d_fus0_s cn38xx;
+        struct cvmx_l2d_fus0_s cn38xxp2;
+        struct cvmx_l2d_fus0_s cn50xx;
+        struct cvmx_l2d_fus0_s cn52xx;
+        struct cvmx_l2d_fus0_s cn52xxp1;
+        struct cvmx_l2d_fus0_s cn56xx;
+        struct cvmx_l2d_fus0_s cn56xxp1;
+        struct cvmx_l2d_fus0_s cn58xx;
+        struct cvmx_l2d_fus0_s cn58xxp1;
+};
+
+union cvmx_l2d_fus1 {
+        uint64_t u64;
+        struct cvmx_l2d_fus1_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q1fus:34;
+        } s;
+        struct cvmx_l2d_fus1_s cn30xx;
+        struct cvmx_l2d_fus1_s cn31xx;
+        struct cvmx_l2d_fus1_s cn38xx;
+        struct cvmx_l2d_fus1_s cn38xxp2;
+        struct cvmx_l2d_fus1_s cn50xx;
+        struct cvmx_l2d_fus1_s cn52xx;
+        struct cvmx_l2d_fus1_s cn52xxp1;
+        struct cvmx_l2d_fus1_s cn56xx;
+        struct cvmx_l2d_fus1_s cn56xxp1;
+        struct cvmx_l2d_fus1_s cn58xx;
+        struct cvmx_l2d_fus1_s cn58xxp1;
+};
+
+union cvmx_l2d_fus2 {
+        uint64_t u64;
+        struct cvmx_l2d_fus2_s {
+                uint64_t reserved_34_63:30;
+                uint64_t q2fus:34;
+        } s;
+        struct cvmx_l2d_fus2_s cn30xx;
+        struct cvmx_l2d_fus2_s cn31xx;
+        struct cvmx_l2d_fus2_s cn38xx;
+        struct cvmx_l2d_fus2_s cn38xxp2;
+        struct cvmx_l2d_fus2_s cn50xx;
+        struct cvmx_l2d_fus2_s cn52xx;
+        struct cvmx_l2d_fus2_s cn52xxp1;
+        struct cvmx_l2d_fus2_s cn56xx;
+        struct cvmx_l2d_fus2_s cn56xxp1;
+        struct cvmx_l2d_fus2_s cn58xx;
+        struct cvmx_l2d_fus2_s cn58xxp1;
+};
+
+union cvmx_l2d_fus3 {
+        uint64_t u64;
+        struct cvmx_l2d_fus3_s {
+                uint64_t reserved_40_63:24;
+                uint64_t ema_ctl:3;
+                uint64_t reserved_34_36:3;
+                uint64_t q3fus:34;
+        } s;
+        struct cvmx_l2d_fus3_cn30xx {
+                uint64_t reserved_35_63:29;
+                uint64_t crip_64k:1;
+                uint64_t q3fus:34;
+        } cn30xx;
+        struct cvmx_l2d_fus3_cn31xx {
+                uint64_t reserved_35_63:29;
+                uint64_t crip_128k:1;
+                uint64_t q3fus:34;
+        } cn31xx;
+        struct cvmx_l2d_fus3_cn38xx {
+                uint64_t reserved_36_63:28;
+                uint64_t crip_256k:1;
+                uint64_t crip_512k:1;
+                uint64_t q3fus:34;
+        } cn38xx;
+        struct cvmx_l2d_fus3_cn38xx cn38xxp2;
+        struct cvmx_l2d_fus3_cn50xx {
+                uint64_t reserved_40_63:24;
+                uint64_t ema_ctl:3;
+                uint64_t reserved_36_36:1;
+                uint64_t crip_32k:1;
+                uint64_t crip_64k:1;
+                uint64_t q3fus:34;
+        } cn50xx;
+        struct cvmx_l2d_fus3_cn52xx {
+                uint64_t reserved_40_63:24;
+                uint64_t ema_ctl:3;
+                uint64_t reserved_36_36:1;
+                uint64_t crip_128k:1;
+                uint64_t crip_256k:1;
+                uint64_t q3fus:34;
+        } cn52xx;
+        struct cvmx_l2d_fus3_cn52xx cn52xxp1;
+        struct cvmx_l2d_fus3_cn56xx {
+                uint64_t reserved_40_63:24;
+                uint64_t ema_ctl:3;
+                uint64_t reserved_36_36:1;
+                uint64_t crip_512k:1;
+                uint64_t crip_1024k:1;
+                uint64_t q3fus:34;
+        } cn56xx;
+        struct cvmx_l2d_fus3_cn56xx cn56xxp1;
+        struct cvmx_l2d_fus3_cn58xx {
+                uint64_t reserved_39_63:25;
+                uint64_t ema_ctl:2;
+                uint64_t reserved_36_36:1;
+                uint64_t crip_512k:1;
+                uint64_t crip_1024k:1;
+                uint64_t q3fus:34;
+        } cn58xx;
+        struct cvmx_l2d_fus3_cn58xx cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-l2t-defs.h b/arch/mips/include/asm/octeon/cvmx-l2t-defs.h
new file mode 100644
index 000000000000..2639a3f5ffc2
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-l2t-defs.h
@@ -0,0 +1,141 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_L2T_DEFS_H__
+#define __CVMX_L2T_DEFS_H__
+
+#define CVMX_L2T_ERR \
+         CVMX_ADD_IO_SEG(0x0001180080000008ull)
+
+union cvmx_l2t_err {
+        uint64_t u64;
+        struct cvmx_l2t_err_s {
+                uint64_t reserved_29_63:35;
+                uint64_t fadru:1;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t fset:3;
+                uint64_t fadr:10;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } s;
+        struct cvmx_l2t_err_cn30xx {
+                uint64_t reserved_28_63:36;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t reserved_23_23:1;
+                uint64_t fset:2;
+                uint64_t reserved_19_20:2;
+                uint64_t fadr:8;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } cn30xx;
+        struct cvmx_l2t_err_cn31xx {
+                uint64_t reserved_28_63:36;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t reserved_23_23:1;
+                uint64_t fset:2;
+                uint64_t reserved_20_20:1;
+                uint64_t fadr:9;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } cn31xx;
+        struct cvmx_l2t_err_cn38xx {
+                uint64_t reserved_28_63:36;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t fset:3;
+                uint64_t fadr:10;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } cn38xx;
+        struct cvmx_l2t_err_cn38xx cn38xxp2;
+        struct cvmx_l2t_err_cn50xx {
+                uint64_t reserved_28_63:36;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t fset:3;
+                uint64_t reserved_18_20:3;
+                uint64_t fadr:7;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } cn50xx;
+        struct cvmx_l2t_err_cn52xx {
+                uint64_t reserved_28_63:36;
+                uint64_t lck_intena2:1;
+                uint64_t lckerr2:1;
+                uint64_t lck_intena:1;
+                uint64_t lckerr:1;
+                uint64_t fset:3;
+                uint64_t reserved_20_20:1;
+                uint64_t fadr:9;
+                uint64_t fsyn:6;
+                uint64_t ded_err:1;
+                uint64_t sec_err:1;
+                uint64_t ded_intena:1;
+                uint64_t sec_intena:1;
+                uint64_t ecc_ena:1;
+        } cn52xx;
+        struct cvmx_l2t_err_cn52xx cn52xxp1;
+        struct cvmx_l2t_err_s cn56xx;
+        struct cvmx_l2t_err_s cn56xxp1;
+        struct cvmx_l2t_err_s cn58xx;
+        struct cvmx_l2t_err_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-led-defs.h b/arch/mips/include/asm/octeon/cvmx-led-defs.h
new file mode 100644
index 000000000000..16f174a4dadf
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-led-defs.h
@@ -0,0 +1,240 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_LED_DEFS_H__
+#define __CVMX_LED_DEFS_H__
+
+#define CVMX_LED_BLINK \
+         CVMX_ADD_IO_SEG(0x0001180000001A48ull)
+#define CVMX_LED_CLK_PHASE \
+         CVMX_ADD_IO_SEG(0x0001180000001A08ull)
+#define CVMX_LED_CYLON \
+         CVMX_ADD_IO_SEG(0x0001180000001AF8ull)
+#define CVMX_LED_DBG \
+         CVMX_ADD_IO_SEG(0x0001180000001A18ull)
+#define CVMX_LED_EN \
+         CVMX_ADD_IO_SEG(0x0001180000001A00ull)
+#define CVMX_LED_POLARITY \
+         CVMX_ADD_IO_SEG(0x0001180000001A50ull)
+#define CVMX_LED_PRT \
+         CVMX_ADD_IO_SEG(0x0001180000001A10ull)
+#define CVMX_LED_PRT_FMT \
+         CVMX_ADD_IO_SEG(0x0001180000001A30ull)
+#define CVMX_LED_PRT_STATUSX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001A80ull + (((offset) & 7) * 8))
+#define CVMX_LED_UDD_CNTX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001A20ull + (((offset) & 1) * 8))
+#define CVMX_LED_UDD_DATX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001A38ull + (((offset) & 1) * 8))
+#define CVMX_LED_UDD_DAT_CLRX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001AC8ull + (((offset) & 1) * 16))
+#define CVMX_LED_UDD_DAT_SETX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001AC0ull + (((offset) & 1) * 16))
+
+union cvmx_led_blink {
+        uint64_t u64;
+        struct cvmx_led_blink_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rate:8;
+        } s;
+        struct cvmx_led_blink_s cn38xx;
+        struct cvmx_led_blink_s cn38xxp2;
+        struct cvmx_led_blink_s cn56xx;
+        struct cvmx_led_blink_s cn56xxp1;
+        struct cvmx_led_blink_s cn58xx;
+        struct cvmx_led_blink_s cn58xxp1;
+};
+
+union cvmx_led_clk_phase {
+        uint64_t u64;
+        struct cvmx_led_clk_phase_s {
+                uint64_t reserved_7_63:57;
+                uint64_t phase:7;
+        } s;
+        struct cvmx_led_clk_phase_s cn38xx;
+        struct cvmx_led_clk_phase_s cn38xxp2;
+        struct cvmx_led_clk_phase_s cn56xx;
+        struct cvmx_led_clk_phase_s cn56xxp1;
+        struct cvmx_led_clk_phase_s cn58xx;
+        struct cvmx_led_clk_phase_s cn58xxp1;
+};
+
+union cvmx_led_cylon {
+        uint64_t u64;
+        struct cvmx_led_cylon_s {
+                uint64_t reserved_16_63:48;
+                uint64_t rate:16;
+        } s;
+        struct cvmx_led_cylon_s cn38xx;
+        struct cvmx_led_cylon_s cn38xxp2;
+        struct cvmx_led_cylon_s cn56xx;
+        struct cvmx_led_cylon_s cn56xxp1;
+        struct cvmx_led_cylon_s cn58xx;
+        struct cvmx_led_cylon_s cn58xxp1;
+};
+
+union cvmx_led_dbg {
+        uint64_t u64;
+        struct cvmx_led_dbg_s {
+                uint64_t reserved_1_63:63;
+                uint64_t dbg_en:1;
+        } s;
+        struct cvmx_led_dbg_s cn38xx;
+        struct cvmx_led_dbg_s cn38xxp2;
+        struct cvmx_led_dbg_s cn56xx;
+        struct cvmx_led_dbg_s cn56xxp1;
+        struct cvmx_led_dbg_s cn58xx;
+        struct cvmx_led_dbg_s cn58xxp1;
+};
+
+union cvmx_led_en {
+        uint64_t u64;
+        struct cvmx_led_en_s {
+                uint64_t reserved_1_63:63;
+                uint64_t en:1;
+        } s;
+        struct cvmx_led_en_s cn38xx;
+        struct cvmx_led_en_s cn38xxp2;
+        struct cvmx_led_en_s cn56xx;
+        struct cvmx_led_en_s cn56xxp1;
+        struct cvmx_led_en_s cn58xx;
+        struct cvmx_led_en_s cn58xxp1;
+};
+
+union cvmx_led_polarity {
+        uint64_t u64;
+        struct cvmx_led_polarity_s {
+                uint64_t reserved_1_63:63;
+                uint64_t polarity:1;
+        } s;
+        struct cvmx_led_polarity_s cn38xx;
+        struct cvmx_led_polarity_s cn38xxp2;
+        struct cvmx_led_polarity_s cn56xx;
+        struct cvmx_led_polarity_s cn56xxp1;
+        struct cvmx_led_polarity_s cn58xx;
+        struct cvmx_led_polarity_s cn58xxp1;
+};
+
+union cvmx_led_prt {
+        uint64_t u64;
+        struct cvmx_led_prt_s {
+                uint64_t reserved_8_63:56;
+                uint64_t prt_en:8;
+        } s;
+        struct cvmx_led_prt_s cn38xx;
+        struct cvmx_led_prt_s cn38xxp2;
+        struct cvmx_led_prt_s cn56xx;
+        struct cvmx_led_prt_s cn56xxp1;
+        struct cvmx_led_prt_s cn58xx;
+        struct cvmx_led_prt_s cn58xxp1;
+};
+
+union cvmx_led_prt_fmt {
+        uint64_t u64;
+        struct cvmx_led_prt_fmt_s {
+                uint64_t reserved_4_63:60;
+                uint64_t format:4;
+        } s;
+        struct cvmx_led_prt_fmt_s cn38xx;
+        struct cvmx_led_prt_fmt_s cn38xxp2;
+        struct cvmx_led_prt_fmt_s cn56xx;
+        struct cvmx_led_prt_fmt_s cn56xxp1;
+        struct cvmx_led_prt_fmt_s cn58xx;
+        struct cvmx_led_prt_fmt_s cn58xxp1;
+};
+
+union cvmx_led_prt_statusx {
+        uint64_t u64;
+        struct cvmx_led_prt_statusx_s {
+                uint64_t reserved_6_63:58;
+                uint64_t status:6;
+        } s;
+        struct cvmx_led_prt_statusx_s cn38xx;
+        struct cvmx_led_prt_statusx_s cn38xxp2;
+        struct cvmx_led_prt_statusx_s cn56xx;
+        struct cvmx_led_prt_statusx_s cn56xxp1;
+        struct cvmx_led_prt_statusx_s cn58xx;
+        struct cvmx_led_prt_statusx_s cn58xxp1;
+};
+
+union cvmx_led_udd_cntx {
+        uint64_t u64;
+        struct cvmx_led_udd_cntx_s {
+                uint64_t reserved_6_63:58;
+                uint64_t cnt:6;
+        } s;
+        struct cvmx_led_udd_cntx_s cn38xx;
+        struct cvmx_led_udd_cntx_s cn38xxp2;
+        struct cvmx_led_udd_cntx_s cn56xx;
+        struct cvmx_led_udd_cntx_s cn56xxp1;
+        struct cvmx_led_udd_cntx_s cn58xx;
+        struct cvmx_led_udd_cntx_s cn58xxp1;
+};
+
+union cvmx_led_udd_datx {
+        uint64_t u64;
+        struct cvmx_led_udd_datx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t dat:32;
+        } s;
+        struct cvmx_led_udd_datx_s cn38xx;
+        struct cvmx_led_udd_datx_s cn38xxp2;
+        struct cvmx_led_udd_datx_s cn56xx;
+        struct cvmx_led_udd_datx_s cn56xxp1;
+        struct cvmx_led_udd_datx_s cn58xx;
+        struct cvmx_led_udd_datx_s cn58xxp1;
+};
+
+union cvmx_led_udd_dat_clrx {
+        uint64_t u64;
+        struct cvmx_led_udd_dat_clrx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t clr:32;
+        } s;
+        struct cvmx_led_udd_dat_clrx_s cn38xx;
+        struct cvmx_led_udd_dat_clrx_s cn38xxp2;
+        struct cvmx_led_udd_dat_clrx_s cn56xx;
+        struct cvmx_led_udd_dat_clrx_s cn56xxp1;
+        struct cvmx_led_udd_dat_clrx_s cn58xx;
+        struct cvmx_led_udd_dat_clrx_s cn58xxp1;
+};
+
+union cvmx_led_udd_dat_setx {
+        uint64_t u64;
+        struct cvmx_led_udd_dat_setx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t set:32;
+        } s;
+        struct cvmx_led_udd_dat_setx_s cn38xx;
+        struct cvmx_led_udd_dat_setx_s cn38xxp2;
+        struct cvmx_led_udd_dat_setx_s cn56xx;
+        struct cvmx_led_udd_dat_setx_s cn56xxp1;
+        struct cvmx_led_udd_dat_setx_s cn58xx;
+        struct cvmx_led_udd_dat_setx_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-mio-defs.h b/arch/mips/include/asm/octeon/cvmx-mio-defs.h
new file mode 100644
index 000000000000..6555f0530988
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-mio-defs.h
@@ -0,0 +1,2004 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_MIO_DEFS_H__
+#define __CVMX_MIO_DEFS_H__
+
+#define CVMX_MIO_BOOT_BIST_STAT \
+         CVMX_ADD_IO_SEG(0x00011800000000F8ull)
+#define CVMX_MIO_BOOT_COMP \
+         CVMX_ADD_IO_SEG(0x00011800000000B8ull)
+#define CVMX_MIO_BOOT_DMA_CFGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000100ull + (((offset) & 3) * 8))
+#define CVMX_MIO_BOOT_DMA_INTX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000138ull + (((offset) & 3) * 8))
+#define CVMX_MIO_BOOT_DMA_INT_ENX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000150ull + (((offset) & 3) * 8))
+#define CVMX_MIO_BOOT_DMA_TIMX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000120ull + (((offset) & 3) * 8))
+#define CVMX_MIO_BOOT_ERR \
+         CVMX_ADD_IO_SEG(0x00011800000000A0ull)
+#define CVMX_MIO_BOOT_INT \
+         CVMX_ADD_IO_SEG(0x00011800000000A8ull)
+#define CVMX_MIO_BOOT_LOC_ADR \
+         CVMX_ADD_IO_SEG(0x0001180000000090ull)
+#define CVMX_MIO_BOOT_LOC_CFGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000080ull + (((offset) & 1) * 8))
+#define CVMX_MIO_BOOT_LOC_DAT \
+         CVMX_ADD_IO_SEG(0x0001180000000098ull)
+#define CVMX_MIO_BOOT_PIN_DEFS \
+         CVMX_ADD_IO_SEG(0x00011800000000C0ull)
+#define CVMX_MIO_BOOT_REG_CFGX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000000ull + (((offset) & 7) * 8))
+#define CVMX_MIO_BOOT_REG_TIMX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000040ull + (((offset) & 7) * 8))
+#define CVMX_MIO_BOOT_THR \
+         CVMX_ADD_IO_SEG(0x00011800000000B0ull)
+#define CVMX_MIO_FUS_BNK_DATX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001520ull + (((offset) & 3) * 8))
+#define CVMX_MIO_FUS_DAT0 \
+         CVMX_ADD_IO_SEG(0x0001180000001400ull)
+#define CVMX_MIO_FUS_DAT1 \
+         CVMX_ADD_IO_SEG(0x0001180000001408ull)
+#define CVMX_MIO_FUS_DAT2 \
+         CVMX_ADD_IO_SEG(0x0001180000001410ull)
+#define CVMX_MIO_FUS_DAT3 \
+         CVMX_ADD_IO_SEG(0x0001180000001418ull)
+#define CVMX_MIO_FUS_EMA \
+         CVMX_ADD_IO_SEG(0x0001180000001550ull)
+#define CVMX_MIO_FUS_PDF \
+         CVMX_ADD_IO_SEG(0x0001180000001420ull)
+#define CVMX_MIO_FUS_PLL \
+         CVMX_ADD_IO_SEG(0x0001180000001580ull)
+#define CVMX_MIO_FUS_PROG \
+         CVMX_ADD_IO_SEG(0x0001180000001510ull)
+#define CVMX_MIO_FUS_PROG_TIMES \
+         CVMX_ADD_IO_SEG(0x0001180000001518ull)
+#define CVMX_MIO_FUS_RCMD \
+         CVMX_ADD_IO_SEG(0x0001180000001500ull)
+#define CVMX_MIO_FUS_SPR_REPAIR_RES \
+         CVMX_ADD_IO_SEG(0x0001180000001548ull)
+#define CVMX_MIO_FUS_SPR_REPAIR_SUM \
+         CVMX_ADD_IO_SEG(0x0001180000001540ull)
+#define CVMX_MIO_FUS_UNLOCK \
+         CVMX_ADD_IO_SEG(0x0001180000001578ull)
+#define CVMX_MIO_FUS_WADR \
+         CVMX_ADD_IO_SEG(0x0001180000001508ull)
+#define CVMX_MIO_NDF_DMA_CFG \
+         CVMX_ADD_IO_SEG(0x0001180000000168ull)
+#define CVMX_MIO_NDF_DMA_INT \
+         CVMX_ADD_IO_SEG(0x0001180000000170ull)
+#define CVMX_MIO_NDF_DMA_INT_EN \
+         CVMX_ADD_IO_SEG(0x0001180000000178ull)
+#define CVMX_MIO_PLL_CTL \
+         CVMX_ADD_IO_SEG(0x0001180000001448ull)
+#define CVMX_MIO_PLL_SETTING \
+         CVMX_ADD_IO_SEG(0x0001180000001440ull)
+#define CVMX_MIO_TWSX_INT(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001010ull + (((offset) & 1) * 512))
+#define CVMX_MIO_TWSX_SW_TWSI(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001000ull + (((offset) & 1) * 512))
+#define CVMX_MIO_TWSX_SW_TWSI_EXT(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001018ull + (((offset) & 1) * 512))
+#define CVMX_MIO_TWSX_TWSI_SW(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000001008ull + (((offset) & 1) * 512))
+#define CVMX_MIO_UART2_DLH \
+         CVMX_ADD_IO_SEG(0x0001180000000488ull)
+#define CVMX_MIO_UART2_DLL \
+         CVMX_ADD_IO_SEG(0x0001180000000480ull)
+#define CVMX_MIO_UART2_FAR \
+         CVMX_ADD_IO_SEG(0x0001180000000520ull)
+#define CVMX_MIO_UART2_FCR \
+         CVMX_ADD_IO_SEG(0x0001180000000450ull)
+#define CVMX_MIO_UART2_HTX \
+         CVMX_ADD_IO_SEG(0x0001180000000708ull)
+#define CVMX_MIO_UART2_IER \
+         CVMX_ADD_IO_SEG(0x0001180000000408ull)
+#define CVMX_MIO_UART2_IIR \
+         CVMX_ADD_IO_SEG(0x0001180000000410ull)
+#define CVMX_MIO_UART2_LCR \
+         CVMX_ADD_IO_SEG(0x0001180000000418ull)
+#define CVMX_MIO_UART2_LSR \
+         CVMX_ADD_IO_SEG(0x0001180000000428ull)
+#define CVMX_MIO_UART2_MCR \
+         CVMX_ADD_IO_SEG(0x0001180000000420ull)
+#define CVMX_MIO_UART2_MSR \
+         CVMX_ADD_IO_SEG(0x0001180000000430ull)
+#define CVMX_MIO_UART2_RBR \
+         CVMX_ADD_IO_SEG(0x0001180000000400ull)
+#define CVMX_MIO_UART2_RFL \
+         CVMX_ADD_IO_SEG(0x0001180000000608ull)
+#define CVMX_MIO_UART2_RFW \
+         CVMX_ADD_IO_SEG(0x0001180000000530ull)
+#define CVMX_MIO_UART2_SBCR \
+         CVMX_ADD_IO_SEG(0x0001180000000620ull)
+#define CVMX_MIO_UART2_SCR \
+         CVMX_ADD_IO_SEG(0x0001180000000438ull)
+#define CVMX_MIO_UART2_SFE \
+         CVMX_ADD_IO_SEG(0x0001180000000630ull)
+#define CVMX_MIO_UART2_SRR \
+         CVMX_ADD_IO_SEG(0x0001180000000610ull)
+#define CVMX_MIO_UART2_SRT \
+         CVMX_ADD_IO_SEG(0x0001180000000638ull)
+#define CVMX_MIO_UART2_SRTS \
+         CVMX_ADD_IO_SEG(0x0001180000000618ull)
+#define CVMX_MIO_UART2_STT \
+         CVMX_ADD_IO_SEG(0x0001180000000700ull)
+#define CVMX_MIO_UART2_TFL \
+         CVMX_ADD_IO_SEG(0x0001180000000600ull)
+#define CVMX_MIO_UART2_TFR \
+         CVMX_ADD_IO_SEG(0x0001180000000528ull)
+#define CVMX_MIO_UART2_THR \
+         CVMX_ADD_IO_SEG(0x0001180000000440ull)
+#define CVMX_MIO_UART2_USR \
+         CVMX_ADD_IO_SEG(0x0001180000000538ull)
+#define CVMX_MIO_UARTX_DLH(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000888ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_DLL(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000880ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_FAR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000920ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_FCR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000850ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_HTX(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000B08ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_IER(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000808ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_IIR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000810ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_LCR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000818ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_LSR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000828ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_MCR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000820ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_MSR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000830ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_RBR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000800ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_RFL(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A08ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_RFW(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000930ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SBCR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A20ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SCR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000838ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SFE(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A30ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SRR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A10ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SRT(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A38ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_SRTS(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A18ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_STT(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000B00ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_TFL(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000A00ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_TFR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000928ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_THR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000840ull + (((offset) & 1) * 1024))
+#define CVMX_MIO_UARTX_USR(offset) \
+         CVMX_ADD_IO_SEG(0x0001180000000938ull + (((offset) & 1) * 1024))
+
+union cvmx_mio_boot_bist_stat {
+        uint64_t u64;
+        struct cvmx_mio_boot_bist_stat_s {
+                uint64_t reserved_2_63:62;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } s;
+        struct cvmx_mio_boot_bist_stat_cn30xx {
+                uint64_t reserved_4_63:60;
+                uint64_t ncbo_1:1;
+                uint64_t ncbo_0:1;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } cn30xx;
+        struct cvmx_mio_boot_bist_stat_cn30xx cn31xx;
+        struct cvmx_mio_boot_bist_stat_cn38xx {
+                uint64_t reserved_3_63:61;
+                uint64_t ncbo_0:1;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } cn38xx;
+        struct cvmx_mio_boot_bist_stat_cn38xx cn38xxp2;
+        struct cvmx_mio_boot_bist_stat_cn50xx {
+                uint64_t reserved_6_63:58;
+                uint64_t pcm_1:1;
+                uint64_t pcm_0:1;
+                uint64_t ncbo_1:1;
+                uint64_t ncbo_0:1;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } cn50xx;
+        struct cvmx_mio_boot_bist_stat_cn52xx {
+                uint64_t reserved_6_63:58;
+                uint64_t ndf:2;
+                uint64_t ncbo_0:1;
+                uint64_t dma:1;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } cn52xx;
+        struct cvmx_mio_boot_bist_stat_cn52xxp1 {
+                uint64_t reserved_4_63:60;
+                uint64_t ncbo_0:1;
+                uint64_t dma:1;
+                uint64_t loc:1;
+                uint64_t ncbi:1;
+        } cn52xxp1;
+        struct cvmx_mio_boot_bist_stat_cn52xxp1 cn56xx;
+        struct cvmx_mio_boot_bist_stat_cn52xxp1 cn56xxp1;
+        struct cvmx_mio_boot_bist_stat_cn38xx cn58xx;
+        struct cvmx_mio_boot_bist_stat_cn38xx cn58xxp1;
+};
+
+union cvmx_mio_boot_comp {
+        uint64_t u64;
+        struct cvmx_mio_boot_comp_s {
+                uint64_t reserved_10_63:54;
+                uint64_t pctl:5;
+                uint64_t nctl:5;
+        } s;
+        struct cvmx_mio_boot_comp_s cn50xx;
+        struct cvmx_mio_boot_comp_s cn52xx;
+        struct cvmx_mio_boot_comp_s cn52xxp1;
+        struct cvmx_mio_boot_comp_s cn56xx;
+        struct cvmx_mio_boot_comp_s cn56xxp1;
+};
+
+union cvmx_mio_boot_dma_cfgx {
+        uint64_t u64;
+        struct cvmx_mio_boot_dma_cfgx_s {
+                uint64_t en:1;
+                uint64_t rw:1;
+                uint64_t clr:1;
+                uint64_t reserved_60_60:1;
+                uint64_t swap32:1;
+                uint64_t swap16:1;
+                uint64_t swap8:1;
+                uint64_t endian:1;
+                uint64_t size:20;
+                uint64_t adr:36;
+        } s;
+        struct cvmx_mio_boot_dma_cfgx_s cn52xx;
+        struct cvmx_mio_boot_dma_cfgx_s cn52xxp1;
+        struct cvmx_mio_boot_dma_cfgx_s cn56xx;
+        struct cvmx_mio_boot_dma_cfgx_s cn56xxp1;
+};
+
+union cvmx_mio_boot_dma_intx {
+        uint64_t u64;
+        struct cvmx_mio_boot_dma_intx_s {
+                uint64_t reserved_2_63:62;
+                uint64_t dmarq:1;
+                uint64_t done:1;
+        } s;
+        struct cvmx_mio_boot_dma_intx_s cn52xx;
+        struct cvmx_mio_boot_dma_intx_s cn52xxp1;
+        struct cvmx_mio_boot_dma_intx_s cn56xx;
+        struct cvmx_mio_boot_dma_intx_s cn56xxp1;
+};
+
+union cvmx_mio_boot_dma_int_enx {
+        uint64_t u64;
+        struct cvmx_mio_boot_dma_int_enx_s {
+                uint64_t reserved_2_63:62;
+                uint64_t dmarq:1;
+                uint64_t done:1;
+        } s;
+        struct cvmx_mio_boot_dma_int_enx_s cn52xx;
+        struct cvmx_mio_boot_dma_int_enx_s cn52xxp1;
+        struct cvmx_mio_boot_dma_int_enx_s cn56xx;
+        struct cvmx_mio_boot_dma_int_enx_s cn56xxp1;
+};
+
+union cvmx_mio_boot_dma_timx {
+        uint64_t u64;
+        struct cvmx_mio_boot_dma_timx_s {
+                uint64_t dmack_pi:1;
+                uint64_t dmarq_pi:1;
+                uint64_t tim_mult:2;
+                uint64_t rd_dly:3;
+                uint64_t ddr:1;
+                uint64_t width:1;
+                uint64_t reserved_48_54:7;
+                uint64_t pause:6;
+                uint64_t dmack_h:6;
+                uint64_t we_n:6;
+                uint64_t we_a:6;
+                uint64_t oe_n:6;
+                uint64_t oe_a:6;
+                uint64_t dmack_s:6;
+                uint64_t dmarq:6;
+        } s;
+        struct cvmx_mio_boot_dma_timx_s cn52xx;
+        struct cvmx_mio_boot_dma_timx_s cn52xxp1;
+        struct cvmx_mio_boot_dma_timx_s cn56xx;
+        struct cvmx_mio_boot_dma_timx_s cn56xxp1;
+};
+
+union cvmx_mio_boot_err {
+        uint64_t u64;
+        struct cvmx_mio_boot_err_s {
+                uint64_t reserved_2_63:62;
+                uint64_t wait_err:1;
+                uint64_t adr_err:1;
+        } s;
+        struct cvmx_mio_boot_err_s cn30xx;
+        struct cvmx_mio_boot_err_s cn31xx;
+        struct cvmx_mio_boot_err_s cn38xx;
+        struct cvmx_mio_boot_err_s cn38xxp2;
+        struct cvmx_mio_boot_err_s cn50xx;
+        struct cvmx_mio_boot_err_s cn52xx;
+        struct cvmx_mio_boot_err_s cn52xxp1;
+        struct cvmx_mio_boot_err_s cn56xx;
+        struct cvmx_mio_boot_err_s cn56xxp1;
+        struct cvmx_mio_boot_err_s cn58xx;
+        struct cvmx_mio_boot_err_s cn58xxp1;
+};
+
+union cvmx_mio_boot_int {
+        uint64_t u64;
+        struct cvmx_mio_boot_int_s {
+                uint64_t reserved_2_63:62;
+                uint64_t wait_int:1;
+                uint64_t adr_int:1;
+        } s;
+        struct cvmx_mio_boot_int_s cn30xx;
+        struct cvmx_mio_boot_int_s cn31xx;
+        struct cvmx_mio_boot_int_s cn38xx;
+        struct cvmx_mio_boot_int_s cn38xxp2;
+        struct cvmx_mio_boot_int_s cn50xx;
+        struct cvmx_mio_boot_int_s cn52xx;
+        struct cvmx_mio_boot_int_s cn52xxp1;
+        struct cvmx_mio_boot_int_s cn56xx;
+        struct cvmx_mio_boot_int_s cn56xxp1;
+        struct cvmx_mio_boot_int_s cn58xx;
+        struct cvmx_mio_boot_int_s cn58xxp1;
+};
+
+union cvmx_mio_boot_loc_adr {
+        uint64_t u64;
+        struct cvmx_mio_boot_loc_adr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t adr:5;
+                uint64_t reserved_0_2:3;
+        } s;
+        struct cvmx_mio_boot_loc_adr_s cn30xx;
+        struct cvmx_mio_boot_loc_adr_s cn31xx;
+        struct cvmx_mio_boot_loc_adr_s cn38xx;
+        struct cvmx_mio_boot_loc_adr_s cn38xxp2;
+        struct cvmx_mio_boot_loc_adr_s cn50xx;
+        struct cvmx_mio_boot_loc_adr_s cn52xx;
+        struct cvmx_mio_boot_loc_adr_s cn52xxp1;
+        struct cvmx_mio_boot_loc_adr_s cn56xx;
+        struct cvmx_mio_boot_loc_adr_s cn56xxp1;
+        struct cvmx_mio_boot_loc_adr_s cn58xx;
+        struct cvmx_mio_boot_loc_adr_s cn58xxp1;
+};
+
+union cvmx_mio_boot_loc_cfgx {
+        uint64_t u64;
+        struct cvmx_mio_boot_loc_cfgx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t en:1;
+                uint64_t reserved_28_30:3;
+                uint64_t base:25;
+                uint64_t reserved_0_2:3;
+        } s;
+        struct cvmx_mio_boot_loc_cfgx_s cn30xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn31xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn38xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn38xxp2;
+        struct cvmx_mio_boot_loc_cfgx_s cn50xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn52xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn52xxp1;
+        struct cvmx_mio_boot_loc_cfgx_s cn56xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn56xxp1;
+        struct cvmx_mio_boot_loc_cfgx_s cn58xx;
+        struct cvmx_mio_boot_loc_cfgx_s cn58xxp1;
+};
+
+union cvmx_mio_boot_loc_dat {
+        uint64_t u64;
+        struct cvmx_mio_boot_loc_dat_s {
+                uint64_t data:64;
+        } s;
+        struct cvmx_mio_boot_loc_dat_s cn30xx;
+        struct cvmx_mio_boot_loc_dat_s cn31xx;
+        struct cvmx_mio_boot_loc_dat_s cn38xx;
+        struct cvmx_mio_boot_loc_dat_s cn38xxp2;
+        struct cvmx_mio_boot_loc_dat_s cn50xx;
+        struct cvmx_mio_boot_loc_dat_s cn52xx;
+        struct cvmx_mio_boot_loc_dat_s cn52xxp1;
+        struct cvmx_mio_boot_loc_dat_s cn56xx;
+        struct cvmx_mio_boot_loc_dat_s cn56xxp1;
+        struct cvmx_mio_boot_loc_dat_s cn58xx;
+        struct cvmx_mio_boot_loc_dat_s cn58xxp1;
+};
+
+union cvmx_mio_boot_pin_defs {
+        uint64_t u64;
+        struct cvmx_mio_boot_pin_defs_s {
+                uint64_t reserved_16_63:48;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t dmack_p2:1;
+                uint64_t dmack_p1:1;
+                uint64_t dmack_p0:1;
+                uint64_t term:2;
+                uint64_t nand:1;
+                uint64_t reserved_0_7:8;
+        } s;
+        struct cvmx_mio_boot_pin_defs_cn52xx {
+                uint64_t reserved_16_63:48;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t reserved_13_13:1;
+                uint64_t dmack_p1:1;
+                uint64_t dmack_p0:1;
+                uint64_t term:2;
+                uint64_t nand:1;
+                uint64_t reserved_0_7:8;
+        } cn52xx;
+        struct cvmx_mio_boot_pin_defs_cn56xx {
+                uint64_t reserved_16_63:48;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t dmack_p2:1;
+                uint64_t dmack_p1:1;
+                uint64_t dmack_p0:1;
+                uint64_t term:2;
+                uint64_t reserved_0_8:9;
+        } cn56xx;
+};
+
+union cvmx_mio_boot_reg_cfgx {
+        uint64_t u64;
+        struct cvmx_mio_boot_reg_cfgx_s {
+                uint64_t reserved_44_63:20;
+                uint64_t dmack:2;
+                uint64_t tim_mult:2;
+                uint64_t rd_dly:3;
+                uint64_t sam:1;
+                uint64_t we_ext:2;
+                uint64_t oe_ext:2;
+                uint64_t en:1;
+                uint64_t orbit:1;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t size:12;
+                uint64_t base:16;
+        } s;
+        struct cvmx_mio_boot_reg_cfgx_cn30xx {
+                uint64_t reserved_37_63:27;
+                uint64_t sam:1;
+                uint64_t we_ext:2;
+                uint64_t oe_ext:2;
+                uint64_t en:1;
+                uint64_t orbit:1;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t size:12;
+                uint64_t base:16;
+        } cn30xx;
+        struct cvmx_mio_boot_reg_cfgx_cn30xx cn31xx;
+        struct cvmx_mio_boot_reg_cfgx_cn38xx {
+                uint64_t reserved_32_63:32;
+                uint64_t en:1;
+                uint64_t orbit:1;
+                uint64_t reserved_28_29:2;
+                uint64_t size:12;
+                uint64_t base:16;
+        } cn38xx;
+        struct cvmx_mio_boot_reg_cfgx_cn38xx cn38xxp2;
+        struct cvmx_mio_boot_reg_cfgx_cn50xx {
+                uint64_t reserved_42_63:22;
+                uint64_t tim_mult:2;
+                uint64_t rd_dly:3;
+                uint64_t sam:1;
+                uint64_t we_ext:2;
+                uint64_t oe_ext:2;
+                uint64_t en:1;
+                uint64_t orbit:1;
+                uint64_t ale:1;
+                uint64_t width:1;
+                uint64_t size:12;
+                uint64_t base:16;
+        } cn50xx;
+        struct cvmx_mio_boot_reg_cfgx_s cn52xx;
+        struct cvmx_mio_boot_reg_cfgx_s cn52xxp1;
+        struct cvmx_mio_boot_reg_cfgx_s cn56xx;
+        struct cvmx_mio_boot_reg_cfgx_s cn56xxp1;
+        struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xx;
+        struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xxp1;
+};
+
+union cvmx_mio_boot_reg_timx {
+        uint64_t u64;
+        struct cvmx_mio_boot_reg_timx_s {
+                uint64_t pagem:1;
+                uint64_t waitm:1;
+                uint64_t pages:2;
+                uint64_t ale:6;
+                uint64_t page:6;
+                uint64_t wait:6;
+                uint64_t pause:6;
+                uint64_t wr_hld:6;
+                uint64_t rd_hld:6;
+                uint64_t we:6;
+                uint64_t oe:6;
+                uint64_t ce:6;
+                uint64_t adr:6;
+        } s;
+        struct cvmx_mio_boot_reg_timx_s cn30xx;
+        struct cvmx_mio_boot_reg_timx_s cn31xx;
+        struct cvmx_mio_boot_reg_timx_cn38xx {
+                uint64_t pagem:1;
+                uint64_t waitm:1;
+                uint64_t pages:2;
+                uint64_t reserved_54_59:6;
+                uint64_t page:6;
+                uint64_t wait:6;
+                uint64_t pause:6;
+                uint64_t wr_hld:6;
+                uint64_t rd_hld:6;
+                uint64_t we:6;
+                uint64_t oe:6;
+                uint64_t ce:6;
+                uint64_t adr:6;
+        } cn38xx;
+        struct cvmx_mio_boot_reg_timx_cn38xx cn38xxp2;
+        struct cvmx_mio_boot_reg_timx_s cn50xx;
+        struct cvmx_mio_boot_reg_timx_s cn52xx;
+        struct cvmx_mio_boot_reg_timx_s cn52xxp1;
+        struct cvmx_mio_boot_reg_timx_s cn56xx;
+        struct cvmx_mio_boot_reg_timx_s cn56xxp1;
+        struct cvmx_mio_boot_reg_timx_s cn58xx;
+        struct cvmx_mio_boot_reg_timx_s cn58xxp1;
+};
+
+union cvmx_mio_boot_thr {
+        uint64_t u64;
+        struct cvmx_mio_boot_thr_s {
+                uint64_t reserved_22_63:42;
+                uint64_t dma_thr:6;
+                uint64_t reserved_14_15:2;
+                uint64_t fif_cnt:6;
+                uint64_t reserved_6_7:2;
+                uint64_t fif_thr:6;
+        } s;
+        struct cvmx_mio_boot_thr_cn30xx {
+                uint64_t reserved_14_63:50;
+                uint64_t fif_cnt:6;
+                uint64_t reserved_6_7:2;
+                uint64_t fif_thr:6;
+        } cn30xx;
+        struct cvmx_mio_boot_thr_cn30xx cn31xx;
+        struct cvmx_mio_boot_thr_cn30xx cn38xx;
+        struct cvmx_mio_boot_thr_cn30xx cn38xxp2;
+        struct cvmx_mio_boot_thr_cn30xx cn50xx;
+        struct cvmx_mio_boot_thr_s cn52xx;
+        struct cvmx_mio_boot_thr_s cn52xxp1;
+        struct cvmx_mio_boot_thr_s cn56xx;
+        struct cvmx_mio_boot_thr_s cn56xxp1;
+        struct cvmx_mio_boot_thr_cn30xx cn58xx;
+        struct cvmx_mio_boot_thr_cn30xx cn58xxp1;
+};
+
+union cvmx_mio_fus_bnk_datx {
+        uint64_t u64;
+        struct cvmx_mio_fus_bnk_datx_s {
+                uint64_t dat:64;
+        } s;
+        struct cvmx_mio_fus_bnk_datx_s cn50xx;
+        struct cvmx_mio_fus_bnk_datx_s cn52xx;
+        struct cvmx_mio_fus_bnk_datx_s cn52xxp1;
+        struct cvmx_mio_fus_bnk_datx_s cn56xx;
+        struct cvmx_mio_fus_bnk_datx_s cn56xxp1;
+        struct cvmx_mio_fus_bnk_datx_s cn58xx;
+        struct cvmx_mio_fus_bnk_datx_s cn58xxp1;
+};
+
+union cvmx_mio_fus_dat0 {
+        uint64_t u64;
+        struct cvmx_mio_fus_dat0_s {
+                uint64_t reserved_32_63:32;
+                uint64_t man_info:32;
+        } s;
+        struct cvmx_mio_fus_dat0_s cn30xx;
+        struct cvmx_mio_fus_dat0_s cn31xx;
+        struct cvmx_mio_fus_dat0_s cn38xx;
+        struct cvmx_mio_fus_dat0_s cn38xxp2;
+        struct cvmx_mio_fus_dat0_s cn50xx;
+        struct cvmx_mio_fus_dat0_s cn52xx;
+        struct cvmx_mio_fus_dat0_s cn52xxp1;
+        struct cvmx_mio_fus_dat0_s cn56xx;
+        struct cvmx_mio_fus_dat0_s cn56xxp1;
+        struct cvmx_mio_fus_dat0_s cn58xx;
+        struct cvmx_mio_fus_dat0_s cn58xxp1;
+};
+
+union cvmx_mio_fus_dat1 {
+        uint64_t u64;
+        struct cvmx_mio_fus_dat1_s {
+                uint64_t reserved_32_63:32;
+                uint64_t man_info:32;
+        } s;
+        struct cvmx_mio_fus_dat1_s cn30xx;
+        struct cvmx_mio_fus_dat1_s cn31xx;
+        struct cvmx_mio_fus_dat1_s cn38xx;
+        struct cvmx_mio_fus_dat1_s cn38xxp2;
+        struct cvmx_mio_fus_dat1_s cn50xx;
+        struct cvmx_mio_fus_dat1_s cn52xx;
+        struct cvmx_mio_fus_dat1_s cn52xxp1;
+        struct cvmx_mio_fus_dat1_s cn56xx;
+        struct cvmx_mio_fus_dat1_s cn56xxp1;
+        struct cvmx_mio_fus_dat1_s cn58xx;
+        struct cvmx_mio_fus_dat1_s cn58xxp1;
+};
+
+union cvmx_mio_fus_dat2 {
+        uint64_t u64;
+        struct cvmx_mio_fus_dat2_s {
+                uint64_t reserved_34_63:30;
+                uint64_t fus318:1;
+                uint64_t raid_en:1;
+                uint64_t reserved_30_31:2;
+                uint64_t nokasu:1;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t reserved_0_15:16;
+        } s;
+        struct cvmx_mio_fus_dat2_cn30xx {
+                uint64_t reserved_29_63:35;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t pll_off:4;
+                uint64_t reserved_1_11:11;
+                uint64_t pp_dis:1;
+        } cn30xx;
+        struct cvmx_mio_fus_dat2_cn31xx {
+                uint64_t reserved_29_63:35;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t pll_off:4;
+                uint64_t reserved_2_11:10;
+                uint64_t pp_dis:2;
+        } cn31xx;
+        struct cvmx_mio_fus_dat2_cn38xx {
+                uint64_t reserved_29_63:35;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t pp_dis:16;
+        } cn38xx;
+        struct cvmx_mio_fus_dat2_cn38xx cn38xxp2;
+        struct cvmx_mio_fus_dat2_cn50xx {
+                uint64_t reserved_34_63:30;
+                uint64_t fus318:1;
+                uint64_t raid_en:1;
+                uint64_t reserved_30_31:2;
+                uint64_t nokasu:1;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t reserved_2_15:14;
+                uint64_t pp_dis:2;
+        } cn50xx;
+        struct cvmx_mio_fus_dat2_cn52xx {
+                uint64_t reserved_34_63:30;
+                uint64_t fus318:1;
+                uint64_t raid_en:1;
+                uint64_t reserved_30_31:2;
+                uint64_t nokasu:1;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t reserved_4_15:12;
+                uint64_t pp_dis:4;
+        } cn52xx;
+        struct cvmx_mio_fus_dat2_cn52xx cn52xxp1;
+        struct cvmx_mio_fus_dat2_cn56xx {
+                uint64_t reserved_34_63:30;
+                uint64_t fus318:1;
+                uint64_t raid_en:1;
+                uint64_t reserved_30_31:2;
+                uint64_t nokasu:1;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t reserved_12_15:4;
+                uint64_t pp_dis:12;
+        } cn56xx;
+        struct cvmx_mio_fus_dat2_cn56xx cn56xxp1;
+        struct cvmx_mio_fus_dat2_cn58xx {
+                uint64_t reserved_30_63:34;
+                uint64_t nokasu:1;
+                uint64_t nodfa_cp2:1;
+                uint64_t nomul:1;
+                uint64_t nocrypto:1;
+                uint64_t rst_sht:1;
+                uint64_t bist_dis:1;
+                uint64_t chip_id:8;
+                uint64_t pp_dis:16;
+        } cn58xx;
+        struct cvmx_mio_fus_dat2_cn58xx cn58xxp1;
+};
+
+union cvmx_mio_fus_dat3 {
+        uint64_t u64;
+        struct cvmx_mio_fus_dat3_s {
+                uint64_t reserved_32_63:32;
+                uint64_t pll_div4:1;
+                uint64_t zip_crip:2;
+                uint64_t bar2_en:1;
+                uint64_t efus_lck:1;
+                uint64_t efus_ign:1;
+                uint64_t nozip:1;
+                uint64_t nodfa_dte:1;
+                uint64_t icache:24;
+        } s;
+        struct cvmx_mio_fus_dat3_cn30xx {
+                uint64_t reserved_32_63:32;
+                uint64_t pll_div4:1;
+                uint64_t reserved_29_30:2;
+                uint64_t bar2_en:1;
+                uint64_t efus_lck:1;
+                uint64_t efus_ign:1;
+                uint64_t nozip:1;
+                uint64_t nodfa_dte:1;
+                uint64_t icache:24;
+        } cn30xx;
+        struct cvmx_mio_fus_dat3_s cn31xx;
+        struct cvmx_mio_fus_dat3_cn38xx {
+                uint64_t reserved_31_63:33;
+                uint64_t zip_crip:2;
+                uint64_t bar2_en:1;
+                uint64_t efus_lck:1;
+                uint64_t efus_ign:1;
+                uint64_t nozip:1;
+                uint64_t nodfa_dte:1;
+                uint64_t icache:24;
+        } cn38xx;
+        struct cvmx_mio_fus_dat3_cn38xxp2 {
+                uint64_t reserved_29_63:35;
+                uint64_t bar2_en:1;
+                uint64_t efus_lck:1;
+                uint64_t efus_ign:1;
+                uint64_t nozip:1;
+                uint64_t nodfa_dte:1;
+                uint64_t icache:24;
+        } cn38xxp2;
+        struct cvmx_mio_fus_dat3_cn38xx cn50xx;
+        struct cvmx_mio_fus_dat3_cn38xx cn52xx;
+        struct cvmx_mio_fus_dat3_cn38xx cn52xxp1;
+        struct cvmx_mio_fus_dat3_cn38xx cn56xx;
+        struct cvmx_mio_fus_dat3_cn38xx cn56xxp1;
+        struct cvmx_mio_fus_dat3_cn38xx cn58xx;
+        struct cvmx_mio_fus_dat3_cn38xx cn58xxp1;
+};
+
+union cvmx_mio_fus_ema {
+        uint64_t u64;
+        struct cvmx_mio_fus_ema_s {
+                uint64_t reserved_7_63:57;
+                uint64_t eff_ema:3;
+                uint64_t reserved_3_3:1;
+                uint64_t ema:3;
+        } s;
+        struct cvmx_mio_fus_ema_s cn50xx;
+        struct cvmx_mio_fus_ema_s cn52xx;
+        struct cvmx_mio_fus_ema_s cn52xxp1;
+        struct cvmx_mio_fus_ema_s cn56xx;
+        struct cvmx_mio_fus_ema_s cn56xxp1;
+        struct cvmx_mio_fus_ema_cn58xx {
+                uint64_t reserved_2_63:62;
+                uint64_t ema:2;
+        } cn58xx;
+        struct cvmx_mio_fus_ema_cn58xx cn58xxp1;
+};
+
+union cvmx_mio_fus_pdf {
+        uint64_t u64;
+        struct cvmx_mio_fus_pdf_s {
+                uint64_t pdf:64;
+        } s;
+        struct cvmx_mio_fus_pdf_s cn50xx;
+        struct cvmx_mio_fus_pdf_s cn52xx;
+        struct cvmx_mio_fus_pdf_s cn52xxp1;
+        struct cvmx_mio_fus_pdf_s cn56xx;
+        struct cvmx_mio_fus_pdf_s cn56xxp1;
+        struct cvmx_mio_fus_pdf_s cn58xx;
+};
+
+union cvmx_mio_fus_pll {
+        uint64_t u64;
+        struct cvmx_mio_fus_pll_s {
+                uint64_t reserved_2_63:62;
+                uint64_t rfslip:1;
+                uint64_t fbslip:1;
+        } s;
+        struct cvmx_mio_fus_pll_s cn50xx;
+        struct cvmx_mio_fus_pll_s cn52xx;
+        struct cvmx_mio_fus_pll_s cn52xxp1;
+        struct cvmx_mio_fus_pll_s cn56xx;
+        struct cvmx_mio_fus_pll_s cn56xxp1;
+        struct cvmx_mio_fus_pll_s cn58xx;
+        struct cvmx_mio_fus_pll_s cn58xxp1;
+};
+
+union cvmx_mio_fus_prog {
+        uint64_t u64;
+        struct cvmx_mio_fus_prog_s {
+                uint64_t reserved_1_63:63;
+                uint64_t prog:1;
+        } s;
+        struct cvmx_mio_fus_prog_s cn30xx;
+        struct cvmx_mio_fus_prog_s cn31xx;
+        struct cvmx_mio_fus_prog_s cn38xx;
+        struct cvmx_mio_fus_prog_s cn38xxp2;
+        struct cvmx_mio_fus_prog_s cn50xx;
+        struct cvmx_mio_fus_prog_s cn52xx;
+        struct cvmx_mio_fus_prog_s cn52xxp1;
+        struct cvmx_mio_fus_prog_s cn56xx;
+        struct cvmx_mio_fus_prog_s cn56xxp1;
+        struct cvmx_mio_fus_prog_s cn58xx;
+        struct cvmx_mio_fus_prog_s cn58xxp1;
+};
+
+union cvmx_mio_fus_prog_times {
+        uint64_t u64;
+        struct cvmx_mio_fus_prog_times_s {
+                uint64_t reserved_33_63:31;
+                uint64_t prog_pin:1;
+                uint64_t out:8;
+                uint64_t sclk_lo:4;
+                uint64_t sclk_hi:12;
+                uint64_t setup:8;
+        } s;
+        struct cvmx_mio_fus_prog_times_s cn50xx;
+        struct cvmx_mio_fus_prog_times_s cn52xx;
+        struct cvmx_mio_fus_prog_times_s cn52xxp1;
+        struct cvmx_mio_fus_prog_times_s cn56xx;
+        struct cvmx_mio_fus_prog_times_s cn56xxp1;
+        struct cvmx_mio_fus_prog_times_s cn58xx;
+        struct cvmx_mio_fus_prog_times_s cn58xxp1;
+};
+
+union cvmx_mio_fus_rcmd {
+        uint64_t u64;
+        struct cvmx_mio_fus_rcmd_s {
+                uint64_t reserved_24_63:40;
+                uint64_t dat:8;
+                uint64_t reserved_13_15:3;
+                uint64_t pend:1;
+                uint64_t reserved_9_11:3;
+                uint64_t efuse:1;
+                uint64_t addr:8;
+        } s;
+        struct cvmx_mio_fus_rcmd_cn30xx {
+                uint64_t reserved_24_63:40;
+                uint64_t dat:8;
+                uint64_t reserved_13_15:3;
+                uint64_t pend:1;
+                uint64_t reserved_9_11:3;
+                uint64_t efuse:1;
+                uint64_t reserved_7_7:1;
+                uint64_t addr:7;
+        } cn30xx;
+        struct cvmx_mio_fus_rcmd_cn30xx cn31xx;
+        struct cvmx_mio_fus_rcmd_cn30xx cn38xx;
+        struct cvmx_mio_fus_rcmd_cn30xx cn38xxp2;
+        struct cvmx_mio_fus_rcmd_cn30xx cn50xx;
+        struct cvmx_mio_fus_rcmd_s cn52xx;
+        struct cvmx_mio_fus_rcmd_s cn52xxp1;
+        struct cvmx_mio_fus_rcmd_s cn56xx;
+        struct cvmx_mio_fus_rcmd_s cn56xxp1;
+        struct cvmx_mio_fus_rcmd_cn30xx cn58xx;
+        struct cvmx_mio_fus_rcmd_cn30xx cn58xxp1;
+};
+
+union cvmx_mio_fus_spr_repair_res {
+        uint64_t u64;
+        struct cvmx_mio_fus_spr_repair_res_s {
+                uint64_t reserved_42_63:22;
+                uint64_t repair2:14;
+                uint64_t repair1:14;
+                uint64_t repair0:14;
+        } s;
+        struct cvmx_mio_fus_spr_repair_res_s cn30xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn31xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn38xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn50xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn52xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn52xxp1;
+        struct cvmx_mio_fus_spr_repair_res_s cn56xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn56xxp1;
+        struct cvmx_mio_fus_spr_repair_res_s cn58xx;
+        struct cvmx_mio_fus_spr_repair_res_s cn58xxp1;
+};
+
+union cvmx_mio_fus_spr_repair_sum {
+        uint64_t u64;
+        struct cvmx_mio_fus_spr_repair_sum_s {
+                uint64_t reserved_1_63:63;
+                uint64_t too_many:1;
+        } s;
+        struct cvmx_mio_fus_spr_repair_sum_s cn30xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn31xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn38xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn50xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn52xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn52xxp1;
+        struct cvmx_mio_fus_spr_repair_sum_s cn56xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn56xxp1;
+        struct cvmx_mio_fus_spr_repair_sum_s cn58xx;
+        struct cvmx_mio_fus_spr_repair_sum_s cn58xxp1;
+};
+
+union cvmx_mio_fus_unlock {
+        uint64_t u64;
+        struct cvmx_mio_fus_unlock_s {
+                uint64_t reserved_24_63:40;
+                uint64_t key:24;
+        } s;
+        struct cvmx_mio_fus_unlock_s cn30xx;
+        struct cvmx_mio_fus_unlock_s cn31xx;
+};
+
+union cvmx_mio_fus_wadr {
+        uint64_t u64;
+        struct cvmx_mio_fus_wadr_s {
+                uint64_t reserved_10_63:54;
+                uint64_t addr:10;
+        } s;
+        struct cvmx_mio_fus_wadr_s cn30xx;
+        struct cvmx_mio_fus_wadr_s cn31xx;
+        struct cvmx_mio_fus_wadr_s cn38xx;
+        struct cvmx_mio_fus_wadr_s cn38xxp2;
+        struct cvmx_mio_fus_wadr_cn50xx {
+                uint64_t reserved_2_63:62;
+                uint64_t addr:2;
+        } cn50xx;
+        struct cvmx_mio_fus_wadr_cn52xx {
+                uint64_t reserved_3_63:61;
+                uint64_t addr:3;
+        } cn52xx;
+        struct cvmx_mio_fus_wadr_cn52xx cn52xxp1;
+        struct cvmx_mio_fus_wadr_cn52xx cn56xx;
+        struct cvmx_mio_fus_wadr_cn52xx cn56xxp1;
+        struct cvmx_mio_fus_wadr_cn50xx cn58xx;
+        struct cvmx_mio_fus_wadr_cn50xx cn58xxp1;
+};
+
+union cvmx_mio_ndf_dma_cfg {
+        uint64_t u64;
+        struct cvmx_mio_ndf_dma_cfg_s {
+                uint64_t en:1;
+                uint64_t rw:1;
+                uint64_t clr:1;
+                uint64_t reserved_60_60:1;
+                uint64_t swap32:1;
+                uint64_t swap16:1;
+                uint64_t swap8:1;
+                uint64_t endian:1;
+                uint64_t size:20;
+                uint64_t adr:36;
+        } s;
+        struct cvmx_mio_ndf_dma_cfg_s cn52xx;
+};
+
+union cvmx_mio_ndf_dma_int {
+        uint64_t u64;
+        struct cvmx_mio_ndf_dma_int_s {
+                uint64_t reserved_1_63:63;
+                uint64_t done:1;
+        } s;
+        struct cvmx_mio_ndf_dma_int_s cn52xx;
+};
+
+union cvmx_mio_ndf_dma_int_en {
+        uint64_t u64;
+        struct cvmx_mio_ndf_dma_int_en_s {
+                uint64_t reserved_1_63:63;
+                uint64_t done:1;
+        } s;
+        struct cvmx_mio_ndf_dma_int_en_s cn52xx;
+};
+
+union cvmx_mio_pll_ctl {
+        uint64_t u64;
+        struct cvmx_mio_pll_ctl_s {
+                uint64_t reserved_5_63:59;
+                uint64_t bw_ctl:5;
+        } s;
+        struct cvmx_mio_pll_ctl_s cn30xx;
+        struct cvmx_mio_pll_ctl_s cn31xx;
+};
+
+union cvmx_mio_pll_setting {
+        uint64_t u64;
+        struct cvmx_mio_pll_setting_s {
+                uint64_t reserved_17_63:47;
+                uint64_t setting:17;
+        } s;
+        struct cvmx_mio_pll_setting_s cn30xx;
+        struct cvmx_mio_pll_setting_s cn31xx;
+};
+
+union cvmx_mio_twsx_int {
+        uint64_t u64;
+        struct cvmx_mio_twsx_int_s {
+                uint64_t reserved_12_63:52;
+                uint64_t scl:1;
+                uint64_t sda:1;
+                uint64_t scl_ovr:1;
+                uint64_t sda_ovr:1;
+                uint64_t reserved_7_7:1;
+                uint64_t core_en:1;
+                uint64_t ts_en:1;
+                uint64_t st_en:1;
+                uint64_t reserved_3_3:1;
+                uint64_t core_int:1;
+                uint64_t ts_int:1;
+                uint64_t st_int:1;
+        } s;
+        struct cvmx_mio_twsx_int_s cn30xx;
+        struct cvmx_mio_twsx_int_s cn31xx;
+        struct cvmx_mio_twsx_int_s cn38xx;
+        struct cvmx_mio_twsx_int_cn38xxp2 {
+                uint64_t reserved_7_63:57;
+                uint64_t core_en:1;
+                uint64_t ts_en:1;
+                uint64_t st_en:1;
+                uint64_t reserved_3_3:1;
+                uint64_t core_int:1;
+                uint64_t ts_int:1;
+                uint64_t st_int:1;
+        } cn38xxp2;
+        struct cvmx_mio_twsx_int_s cn50xx;
+        struct cvmx_mio_twsx_int_s cn52xx;
+        struct cvmx_mio_twsx_int_s cn52xxp1;
+        struct cvmx_mio_twsx_int_s cn56xx;
+        struct cvmx_mio_twsx_int_s cn56xxp1;
+        struct cvmx_mio_twsx_int_s cn58xx;
+        struct cvmx_mio_twsx_int_s cn58xxp1;
+};
+
+union cvmx_mio_twsx_sw_twsi {
+        uint64_t u64;
+        struct cvmx_mio_twsx_sw_twsi_s {
+                uint64_t v:1;
+                uint64_t slonly:1;
+                uint64_t eia:1;
+                uint64_t op:4;
+                uint64_t r:1;
+                uint64_t sovr:1;
+                uint64_t size:3;
+                uint64_t scr:2;
+                uint64_t a:10;
+                uint64_t ia:5;
+                uint64_t eop_ia:3;
+                uint64_t d:32;
+        } s;
+        struct cvmx_mio_twsx_sw_twsi_s cn30xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn31xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn38xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn38xxp2;
+        struct cvmx_mio_twsx_sw_twsi_s cn50xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn52xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn52xxp1;
+        struct cvmx_mio_twsx_sw_twsi_s cn56xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn56xxp1;
+        struct cvmx_mio_twsx_sw_twsi_s cn58xx;
+        struct cvmx_mio_twsx_sw_twsi_s cn58xxp1;
+};
+
+union cvmx_mio_twsx_sw_twsi_ext {
+        uint64_t u64;
+        struct cvmx_mio_twsx_sw_twsi_ext_s {
+                uint64_t reserved_40_63:24;
+                uint64_t ia:8;
+                uint64_t d:32;
+        } s;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn30xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn31xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn38xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn38xxp2;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn50xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn52xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn52xxp1;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn56xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn56xxp1;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn58xx;
+        struct cvmx_mio_twsx_sw_twsi_ext_s cn58xxp1;
+};
+
+union cvmx_mio_twsx_twsi_sw {
+        uint64_t u64;
+        struct cvmx_mio_twsx_twsi_sw_s {
+                uint64_t v:2;
+                uint64_t reserved_32_61:30;
+                uint64_t d:32;
+        } s;
+        struct cvmx_mio_twsx_twsi_sw_s cn30xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn31xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn38xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn38xxp2;
+        struct cvmx_mio_twsx_twsi_sw_s cn50xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn52xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn52xxp1;
+        struct cvmx_mio_twsx_twsi_sw_s cn56xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn56xxp1;
+        struct cvmx_mio_twsx_twsi_sw_s cn58xx;
+        struct cvmx_mio_twsx_twsi_sw_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_dlh {
+        uint64_t u64;
+        struct cvmx_mio_uartx_dlh_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dlh:8;
+        } s;
+        struct cvmx_mio_uartx_dlh_s cn30xx;
+        struct cvmx_mio_uartx_dlh_s cn31xx;
+        struct cvmx_mio_uartx_dlh_s cn38xx;
+        struct cvmx_mio_uartx_dlh_s cn38xxp2;
+        struct cvmx_mio_uartx_dlh_s cn50xx;
+        struct cvmx_mio_uartx_dlh_s cn52xx;
+        struct cvmx_mio_uartx_dlh_s cn52xxp1;
+        struct cvmx_mio_uartx_dlh_s cn56xx;
+        struct cvmx_mio_uartx_dlh_s cn56xxp1;
+        struct cvmx_mio_uartx_dlh_s cn58xx;
+        struct cvmx_mio_uartx_dlh_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_dll {
+        uint64_t u64;
+        struct cvmx_mio_uartx_dll_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dll:8;
+        } s;
+        struct cvmx_mio_uartx_dll_s cn30xx;
+        struct cvmx_mio_uartx_dll_s cn31xx;
+        struct cvmx_mio_uartx_dll_s cn38xx;
+        struct cvmx_mio_uartx_dll_s cn38xxp2;
+        struct cvmx_mio_uartx_dll_s cn50xx;
+        struct cvmx_mio_uartx_dll_s cn52xx;
+        struct cvmx_mio_uartx_dll_s cn52xxp1;
+        struct cvmx_mio_uartx_dll_s cn56xx;
+        struct cvmx_mio_uartx_dll_s cn56xxp1;
+        struct cvmx_mio_uartx_dll_s cn58xx;
+        struct cvmx_mio_uartx_dll_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_far {
+        uint64_t u64;
+        struct cvmx_mio_uartx_far_s {
+                uint64_t reserved_1_63:63;
+                uint64_t far:1;
+        } s;
+        struct cvmx_mio_uartx_far_s cn30xx;
+        struct cvmx_mio_uartx_far_s cn31xx;
+        struct cvmx_mio_uartx_far_s cn38xx;
+        struct cvmx_mio_uartx_far_s cn38xxp2;
+        struct cvmx_mio_uartx_far_s cn50xx;
+        struct cvmx_mio_uartx_far_s cn52xx;
+        struct cvmx_mio_uartx_far_s cn52xxp1;
+        struct cvmx_mio_uartx_far_s cn56xx;
+        struct cvmx_mio_uartx_far_s cn56xxp1;
+        struct cvmx_mio_uartx_far_s cn58xx;
+        struct cvmx_mio_uartx_far_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_fcr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_fcr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rxtrig:2;
+                uint64_t txtrig:2;
+                uint64_t reserved_3_3:1;
+                uint64_t txfr:1;
+                uint64_t rxfr:1;
+                uint64_t en:1;
+        } s;
+        struct cvmx_mio_uartx_fcr_s cn30xx;
+        struct cvmx_mio_uartx_fcr_s cn31xx;
+        struct cvmx_mio_uartx_fcr_s cn38xx;
+        struct cvmx_mio_uartx_fcr_s cn38xxp2;
+        struct cvmx_mio_uartx_fcr_s cn50xx;
+        struct cvmx_mio_uartx_fcr_s cn52xx;
+        struct cvmx_mio_uartx_fcr_s cn52xxp1;
+        struct cvmx_mio_uartx_fcr_s cn56xx;
+        struct cvmx_mio_uartx_fcr_s cn56xxp1;
+        struct cvmx_mio_uartx_fcr_s cn58xx;
+        struct cvmx_mio_uartx_fcr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_htx {
+        uint64_t u64;
+        struct cvmx_mio_uartx_htx_s {
+                uint64_t reserved_1_63:63;
+                uint64_t htx:1;
+        } s;
+        struct cvmx_mio_uartx_htx_s cn30xx;
+        struct cvmx_mio_uartx_htx_s cn31xx;
+        struct cvmx_mio_uartx_htx_s cn38xx;
+        struct cvmx_mio_uartx_htx_s cn38xxp2;
+        struct cvmx_mio_uartx_htx_s cn50xx;
+        struct cvmx_mio_uartx_htx_s cn52xx;
+        struct cvmx_mio_uartx_htx_s cn52xxp1;
+        struct cvmx_mio_uartx_htx_s cn56xx;
+        struct cvmx_mio_uartx_htx_s cn56xxp1;
+        struct cvmx_mio_uartx_htx_s cn58xx;
+        struct cvmx_mio_uartx_htx_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_ier {
+        uint64_t u64;
+        struct cvmx_mio_uartx_ier_s {
+                uint64_t reserved_8_63:56;
+                uint64_t ptime:1;
+                uint64_t reserved_4_6:3;
+                uint64_t edssi:1;
+                uint64_t elsi:1;
+                uint64_t etbei:1;
+                uint64_t erbfi:1;
+        } s;
+        struct cvmx_mio_uartx_ier_s cn30xx;
+        struct cvmx_mio_uartx_ier_s cn31xx;
+        struct cvmx_mio_uartx_ier_s cn38xx;
+        struct cvmx_mio_uartx_ier_s cn38xxp2;
+        struct cvmx_mio_uartx_ier_s cn50xx;
+        struct cvmx_mio_uartx_ier_s cn52xx;
+        struct cvmx_mio_uartx_ier_s cn52xxp1;
+        struct cvmx_mio_uartx_ier_s cn56xx;
+        struct cvmx_mio_uartx_ier_s cn56xxp1;
+        struct cvmx_mio_uartx_ier_s cn58xx;
+        struct cvmx_mio_uartx_ier_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_iir {
+        uint64_t u64;
+        struct cvmx_mio_uartx_iir_s {
+                uint64_t reserved_8_63:56;
+                uint64_t fen:2;
+                uint64_t reserved_4_5:2;
+                uint64_t iid:4;
+        } s;
+        struct cvmx_mio_uartx_iir_s cn30xx;
+        struct cvmx_mio_uartx_iir_s cn31xx;
+        struct cvmx_mio_uartx_iir_s cn38xx;
+        struct cvmx_mio_uartx_iir_s cn38xxp2;
+        struct cvmx_mio_uartx_iir_s cn50xx;
+        struct cvmx_mio_uartx_iir_s cn52xx;
+        struct cvmx_mio_uartx_iir_s cn52xxp1;
+        struct cvmx_mio_uartx_iir_s cn56xx;
+        struct cvmx_mio_uartx_iir_s cn56xxp1;
+        struct cvmx_mio_uartx_iir_s cn58xx;
+        struct cvmx_mio_uartx_iir_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_lcr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_lcr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dlab:1;
+                uint64_t brk:1;
+                uint64_t reserved_5_5:1;
+                uint64_t eps:1;
+                uint64_t pen:1;
+                uint64_t stop:1;
+                uint64_t cls:2;
+        } s;
+        struct cvmx_mio_uartx_lcr_s cn30xx;
+        struct cvmx_mio_uartx_lcr_s cn31xx;
+        struct cvmx_mio_uartx_lcr_s cn38xx;
+        struct cvmx_mio_uartx_lcr_s cn38xxp2;
+        struct cvmx_mio_uartx_lcr_s cn50xx;
+        struct cvmx_mio_uartx_lcr_s cn52xx;
+        struct cvmx_mio_uartx_lcr_s cn52xxp1;
+        struct cvmx_mio_uartx_lcr_s cn56xx;
+        struct cvmx_mio_uartx_lcr_s cn56xxp1;
+        struct cvmx_mio_uartx_lcr_s cn58xx;
+        struct cvmx_mio_uartx_lcr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_lsr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_lsr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t ferr:1;
+                uint64_t temt:1;
+                uint64_t thre:1;
+                uint64_t bi:1;
+                uint64_t fe:1;
+                uint64_t pe:1;
+                uint64_t oe:1;
+                uint64_t dr:1;
+        } s;
+        struct cvmx_mio_uartx_lsr_s cn30xx;
+        struct cvmx_mio_uartx_lsr_s cn31xx;
+        struct cvmx_mio_uartx_lsr_s cn38xx;
+        struct cvmx_mio_uartx_lsr_s cn38xxp2;
+        struct cvmx_mio_uartx_lsr_s cn50xx;
+        struct cvmx_mio_uartx_lsr_s cn52xx;
+        struct cvmx_mio_uartx_lsr_s cn52xxp1;
+        struct cvmx_mio_uartx_lsr_s cn56xx;
+        struct cvmx_mio_uartx_lsr_s cn56xxp1;
+        struct cvmx_mio_uartx_lsr_s cn58xx;
+        struct cvmx_mio_uartx_lsr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_mcr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_mcr_s {
+                uint64_t reserved_6_63:58;
+                uint64_t afce:1;
+                uint64_t loop:1;
+                uint64_t out2:1;
+                uint64_t out1:1;
+                uint64_t rts:1;
+                uint64_t dtr:1;
+        } s;
+        struct cvmx_mio_uartx_mcr_s cn30xx;
+        struct cvmx_mio_uartx_mcr_s cn31xx;
+        struct cvmx_mio_uartx_mcr_s cn38xx;
+        struct cvmx_mio_uartx_mcr_s cn38xxp2;
+        struct cvmx_mio_uartx_mcr_s cn50xx;
+        struct cvmx_mio_uartx_mcr_s cn52xx;
+        struct cvmx_mio_uartx_mcr_s cn52xxp1;
+        struct cvmx_mio_uartx_mcr_s cn56xx;
+        struct cvmx_mio_uartx_mcr_s cn56xxp1;
+        struct cvmx_mio_uartx_mcr_s cn58xx;
+        struct cvmx_mio_uartx_mcr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_msr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_msr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dcd:1;
+                uint64_t ri:1;
+                uint64_t dsr:1;
+                uint64_t cts:1;
+                uint64_t ddcd:1;
+                uint64_t teri:1;
+                uint64_t ddsr:1;
+                uint64_t dcts:1;
+        } s;
+        struct cvmx_mio_uartx_msr_s cn30xx;
+        struct cvmx_mio_uartx_msr_s cn31xx;
+        struct cvmx_mio_uartx_msr_s cn38xx;
+        struct cvmx_mio_uartx_msr_s cn38xxp2;
+        struct cvmx_mio_uartx_msr_s cn50xx;
+        struct cvmx_mio_uartx_msr_s cn52xx;
+        struct cvmx_mio_uartx_msr_s cn52xxp1;
+        struct cvmx_mio_uartx_msr_s cn56xx;
+        struct cvmx_mio_uartx_msr_s cn56xxp1;
+        struct cvmx_mio_uartx_msr_s cn58xx;
+        struct cvmx_mio_uartx_msr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_rbr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_rbr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rbr:8;
+        } s;
+        struct cvmx_mio_uartx_rbr_s cn30xx;
+        struct cvmx_mio_uartx_rbr_s cn31xx;
+        struct cvmx_mio_uartx_rbr_s cn38xx;
+        struct cvmx_mio_uartx_rbr_s cn38xxp2;
+        struct cvmx_mio_uartx_rbr_s cn50xx;
+        struct cvmx_mio_uartx_rbr_s cn52xx;
+        struct cvmx_mio_uartx_rbr_s cn52xxp1;
+        struct cvmx_mio_uartx_rbr_s cn56xx;
+        struct cvmx_mio_uartx_rbr_s cn56xxp1;
+        struct cvmx_mio_uartx_rbr_s cn58xx;
+        struct cvmx_mio_uartx_rbr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_rfl {
+        uint64_t u64;
+        struct cvmx_mio_uartx_rfl_s {
+                uint64_t reserved_7_63:57;
+                uint64_t rfl:7;
+        } s;
+        struct cvmx_mio_uartx_rfl_s cn30xx;
+        struct cvmx_mio_uartx_rfl_s cn31xx;
+        struct cvmx_mio_uartx_rfl_s cn38xx;
+        struct cvmx_mio_uartx_rfl_s cn38xxp2;
+        struct cvmx_mio_uartx_rfl_s cn50xx;
+        struct cvmx_mio_uartx_rfl_s cn52xx;
+        struct cvmx_mio_uartx_rfl_s cn52xxp1;
+        struct cvmx_mio_uartx_rfl_s cn56xx;
+        struct cvmx_mio_uartx_rfl_s cn56xxp1;
+        struct cvmx_mio_uartx_rfl_s cn58xx;
+        struct cvmx_mio_uartx_rfl_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_rfw {
+        uint64_t u64;
+        struct cvmx_mio_uartx_rfw_s {
+                uint64_t reserved_10_63:54;
+                uint64_t rffe:1;
+                uint64_t rfpe:1;
+                uint64_t rfwd:8;
+        } s;
+        struct cvmx_mio_uartx_rfw_s cn30xx;
+        struct cvmx_mio_uartx_rfw_s cn31xx;
+        struct cvmx_mio_uartx_rfw_s cn38xx;
+        struct cvmx_mio_uartx_rfw_s cn38xxp2;
+        struct cvmx_mio_uartx_rfw_s cn50xx;
+        struct cvmx_mio_uartx_rfw_s cn52xx;
+        struct cvmx_mio_uartx_rfw_s cn52xxp1;
+        struct cvmx_mio_uartx_rfw_s cn56xx;
+        struct cvmx_mio_uartx_rfw_s cn56xxp1;
+        struct cvmx_mio_uartx_rfw_s cn58xx;
+        struct cvmx_mio_uartx_rfw_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_sbcr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_sbcr_s {
+                uint64_t reserved_1_63:63;
+                uint64_t sbcr:1;
+        } s;
+        struct cvmx_mio_uartx_sbcr_s cn30xx;
+        struct cvmx_mio_uartx_sbcr_s cn31xx;
+        struct cvmx_mio_uartx_sbcr_s cn38xx;
+        struct cvmx_mio_uartx_sbcr_s cn38xxp2;
+        struct cvmx_mio_uartx_sbcr_s cn50xx;
+        struct cvmx_mio_uartx_sbcr_s cn52xx;
+        struct cvmx_mio_uartx_sbcr_s cn52xxp1;
+        struct cvmx_mio_uartx_sbcr_s cn56xx;
+        struct cvmx_mio_uartx_sbcr_s cn56xxp1;
+        struct cvmx_mio_uartx_sbcr_s cn58xx;
+        struct cvmx_mio_uartx_sbcr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_scr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_scr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t scr:8;
+        } s;
+        struct cvmx_mio_uartx_scr_s cn30xx;
+        struct cvmx_mio_uartx_scr_s cn31xx;
+        struct cvmx_mio_uartx_scr_s cn38xx;
+        struct cvmx_mio_uartx_scr_s cn38xxp2;
+        struct cvmx_mio_uartx_scr_s cn50xx;
+        struct cvmx_mio_uartx_scr_s cn52xx;
+        struct cvmx_mio_uartx_scr_s cn52xxp1;
+        struct cvmx_mio_uartx_scr_s cn56xx;
+        struct cvmx_mio_uartx_scr_s cn56xxp1;
+        struct cvmx_mio_uartx_scr_s cn58xx;
+        struct cvmx_mio_uartx_scr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_sfe {
+        uint64_t u64;
+        struct cvmx_mio_uartx_sfe_s {
+                uint64_t reserved_1_63:63;
+                uint64_t sfe:1;
+        } s;
+        struct cvmx_mio_uartx_sfe_s cn30xx;
+        struct cvmx_mio_uartx_sfe_s cn31xx;
+        struct cvmx_mio_uartx_sfe_s cn38xx;
+        struct cvmx_mio_uartx_sfe_s cn38xxp2;
+        struct cvmx_mio_uartx_sfe_s cn50xx;
+        struct cvmx_mio_uartx_sfe_s cn52xx;
+        struct cvmx_mio_uartx_sfe_s cn52xxp1;
+        struct cvmx_mio_uartx_sfe_s cn56xx;
+        struct cvmx_mio_uartx_sfe_s cn56xxp1;
+        struct cvmx_mio_uartx_sfe_s cn58xx;
+        struct cvmx_mio_uartx_sfe_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_srr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_srr_s {
+                uint64_t reserved_3_63:61;
+                uint64_t stfr:1;
+                uint64_t srfr:1;
+                uint64_t usr:1;
+        } s;
+        struct cvmx_mio_uartx_srr_s cn30xx;
+        struct cvmx_mio_uartx_srr_s cn31xx;
+        struct cvmx_mio_uartx_srr_s cn38xx;
+        struct cvmx_mio_uartx_srr_s cn38xxp2;
+        struct cvmx_mio_uartx_srr_s cn50xx;
+        struct cvmx_mio_uartx_srr_s cn52xx;
+        struct cvmx_mio_uartx_srr_s cn52xxp1;
+        struct cvmx_mio_uartx_srr_s cn56xx;
+        struct cvmx_mio_uartx_srr_s cn56xxp1;
+        struct cvmx_mio_uartx_srr_s cn58xx;
+        struct cvmx_mio_uartx_srr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_srt {
+        uint64_t u64;
+        struct cvmx_mio_uartx_srt_s {
+                uint64_t reserved_2_63:62;
+                uint64_t srt:2;
+        } s;
+        struct cvmx_mio_uartx_srt_s cn30xx;
+        struct cvmx_mio_uartx_srt_s cn31xx;
+        struct cvmx_mio_uartx_srt_s cn38xx;
+        struct cvmx_mio_uartx_srt_s cn38xxp2;
+        struct cvmx_mio_uartx_srt_s cn50xx;
+        struct cvmx_mio_uartx_srt_s cn52xx;
+        struct cvmx_mio_uartx_srt_s cn52xxp1;
+        struct cvmx_mio_uartx_srt_s cn56xx;
+        struct cvmx_mio_uartx_srt_s cn56xxp1;
+        struct cvmx_mio_uartx_srt_s cn58xx;
+        struct cvmx_mio_uartx_srt_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_srts {
+        uint64_t u64;
+        struct cvmx_mio_uartx_srts_s {
+                uint64_t reserved_1_63:63;
+                uint64_t srts:1;
+        } s;
+        struct cvmx_mio_uartx_srts_s cn30xx;
+        struct cvmx_mio_uartx_srts_s cn31xx;
+        struct cvmx_mio_uartx_srts_s cn38xx;
+        struct cvmx_mio_uartx_srts_s cn38xxp2;
+        struct cvmx_mio_uartx_srts_s cn50xx;
+        struct cvmx_mio_uartx_srts_s cn52xx;
+        struct cvmx_mio_uartx_srts_s cn52xxp1;
+        struct cvmx_mio_uartx_srts_s cn56xx;
+        struct cvmx_mio_uartx_srts_s cn56xxp1;
+        struct cvmx_mio_uartx_srts_s cn58xx;
+        struct cvmx_mio_uartx_srts_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_stt {
+        uint64_t u64;
+        struct cvmx_mio_uartx_stt_s {
+                uint64_t reserved_2_63:62;
+                uint64_t stt:2;
+        } s;
+        struct cvmx_mio_uartx_stt_s cn30xx;
+        struct cvmx_mio_uartx_stt_s cn31xx;
+        struct cvmx_mio_uartx_stt_s cn38xx;
+        struct cvmx_mio_uartx_stt_s cn38xxp2;
+        struct cvmx_mio_uartx_stt_s cn50xx;
+        struct cvmx_mio_uartx_stt_s cn52xx;
+        struct cvmx_mio_uartx_stt_s cn52xxp1;
+        struct cvmx_mio_uartx_stt_s cn56xx;
+        struct cvmx_mio_uartx_stt_s cn56xxp1;
+        struct cvmx_mio_uartx_stt_s cn58xx;
+        struct cvmx_mio_uartx_stt_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_tfl {
+        uint64_t u64;
+        struct cvmx_mio_uartx_tfl_s {
+                uint64_t reserved_7_63:57;
+                uint64_t tfl:7;
+        } s;
+        struct cvmx_mio_uartx_tfl_s cn30xx;
+        struct cvmx_mio_uartx_tfl_s cn31xx;
+        struct cvmx_mio_uartx_tfl_s cn38xx;
+        struct cvmx_mio_uartx_tfl_s cn38xxp2;
+        struct cvmx_mio_uartx_tfl_s cn50xx;
+        struct cvmx_mio_uartx_tfl_s cn52xx;
+        struct cvmx_mio_uartx_tfl_s cn52xxp1;
+        struct cvmx_mio_uartx_tfl_s cn56xx;
+        struct cvmx_mio_uartx_tfl_s cn56xxp1;
+        struct cvmx_mio_uartx_tfl_s cn58xx;
+        struct cvmx_mio_uartx_tfl_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_tfr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_tfr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t tfr:8;
+        } s;
+        struct cvmx_mio_uartx_tfr_s cn30xx;
+        struct cvmx_mio_uartx_tfr_s cn31xx;
+        struct cvmx_mio_uartx_tfr_s cn38xx;
+        struct cvmx_mio_uartx_tfr_s cn38xxp2;
+        struct cvmx_mio_uartx_tfr_s cn50xx;
+        struct cvmx_mio_uartx_tfr_s cn52xx;
+        struct cvmx_mio_uartx_tfr_s cn52xxp1;
+        struct cvmx_mio_uartx_tfr_s cn56xx;
+        struct cvmx_mio_uartx_tfr_s cn56xxp1;
+        struct cvmx_mio_uartx_tfr_s cn58xx;
+        struct cvmx_mio_uartx_tfr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_thr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_thr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t thr:8;
+        } s;
+        struct cvmx_mio_uartx_thr_s cn30xx;
+        struct cvmx_mio_uartx_thr_s cn31xx;
+        struct cvmx_mio_uartx_thr_s cn38xx;
+        struct cvmx_mio_uartx_thr_s cn38xxp2;
+        struct cvmx_mio_uartx_thr_s cn50xx;
+        struct cvmx_mio_uartx_thr_s cn52xx;
+        struct cvmx_mio_uartx_thr_s cn52xxp1;
+        struct cvmx_mio_uartx_thr_s cn56xx;
+        struct cvmx_mio_uartx_thr_s cn56xxp1;
+        struct cvmx_mio_uartx_thr_s cn58xx;
+        struct cvmx_mio_uartx_thr_s cn58xxp1;
+};
+
+union cvmx_mio_uartx_usr {
+        uint64_t u64;
+        struct cvmx_mio_uartx_usr_s {
+                uint64_t reserved_5_63:59;
+                uint64_t rff:1;
+                uint64_t rfne:1;
+                uint64_t tfe:1;
+                uint64_t tfnf:1;
+                uint64_t busy:1;
+        } s;
+        struct cvmx_mio_uartx_usr_s cn30xx;
+        struct cvmx_mio_uartx_usr_s cn31xx;
+        struct cvmx_mio_uartx_usr_s cn38xx;
+        struct cvmx_mio_uartx_usr_s cn38xxp2;
+        struct cvmx_mio_uartx_usr_s cn50xx;
+        struct cvmx_mio_uartx_usr_s cn52xx;
+        struct cvmx_mio_uartx_usr_s cn52xxp1;
+        struct cvmx_mio_uartx_usr_s cn56xx;
+        struct cvmx_mio_uartx_usr_s cn56xxp1;
+        struct cvmx_mio_uartx_usr_s cn58xx;
+        struct cvmx_mio_uartx_usr_s cn58xxp1;
+};
+
+union cvmx_mio_uart2_dlh {
+        uint64_t u64;
+        struct cvmx_mio_uart2_dlh_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dlh:8;
+        } s;
+        struct cvmx_mio_uart2_dlh_s cn52xx;
+        struct cvmx_mio_uart2_dlh_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_dll {
+        uint64_t u64;
+        struct cvmx_mio_uart2_dll_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dll:8;
+        } s;
+        struct cvmx_mio_uart2_dll_s cn52xx;
+        struct cvmx_mio_uart2_dll_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_far {
+        uint64_t u64;
+        struct cvmx_mio_uart2_far_s {
+                uint64_t reserved_1_63:63;
+                uint64_t far:1;
+        } s;
+        struct cvmx_mio_uart2_far_s cn52xx;
+        struct cvmx_mio_uart2_far_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_fcr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_fcr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rxtrig:2;
+                uint64_t txtrig:2;
+                uint64_t reserved_3_3:1;
+                uint64_t txfr:1;
+                uint64_t rxfr:1;
+                uint64_t en:1;
+        } s;
+        struct cvmx_mio_uart2_fcr_s cn52xx;
+        struct cvmx_mio_uart2_fcr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_htx {
+        uint64_t u64;
+        struct cvmx_mio_uart2_htx_s {
+                uint64_t reserved_1_63:63;
+                uint64_t htx:1;
+        } s;
+        struct cvmx_mio_uart2_htx_s cn52xx;
+        struct cvmx_mio_uart2_htx_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_ier {
+        uint64_t u64;
+        struct cvmx_mio_uart2_ier_s {
+                uint64_t reserved_8_63:56;
+                uint64_t ptime:1;
+                uint64_t reserved_4_6:3;
+                uint64_t edssi:1;
+                uint64_t elsi:1;
+                uint64_t etbei:1;
+                uint64_t erbfi:1;
+        } s;
+        struct cvmx_mio_uart2_ier_s cn52xx;
+        struct cvmx_mio_uart2_ier_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_iir {
+        uint64_t u64;
+        struct cvmx_mio_uart2_iir_s {
+                uint64_t reserved_8_63:56;
+                uint64_t fen:2;
+                uint64_t reserved_4_5:2;
+                uint64_t iid:4;
+        } s;
+        struct cvmx_mio_uart2_iir_s cn52xx;
+        struct cvmx_mio_uart2_iir_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_lcr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_lcr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dlab:1;
+                uint64_t brk:1;
+                uint64_t reserved_5_5:1;
+                uint64_t eps:1;
+                uint64_t pen:1;
+                uint64_t stop:1;
+                uint64_t cls:2;
+        } s;
+        struct cvmx_mio_uart2_lcr_s cn52xx;
+        struct cvmx_mio_uart2_lcr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_lsr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_lsr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t ferr:1;
+                uint64_t temt:1;
+                uint64_t thre:1;
+                uint64_t bi:1;
+                uint64_t fe:1;
+                uint64_t pe:1;
+                uint64_t oe:1;
+                uint64_t dr:1;
+        } s;
+        struct cvmx_mio_uart2_lsr_s cn52xx;
+        struct cvmx_mio_uart2_lsr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_mcr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_mcr_s {
+                uint64_t reserved_6_63:58;
+                uint64_t afce:1;
+                uint64_t loop:1;
+                uint64_t out2:1;
+                uint64_t out1:1;
+                uint64_t rts:1;
+                uint64_t dtr:1;
+        } s;
+        struct cvmx_mio_uart2_mcr_s cn52xx;
+        struct cvmx_mio_uart2_mcr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_msr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_msr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t dcd:1;
+                uint64_t ri:1;
+                uint64_t dsr:1;
+                uint64_t cts:1;
+                uint64_t ddcd:1;
+                uint64_t teri:1;
+                uint64_t ddsr:1;
+                uint64_t dcts:1;
+        } s;
+        struct cvmx_mio_uart2_msr_s cn52xx;
+        struct cvmx_mio_uart2_msr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_rbr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_rbr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rbr:8;
+        } s;
+        struct cvmx_mio_uart2_rbr_s cn52xx;
+        struct cvmx_mio_uart2_rbr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_rfl {
+        uint64_t u64;
+        struct cvmx_mio_uart2_rfl_s {
+                uint64_t reserved_7_63:57;
+                uint64_t rfl:7;
+        } s;
+        struct cvmx_mio_uart2_rfl_s cn52xx;
+        struct cvmx_mio_uart2_rfl_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_rfw {
+        uint64_t u64;
+        struct cvmx_mio_uart2_rfw_s {
+                uint64_t reserved_10_63:54;
+                uint64_t rffe:1;
+                uint64_t rfpe:1;
+                uint64_t rfwd:8;
+        } s;
+        struct cvmx_mio_uart2_rfw_s cn52xx;
+        struct cvmx_mio_uart2_rfw_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_sbcr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_sbcr_s {
+                uint64_t reserved_1_63:63;
+                uint64_t sbcr:1;
+        } s;
+        struct cvmx_mio_uart2_sbcr_s cn52xx;
+        struct cvmx_mio_uart2_sbcr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_scr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_scr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t scr:8;
+        } s;
+        struct cvmx_mio_uart2_scr_s cn52xx;
+        struct cvmx_mio_uart2_scr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_sfe {
+        uint64_t u64;
+        struct cvmx_mio_uart2_sfe_s {
+                uint64_t reserved_1_63:63;
+                uint64_t sfe:1;
+        } s;
+        struct cvmx_mio_uart2_sfe_s cn52xx;
+        struct cvmx_mio_uart2_sfe_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_srr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_srr_s {
+                uint64_t reserved_3_63:61;
+                uint64_t stfr:1;
+                uint64_t srfr:1;
+                uint64_t usr:1;
+        } s;
+        struct cvmx_mio_uart2_srr_s cn52xx;
+        struct cvmx_mio_uart2_srr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_srt {
+        uint64_t u64;
+        struct cvmx_mio_uart2_srt_s {
+                uint64_t reserved_2_63:62;
+                uint64_t srt:2;
+        } s;
+        struct cvmx_mio_uart2_srt_s cn52xx;
+        struct cvmx_mio_uart2_srt_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_srts {
+        uint64_t u64;
+        struct cvmx_mio_uart2_srts_s {
+                uint64_t reserved_1_63:63;
+                uint64_t srts:1;
+        } s;
+        struct cvmx_mio_uart2_srts_s cn52xx;
+        struct cvmx_mio_uart2_srts_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_stt {
+        uint64_t u64;
+        struct cvmx_mio_uart2_stt_s {
+                uint64_t reserved_2_63:62;
+                uint64_t stt:2;
+        } s;
+        struct cvmx_mio_uart2_stt_s cn52xx;
+        struct cvmx_mio_uart2_stt_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_tfl {
+        uint64_t u64;
+        struct cvmx_mio_uart2_tfl_s {
+                uint64_t reserved_7_63:57;
+                uint64_t tfl:7;
+        } s;
+        struct cvmx_mio_uart2_tfl_s cn52xx;
+        struct cvmx_mio_uart2_tfl_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_tfr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_tfr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t tfr:8;
+        } s;
+        struct cvmx_mio_uart2_tfr_s cn52xx;
+        struct cvmx_mio_uart2_tfr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_thr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_thr_s {
+                uint64_t reserved_8_63:56;
+                uint64_t thr:8;
+        } s;
+        struct cvmx_mio_uart2_thr_s cn52xx;
+        struct cvmx_mio_uart2_thr_s cn52xxp1;
+};
+
+union cvmx_mio_uart2_usr {
+        uint64_t u64;
+        struct cvmx_mio_uart2_usr_s {
+                uint64_t reserved_5_63:59;
+                uint64_t rff:1;
+                uint64_t rfne:1;
+                uint64_t tfe:1;
+                uint64_t tfnf:1;
+                uint64_t busy:1;
+        } s;
+        struct cvmx_mio_uart2_usr_s cn52xx;
+        struct cvmx_mio_uart2_usr_s cn52xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-packet.h b/arch/mips/include/asm/octeon/cvmx-packet.h
new file mode 100644
index 000000000000..38aefa1bab9d
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-packet.h
@@ -0,0 +1,61 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ * Packet buffer defines.
+ */
+
+#ifndef __CVMX_PACKET_H__
+#define __CVMX_PACKET_H__
+
+/**
+ * This structure defines a buffer pointer on Octeon
+ */
+union cvmx_buf_ptr {
+        void *ptr;
+        uint64_t u64;
+        struct {
+                /* if set, invert the "free" pick of the overall
+                 * packet. HW always sets this bit to 0 on inbound
+                 * packet */
+                uint64_t i:1;
+
+                /* Indicates the amount to back up to get to the
+                 * buffer start in cache lines. In most cases this is
+                 * less than one complete cache line, so the value is
+                 * zero */
+                uint64_t back:4;
+                /* The pool that the buffer came from / goes to */
+                uint64_t pool:3;
+                /* The size of the segment pointed to by addr (in bytes) */
+                uint64_t size:16;
+                /* Pointer to the first byte of the data, NOT buffer */
+                uint64_t addr:40;
+        } s;
+};
+
+#endif /*  __CVMX_PACKET_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-pow-defs.h b/arch/mips/include/asm/octeon/cvmx-pow-defs.h
new file mode 100644
index 000000000000..2d82e24be51c
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-pow-defs.h
@@ -0,0 +1,698 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_POW_DEFS_H__
+#define __CVMX_POW_DEFS_H__
+
+#define CVMX_POW_BIST_STAT \
+         CVMX_ADD_IO_SEG(0x00016700000003F8ull)
+#define CVMX_POW_DS_PC \
+         CVMX_ADD_IO_SEG(0x0001670000000398ull)
+#define CVMX_POW_ECC_ERR \
+         CVMX_ADD_IO_SEG(0x0001670000000218ull)
+#define CVMX_POW_INT_CTL \
+         CVMX_ADD_IO_SEG(0x0001670000000220ull)
+#define CVMX_POW_IQ_CNTX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000340ull + (((offset) & 7) * 8))
+#define CVMX_POW_IQ_COM_CNT \
+         CVMX_ADD_IO_SEG(0x0001670000000388ull)
+#define CVMX_POW_IQ_INT \
+         CVMX_ADD_IO_SEG(0x0001670000000238ull)
+#define CVMX_POW_IQ_INT_EN \
+         CVMX_ADD_IO_SEG(0x0001670000000240ull)
+#define CVMX_POW_IQ_THRX(offset) \
+         CVMX_ADD_IO_SEG(0x00016700000003A0ull + (((offset) & 7) * 8))
+#define CVMX_POW_NOS_CNT \
+         CVMX_ADD_IO_SEG(0x0001670000000228ull)
+#define CVMX_POW_NW_TIM \
+         CVMX_ADD_IO_SEG(0x0001670000000210ull)
+#define CVMX_POW_PF_RST_MSK \
+         CVMX_ADD_IO_SEG(0x0001670000000230ull)
+#define CVMX_POW_PP_GRP_MSKX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000000ull + (((offset) & 15) * 8))
+#define CVMX_POW_QOS_RNDX(offset) \
+         CVMX_ADD_IO_SEG(0x00016700000001C0ull + (((offset) & 7) * 8))
+#define CVMX_POW_QOS_THRX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000180ull + (((offset) & 7) * 8))
+#define CVMX_POW_TS_PC \
+         CVMX_ADD_IO_SEG(0x0001670000000390ull)
+#define CVMX_POW_WA_COM_PC \
+         CVMX_ADD_IO_SEG(0x0001670000000380ull)
+#define CVMX_POW_WA_PCX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000300ull + (((offset) & 7) * 8))
+#define CVMX_POW_WQ_INT \
+         CVMX_ADD_IO_SEG(0x0001670000000200ull)
+#define CVMX_POW_WQ_INT_CNTX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000100ull + (((offset) & 15) * 8))
+#define CVMX_POW_WQ_INT_PC \
+         CVMX_ADD_IO_SEG(0x0001670000000208ull)
+#define CVMX_POW_WQ_INT_THRX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000080ull + (((offset) & 15) * 8))
+#define CVMX_POW_WS_PCX(offset) \
+         CVMX_ADD_IO_SEG(0x0001670000000280ull + (((offset) & 15) * 8))
+
+union cvmx_pow_bist_stat {
+        uint64_t u64;
+        struct cvmx_pow_bist_stat_s {
+                uint64_t reserved_32_63:32;
+                uint64_t pp:16;
+                uint64_t reserved_0_15:16;
+        } s;
+        struct cvmx_pow_bist_stat_cn30xx {
+                uint64_t reserved_17_63:47;
+                uint64_t pp:1;
+                uint64_t reserved_9_15:7;
+                uint64_t cam:1;
+                uint64_t nbt1:1;
+                uint64_t nbt0:1;
+                uint64_t index:1;
+                uint64_t fidx:1;
+                uint64_t nbr1:1;
+                uint64_t nbr0:1;
+                uint64_t pend:1;
+                uint64_t adr:1;
+        } cn30xx;
+        struct cvmx_pow_bist_stat_cn31xx {
+                uint64_t reserved_18_63:46;
+                uint64_t pp:2;
+                uint64_t reserved_9_15:7;
+                uint64_t cam:1;
+                uint64_t nbt1:1;
+                uint64_t nbt0:1;
+                uint64_t index:1;
+                uint64_t fidx:1;
+                uint64_t nbr1:1;
+                uint64_t nbr0:1;
+                uint64_t pend:1;
+                uint64_t adr:1;
+        } cn31xx;
+        struct cvmx_pow_bist_stat_cn38xx {
+                uint64_t reserved_32_63:32;
+                uint64_t pp:16;
+                uint64_t reserved_10_15:6;
+                uint64_t cam:1;
+                uint64_t nbt:1;
+                uint64_t index:1;
+                uint64_t fidx:1;
+                uint64_t nbr1:1;
+                uint64_t nbr0:1;
+                uint64_t pend1:1;
+                uint64_t pend0:1;
+                uint64_t adr1:1;
+                uint64_t adr0:1;
+        } cn38xx;
+        struct cvmx_pow_bist_stat_cn38xx cn38xxp2;
+        struct cvmx_pow_bist_stat_cn31xx cn50xx;
+        struct cvmx_pow_bist_stat_cn52xx {
+                uint64_t reserved_20_63:44;
+                uint64_t pp:4;
+                uint64_t reserved_9_15:7;
+                uint64_t cam:1;
+                uint64_t nbt1:1;
+                uint64_t nbt0:1;
+                uint64_t index:1;
+                uint64_t fidx:1;
+                uint64_t nbr1:1;
+                uint64_t nbr0:1;
+                uint64_t pend:1;
+                uint64_t adr:1;
+        } cn52xx;
+        struct cvmx_pow_bist_stat_cn52xx cn52xxp1;
+        struct cvmx_pow_bist_stat_cn56xx {
+                uint64_t reserved_28_63:36;
+                uint64_t pp:12;
+                uint64_t reserved_10_15:6;
+                uint64_t cam:1;
+                uint64_t nbt:1;
+                uint64_t index:1;
+                uint64_t fidx:1;
+                uint64_t nbr1:1;
+                uint64_t nbr0:1;
+                uint64_t pend1:1;
+                uint64_t pend0:1;
+                uint64_t adr1:1;
+                uint64_t adr0:1;
+        } cn56xx;
+        struct cvmx_pow_bist_stat_cn56xx cn56xxp1;
+        struct cvmx_pow_bist_stat_cn38xx cn58xx;
+        struct cvmx_pow_bist_stat_cn38xx cn58xxp1;
+};
+
+union cvmx_pow_ds_pc {
+        uint64_t u64;
+        struct cvmx_pow_ds_pc_s {
+                uint64_t reserved_32_63:32;
+                uint64_t ds_pc:32;
+        } s;
+        struct cvmx_pow_ds_pc_s cn30xx;
+        struct cvmx_pow_ds_pc_s cn31xx;
+        struct cvmx_pow_ds_pc_s cn38xx;
+        struct cvmx_pow_ds_pc_s cn38xxp2;
+        struct cvmx_pow_ds_pc_s cn50xx;
+        struct cvmx_pow_ds_pc_s cn52xx;
+        struct cvmx_pow_ds_pc_s cn52xxp1;
+        struct cvmx_pow_ds_pc_s cn56xx;
+        struct cvmx_pow_ds_pc_s cn56xxp1;
+        struct cvmx_pow_ds_pc_s cn58xx;
+        struct cvmx_pow_ds_pc_s cn58xxp1;
+};
+
+union cvmx_pow_ecc_err {
+        uint64_t u64;
+        struct cvmx_pow_ecc_err_s {
+                uint64_t reserved_45_63:19;
+                uint64_t iop_ie:13;
+                uint64_t reserved_29_31:3;
+                uint64_t iop:13;
+                uint64_t reserved_14_15:2;
+                uint64_t rpe_ie:1;
+                uint64_t rpe:1;
+                uint64_t reserved_9_11:3;
+                uint64_t syn:5;
+                uint64_t dbe_ie:1;
+                uint64_t sbe_ie:1;
+                uint64_t dbe:1;
+                uint64_t sbe:1;
+        } s;
+        struct cvmx_pow_ecc_err_s cn30xx;
+        struct cvmx_pow_ecc_err_cn31xx {
+                uint64_t reserved_14_63:50;
+                uint64_t rpe_ie:1;
+                uint64_t rpe:1;
+                uint64_t reserved_9_11:3;
+                uint64_t syn:5;
+                uint64_t dbe_ie:1;
+                uint64_t sbe_ie:1;
+                uint64_t dbe:1;
+                uint64_t sbe:1;
+        } cn31xx;
+        struct cvmx_pow_ecc_err_s cn38xx;
+        struct cvmx_pow_ecc_err_cn31xx cn38xxp2;
+        struct cvmx_pow_ecc_err_s cn50xx;
+        struct cvmx_pow_ecc_err_s cn52xx;
+        struct cvmx_pow_ecc_err_s cn52xxp1;
+        struct cvmx_pow_ecc_err_s cn56xx;
+        struct cvmx_pow_ecc_err_s cn56xxp1;
+        struct cvmx_pow_ecc_err_s cn58xx;
+        struct cvmx_pow_ecc_err_s cn58xxp1;
+};
+
+union cvmx_pow_int_ctl {
+        uint64_t u64;
+        struct cvmx_pow_int_ctl_s {
+                uint64_t reserved_6_63:58;
+                uint64_t pfr_dis:1;
+                uint64_t nbr_thr:5;
+        } s;
+        struct cvmx_pow_int_ctl_s cn30xx;
+        struct cvmx_pow_int_ctl_s cn31xx;
+        struct cvmx_pow_int_ctl_s cn38xx;
+        struct cvmx_pow_int_ctl_s cn38xxp2;
+        struct cvmx_pow_int_ctl_s cn50xx;
+        struct cvmx_pow_int_ctl_s cn52xx;
+        struct cvmx_pow_int_ctl_s cn52xxp1;
+        struct cvmx_pow_int_ctl_s cn56xx;
+        struct cvmx_pow_int_ctl_s cn56xxp1;
+        struct cvmx_pow_int_ctl_s cn58xx;
+        struct cvmx_pow_int_ctl_s cn58xxp1;
+};
+
+union cvmx_pow_iq_cntx {
+        uint64_t u64;
+        struct cvmx_pow_iq_cntx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t iq_cnt:32;
+        } s;
+        struct cvmx_pow_iq_cntx_s cn30xx;
+        struct cvmx_pow_iq_cntx_s cn31xx;
+        struct cvmx_pow_iq_cntx_s cn38xx;
+        struct cvmx_pow_iq_cntx_s cn38xxp2;
+        struct cvmx_pow_iq_cntx_s cn50xx;
+        struct cvmx_pow_iq_cntx_s cn52xx;
+        struct cvmx_pow_iq_cntx_s cn52xxp1;
+        struct cvmx_pow_iq_cntx_s cn56xx;
+        struct cvmx_pow_iq_cntx_s cn56xxp1;
+        struct cvmx_pow_iq_cntx_s cn58xx;
+        struct cvmx_pow_iq_cntx_s cn58xxp1;
+};
+
+union cvmx_pow_iq_com_cnt {
+        uint64_t u64;
+        struct cvmx_pow_iq_com_cnt_s {
+                uint64_t reserved_32_63:32;
+                uint64_t iq_cnt:32;
+        } s;
+        struct cvmx_pow_iq_com_cnt_s cn30xx;
+        struct cvmx_pow_iq_com_cnt_s cn31xx;
+        struct cvmx_pow_iq_com_cnt_s cn38xx;
+        struct cvmx_pow_iq_com_cnt_s cn38xxp2;
+        struct cvmx_pow_iq_com_cnt_s cn50xx;
+        struct cvmx_pow_iq_com_cnt_s cn52xx;
+        struct cvmx_pow_iq_com_cnt_s cn52xxp1;
+        struct cvmx_pow_iq_com_cnt_s cn56xx;
+        struct cvmx_pow_iq_com_cnt_s cn56xxp1;
+        struct cvmx_pow_iq_com_cnt_s cn58xx;
+        struct cvmx_pow_iq_com_cnt_s cn58xxp1;
+};
+
+union cvmx_pow_iq_int {
+        uint64_t u64;
+        struct cvmx_pow_iq_int_s {
+                uint64_t reserved_8_63:56;
+                uint64_t iq_int:8;
+        } s;
+        struct cvmx_pow_iq_int_s cn52xx;
+        struct cvmx_pow_iq_int_s cn52xxp1;
+        struct cvmx_pow_iq_int_s cn56xx;
+        struct cvmx_pow_iq_int_s cn56xxp1;
+};
+
+union cvmx_pow_iq_int_en {
+        uint64_t u64;
+        struct cvmx_pow_iq_int_en_s {
+                uint64_t reserved_8_63:56;
+                uint64_t int_en:8;
+        } s;
+        struct cvmx_pow_iq_int_en_s cn52xx;
+        struct cvmx_pow_iq_int_en_s cn52xxp1;
+        struct cvmx_pow_iq_int_en_s cn56xx;
+        struct cvmx_pow_iq_int_en_s cn56xxp1;
+};
+
+union cvmx_pow_iq_thrx {
+        uint64_t u64;
+        struct cvmx_pow_iq_thrx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t iq_thr:32;
+        } s;
+        struct cvmx_pow_iq_thrx_s cn52xx;
+        struct cvmx_pow_iq_thrx_s cn52xxp1;
+        struct cvmx_pow_iq_thrx_s cn56xx;
+        struct cvmx_pow_iq_thrx_s cn56xxp1;
+};
+
+union cvmx_pow_nos_cnt {
+        uint64_t u64;
+        struct cvmx_pow_nos_cnt_s {
+                uint64_t reserved_12_63:52;
+                uint64_t nos_cnt:12;
+        } s;
+        struct cvmx_pow_nos_cnt_cn30xx {
+                uint64_t reserved_7_63:57;
+                uint64_t nos_cnt:7;
+        } cn30xx;
+        struct cvmx_pow_nos_cnt_cn31xx {
+                uint64_t reserved_9_63:55;
+                uint64_t nos_cnt:9;
+        } cn31xx;
+        struct cvmx_pow_nos_cnt_s cn38xx;
+        struct cvmx_pow_nos_cnt_s cn38xxp2;
+        struct cvmx_pow_nos_cnt_cn31xx cn50xx;
+        struct cvmx_pow_nos_cnt_cn52xx {
+                uint64_t reserved_10_63:54;
+                uint64_t nos_cnt:10;
+        } cn52xx;
+        struct cvmx_pow_nos_cnt_cn52xx cn52xxp1;
+        struct cvmx_pow_nos_cnt_s cn56xx;
+        struct cvmx_pow_nos_cnt_s cn56xxp1;
+        struct cvmx_pow_nos_cnt_s cn58xx;
+        struct cvmx_pow_nos_cnt_s cn58xxp1;
+};
+
+union cvmx_pow_nw_tim {
+        uint64_t u64;
+        struct cvmx_pow_nw_tim_s {
+                uint64_t reserved_10_63:54;
+                uint64_t nw_tim:10;
+        } s;
+        struct cvmx_pow_nw_tim_s cn30xx;
+        struct cvmx_pow_nw_tim_s cn31xx;
+        struct cvmx_pow_nw_tim_s cn38xx;
+        struct cvmx_pow_nw_tim_s cn38xxp2;
+        struct cvmx_pow_nw_tim_s cn50xx;
+        struct cvmx_pow_nw_tim_s cn52xx;
+        struct cvmx_pow_nw_tim_s cn52xxp1;
+        struct cvmx_pow_nw_tim_s cn56xx;
+        struct cvmx_pow_nw_tim_s cn56xxp1;
+        struct cvmx_pow_nw_tim_s cn58xx;
+        struct cvmx_pow_nw_tim_s cn58xxp1;
+};
+
+union cvmx_pow_pf_rst_msk {
+        uint64_t u64;
+        struct cvmx_pow_pf_rst_msk_s {
+                uint64_t reserved_8_63:56;
+                uint64_t rst_msk:8;
+        } s;
+        struct cvmx_pow_pf_rst_msk_s cn50xx;
+        struct cvmx_pow_pf_rst_msk_s cn52xx;
+        struct cvmx_pow_pf_rst_msk_s cn52xxp1;
+        struct cvmx_pow_pf_rst_msk_s cn56xx;
+        struct cvmx_pow_pf_rst_msk_s cn56xxp1;
+        struct cvmx_pow_pf_rst_msk_s cn58xx;
+        struct cvmx_pow_pf_rst_msk_s cn58xxp1;
+};
+
+union cvmx_pow_pp_grp_mskx {
+        uint64_t u64;
+        struct cvmx_pow_pp_grp_mskx_s {
+                uint64_t reserved_48_63:16;
+                uint64_t qos7_pri:4;
+                uint64_t qos6_pri:4;
+                uint64_t qos5_pri:4;
+                uint64_t qos4_pri:4;
+                uint64_t qos3_pri:4;
+                uint64_t qos2_pri:4;
+                uint64_t qos1_pri:4;
+                uint64_t qos0_pri:4;
+                uint64_t grp_msk:16;
+        } s;
+        struct cvmx_pow_pp_grp_mskx_cn30xx {
+                uint64_t reserved_16_63:48;
+                uint64_t grp_msk:16;
+        } cn30xx;
+        struct cvmx_pow_pp_grp_mskx_cn30xx cn31xx;
+        struct cvmx_pow_pp_grp_mskx_cn30xx cn38xx;
+        struct cvmx_pow_pp_grp_mskx_cn30xx cn38xxp2;
+        struct cvmx_pow_pp_grp_mskx_s cn50xx;
+        struct cvmx_pow_pp_grp_mskx_s cn52xx;
+        struct cvmx_pow_pp_grp_mskx_s cn52xxp1;
+        struct cvmx_pow_pp_grp_mskx_s cn56xx;
+        struct cvmx_pow_pp_grp_mskx_s cn56xxp1;
+        struct cvmx_pow_pp_grp_mskx_s cn58xx;
+        struct cvmx_pow_pp_grp_mskx_s cn58xxp1;
+};
+
+union cvmx_pow_qos_rndx {
+        uint64_t u64;
+        struct cvmx_pow_qos_rndx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t rnd_p3:8;
+                uint64_t rnd_p2:8;
+                uint64_t rnd_p1:8;
+                uint64_t rnd:8;
+        } s;
+        struct cvmx_pow_qos_rndx_s cn30xx;
+        struct cvmx_pow_qos_rndx_s cn31xx;
+        struct cvmx_pow_qos_rndx_s cn38xx;
+        struct cvmx_pow_qos_rndx_s cn38xxp2;
+        struct cvmx_pow_qos_rndx_s cn50xx;
+        struct cvmx_pow_qos_rndx_s cn52xx;
+        struct cvmx_pow_qos_rndx_s cn52xxp1;
+        struct cvmx_pow_qos_rndx_s cn56xx;
+        struct cvmx_pow_qos_rndx_s cn56xxp1;
+        struct cvmx_pow_qos_rndx_s cn58xx;
+        struct cvmx_pow_qos_rndx_s cn58xxp1;
+};
+
+union cvmx_pow_qos_thrx {
+        uint64_t u64;
+        struct cvmx_pow_qos_thrx_s {
+                uint64_t reserved_60_63:4;
+                uint64_t des_cnt:12;
+                uint64_t buf_cnt:12;
+                uint64_t free_cnt:12;
+                uint64_t reserved_23_23:1;
+                uint64_t max_thr:11;
+                uint64_t reserved_11_11:1;
+                uint64_t min_thr:11;
+        } s;
+        struct cvmx_pow_qos_thrx_cn30xx {
+                uint64_t reserved_55_63:9;
+                uint64_t des_cnt:7;
+                uint64_t reserved_43_47:5;
+                uint64_t buf_cnt:7;
+                uint64_t reserved_31_35:5;
+                uint64_t free_cnt:7;
+                uint64_t reserved_18_23:6;
+                uint64_t max_thr:6;
+                uint64_t reserved_6_11:6;
+                uint64_t min_thr:6;
+        } cn30xx;
+        struct cvmx_pow_qos_thrx_cn31xx {
+                uint64_t reserved_57_63:7;
+                uint64_t des_cnt:9;
+                uint64_t reserved_45_47:3;
+                uint64_t buf_cnt:9;
+                uint64_t reserved_33_35:3;
+                uint64_t free_cnt:9;
+                uint64_t reserved_20_23:4;
+                uint64_t max_thr:8;
+                uint64_t reserved_8_11:4;
+                uint64_t min_thr:8;
+        } cn31xx;
+        struct cvmx_pow_qos_thrx_s cn38xx;
+        struct cvmx_pow_qos_thrx_s cn38xxp2;
+        struct cvmx_pow_qos_thrx_cn31xx cn50xx;
+        struct cvmx_pow_qos_thrx_cn52xx {
+                uint64_t reserved_58_63:6;
+                uint64_t des_cnt:10;
+                uint64_t reserved_46_47:2;
+                uint64_t buf_cnt:10;
+                uint64_t reserved_34_35:2;
+                uint64_t free_cnt:10;
+                uint64_t reserved_21_23:3;
+                uint64_t max_thr:9;
+                uint64_t reserved_9_11:3;
+                uint64_t min_thr:9;
+        } cn52xx;
+        struct cvmx_pow_qos_thrx_cn52xx cn52xxp1;
+        struct cvmx_pow_qos_thrx_s cn56xx;
+        struct cvmx_pow_qos_thrx_s cn56xxp1;
+        struct cvmx_pow_qos_thrx_s cn58xx;
+        struct cvmx_pow_qos_thrx_s cn58xxp1;
+};
+
+union cvmx_pow_ts_pc {
+        uint64_t u64;
+        struct cvmx_pow_ts_pc_s {
+                uint64_t reserved_32_63:32;
+                uint64_t ts_pc:32;
+        } s;
+        struct cvmx_pow_ts_pc_s cn30xx;
+        struct cvmx_pow_ts_pc_s cn31xx;
+        struct cvmx_pow_ts_pc_s cn38xx;
+        struct cvmx_pow_ts_pc_s cn38xxp2;
+        struct cvmx_pow_ts_pc_s cn50xx;
+        struct cvmx_pow_ts_pc_s cn52xx;
+        struct cvmx_pow_ts_pc_s cn52xxp1;
+        struct cvmx_pow_ts_pc_s cn56xx;
+        struct cvmx_pow_ts_pc_s cn56xxp1;
+        struct cvmx_pow_ts_pc_s cn58xx;
+        struct cvmx_pow_ts_pc_s cn58xxp1;
+};
+
+union cvmx_pow_wa_com_pc {
+        uint64_t u64;
+        struct cvmx_pow_wa_com_pc_s {
+                uint64_t reserved_32_63:32;
+                uint64_t wa_pc:32;
+        } s;
+        struct cvmx_pow_wa_com_pc_s cn30xx;
+        struct cvmx_pow_wa_com_pc_s cn31xx;
+        struct cvmx_pow_wa_com_pc_s cn38xx;
+        struct cvmx_pow_wa_com_pc_s cn38xxp2;
+        struct cvmx_pow_wa_com_pc_s cn50xx;
+        struct cvmx_pow_wa_com_pc_s cn52xx;
+        struct cvmx_pow_wa_com_pc_s cn52xxp1;
+        struct cvmx_pow_wa_com_pc_s cn56xx;
+        struct cvmx_pow_wa_com_pc_s cn56xxp1;
+        struct cvmx_pow_wa_com_pc_s cn58xx;
+        struct cvmx_pow_wa_com_pc_s cn58xxp1;
+};
+
+union cvmx_pow_wa_pcx {
+        uint64_t u64;
+        struct cvmx_pow_wa_pcx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t wa_pc:32;
+        } s;
+        struct cvmx_pow_wa_pcx_s cn30xx;
+        struct cvmx_pow_wa_pcx_s cn31xx;
+        struct cvmx_pow_wa_pcx_s cn38xx;
+        struct cvmx_pow_wa_pcx_s cn38xxp2;
+        struct cvmx_pow_wa_pcx_s cn50xx;
+        struct cvmx_pow_wa_pcx_s cn52xx;
+        struct cvmx_pow_wa_pcx_s cn52xxp1;
+        struct cvmx_pow_wa_pcx_s cn56xx;
+        struct cvmx_pow_wa_pcx_s cn56xxp1;
+        struct cvmx_pow_wa_pcx_s cn58xx;
+        struct cvmx_pow_wa_pcx_s cn58xxp1;
+};
+
+union cvmx_pow_wq_int {
+        uint64_t u64;
+        struct cvmx_pow_wq_int_s {
+                uint64_t reserved_32_63:32;
+                uint64_t iq_dis:16;
+                uint64_t wq_int:16;
+        } s;
+        struct cvmx_pow_wq_int_s cn30xx;
+        struct cvmx_pow_wq_int_s cn31xx;
+        struct cvmx_pow_wq_int_s cn38xx;
+        struct cvmx_pow_wq_int_s cn38xxp2;
+        struct cvmx_pow_wq_int_s cn50xx;
+        struct cvmx_pow_wq_int_s cn52xx;
+        struct cvmx_pow_wq_int_s cn52xxp1;
+        struct cvmx_pow_wq_int_s cn56xx;
+        struct cvmx_pow_wq_int_s cn56xxp1;
+        struct cvmx_pow_wq_int_s cn58xx;
+        struct cvmx_pow_wq_int_s cn58xxp1;
+};
+
+union cvmx_pow_wq_int_cntx {
+        uint64_t u64;
+        struct cvmx_pow_wq_int_cntx_s {
+                uint64_t reserved_28_63:36;
+                uint64_t tc_cnt:4;
+                uint64_t ds_cnt:12;
+                uint64_t iq_cnt:12;
+        } s;
+        struct cvmx_pow_wq_int_cntx_cn30xx {
+                uint64_t reserved_28_63:36;
+                uint64_t tc_cnt:4;
+                uint64_t reserved_19_23:5;
+                uint64_t ds_cnt:7;
+                uint64_t reserved_7_11:5;
+                uint64_t iq_cnt:7;
+        } cn30xx;
+        struct cvmx_pow_wq_int_cntx_cn31xx {
+                uint64_t reserved_28_63:36;
+                uint64_t tc_cnt:4;
+                uint64_t reserved_21_23:3;
+                uint64_t ds_cnt:9;
+                uint64_t reserved_9_11:3;
+                uint64_t iq_cnt:9;
+        } cn31xx;
+        struct cvmx_pow_wq_int_cntx_s cn38xx;
+        struct cvmx_pow_wq_int_cntx_s cn38xxp2;
+        struct cvmx_pow_wq_int_cntx_cn31xx cn50xx;
+        struct cvmx_pow_wq_int_cntx_cn52xx {
+                uint64_t reserved_28_63:36;
+                uint64_t tc_cnt:4;
+                uint64_t reserved_22_23:2;
+                uint64_t ds_cnt:10;
+                uint64_t reserved_10_11:2;
+                uint64_t iq_cnt:10;
+        } cn52xx;
+        struct cvmx_pow_wq_int_cntx_cn52xx cn52xxp1;
+        struct cvmx_pow_wq_int_cntx_s cn56xx;
+        struct cvmx_pow_wq_int_cntx_s cn56xxp1;
+        struct cvmx_pow_wq_int_cntx_s cn58xx;
+        struct cvmx_pow_wq_int_cntx_s cn58xxp1;
+};
+
+union cvmx_pow_wq_int_pc {
+        uint64_t u64;
+        struct cvmx_pow_wq_int_pc_s {
+                uint64_t reserved_60_63:4;
+                uint64_t pc:28;
+                uint64_t reserved_28_31:4;
+                uint64_t pc_thr:20;
+                uint64_t reserved_0_7:8;
+        } s;
+        struct cvmx_pow_wq_int_pc_s cn30xx;
+        struct cvmx_pow_wq_int_pc_s cn31xx;
+        struct cvmx_pow_wq_int_pc_s cn38xx;
+        struct cvmx_pow_wq_int_pc_s cn38xxp2;
+        struct cvmx_pow_wq_int_pc_s cn50xx;
+        struct cvmx_pow_wq_int_pc_s cn52xx;
+        struct cvmx_pow_wq_int_pc_s cn52xxp1;
+        struct cvmx_pow_wq_int_pc_s cn56xx;
+        struct cvmx_pow_wq_int_pc_s cn56xxp1;
+        struct cvmx_pow_wq_int_pc_s cn58xx;
+        struct cvmx_pow_wq_int_pc_s cn58xxp1;
+};
+
+union cvmx_pow_wq_int_thrx {
+        uint64_t u64;
+        struct cvmx_pow_wq_int_thrx_s {
+                uint64_t reserved_29_63:35;
+                uint64_t tc_en:1;
+                uint64_t tc_thr:4;
+                uint64_t reserved_23_23:1;
+                uint64_t ds_thr:11;
+                uint64_t reserved_11_11:1;
+                uint64_t iq_thr:11;
+        } s;
+        struct cvmx_pow_wq_int_thrx_cn30xx {
+                uint64_t reserved_29_63:35;
+                uint64_t tc_en:1;
+                uint64_t tc_thr:4;
+                uint64_t reserved_18_23:6;
+                uint64_t ds_thr:6;
+                uint64_t reserved_6_11:6;
+                uint64_t iq_thr:6;
+        } cn30xx;
+        struct cvmx_pow_wq_int_thrx_cn31xx {
+                uint64_t reserved_29_63:35;
+                uint64_t tc_en:1;
+                uint64_t tc_thr:4;
+                uint64_t reserved_20_23:4;
+                uint64_t ds_thr:8;
+                uint64_t reserved_8_11:4;
+                uint64_t iq_thr:8;
+        } cn31xx;
+        struct cvmx_pow_wq_int_thrx_s cn38xx;
+        struct cvmx_pow_wq_int_thrx_s cn38xxp2;
+        struct cvmx_pow_wq_int_thrx_cn31xx cn50xx;
+        struct cvmx_pow_wq_int_thrx_cn52xx {
+                uint64_t reserved_29_63:35;
+                uint64_t tc_en:1;
+                uint64_t tc_thr:4;
+                uint64_t reserved_21_23:3;
+                uint64_t ds_thr:9;
+                uint64_t reserved_9_11:3;
+                uint64_t iq_thr:9;
+        } cn52xx;
+        struct cvmx_pow_wq_int_thrx_cn52xx cn52xxp1;
+        struct cvmx_pow_wq_int_thrx_s cn56xx;
+        struct cvmx_pow_wq_int_thrx_s cn56xxp1;
+        struct cvmx_pow_wq_int_thrx_s cn58xx;
+        struct cvmx_pow_wq_int_thrx_s cn58xxp1;
+};
+
+union cvmx_pow_ws_pcx {
+        uint64_t u64;
+        struct cvmx_pow_ws_pcx_s {
+                uint64_t reserved_32_63:32;
+                uint64_t ws_pc:32;
+        } s;
+        struct cvmx_pow_ws_pcx_s cn30xx;
+        struct cvmx_pow_ws_pcx_s cn31xx;
+        struct cvmx_pow_ws_pcx_s cn38xx;
+        struct cvmx_pow_ws_pcx_s cn38xxp2;
+        struct cvmx_pow_ws_pcx_s cn50xx;
+        struct cvmx_pow_ws_pcx_s cn52xx;
+        struct cvmx_pow_ws_pcx_s cn52xxp1;
+        struct cvmx_pow_ws_pcx_s cn56xx;
+        struct cvmx_pow_ws_pcx_s cn56xxp1;
+        struct cvmx_pow_ws_pcx_s cn58xx;
+        struct cvmx_pow_ws_pcx_s cn58xxp1;
+};
+
+#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-spinlock.h b/arch/mips/include/asm/octeon/cvmx-spinlock.h
new file mode 100644
index 000000000000..2fbf0871df11
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-spinlock.h
@@ -0,0 +1,232 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/**
+ * Implementation of spinlocks for Octeon CVMX.  Although similar in
+ * function to Linux kernel spinlocks, they are not compatible.
+ * Octeon CVMX spinlocks are only used to synchronize with the boot
+ * monitor and other non-Linux programs running in the system.
+ */
+
+#ifndef __CVMX_SPINLOCK_H__
+#define __CVMX_SPINLOCK_H__
+
+#include "cvmx-asm.h"
+
+/* Spinlocks for Octeon */
+
+/* define these to enable recursive spinlock debugging */
+/*#define CVMX_SPINLOCK_DEBUG */
+
+/**
+ * Spinlocks for Octeon CVMX
+ */
+typedef struct {
+        volatile uint32_t value;
+} cvmx_spinlock_t;
+
+/* note - macros not expanded in inline ASM, so values hardcoded */
+#define  CVMX_SPINLOCK_UNLOCKED_VAL  0
+#define  CVMX_SPINLOCK_LOCKED_VAL    1
+
+#define CVMX_SPINLOCK_UNLOCKED_INITIALIZER  {CVMX_SPINLOCK_UNLOCKED_VAL}
+
+/**
+ * Initialize a spinlock
+ *
+ * @lock:   Lock to initialize
+ */
+static inline void cvmx_spinlock_init(cvmx_spinlock_t *lock)
+{
+        lock->value = CVMX_SPINLOCK_UNLOCKED_VAL;
+}
+
+/**
+ * Return non-zero if the spinlock is currently locked
+ *
+ * @lock:   Lock to check
+ * Returns Non-zero if locked
+ */
+static inline int cvmx_spinlock_locked(cvmx_spinlock_t *lock)
+{
+        return lock->value != CVMX_SPINLOCK_UNLOCKED_VAL;
+}
+
+/**
+ * Releases lock
+ *
+ * @lock:   pointer to lock structure
+ */
+static inline void cvmx_spinlock_unlock(cvmx_spinlock_t *lock)
+{
+        CVMX_SYNCWS;
+        lock->value = 0;
+        CVMX_SYNCWS;
+}
+
+/**
+ * Attempts to take the lock, but does not spin if lock is not available.
+ * May take some time to acquire the lock even if it is available
+ * due to the ll/sc not succeeding.
+ *
+ * @lock:   pointer to lock structure
+ *
+ * Returns 0: lock successfully taken
+ *         1: lock not taken, held by someone else
+ * These return values match the Linux semantics.
+ */
+
+static inline unsigned int cvmx_spinlock_trylock(cvmx_spinlock_t *lock)
+{
+        unsigned int tmp;
+
+        __asm__ __volatile__(".set noreorder         \n"
+                             "1: ll   %[tmp], %[val] \n"
+                        /* if lock held, fail immediately */
+                             "   bnez %[tmp], 2f     \n"
+                             "   li   %[tmp], 1      \n"
+                             "   sc   %[tmp], %[val] \n"
+                             "   beqz %[tmp], 1b     \n"
+                             "   li   %[tmp], 0      \n"
+                             "2:                     \n"
+                             ".set reorder           \n" :
+                        [val] "+m"(lock->value), [tmp] "=&r"(tmp)
+                             : : "memory");
+
+        return tmp != 0;                /* normalize to 0 or 1 */
+}
+
+/**
+ * Gets lock, spins until lock is taken
+ *
+ * @lock:   pointer to lock structure
+ */
+static inline void cvmx_spinlock_lock(cvmx_spinlock_t *lock)
+{
+        unsigned int tmp;
+
+        __asm__ __volatile__(".set noreorder         \n"
+                             "1: ll   %[tmp], %[val]  \n"
+                             "   bnez %[tmp], 1b     \n"
+                             "   li   %[tmp], 1      \n"
+                             "   sc   %[tmp], %[val] \n"
+                             "   beqz %[tmp], 1b     \n"
+                             "   nop                \n"
+                             ".set reorder           \n" :
+                        [val] "+m"(lock->value), [tmp] "=&r"(tmp)
+                        : : "memory");
+
+}
+
+/** ********************************************************************
+ * Bit spinlocks
+ * These spinlocks use a single bit (bit 31) of a 32 bit word for locking.
+ * The rest of the bits in the word are left undisturbed.  This enables more
+ * compact data structures as only 1 bit is consumed for the lock.
+ *
+ */
+
+/**
+ * Gets lock, spins until lock is taken
+ * Preserves the low 31 bits of the 32 bit
+ * word used for the lock.
+ *
+ *
+ * @word:  word to lock bit 31 of
+ */
+static inline void cvmx_spinlock_bit_lock(uint32_t *word)
+{
+        unsigned int tmp;
+        unsigned int sav;
+
+        __asm__ __volatile__(".set noreorder         \n"
+                             ".set noat              \n"
+                             "1: ll    %[tmp], %[val]  \n"
+                             "   bbit1 %[tmp], 31, 1b    \n"
+                             "   li    $at, 1      \n"
+                             "   ins   %[tmp], $at, 31, 1  \n"
+                             "   sc    %[tmp], %[val] \n"
+                             "   beqz  %[tmp], 1b     \n"
+                             "   nop                \n"
+                             ".set at              \n"
+                             ".set reorder           \n" :
+                        [val] "+m"(*word), [tmp] "=&r"(tmp), [sav] "=&r"(sav)
+                             : : "memory");
+
+}
+
+/**
+ * Attempts to get lock, returns immediately with success/failure
+ * Preserves the low 31 bits of the 32 bit
+ * word used for the lock.
+ *
+ *
+ * @word:  word to lock bit 31 of
+ * Returns 0: lock successfully taken
+ *         1: lock not taken, held by someone else
+ * These return values match the Linux semantics.
+ */
+static inline unsigned int cvmx_spinlock_bit_trylock(uint32_t *word)
+{
+        unsigned int tmp;
+
+        __asm__ __volatile__(".set noreorder\n\t"
+                             ".set noat\n"
+                             "1: ll    %[tmp], %[val] \n"
+                        /* if lock held, fail immediately */
+                             "   bbit1 %[tmp], 31, 2f     \n"
+                             "   li    $at, 1      \n"
+                             "   ins   %[tmp], $at, 31, 1  \n"
+                             "   sc    %[tmp], %[val] \n"
+                             "   beqz  %[tmp], 1b     \n"
+                             "   li    %[tmp], 0      \n"
+                             "2:                     \n"
+                             ".set at              \n"
+                             ".set reorder           \n" :
+                        [val] "+m"(*word), [tmp] "=&r"(tmp)
+                        : : "memory");
+
+        return tmp != 0;                /* normalize to 0 or 1 */
+}
+
+/**
+ * Releases bit lock
+ *
+ * Unconditionally clears bit 31 of the lock word.  Note that this is
+ * done non-atomically, as this implementation assumes that the rest
+ * of the bits in the word are protected by the lock.
+ *
+ * @word:  word to unlock bit 31 in
+ */
+static inline void cvmx_spinlock_bit_unlock(uint32_t *word)
+{
+        CVMX_SYNCWS;
+        *word &= ~(1UL << 31);
+        CVMX_SYNCWS;
+}
+
+#endif /* __CVMX_SPINLOCK_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx-sysinfo.h b/arch/mips/include/asm/octeon/cvmx-sysinfo.h
new file mode 100644
index 000000000000..61dd5741afe4
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx-sysinfo.h
@@ -0,0 +1,152 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ * This module provides system/board information obtained by the bootloader.
+ */
+
+#ifndef __CVMX_SYSINFO_H__
+#define __CVMX_SYSINFO_H__
+
+#define OCTEON_SERIAL_LEN 20
+/**
+ * Structure describing application specific information.
+ * __cvmx_app_init() populates this from the cvmx boot descriptor.
+ * This structure is private to simple executive applications, so
+ * no versioning is required.
+ *
+ * This structure must be provided with some fields set in order to
+ * use simple executive functions in other applications (Linux kernel,
+ * u-boot, etc.)  The cvmx_sysinfo_minimal_initialize() function is
+ * provided to set the required values in these cases.
+ */
+struct cvmx_sysinfo {
+        /* System wide variables */
+        /* installed DRAM in system, in bytes */
+        uint64_t system_dram_size;
+
+        /* ptr to memory descriptor block */
+        void *phy_mem_desc_ptr;
+
+
+        /* Application image specific variables */
+        /* stack top address (virtual) */
+        uint64_t stack_top;
+        /* heap base address (virtual) */
+        uint64_t heap_base;
+        /* stack size in bytes */
+        uint32_t stack_size;
+        /* heap size in bytes */
+        uint32_t heap_size;
+        /* coremask defining cores running application */
+        uint32_t core_mask;
+        /* Deprecated, use cvmx_coremask_first_core() to select init core */
+        uint32_t init_core;
+
+        /* exception base address, as set by bootloader */
+        uint64_t exception_base_addr;
+
+        /* cpu clock speed in hz */
+        uint32_t cpu_clock_hz;
+
+        /* dram data rate in hz (data rate = 2 * clock rate */
+        uint32_t dram_data_rate_hz;
+
+
+        uint16_t board_type;
+        uint8_t board_rev_major;
+        uint8_t board_rev_minor;
+        uint8_t mac_addr_base[6];
+        uint8_t mac_addr_count;
+        char board_serial_number[OCTEON_SERIAL_LEN];
+        /*
+         * Several boards support compact flash on the Octeon boot
+         * bus.  The CF memory spaces may be mapped to different
+         * addresses on different boards.  These values will be 0 if
+         * CF is not present.  Note that these addresses are physical
+         * addresses, and it is up to the application to use the
+         * proper addressing mode (XKPHYS, KSEG0, etc.)
+         */
+        uint64_t compact_flash_common_base_addr;
+        uint64_t compact_flash_attribute_base_addr;
+        /*
+         * Base address of the LED display (as on EBT3000 board) This
+         * will be 0 if LED display not present.  Note that this
+         * address is a physical address, and it is up to the
+         * application to use the proper addressing mode (XKPHYS,
+         * KSEG0, etc.)
+         */
+        uint64_t led_display_base_addr;
+        /* DFA reference clock in hz (if applicable)*/
+        uint32_t dfa_ref_clock_hz;
+        /* configuration flags from bootloader */
+        uint32_t bootloader_config_flags;
+
+        /* Uart number used for console */
+        uint8_t console_uart_num;
+};
+
+/**
+ * This function returns the system/board information as obtained
+ * by the bootloader.
+ *
+ *
+ * Returns  Pointer to the boot information structure
+ *
+ */
+
+extern struct cvmx_sysinfo *cvmx_sysinfo_get(void);
+
+/**
+ * This function is used in non-simple executive environments (such as
+ * Linux kernel, u-boot, etc.)  to configure the minimal fields that
+ * are required to use simple executive files directly.
+ *
+ * Locking (if required) must be handled outside of this
+ * function
+ *
+ * @phy_mem_desc_ptr: Pointer to global physical memory descriptor
+ *                   (bootmem descriptor) @board_type: Octeon board
+ *                   type enumeration
+ *
+ * @board_rev_major:
+ *                   Board major revision
+ * @board_rev_minor:
+ *                   Board minor revision
+ * @cpu_clock_hz:
+ *                   CPU clock freqency in hertz
+ *
+ * Returns 0: Failure
+ *         1: success
+ */
+extern int cvmx_sysinfo_minimal_initialize(void *phy_mem_desc_ptr,
+                                           uint16_t board_type,
+                                           uint8_t board_rev_major,
+                                           uint8_t board_rev_minor,
+                                           uint32_t cpu_clock_hz);
+
+#endif /* __CVMX_SYSINFO_H__ */
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
new file mode 100644
index 000000000000..03fddfa3e928
--- /dev/null
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -0,0 +1,505 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+#ifndef __CVMX_H__
+#define __CVMX_H__
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+#include "cvmx-asm.h"
+#include "cvmx-packet.h"
+#include "cvmx-sysinfo.h"
+
+#include "cvmx-ciu-defs.h"
+#include "cvmx-gpio-defs.h"
+#include "cvmx-iob-defs.h"
+#include "cvmx-ipd-defs.h"
+#include "cvmx-l2c-defs.h"
+#include "cvmx-l2d-defs.h"
+#include "cvmx-l2t-defs.h"
+#include "cvmx-led-defs.h"
+#include "cvmx-mio-defs.h"
+#include "cvmx-pow-defs.h"
+
+#include "cvmx-bootinfo.h"
+#include "cvmx-bootmem.h"
+#include "cvmx-l2c.h"
+
+#ifndef CVMX_ENABLE_DEBUG_PRINTS
+#define CVMX_ENABLE_DEBUG_PRINTS 1
+#endif
+
+#if CVMX_ENABLE_DEBUG_PRINTS
+#define cvmx_dprintf        printk
+#else
+#define cvmx_dprintf(...)   {}
+#endif
+
+#define CVMX_MAX_CORES          (16)
+#define CVMX_CACHE_LINE_SIZE    (128)   /* In bytes */
+#define CVMX_CACHE_LINE_MASK    (CVMX_CACHE_LINE_SIZE - 1)      /* In bytes */
+#define CVMX_CACHE_LINE_ALIGNED __attribute__ ((aligned(CVMX_CACHE_LINE_SIZE)))
+#define CAST64(v) ((long long)(long)(v))
+#define CASTPTR(type, v) ((type *)(long)(v))
+
+/*
+ * Returns processor ID, different Linux and simple exec versions
+ * provided in the cvmx-app-init*.c files.
+ */
+static inline uint32_t cvmx_get_proc_id(void) __attribute__ ((pure));
+static inline uint32_t cvmx_get_proc_id(void)
+{
+        uint32_t id;
+        asm("mfc0 %0, $15,0" : "=r"(id));
+        return id;
+}
+
+/* turn the variable name into a string */
+#define CVMX_TMP_STR(x) CVMX_TMP_STR2(x)
+#define CVMX_TMP_STR2(x) #x
+
+/**
+ * Builds a bit mask given the required size in bits.
+ *
+ * @bits:   Number of bits in the mask
+ * Returns The mask
+ */ static inline uint64_t cvmx_build_mask(uint64_t bits)
+{
+        return ~((~0x0ull) << bits);
+}
+
+/**
+ * Builds a memory address for I/O based on the Major and Sub DID.
+ *
+ * @major_did: 5 bit major did
+ * @sub_did:   3 bit sub did
+ * Returns I/O base address
+ */
+static inline uint64_t cvmx_build_io_address(uint64_t major_did,
+                                             uint64_t sub_did)
+{
+        return (0x1ull << 48) | (major_did << 43) | (sub_did << 40);
+}
+
+/**
+ * Perform mask and shift to place the supplied value into
+ * the supplied bit rage.
+ *
+ * Example: cvmx_build_bits(39,24,value)
+ * <pre>
+ * 6       5       4       3       3       2       1
+ * 3       5       7       9       1       3       5       7      0
+ * +-------+-------+-------+-------+-------+-------+-------+------+
+ * 000000000000000000000000___________value000000000000000000000000
+ * </pre>
+ *
+ * @high_bit: Highest bit value can occupy (inclusive) 0-63
+ * @low_bit:  Lowest bit value can occupy inclusive 0-high_bit
+ * @value:    Value to use
+ * Returns Value masked and shifted
+ */
+static inline uint64_t cvmx_build_bits(uint64_t high_bit,
+                                       uint64_t low_bit, uint64_t value)
+{
+        return (value & cvmx_build_mask(high_bit - low_bit + 1)) << low_bit;
+}
+
+enum cvmx_mips_space {
+        CVMX_MIPS_SPACE_XKSEG = 3LL,
+        CVMX_MIPS_SPACE_XKPHYS = 2LL,
+        CVMX_MIPS_SPACE_XSSEG = 1LL,
+        CVMX_MIPS_SPACE_XUSEG = 0LL
+};
+
+/* These macros for use when using 32 bit pointers. */
+#define CVMX_MIPS32_SPACE_KSEG0 1l
+#define CVMX_ADD_SEG32(segment, add) \
+        (((int32_t)segment << 31) | (int32_t)(add))
+
+#define CVMX_IO_SEG CVMX_MIPS_SPACE_XKPHYS
+
+/* These macros simplify the process of creating common IO addresses */
+#define CVMX_ADD_SEG(segment, add) \
+        ((((uint64_t)segment) << 62) | (add))
+#ifndef CVMX_ADD_IO_SEG
+#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))
+#endif
+
+/**
+ * Convert a memory pointer (void*) into a hardware compatable
+ * memory address (uint64_t). Octeon hardware widgets don't
+ * understand logical addresses.
+ *
+ * @ptr:    C style memory pointer
+ * Returns Hardware physical address
+ */
+static inline uint64_t cvmx_ptr_to_phys(void *ptr)
+{
+        if (sizeof(void *) == 8) {
+                /*
+                 * We're running in 64 bit mode. Normally this means
+                 * that we can use 40 bits of address space (the
+                 * hardware limit). Unfortunately there is one case
+                 * were we need to limit this to 30 bits, sign
+                 * extended 32 bit. Although these are 64 bits wide,
+                 * only 30 bits can be used.
+                 */
+                if ((CAST64(ptr) >> 62) == 3)
+                        return CAST64(ptr) & cvmx_build_mask(30);
+                else
+                        return CAST64(ptr) & cvmx_build_mask(40);
+        } else {
+                return (long)(ptr) & 0x1fffffff;
+        }
+}
+
+/**
+ * Convert a hardware physical address (uint64_t) into a
+ * memory pointer (void *).
+ *
+ * @physical_address:
+ *               Hardware physical address to memory
+ * Returns Pointer to memory
+ */
+static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
+{
+        if (sizeof(void *) == 8) {
+                /* Just set the top bit, avoiding any TLB uglyness */
+                return CASTPTR(void,
+                               CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,
+                                            physical_address));
+        } else {
+                return CASTPTR(void,
+                               CVMX_ADD_SEG32(CVMX_MIPS32_SPACE_KSEG0,
+                                              physical_address));
+        }
+}
+
+/* The following #if controls the definition of the macro
+    CVMX_BUILD_WRITE64. This macro is used to build a store operation to
+    a full 64bit address. With a 64bit ABI, this can be done with a simple
+    pointer access. 32bit ABIs require more complicated assembly */
+
+/* We have a full 64bit ABI. Writing to a 64bit address can be done with
+    a simple volatile pointer */
+#define CVMX_BUILD_WRITE64(TYPE, ST)                                    \
+static inline void cvmx_write64_##TYPE(uint64_t addr, TYPE##_t val)     \
+{                                                                       \
+    *CASTPTR(volatile TYPE##_t, addr) = val;                            \
+}
+
+
+/* The following #if controls the definition of the macro
+    CVMX_BUILD_READ64. This macro is used to build a load operation from
+    a full 64bit address. With a 64bit ABI, this can be done with a simple
+    pointer access. 32bit ABIs require more complicated assembly */
+
+/* We have a full 64bit ABI. Writing to a 64bit address can be done with
+    a simple volatile pointer */
+#define CVMX_BUILD_READ64(TYPE, LT)                                     \
+static inline TYPE##_t cvmx_read64_##TYPE(uint64_t addr)                \
+{                                                                       \
+        return *CASTPTR(volatile TYPE##_t, addr);                       \
+}
+
+
+/* The following defines 8 functions for writing to a 64bit address. Each
+    takes two arguments, the address and the value to write.
+    cvmx_write64_int64      cvmx_write64_uint64
+    cvmx_write64_int32      cvmx_write64_uint32
+    cvmx_write64_int16      cvmx_write64_uint16
+    cvmx_write64_int8       cvmx_write64_uint8 */
+CVMX_BUILD_WRITE64(int64, "sd");
+CVMX_BUILD_WRITE64(int32, "sw");
+CVMX_BUILD_WRITE64(int16, "sh");
+CVMX_BUILD_WRITE64(int8, "sb");
+CVMX_BUILD_WRITE64(uint64, "sd");
+CVMX_BUILD_WRITE64(uint32, "sw");
+CVMX_BUILD_WRITE64(uint16, "sh");
+CVMX_BUILD_WRITE64(uint8, "sb");
+#define cvmx_write64 cvmx_write64_uint64
+
+/* The following defines 8 functions for reading from a 64bit address. Each
+    takes the address as the only argument
+    cvmx_read64_int64       cvmx_read64_uint64
+    cvmx_read64_int32       cvmx_read64_uint32
+    cvmx_read64_int16       cvmx_read64_uint16
+    cvmx_read64_int8        cvmx_read64_uint8 */
+CVMX_BUILD_READ64(int64, "ld");
+CVMX_BUILD_READ64(int32, "lw");
+CVMX_BUILD_READ64(int16, "lh");
+CVMX_BUILD_READ64(int8, "lb");
+CVMX_BUILD_READ64(uint64, "ld");
+CVMX_BUILD_READ64(uint32, "lw");
+CVMX_BUILD_READ64(uint16, "lhu");
+CVMX_BUILD_READ64(uint8, "lbu");
+#define cvmx_read64 cvmx_read64_uint64
+
+
+static inline void cvmx_write_csr(uint64_t csr_addr, uint64_t val)
+{
+        cvmx_write64(csr_addr, val);
+
+        /*
+         * Perform an immediate read after every write to an RSL
+         * register to force the write to complete. It doesn't matter
+         * what RSL read we do, so we choose CVMX_MIO_BOOT_BIST_STAT
+         * because it is fast and harmless.
+         */
+        if ((csr_addr >> 40) == (0x800118))
+                cvmx_read64(CVMX_MIO_BOOT_BIST_STAT);
+}
+
+static inline void cvmx_write_io(uint64_t io_addr, uint64_t val)
+{
+        cvmx_write64(io_addr, val);
+
+}
+
+static inline uint64_t cvmx_read_csr(uint64_t csr_addr)
+{
+        uint64_t val = cvmx_read64(csr_addr);
+        return val;
+}
+
+
+static inline void cvmx_send_single(uint64_t data)
+{
+        const uint64_t CVMX_IOBDMA_SENDSINGLE = 0xffffffffffffa200ull;
+        cvmx_write64(CVMX_IOBDMA_SENDSINGLE, data);
+}
+
+static inline void cvmx_read_csr_async(uint64_t scraddr, uint64_t csr_addr)
+{
+        union {
+                uint64_t u64;
+                struct {
+                        uint64_t scraddr:8;
+                        uint64_t len:8;
+                        uint64_t addr:48;
+                } s;
+        } addr;
+        addr.u64 = csr_addr;
+        addr.s.scraddr = scraddr >> 3;
+        addr.s.len = 1;
+        cvmx_send_single(addr.u64);
+}
+
+/* Return true if Octeon is CN38XX pass 1 */
+static inline int cvmx_octeon_is_pass1(void)
+{
+#if OCTEON_IS_COMMON_BINARY()
+        return 0;       /* Pass 1 isn't supported for common binaries */
+#else
+/* Now that we know we're built for a specific model, only check CN38XX */
+#if OCTEON_IS_MODEL(OCTEON_CN38XX)
+        return cvmx_get_proc_id() == OCTEON_CN38XX_PASS1;
+#else
+        return 0;       /* Built for non CN38XX chip, we're not CN38XX pass1 */
+#endif
+#endif
+}
+
+static inline unsigned int cvmx_get_core_num(void)
+{
+        unsigned int core_num;
+        CVMX_RDHWRNV(core_num, 0);
+        return core_num;
+}
+
+/**
+ * Returns the number of bits set in the provided value.
+ * Simple wrapper for POP instruction.
+ *
+ * @val:    32 bit value to count set bits in
+ *
+ * Returns Number of bits set
+ */
+static inline uint32_t cvmx_pop(uint32_t val)
+{
+        uint32_t pop;
+        CVMX_POP(pop, val);
+        return pop;
+}
+
+/**
+ * Returns the number of bits set in the provided value.
+ * Simple wrapper for DPOP instruction.
+ *
+ * @val:    64 bit value to count set bits in
+ *
+ * Returns Number of bits set
+ */
+static inline int cvmx_dpop(uint64_t val)
+{
+        int pop;
+        CVMX_DPOP(pop, val);
+        return pop;
+}
+
+/**
+ * Provide current cycle counter as a return value
+ *
+ * Returns current cycle counter
+ */
+
+static inline uint64_t cvmx_get_cycle(void)
+{
+        uint64_t cycle;
+        CVMX_RDHWR(cycle, 31);
+        return cycle;
+}
+
+/**
+ * Reads a chip global cycle counter.  This counts CPU cycles since
+ * chip reset.  The counter is 64 bit.
+ * This register does not exist on CN38XX pass 1 silicion
+ *
+ * Returns Global chip cycle count since chip reset.
+ */
+static inline uint64_t cvmx_get_cycle_global(void)
+{
+        if (cvmx_octeon_is_pass1())
+                return 0;
+        else
+                return cvmx_read64(CVMX_IPD_CLK_COUNT);
+}
+
+/**
+ * This macro spins on a field waiting for it to reach a value. It
+ * is common in code to need to wait for a specific field in a CSR
+ * to match a specific value. Conceptually this macro expands to:
+ *
+ * 1) read csr at "address" with a csr typedef of "type"
+ * 2) Check if ("type".s."field" "op" "value")
+ * 3) If #2 isn't true loop to #1 unless too much time has passed.
+ */
+#define CVMX_WAIT_FOR_FIELD64(address, type, field, op, value, timeout_usec)\
+    (                                                                   \
+{                                                                       \
+        int result;                                                     \
+        do {                                                            \
+                uint64_t done = cvmx_get_cycle() + (uint64_t)timeout_usec * \
+                        cvmx_sysinfo_get()->cpu_clock_hz / 1000000;     \
+                type c;                                                 \
+                while (1) {                                             \
+                        c.u64 = cvmx_read_csr(address);                 \
+                        if ((c.s.field) op(value)) {                    \
+                                result = 0;                             \
+                                break;                                  \
+                        } else if (cvmx_get_cycle() > done) {           \
+                                result = -1;                            \
+                                break;                                  \
+                        } else                                          \
+                                cvmx_wait(100);                         \
+                }                                                       \
+        } while (0);                                                    \
+        result;                                                         \
+})
+
+/***************************************************************************/
+
+static inline void cvmx_reset_octeon(void)
+{
+        union cvmx_ciu_soft_rst ciu_soft_rst;
+        ciu_soft_rst.u64 = 0;
+        ciu_soft_rst.s.soft_rst = 1;
+        cvmx_write_csr(CVMX_CIU_SOFT_RST, ciu_soft_rst.u64);
+}
+
+/* Return the number of cores available in the chip */
+static inline uint32_t cvmx_octeon_num_cores(void)
+{
+        uint32_t ciu_fuse = (uint32_t) cvmx_read_csr(CVMX_CIU_FUSE) & 0xffff;
+        return cvmx_pop(ciu_fuse);
+}
+
+/**
+ * Read a byte of fuse data
+ * @byte_addr:   address to read
+ *
+ * Returns fuse value: 0 or 1
+ */
+static uint8_t cvmx_fuse_read_byte(int byte_addr)
+{
+        union cvmx_mio_fus_rcmd read_cmd;
+
+        read_cmd.u64 = 0;
+        read_cmd.s.addr = byte_addr;
+        read_cmd.s.pend = 1;
+        cvmx_write_csr(CVMX_MIO_FUS_RCMD, read_cmd.u64);
+        while ((read_cmd.u64 = cvmx_read_csr(CVMX_MIO_FUS_RCMD))
+               && read_cmd.s.pend)
+                ;
+        return read_cmd.s.dat;
+}
+
+/**
+ * Read a single fuse bit
+ *
+ * @fuse:   Fuse number (0-1024)
+ *
+ * Returns fuse value: 0 or 1
+ */
+static inline int cvmx_fuse_read(int fuse)
+{
+        return (cvmx_fuse_read_byte(fuse >> 3) >> (fuse & 0x7)) & 1;
+}
+
+static inline int cvmx_octeon_model_CN36XX(void)
+{
+        return OCTEON_IS_MODEL(OCTEON_CN38XX)
+                && !cvmx_octeon_is_pass1()
+                && cvmx_fuse_read(264);
+}
+
+static inline int cvmx_octeon_zip_present(void)
+{
+        return octeon_has_feature(OCTEON_FEATURE_ZIP);
+}
+
+static inline int cvmx_octeon_dfa_present(void)
+{
+        if (!OCTEON_IS_MODEL(OCTEON_CN38XX)
+            && !OCTEON_IS_MODEL(OCTEON_CN31XX)
+            && !OCTEON_IS_MODEL(OCTEON_CN58XX))
+                return 0;
+        else if (OCTEON_IS_MODEL(OCTEON_CN3020))
+                return 0;
+        else if (cvmx_octeon_is_pass1())
+                return 1;
+        else
+                return !cvmx_fuse_read(120);
+}
+
+static inline int cvmx_octeon_crypto_present(void)
+{
+        return octeon_has_feature(OCTEON_FEATURE_CRYPTO);
+}
+
+#endif /*  __CVMX_H__  */
diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h
new file mode 100644
index 000000000000..04fac684069c
--- /dev/null
+++ b/arch/mips/include/asm/octeon/octeon-feature.h
@@ -0,0 +1,119 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ * File defining checks for different Octeon features.
+ */
+
+#ifndef __OCTEON_FEATURE_H__
+#define __OCTEON_FEATURE_H__
+
+enum octeon_feature {
+        /*
+         * Octeon models in the CN5XXX family and higher support
+         * atomic add instructions to memory (saa/saad).
+         */
+        OCTEON_FEATURE_SAAD,
+        /* Does this Octeon support the ZIP offload engine? */
+        OCTEON_FEATURE_ZIP,
+        /* Does this Octeon support crypto acceleration using COP2? */
+        OCTEON_FEATURE_CRYPTO,
+        /* Does this Octeon support PCI express? */
+        OCTEON_FEATURE_PCIE,
+        /* Some Octeon models support internal memory for storing
+         * cryptographic keys */
+        OCTEON_FEATURE_KEY_MEMORY,
+        /* Octeon has a LED controller for banks of external LEDs */
+        OCTEON_FEATURE_LED_CONTROLLER,
+        /* Octeon has a trace buffer */
+        OCTEON_FEATURE_TRA,
+        /* Octeon has a management port */
+        OCTEON_FEATURE_MGMT_PORT,
+        /* Octeon has a raid unit */
+        OCTEON_FEATURE_RAID,
+        /* Octeon has a builtin USB */
+        OCTEON_FEATURE_USB,
+};
+
+static inline int cvmx_fuse_read(int fuse);
+
+/**
+ * Determine if the current Octeon supports a specific feature. These
+ * checks have been optimized to be fairly quick, but they should still
+ * be kept out of fast path code.
+ *
+ * @feature: Feature to check for. This should always be a constant so the
+ *                compiler can remove the switch statement through optimization.
+ *
+ * Returns Non zero if the feature exists. Zero if the feature does not
+ *         exist.
+ */
+static inline int octeon_has_feature(enum octeon_feature feature)
+{
+        switch (feature) {
+        case OCTEON_FEATURE_SAAD:
+                return !OCTEON_IS_MODEL(OCTEON_CN3XXX);
+
+        case OCTEON_FEATURE_ZIP:
+                if (OCTEON_IS_MODEL(OCTEON_CN30XX)
+                    || OCTEON_IS_MODEL(OCTEON_CN50XX)
+                    || OCTEON_IS_MODEL(OCTEON_CN52XX))
+                        return 0;
+                else if (OCTEON_IS_MODEL(OCTEON_CN38XX_PASS1))
+                        return 1;
+                else
+                        return !cvmx_fuse_read(121);
+
+        case OCTEON_FEATURE_CRYPTO:
+                return !cvmx_fuse_read(90);
+
+        case OCTEON_FEATURE_PCIE:
+                return OCTEON_IS_MODEL(OCTEON_CN56XX)
+                        || OCTEON_IS_MODEL(OCTEON_CN52XX);
+
+        case OCTEON_FEATURE_KEY_MEMORY:
+        case OCTEON_FEATURE_LED_CONTROLLER:
+                return OCTEON_IS_MODEL(OCTEON_CN38XX)
+                        || OCTEON_IS_MODEL(OCTEON_CN58XX)
+                        || OCTEON_IS_MODEL(OCTEON_CN56XX);
+        case OCTEON_FEATURE_TRA:
+                return !(OCTEON_IS_MODEL(OCTEON_CN30XX)
+                         || OCTEON_IS_MODEL(OCTEON_CN50XX));
+        case OCTEON_FEATURE_MGMT_PORT:
+                return OCTEON_IS_MODEL(OCTEON_CN56XX)
+                        || OCTEON_IS_MODEL(OCTEON_CN52XX);
+        case OCTEON_FEATURE_RAID:
+                return OCTEON_IS_MODEL(OCTEON_CN56XX)
+                        || OCTEON_IS_MODEL(OCTEON_CN52XX);
+        case OCTEON_FEATURE_USB:
+                return !(OCTEON_IS_MODEL(OCTEON_CN38XX)
+                         || OCTEON_IS_MODEL(OCTEON_CN58XX));
+        }
+        return 0;
+}
+
+#endif /* __OCTEON_FEATURE_H__ */
diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h
new file mode 100644
index 000000000000..cf50336eca2e
--- /dev/null
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@ -0,0 +1,321 @@
+/***********************license start***************
+ * Author: Cavium Networks
+ *
+ * Contact: support@caviumnetworks.com
+ * This file is part of the OCTEON SDK
+ *
+ * Copyright (c) 2003-2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
+ * NONINFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this file; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * or visit http://www.gnu.org/licenses/.
+ *
+ * This file may also be available under a different license from Cavium.
+ * Contact Cavium Networks for more information
+ ***********************license end**************************************/
+
+/*
+ *
+ * File defining different Octeon model IDs and macros to
+ * compare them.
+ *
+ */
+
+#ifndef __OCTEON_MODEL_H__
+#define __OCTEON_MODEL_H__
+
+/* NOTE: These must match what is checked in common-config.mk */
+/* Defines to represent the different versions of Octeon.  */
+
+/*
+ * IMPORTANT: When the default pass is updated for an Octeon Model,
+ * the corresponding change must also be made in the oct-sim script.
+ */
+
+/*
+ * The defines below should be used with the OCTEON_IS_MODEL() macro
+ * to determine what model of chip the software is running on.  Models
+ * ending in 'XX' match multiple models (families), while specific
+ * models match only that model.  If a pass (revision) is specified,
+ * then only that revision will be matched.  Care should be taken when
+ * checking for both specific models and families that the specific
+ * models are checked for first.  While these defines are similar to
+ * the processor ID, they are not intended to be used by anything
+ * other that the OCTEON_IS_MODEL framework, and the values are
+ * subject to change at anytime without notice.
+ *
+ * NOTE: only the OCTEON_IS_MODEL() macro/function and the OCTEON_CN*
+ * macros should be used outside of this file.  All other macros are
+ * for internal use only, and may change without notice.
+ */
+
+/* Flag bits in top byte */
+/* Ignores revision in model checks */
+#define OM_IGNORE_REVISION        0x01000000
+/* Check submodels */
+#define OM_CHECK_SUBMODEL         0x02000000
+/* Match all models previous than the one specified */
+#define OM_MATCH_PREVIOUS_MODELS  0x04000000
+/* Ignores the minor revison on newer parts */
+#define OM_IGNORE_MINOR_REVISION  0x08000000
+#define OM_FLAG_MASK              0xff000000
+
+/*
+ * CN5XXX models with new revision encoding
+ */
+#define OCTEON_CN58XX_PASS1_0   0x000d0300
+#define OCTEON_CN58XX_PASS1_1   0x000d0301
+#define OCTEON_CN58XX_PASS1_2   0x000d0303
+#define OCTEON_CN58XX_PASS2_0   0x000d0308
+#define OCTEON_CN58XX_PASS2_1   0x000d0309
+#define OCTEON_CN58XX_PASS2_2   0x000d030a
+#define OCTEON_CN58XX_PASS2_3   0x000d030b
+
+#define OCTEON_CN58XX           (OCTEON_CN58XX_PASS1_0 | OM_IGNORE_REVISION)
+#define OCTEON_CN58XX_PASS1_X   (OCTEON_CN58XX_PASS1_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN58XX_PASS2_X   (OCTEON_CN58XX_PASS2_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN58XX_PASS1     OCTEON_CN58XX_PASS1_X
+#define OCTEON_CN58XX_PASS2     OCTEON_CN58XX_PASS2_X
+
+#define OCTEON_CN56XX_PASS1_0   0x000d0400
+#define OCTEON_CN56XX_PASS1_1   0x000d0401
+#define OCTEON_CN56XX_PASS2_0   0x000d0408
+#define OCTEON_CN56XX_PASS2_1   0x000d0409
+
+#define OCTEON_CN56XX           (OCTEON_CN56XX_PASS2_0 | OM_IGNORE_REVISION)
+#define OCTEON_CN56XX_PASS1_X   (OCTEON_CN56XX_PASS1_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN56XX_PASS2_X   (OCTEON_CN56XX_PASS2_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN56XX_PASS1     OCTEON_CN56XX_PASS1_X
+#define OCTEON_CN56XX_PASS2     OCTEON_CN56XX_PASS2_X
+
+#define OCTEON_CN57XX           OCTEON_CN56XX
+#define OCTEON_CN57XX_PASS1     OCTEON_CN56XX_PASS1
+#define OCTEON_CN57XX_PASS2     OCTEON_CN56XX_PASS2
+
+#define OCTEON_CN55XX           OCTEON_CN56XX
+#define OCTEON_CN55XX_PASS1     OCTEON_CN56XX_PASS1
+#define OCTEON_CN55XX_PASS2     OCTEON_CN56XX_PASS2
+
+#define OCTEON_CN54XX           OCTEON_CN56XX
+#define OCTEON_CN54XX_PASS1     OCTEON_CN56XX_PASS1
+#define OCTEON_CN54XX_PASS2     OCTEON_CN56XX_PASS2
+
+#define OCTEON_CN50XX_PASS1_0   0x000d0600
+
+#define OCTEON_CN50XX           (OCTEON_CN50XX_PASS1_0 | OM_IGNORE_REVISION)
+#define OCTEON_CN50XX_PASS1_X   (OCTEON_CN50XX_PASS1_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN50XX_PASS1     OCTEON_CN50XX_PASS1_X
+
+/*
+ * NOTE: Octeon CN5000F model is not identifiable using the
+ * OCTEON_IS_MODEL() functions, but are treated as CN50XX.
+ */
+
+#define OCTEON_CN52XX_PASS1_0   0x000d0700
+#define OCTEON_CN52XX_PASS2_0   0x000d0708
+
+#define OCTEON_CN52XX           (OCTEON_CN52XX_PASS2_0 | OM_IGNORE_REVISION)
+#define OCTEON_CN52XX_PASS1_X   (OCTEON_CN52XX_PASS1_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN52XX_PASS2_X   (OCTEON_CN52XX_PASS2_0 \
+                                 | OM_IGNORE_MINOR_REVISION)
+#define OCTEON_CN52XX_PASS1     OCTEON_CN52XX_PASS1_X
+#define OCTEON_CN52XX_PASS2     OCTEON_CN52XX_PASS2_X
+
+/*
+ * CN3XXX models with old revision enconding
+ */
+#define OCTEON_CN38XX_PASS1     0x000d0000
+#define OCTEON_CN38XX_PASS2     0x000d0001
+#define OCTEON_CN38XX_PASS3     0x000d0003
+#define OCTEON_CN38XX           (OCTEON_CN38XX_PASS3 | OM_IGNORE_REVISION)
+
+#define OCTEON_CN36XX           OCTEON_CN38XX
+#define OCTEON_CN36XX_PASS2     OCTEON_CN38XX_PASS2
+#define OCTEON_CN36XX_PASS3     OCTEON_CN38XX_PASS3
+
+/* The OCTEON_CN31XX matches CN31XX models and the CN3020 */
+#define OCTEON_CN31XX_PASS1     0x000d0100
+#define OCTEON_CN31XX_PASS1_1   0x000d0102
+#define OCTEON_CN31XX           (OCTEON_CN31XX_PASS1 | OM_IGNORE_REVISION)
+
+/*
+ * This model is only used for internal checks, it is not a valid
+ * model for the OCTEON_MODEL environment variable.  This matches the
+ * CN3010 and CN3005 but NOT the CN3020.
+ */
+#define OCTEON_CN30XX_PASS1     0x000d0200
+#define OCTEON_CN30XX_PASS1_1   0x000d0202
+#define OCTEON_CN30XX           (OCTEON_CN30XX_PASS1 | OM_IGNORE_REVISION)
+
+#define OCTEON_CN3005_PASS1     (0x000d0210 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3005_PASS1_0   (0x000d0210 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3005_PASS1_1   (0x000d0212 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3005           (OCTEON_CN3005_PASS1 | OM_IGNORE_REVISION \
+                                 | OM_CHECK_SUBMODEL)
+
+#define OCTEON_CN3010_PASS1     (0x000d0200 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3010_PASS1_0   (0x000d0200 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3010_PASS1_1   (0x000d0202 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3010           (OCTEON_CN3010_PASS1 | OM_IGNORE_REVISION \
+                                 | OM_CHECK_SUBMODEL)
+
+#define OCTEON_CN3020_PASS1     (0x000d0110 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3020_PASS1_0   (0x000d0110 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3020_PASS1_1   (0x000d0112 | OM_CHECK_SUBMODEL)
+#define OCTEON_CN3020           (OCTEON_CN3020_PASS1 | OM_IGNORE_REVISION \
+                                 | OM_CHECK_SUBMODEL)
+
+
+
+/* This matches the complete family of CN3xxx CPUs, and not subsequent models */
+#define OCTEON_CN3XXX           (OCTEON_CN58XX_PASS1_0 \
+                                 | OM_MATCH_PREVIOUS_MODELS \
+                                 | OM_IGNORE_REVISION)
+
+/* The revision byte (low byte) has two different encodings.
+ * CN3XXX:
+ *
+ *     bits
+ *     <7:5>: reserved (0)
+ *     <4>:   alternate package
+ *     <3:0>: revision
+ *
+ * CN5XXX:
+ *
+ *     bits
+ *     <7>:   reserved (0)
+ *     <6>:   alternate package
+ *     <5:3>: major revision
+ *     <2:0>: minor revision
+ *
+ */
+
+/* Masks used for the various types of model/family/revision matching */
+#define OCTEON_38XX_FAMILY_MASK      0x00ffff00
+#define OCTEON_38XX_FAMILY_REV_MASK  0x00ffff0f
+#define OCTEON_38XX_MODEL_MASK       0x00ffff10
+#define OCTEON_38XX_MODEL_REV_MASK   (OCTEON_38XX_FAMILY_REV_MASK \
+                                      | OCTEON_38XX_MODEL_MASK)
+
+/* CN5XXX and later use different layout of bits in the revision ID field */
+#define OCTEON_58XX_FAMILY_MASK      OCTEON_38XX_FAMILY_MASK
+#define OCTEON_58XX_FAMILY_REV_MASK  0x00ffff3f
+#define OCTEON_58XX_MODEL_MASK       0x00ffffc0
+#define OCTEON_58XX_MODEL_REV_MASK   (OCTEON_58XX_FAMILY_REV_MASK \
+                                      | OCTEON_58XX_MODEL_MASK)
+#define OCTEON_58XX_MODEL_MINOR_REV_MASK (OCTEON_58XX_MODEL_REV_MASK \
+                                          & 0x00fffff8)
+
+#define __OCTEON_MATCH_MASK__(x, y, z) (((x) & (z)) == ((y) & (z)))
+
+/* NOTE: This is for internal (to this file) use only. */
+static inline int __OCTEON_IS_MODEL_COMPILE__(uint32_t arg_model,
+                                              uint32_t chip_model)
+{
+        uint32_t rev_and_sub = OM_IGNORE_REVISION | OM_CHECK_SUBMODEL;
+
+        if ((arg_model & OCTEON_38XX_FAMILY_MASK) < OCTEON_CN58XX_PASS1_0) {
+                if (((arg_model & OM_FLAG_MASK) == rev_and_sub) &&
+                    __OCTEON_MATCH_MASK__(chip_model, arg_model,
+                                          OCTEON_38XX_MODEL_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == 0) &&
+                    __OCTEON_MATCH_MASK__(chip_model, arg_model,
+                                          OCTEON_38XX_FAMILY_REV_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == OM_IGNORE_REVISION) &&
+                    __OCTEON_MATCH_MASK__(chip_model, arg_model,
+                                          OCTEON_38XX_FAMILY_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == OM_CHECK_SUBMODEL) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_38XX_MODEL_REV_MASK))
+                        return 1;
+                if ((arg_model & OM_MATCH_PREVIOUS_MODELS) &&
+                    ((chip_model & OCTEON_38XX_MODEL_MASK) <
+                            (arg_model & OCTEON_38XX_MODEL_MASK)))
+                        return 1;
+        } else {
+                if (((arg_model & OM_FLAG_MASK) == rev_and_sub) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_58XX_MODEL_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == 0) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_58XX_FAMILY_REV_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == OM_IGNORE_MINOR_REVISION) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_58XX_MODEL_MINOR_REV_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == OM_IGNORE_REVISION) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_58XX_FAMILY_MASK))
+                        return 1;
+                if (((arg_model & OM_FLAG_MASK) == OM_CHECK_SUBMODEL) &&
+                    __OCTEON_MATCH_MASK__((chip_model), (arg_model),
+                                          OCTEON_58XX_MODEL_REV_MASK))
+                        return 1;
+                if ((arg_model & OM_MATCH_PREVIOUS_MODELS) &&
+                    ((chip_model & OCTEON_58XX_MODEL_MASK) <
+                            (arg_model & OCTEON_58XX_MODEL_MASK)))
+                        return 1;
+        }
+        return 0;
+}
+
+/* forward declarations */
+static inline uint32_t cvmx_get_proc_id(void) __attribute__ ((pure));
+static inline uint64_t cvmx_read_csr(uint64_t csr_addr);
+
+/* NOTE: This for internal use only!!!!! */
+static inline int __octeon_is_model_runtime__(uint32_t model)
+{
+        uint32_t cpuid = cvmx_get_proc_id();
+
+        /*
+         * Check for special case of mismarked 3005 samples. We only
+         * need to check if the sub model isn't being ignored.
+         */
+        if ((model & OM_CHECK_SUBMODEL) == OM_CHECK_SUBMODEL) {
+                if (cpuid == OCTEON_CN3010_PASS1 \
+                    && (cvmx_read_csr(0x80011800800007B8ull) & (1ull << 34)))
+                        cpuid |= 0x10;
+        }
+        return __OCTEON_IS_MODEL_COMPILE__(model, cpuid);
+}
+
+/*
+ * The OCTEON_IS_MODEL macro should be used for all Octeon model
+ * checking done in a program.  This should be kept runtime if at all
+ * possible.  Any compile time (#if OCTEON_IS_MODEL) usage must be
+ * condtionalized with OCTEON_IS_COMMON_BINARY() if runtime checking
+ * support is required.
+ */
+#define OCTEON_IS_MODEL(x) __octeon_is_model_runtime__(x)
+#define OCTEON_IS_COMMON_BINARY() 1
+#undef OCTEON_MODEL
+
+const char *octeon_model_get_string(uint32_t chip_id);
+const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
+
+#include "octeon-feature.h"
+
+#endif /* __OCTEON_MODEL_H__ */
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
new file mode 100644
index 000000000000..edc676084cda
--- /dev/null
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -0,0 +1,248 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2004-2008 Cavium Networks
+ */
+#ifndef __ASM_OCTEON_OCTEON_H
+#define __ASM_OCTEON_OCTEON_H
+
+#include "cvmx.h"
+
+extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
+                                                uint64_t alignment,
+                                                uint64_t min_addr,
+                                                uint64_t max_addr,
+                                                int do_locking);
+extern void *octeon_bootmem_alloc(uint64_t size, uint64_t alignment,
+                                  int do_locking);
+extern void *octeon_bootmem_alloc_range(uint64_t size, uint64_t alignment,
+                                        uint64_t min_addr, uint64_t max_addr,
+                                        int do_locking);
+extern void *octeon_bootmem_alloc_named(uint64_t size, uint64_t alignment,
+                                        char *name);
+extern void *octeon_bootmem_alloc_named_range(uint64_t size, uint64_t min_addr,
+                                              uint64_t max_addr, uint64_t align,
+                                              char *name);
+extern void *octeon_bootmem_alloc_named_address(uint64_t size, uint64_t address,
+                                                char *name);
+extern int octeon_bootmem_free_named(char *name);
+extern void octeon_bootmem_lock(void);
+extern void octeon_bootmem_unlock(void);
+
+extern int octeon_is_simulation(void);
+extern int octeon_is_pci_host(void);
+extern int octeon_usb_is_ref_clk(void);
+extern uint64_t octeon_get_clock_rate(void);
+extern const char *octeon_board_type_string(void);
+extern const char *octeon_get_pci_interrupts(void);
+extern int octeon_get_southbridge_interrupt(void);
+extern int octeon_get_boot_coremask(void);
+extern int octeon_get_boot_num_arguments(void);
+extern const char *octeon_get_boot_argument(int arg);
+extern void octeon_hal_setup_reserved32(void);
+extern void octeon_user_io_init(void);
+struct octeon_cop2_state;
+extern unsigned long octeon_crypto_enable(struct octeon_cop2_state *state);
+extern void octeon_crypto_disable(struct octeon_cop2_state *state,
+                                  unsigned long flags);
+
+extern void octeon_init_cvmcount(void);
+
+#define OCTEON_ARGV_MAX_ARGS    64
+#define OCTOEN_SERIAL_LEN       20
+
+struct octeon_boot_descriptor {
+        /* Start of block referenced by assembly code - do not change! */
+        uint32_t desc_version;
+        uint32_t desc_size;
+        uint64_t stack_top;
+        uint64_t heap_base;
+        uint64_t heap_end;
+        /* Only used by bootloader */
+        uint64_t entry_point;
+        uint64_t desc_vaddr;
+        /* End of This block referenced by assembly code - do not change! */
+        uint32_t exception_base_addr;
+        uint32_t stack_size;
+        uint32_t heap_size;
+        /* Argc count for application. */
+        uint32_t argc;
+        uint32_t argv[OCTEON_ARGV_MAX_ARGS];
+
+#define  BOOT_FLAG_INIT_CORE            (1 << 0)
+#define  OCTEON_BL_FLAG_DEBUG           (1 << 1)
+#define  OCTEON_BL_FLAG_NO_MAGIC        (1 << 2)
+        /* If set, use uart1 for console */
+#define  OCTEON_BL_FLAG_CONSOLE_UART1   (1 << 3)
+        /* If set, use PCI console */
+#define  OCTEON_BL_FLAG_CONSOLE_PCI     (1 << 4)
+        /* Call exit on break on serial port */
+#define  OCTEON_BL_FLAG_BREAK           (1 << 5)
+
+        uint32_t flags;
+        uint32_t core_mask;
+        /* DRAM size in megabyes. */
+        uint32_t dram_size;
+        /* physical address of free memory descriptor block. */
+        uint32_t phy_mem_desc_addr;
+        /* used to pass flags from app to debugger. */
+        uint32_t debugger_flags_base_addr;
+        /* CPU clock speed, in hz. */
+        uint32_t eclock_hz;
+        /* DRAM clock speed, in hz. */
+        uint32_t dclock_hz;
+        /* SPI4 clock in hz. */
+        uint32_t spi_clock_hz;
+        uint16_t board_type;
+        uint8_t board_rev_major;
+        uint8_t board_rev_minor;
+        uint16_t chip_type;
+        uint8_t chip_rev_major;
+        uint8_t chip_rev_minor;
+        char board_serial_number[OCTOEN_SERIAL_LEN];
+        uint8_t mac_addr_base[6];
+        uint8_t mac_addr_count;
+        uint64_t cvmx_desc_vaddr;
+};
+
+union octeon_cvmemctl {
+        uint64_t u64;
+        struct {
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t tlbbist:1;
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t l1cbist:1;
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t l1dbist:1;
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t dcmbist:1;
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t ptgbist:1;
+                /* RO 1 = BIST fail, 0 = BIST pass */
+                uint64_t wbfbist:1;
+                /* Reserved */
+                uint64_t reserved:22;
+                /* R/W If set, marked write-buffer entries time out
+                 * the same as as other entries; if clear, marked
+                 * write-buffer entries use the maximum timeout. */
+                uint64_t dismarkwblongto:1;
+                /* R/W If set, a merged store does not clear the
+                 * write-buffer entry timeout state. */
+                uint64_t dismrgclrwbto:1;
+                /* R/W Two bits that are the MSBs of the resultant
+                 * CVMSEG LM word location for an IOBDMA. The other 8
+                 * bits come from the SCRADDR field of the IOBDMA. */
+                uint64_t iobdmascrmsb:2;
+                /* R/W If set, SYNCWS and SYNCS only order marked
+                 * stores; if clear, SYNCWS and SYNCS only order
+                 * unmarked stores. SYNCWSMARKED has no effect when
+                 * DISSYNCWS is set. */
+                uint64_t syncwsmarked:1;
+                /* R/W If set, SYNCWS acts as SYNCW and SYNCS acts as
+                 * SYNC. */
+                uint64_t dissyncws:1;
+                /* R/W If set, no stall happens on write buffer
+                 * full. */
+                uint64_t diswbfst:1;
+                /* R/W If set (and SX set), supervisor-level
+                 * loads/stores can use XKPHYS addresses with
+                 * VA<48>==0 */
+                uint64_t xkmemenas:1;
+                /* R/W If set (and UX set), user-level loads/stores
+                 * can use XKPHYS addresses with VA<48>==0 */
+                uint64_t xkmemenau:1;
+                /* R/W If set (and SX set), supervisor-level
+                 * loads/stores can use XKPHYS addresses with
+                 * VA<48>==1 */
+                uint64_t xkioenas:1;
+                /* R/W If set (and UX set), user-level loads/stores
+                 * can use XKPHYS addresses with VA<48>==1 */
+                uint64_t xkioenau:1;
+                /* R/W If set, all stores act as SYNCW (NOMERGE must
+                 * be set when this is set) RW, reset to 0. */
+                uint64_t allsyncw:1;
+                /* R/W If set, no stores merge, and all stores reach
+                 * the coherent bus in order. */
+                uint64_t nomerge:1;
+                /* R/W Selects the bit in the counter used for DID
+                 * time-outs 0 = 231, 1 = 230, 2 = 229, 3 =
+                 * 214. Actual time-out is between 1x and 2x this
+                 * interval. For example, with DIDTTO=3, expiration
+                 * interval is between 16K and 32K. */
+                uint64_t didtto:2;
+                /* R/W If set, the (mem) CSR clock never turns off. */
+                uint64_t csrckalwys:1;
+                /* R/W If set, mclk never turns off. */
+                uint64_t mclkalwys:1;
+                /* R/W Selects the bit in the counter used for write
+                 * buffer flush time-outs (WBFLT+11) is the bit
+                 * position in an internal counter used to determine
+                 * expiration. The write buffer expires between 1x and
+                 * 2x this interval. For example, with WBFLT = 0, a
+                 * write buffer expires between 2K and 4K cycles after
+                 * the write buffer entry is allocated. */
+                uint64_t wbfltime:3;
+                /* R/W If set, do not put Istream in the L2 cache. */
+                uint64_t istrnol2:1;
+                /* R/W The write buffer threshold. */
+                uint64_t wbthresh:4;
+                /* Reserved */
+                uint64_t reserved2:2;
+                /* R/W If set, CVMSEG is available for loads/stores in
+                 * kernel/debug mode. */
+                uint64_t cvmsegenak:1;
+                /* R/W If set, CVMSEG is available for loads/stores in
+                 * supervisor mode. */
+                uint64_t cvmsegenas:1;
+                /* R/W If set, CVMSEG is available for loads/stores in
+                 * user mode. */
+                uint64_t cvmsegenau:1;
+                /* R/W Size of local memory in cache blocks, 54 (6912
+                 * bytes) is max legal value. */
+                uint64_t lmemsz:6;
+        } s;
+};
+
+struct octeon_cf_data {
+        unsigned long   base_region_bias;
+        unsigned int    base_region;    /* The chip select region used by CF */
+        int             is16bit;        /* 0 - 8bit, !0 - 16bit */
+        int             dma_engine;     /* -1 for no DMA */
+};
+
+extern void octeon_write_lcd(const char *s);
+extern void octeon_check_cpu_bist(void);
+extern int octeon_get_boot_debug_flag(void);
+extern int octeon_get_boot_uart(void);
+
+struct uart_port;
+extern unsigned int octeon_serial_in(struct uart_port *, int);
+extern void octeon_serial_out(struct uart_port *, int, int);
+
+/**
+ * Write a 32bit value to the Octeon NPI register space
+ *
+ * @address: Address to write to
+ * @val:     Value to write
+ */
+static inline void octeon_npi_write32(uint64_t address, uint32_t val)
+{
+        cvmx_write64_uint32(address ^ 4, val);
+        cvmx_read64_uint32(address ^ 4);
+}
+
+
+/**
+ * Read a 32bit value from the Octeon NPI register space
+ *
+ * @address: Address to read
+ * Returns The result
+ */
+static inline uint32_t octeon_npi_read32(uint64_t address)
+{
+        return cvmx_read64_uint32(address ^ 4);
+}
+
+#endif /* __ASM_OCTEON_OCTEON_H */
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index 18ee58e39445..0f926aa0cb47 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -118,6 +118,60 @@ union mips_watch_reg_state {
         struct mips3264_watch_reg_state mips3264;
 };
 
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+
+struct octeon_cop2_state {
+        /* DMFC2 rt, 0x0201 */
+        unsigned long   cop2_crc_iv;
+        /* DMFC2 rt, 0x0202 (Set with DMTC2 rt, 0x1202) */
+        unsigned long   cop2_crc_length;
+        /* DMFC2 rt, 0x0200 (set with DMTC2 rt, 0x4200) */
+        unsigned long   cop2_crc_poly;
+        /* DMFC2 rt, 0x0402; DMFC2 rt, 0x040A */
+        unsigned long   cop2_llm_dat[2];
+       /* DMFC2 rt, 0x0084 */
+        unsigned long   cop2_3des_iv;
+        /* DMFC2 rt, 0x0080; DMFC2 rt, 0x0081; DMFC2 rt, 0x0082 */
+        unsigned long   cop2_3des_key[3];
+        /* DMFC2 rt, 0x0088 (Set with DMTC2 rt, 0x0098) */
+        unsigned long   cop2_3des_result;
+        /* DMFC2 rt, 0x0111 (FIXME: Read Pass1 Errata) */
+        unsigned long   cop2_aes_inp0;
+        /* DMFC2 rt, 0x0102; DMFC2 rt, 0x0103 */
+        unsigned long   cop2_aes_iv[2];
+        /* DMFC2 rt, 0x0104; DMFC2 rt, 0x0105; DMFC2 rt, 0x0106; DMFC2
+         * rt, 0x0107 */
+        unsigned long   cop2_aes_key[4];
+        /* DMFC2 rt, 0x0110 */
+        unsigned long   cop2_aes_keylen;
+        /* DMFC2 rt, 0x0100; DMFC2 rt, 0x0101 */
+        unsigned long   cop2_aes_result[2];
+        /* DMFC2 rt, 0x0240; DMFC2 rt, 0x0241; DMFC2 rt, 0x0242; DMFC2
+         * rt, 0x0243; DMFC2 rt, 0x0244; DMFC2 rt, 0x0245; DMFC2 rt,
+         * 0x0246; DMFC2 rt, 0x0247; DMFC2 rt, 0x0248; DMFC2 rt,
+         * 0x0249; DMFC2 rt, 0x024A; DMFC2 rt, 0x024B; DMFC2 rt,
+         * 0x024C; DMFC2 rt, 0x024D; DMFC2 rt, 0x024E - Pass2 */
+        unsigned long   cop2_hsh_datw[15];
+        /* DMFC2 rt, 0x0250; DMFC2 rt, 0x0251; DMFC2 rt, 0x0252; DMFC2
+         * rt, 0x0253; DMFC2 rt, 0x0254; DMFC2 rt, 0x0255; DMFC2 rt,
+         * 0x0256; DMFC2 rt, 0x0257 - Pass2 */
+        unsigned long   cop2_hsh_ivw[8];
+        /* DMFC2 rt, 0x0258; DMFC2 rt, 0x0259 - Pass2 */
+        unsigned long   cop2_gfm_mult[2];
+        /* DMFC2 rt, 0x025E - Pass2 */
+        unsigned long   cop2_gfm_poly;
+        /* DMFC2 rt, 0x025A; DMFC2 rt, 0x025B - Pass2 */
+        unsigned long   cop2_gfm_result[2];
+};
+#define INIT_OCTEON_COP2 {0,}
+
+struct octeon_cvmseg_state {
+        unsigned long cvmseg[CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE]
+                            [cpu_dcache_line_size() / sizeof(unsigned long)];
+};
+
+#endif
+
 typedef struct {
         unsigned long seg;
 } mm_segment_t;
@@ -160,6 +214,10 @@ struct thread_struct {
         unsigned long trap_no;
         unsigned long irix_trampoline;  /* Wheee... */
         unsigned long irix_oldctx;
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+    struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128)));
+    struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128)));
+#endif
         struct mips_abi *abi;
 };
 
@@ -171,6 +229,13 @@ struct thread_struct {
 #define FPAFF_INIT
 #endif /* CONFIG_MIPS_MT_FPAFF */
 
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+#define OCTEON_INIT                                             \
+        .cp2                    = INIT_OCTEON_COP2,
+#else
+#define OCTEON_INIT
+#endif /* CONFIG_CPU_CAVIUM_OCTEON */
+
 #define INIT_THREAD  {                                          \
         /*                                                      \
          * Saved main processor registers                       \
@@ -221,6 +286,10 @@ struct thread_struct {
         .trap_no                = 0,                            \
         .irix_trampoline        = 0,                            \
         .irix_oldctx            = 0,                            \
+        /*                                                      \
+         * Cavium Octeon specifics (null if not Octeon)         \
+         */                                                     \
+        OCTEON_INIT                                             \
 }
 
 struct task_struct;
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index c2c8bac43307..ce47118e52b7 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -48,6 +48,10 @@ struct pt_regs {
 #ifdef CONFIG_MIPS_MT_SMTC
         unsigned long cp0_tcstatus;
 #endif /* CONFIG_MIPS_MT_SMTC */
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+        unsigned long long mpl[3];        /* MTM{0,1,2} */
+        unsigned long long mtp[3];        /* MTP{0,1,2} */
+#endif
 } __attribute__ ((aligned (8)));
 
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
@@ -101,7 +105,7 @@ struct pt_watch_regs {
         enum pt_watch_style style;
         union {
                 struct mips32_watch_regs mips32;
-                struct mips32_watch_regs mips64;
+                struct mips64_watch_regs mips64;
         };
 };
 
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index 86557b5d1b3f..40e5ef1d4d26 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -37,6 +37,9 @@ extern int __cpu_logical_map[NR_CPUS];
 
 #define SMP_RESCHEDULE_YOURSELF 0x1     /* XXX braindead */
 #define SMP_CALL_FUNCTION       0x2
+/* Octeon - Tell another core to flush its icache */
+#define SMP_ICACHE_FLUSH        0x4
+
 
 extern void asmlinkage smp_bootstrap(void);
 
diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
index 4c37c4e5f72e..db0fa7b5aeaf 100644
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
@@ -194,6 +194,19 @@
                 LONG_S  $31, PT_R31(sp)
                 ori     $28, sp, _THREAD_MASK
                 xori    $28, _THREAD_MASK
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+                .set    mips64
+                pref    0, 0($28)       /* Prefetch the current pointer */
+                pref    0, PT_R31(sp)   /* Prefetch the $31(ra) */
+                /* The Octeon multiplier state is affected by general multiply
+                    instructions. It must be saved before and kernel code might
+                    corrupt it */
+                jal     octeon_mult_save
+                LONG_L  v1, 0($28)  /* Load the current pointer */
+                         /* Restore $31(ra) that was changed by the jal */
+                LONG_L  ra, PT_R31(sp)
+                pref    0, 0(v1)    /* Prefetch the current thread */
+#endif
                 .set    pop
                 .endm
 
@@ -324,6 +337,10 @@
                 DVPE    5                               # dvpe a1
                 jal     mips_ihb
 #endif /* CONFIG_MIPS_MT_SMTC */
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+                /* Restore the Octeon multiplier state */
+                jal     octeon_mult_restore
+#endif
                 mfc0    a0, CP0_STATUS
                 ori     a0, STATMASK
                 xori    a0, STATMASK
diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h
index a275661fa7e1..8f77f774a2a0 100644
--- a/arch/mips/include/asm/termios.h
+++ b/arch/mips/include/asm/termios.h
@@ -9,6 +9,7 @@
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
 
+#include <linux/errno.h>
 #include <asm/termbits.h>
 #include <asm/ioctls.h>
 
@@ -94,38 +95,81 @@ struct termio {
 /*
  * Translate a "termio" structure into a "termios". Ugh.
  */
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        unsigned short tmp; \
-        get_user(tmp, &(termio)->c_iflag); \
-        (termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
-        get_user(tmp, &(termio)->c_oflag); \
-        (termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
-        get_user(tmp, &(termio)->c_cflag); \
-        (termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
-        get_user(tmp, &(termio)->c_lflag); \
-        (termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
-        get_user((termios)->c_line, &(termio)->c_line); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
+static inline int user_termio_to_kernel_termios(struct ktermios *termios,
+        struct termio __user *termio)
+{
+        unsigned short iflag, oflag, cflag, lflag;
+        unsigned int err;
+
+        if (!access_ok(VERIFY_READ, termio, sizeof(struct termio)))
+                return -EFAULT;
+
+        err = __get_user(iflag, &termio->c_iflag);
+        termios->c_iflag = (termios->c_iflag & 0xffff0000) | iflag;
+        err |=__get_user(oflag, &termio->c_oflag);
+        termios->c_oflag = (termios->c_oflag & 0xffff0000) | oflag;
+        err |=__get_user(cflag, &termio->c_cflag);
+        termios->c_cflag = (termios->c_cflag & 0xffff0000) | cflag;
+        err |=__get_user(lflag, &termio->c_lflag);
+        termios->c_lflag = (termios->c_lflag & 0xffff0000) | lflag;
+        err |=__get_user(termios->c_line, &termio->c_line);
+        if (err)
+                return -EFAULT;
+
+        if (__copy_from_user(termios->c_cc, termio->c_cc, NCC))
+                return -EFAULT;
+
+        return 0;
+}
 
 /*
  * Translate a "termios" structure into a "termio". Ugh.
  */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line, &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
+static inline int kernel_termios_to_user_termio(struct termio __user *termio,
+        struct ktermios *termios)
+{
+        int err;
+
+        if (!access_ok(VERIFY_WRITE, termio, sizeof(struct termio)))
+                return -EFAULT;
+
+        err = __put_user(termios->c_iflag, &termio->c_iflag);
+        err |= __put_user(termios->c_oflag, &termio->c_oflag);
+        err |= __put_user(termios->c_cflag, &termio->c_cflag);
+        err |= __put_user(termios->c_lflag, &termio->c_lflag);
+        err |= __put_user(termios->c_line, &termio->c_line);
+        if (err)
+                return -EFAULT;
+
+        if (__copy_to_user(termio->c_cc, termios->c_cc, NCC))
+                return -EFAULT;
+
+        return 0;
+}
+
+static inline int user_termios_to_kernel_termios(struct ktermios __user *k,
+        struct termios2 *u)
+{
+        return copy_from_user(k, u, sizeof(struct termios2)) ? -EFAULT : 0;
+}
+
+static inline int kernel_termios_to_user_termios(struct termios2 __user *u,
+        struct ktermios *k)
+{
+        return copy_to_user(u, k, sizeof(struct termios2)) ? -EFAULT : 0;
+}
+
+static inline int user_termios_to_kernel_termios_1(struct ktermios *k,
+        struct termios __user *u)
+{
+        return copy_from_user(k, u, sizeof(struct termios)) ? -EFAULT : 0;
+}
+
+static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
+        struct ktermios *k)
+{
+        return copy_to_user(u, k, sizeof(struct termios)) ? -EFAULT : 0;
+}
 
 #endif /* defined(__KERNEL__) */
 
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 9601ea950542..38a30d2ee959 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -50,27 +50,35 @@ extern int (*perf_irq)(void);
 /*
  * Initialize the calling CPU's compare interrupt as clockevent device
  */
-#ifdef CONFIG_CEVT_R4K
-extern int mips_clockevent_init(void);
+#ifdef CONFIG_CEVT_R4K_LIB
 extern unsigned int __weak get_c0_compare_int(void);
-#else
+extern int r4k_clockevent_init(void);
+#endif
+
 static inline int mips_clockevent_init(void)
 {
+#ifdef CONFIG_CEVT_R4K
+        return r4k_clockevent_init();
+#else
         return -ENXIO;
-}
 #endif
+}
 
 /*
  * Initialize the count register as a clocksource
  */
-#ifdef CONFIG_CSRC_R4K
-extern int init_mips_clocksource(void);
-#else
+#ifdef CONFIG_CSRC_R4K_LIB
+extern int init_r4k_clocksource(void);
+#endif
+
 static inline int init_mips_clocksource(void)
 {
+#ifdef CONFIG_CSRC_R4K
+        return init_r4k_clocksource();
+#else
         return 0;
-}
 #endif
+}
 
 extern void clocksource_set_clock(struct clocksource *cs, unsigned int clock);
 extern void clockevent_set_clock(struct clock_event_device *cd,
diff --git a/arch/mips/include/asm/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h
index 88badb423010..964ef7ede268 100644
--- a/arch/mips/include/asm/txx9/tx4939.h
+++ b/arch/mips/include/asm/txx9/tx4939.h
@@ -541,5 +541,6 @@ void tx4939_irq_init(void);
 int tx4939_irq(void);
 void tx4939_mtd_init(int ch);
 void tx4939_ata_init(void);
+void tx4939_rtc_init(void);
 
 #endif /* __ASM_TXX9_TX4939_H */