Import Cavium Octeon SDK 2.0 Simple Executive from cnusers.org.vendor/octeon-sdk/2.0.0

1 files changed, 401 insertions, 96 deletions

diff --git a/cvmx-tra.c b/cvmx-tra.c
index 02b1da2817b1..e1585ec161e3 100644
--- a/cvmx-tra.c
+++ b/cvmx-tra.c
@@ -1,45 +1,47 @@
 /***********************license start***************
- *  Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
- *  reserved.
+ * Copyright (c) 2003-2010  Cavium Networks (support@cavium.com). All rights
+ * reserved.
  *
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- *      * Redistributions of source code must retain the above copyright
- *        notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials provided
- *        with the distribution.
- *
- *      * Neither the name of Cavium Networks nor the names of
- *        its contributors may be used to endorse or promote products
- *        derived from this software without specific prior written
- *        permission.
- *
- *  TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
- *  AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS
- *  OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH
- *  RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY
- *  REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT
- *  DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES
- *  OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR
- *  PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET
- *  POSSESSION OR CORRESPONDENCE TO DESCRIPTION.  THE ENTIRE RISK ARISING OUT
- *  OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
- *
- *
- *  For any questions regarding licensing please contact marketing@caviumnetworks.com
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
  *
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
+
+ *   * Neither the name of Cavium Networks nor the names of
+ *     its contributors may be used to endorse or promote products
+ *     derived from this software without specific prior written
+ *     permission.
+
+ * This Software, including technical data, may be subject to U.S. export  control
+ * laws, including the U.S. Export Administration Act and its  associated
+ * regulations, and may be subject to export or import  regulations in other
+ * countries.
+
+ * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
+ * AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR
+ * WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO
+ * THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
+ * DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
+ * SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE,
+ * MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF
+ * VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
+ * CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR
+ * PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
  ***********************license end**************************************/
 
 
 
 
 
+
 /**
  * @file
  *
@@ -47,8 +49,14 @@
  *
  * <hr>$Revision: 30644 $<hr>
  */
+#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
+#include <linux/module.h>
+#include <asm/octeon/cvmx.h>
+#include <asm/octeon/cvmx-tra.h>
+#else
 #include "cvmx.h"
 #include "cvmx-tra.h"
+#endif
 
 static const char *TYPE_ARRAY[] = {
     "DWB - Don't write back",
@@ -85,6 +93,73 @@ static const char *TYPE_ARRAY[] = {
     "RSVD31"
 };
 
+static const char *TYPE_ARRAY2[] = {
+    "NOP - None",
+    "LDT - Icache/IO fill, skip L2",
+    "LDI - Icache/IO fill",
+    "PL2 - Prefetch into L2",
+    "RPL2 - Mark for replacement in L2",
+    "DWB - Don't write back",
+    "RSVD6",
+    "RSVD7",
+    "LDD - Dcache fill",
+    "PSL1 - Prefetch L1, skip L2",
+    "RSVD10",
+    "RSVD11",
+    "RSVD12",
+    "RSVD13",
+    "RSVD14",
+    "IOBDMA - Async IOB",
+    "STF - Store full",
+    "STT - Store full, skip L2",
+    "STP - Store partial",
+    "STC - Store conditional",
+    "STFIL1 - Store full, invalidate L1",
+    "STTIL1 - Store full, skip L2, invalidate L1",
+    "FAS32 - Atomic 32bit swap",
+    "FAS64 - Atomic 64bit swap",
+    "WBIL2i - Writeback, invalidate, by index/way",
+    "LTGL2i - Read tag@index/way",
+    "STGL2i - Write tag@index/way",
+    "RSVD27",
+    "INVL2 - Invalidate, by address",
+    "WBIL2 - Writeback, invalidate, by address",
+    "WBL2 - Writeback, by address",
+    "LCKL2 - Allocate, lock, by address",
+    "IOBLD8 - IOB 8bit load",
+    "IOBLD16 - IOB 16bit load",
+    "IOBLD32 - IOB 32bit load",
+    "IOBLD64 - IOB 64bit load",
+    "IOBST8 - IOB 8bit store",
+    "IOBST16 - IOB 16bit store",
+    "IOBST32 - IOB 32bit store",
+    "IOBST64 - IOB 64bit store",
+    "SET8 - 8bit Atomic swap with 1's",
+    "SET16 - 16bit Atomic swap with 1's",
+    "SET32 - 32bit Atomic swap with 1's",
+    "SET64 - 64bit Atomic swap with 1's",
+    "CLR8 - 8bit Atomic swap with 0's",
+    "CLR16 - 16bit Atomic swap with 0's",
+    "CLR32 - 32bit Atomic swap with 0's",
+    "CLR64 - 64bit Atomic swap with 0's",
+    "INCR8 - 8bit Atomic fetch & add by 1",
+    "INCR16 - 16bit Atomic fetch & add by 1",
+    "INCR32 - 32bit Atomic fetch & add by 1",
+    "INCR64 - 64bit Atomic fetch & add by 1",
+    "DECR8 - 8bit Atomic fetch & add by -1",
+    "DECR16 - 16bit Atomic fetch & add by -1",
+    "DECR32 - 32bit Atomic fetch & add by -1",
+    "DECR64 - 64bit Atomic fetch & add by -1",
+    "RSVD56",
+    "RSVD57",
+    "FAA32 - 32bit Atomic fetch and add",
+    "FAA64 - 64bit Atomic fetch and add",
+    "RSVD60",
+    "RSVD61",
+    "SAA32 - 32bit Atomic add",
+    "SAA64 - 64bit Atomic add"
+};
+
 static const char *SOURCE_ARRAY[] = {
     "PP0",
     "PP1",
@@ -124,7 +199,7 @@ static const char *DEST_ARRAY[] = {
     "CIU/GPIO",
     "RSVD1",
     "RSVD2",
-    "PCI/PCIe",
+    "PCI/PCIe/SLI",
     "KEY",
     "FPA",
     "DFA",
@@ -134,8 +209,8 @@ static const char *DEST_ARRAY[] = {
     "PKO",
     "RSVD11",
     "POW",
-    "RSVD13",
-    "RSVD14",
+    "USB0",
+    "RAD",
     "RSVD15",
     "RSVD16",
     "RSVD17",
@@ -148,13 +223,92 @@ static const char *DEST_ARRAY[] = {
     "RSVD24",
     "RSVD25",
     "RSVD26",
-    "RSVD27",
+    "DPI",
     "RSVD28",
     "RSVD29",
-    "RSVD30",
+    "FAU",
     "RSVD31"
 };
 
+#define CVMX_TRA_SOURCE_MASK       (OCTEON_IS_MODEL(OCTEON_CN63XX) ? 0xf00ff : 0xfffff)
+#define CVMX_TRA_DESTINATION_MASK  0xfffffffful
+
+/**
+ * @INTERNAL
+ * Setup the trace buffer filter command mask. The bit position of filter commands
+ * are different for each Octeon model.
+ *
+ * @param filter    Which event to log
+ * @return          Bitmask of filter command based on the event.
+ */
+static uint64_t __cvmx_tra_set_filter_cmd_mask(cvmx_tra_filt_t filter)
+{
+    cvmx_tra_filt_cmd_t filter_command;
+
+    if (OCTEON_IS_MODEL(OCTEON_CN3XXX) || OCTEON_IS_MODEL(OCTEON_CN5XXX))
+    {
+        /* Bit positions of filter commands are different, map it accordingly */
+        uint64_t cmd = 0;
+        if ((filter & CVMX_TRA_FILT_ALL) == -1ull)
+        {
+            if (OCTEON_IS_MODEL(OCTEON_CN5XXX))
+                cmd = 0x1ffff;
+            else
+                cmd = 0xffff;
+        }
+        if (filter & CVMX_TRA_FILT_DWB)
+            cmd |= 1ull<<0;
+        if (filter & CVMX_TRA_FILT_PL2)
+            cmd |= 1ull<<1;
+        if (filter & CVMX_TRA_FILT_PSL1)
+            cmd |= 1ull<<2;
+        if (filter & CVMX_TRA_FILT_LDD)
+            cmd |= 1ull<<3;
+        if (filter & CVMX_TRA_FILT_LDI)
+            cmd |= 1ull<<4;
+        if (filter & CVMX_TRA_FILT_LDT)
+            cmd |= 1ull<<5;
+        if (filter & CVMX_TRA_FILT_STF)
+            cmd |= 1ull<<6;
+        if (filter & CVMX_TRA_FILT_STC)
+            cmd |= 1ull<<7;
+        if (filter & CVMX_TRA_FILT_STP)
+            cmd |= 1ull<<8;
+        if (filter & CVMX_TRA_FILT_STT)
+            cmd |= 1ull<<9;
+        if (filter & CVMX_TRA_FILT_IOBLD8)
+            cmd |= 1ull<<10;
+        if (filter & CVMX_TRA_FILT_IOBLD16)
+            cmd |= 1ull<<11;
+        if (filter & CVMX_TRA_FILT_IOBLD32)
+            cmd |= 1ull<<12;
+        if (filter & CVMX_TRA_FILT_IOBLD64)
+            cmd |= 1ull<<13;
+        if (filter & CVMX_TRA_FILT_IOBST)
+            cmd |= 1ull<<14;
+        if (filter & CVMX_TRA_FILT_IOBDMA)
+            cmd |= 1ull<<15;
+        if (OCTEON_IS_MODEL(OCTEON_CN5XXX) && (filter & CVMX_TRA_FILT_SAA))
+            cmd |= 1ull<<16;
+
+        filter_command.u64 = cmd;
+    }
+    else
+    {
+        if ((filter & CVMX_TRA_FILT_ALL) == -1ull)
+            filter_command.u64 = CVMX_TRA_FILT_ALL;
+        else
+            filter_command.u64 = filter;
+
+        filter_command.cn63xx.reserved_60_61 = 0;
+        filter_command.cn63xx.reserved_56_57 = 0;
+        filter_command.cn63xx.reserved_10_14 = 0;
+        filter_command.cn63xx.reserved_6_7 = 0;
+    }
+    return filter_command.u64;
+}
+
+
 /**
  * Setup the TRA buffer for use
  *
@@ -168,17 +322,28 @@ static const char *DEST_ARRAY[] = {
  * @param address_mask
  *                Address mask
  */
-void cvmx_tra_setup(cvmx_tra_ctl_t control, cvmx_tra_filt_cmd_t filter,
-                    cvmx_tra_filt_sid_t source_filter, cvmx_tra_filt_did_t dest_filter,
+void cvmx_tra_setup(cvmx_tra_ctl_t control, cvmx_tra_filt_t filter,
+                    cvmx_tra_sid_t source_filter, cvmx_tra_did_t dest_filter,
                     uint64_t address, uint64_t address_mask)
 {
+    cvmx_tra_filt_cmd_t filt_cmd;
+    cvmx_tra_filt_sid_t filt_sid;
+    cvmx_tra_filt_did_t filt_did;
+
+    filt_cmd.u64 = __cvmx_tra_set_filter_cmd_mask(filter);
+    filt_sid.u64 = source_filter & CVMX_TRA_SOURCE_MASK;
+    filt_did.u64 = dest_filter & CVMX_TRA_DESTINATION_MASK;
+
     cvmx_write_csr(CVMX_TRA_CTL,            control.u64);
-    cvmx_write_csr(CVMX_TRA_FILT_CMD,       filter.u64);
-    cvmx_write_csr(CVMX_TRA_FILT_SID,       source_filter.u64);
-    cvmx_write_csr(CVMX_TRA_FILT_DID,       dest_filter.u64);
+    cvmx_write_csr(CVMX_TRA_FILT_CMD,       filt_cmd.u64);
+    cvmx_write_csr(CVMX_TRA_FILT_SID,       filt_sid.u64);
+    cvmx_write_csr(CVMX_TRA_FILT_DID,       filt_did.u64);
     cvmx_write_csr(CVMX_TRA_FILT_ADR_ADR,   address);
     cvmx_write_csr(CVMX_TRA_FILT_ADR_MSK,   address_mask);
 }
+#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
+EXPORT_SYMBOL(cvmx_tra_setup);
+#endif
 
 
 /**
@@ -195,16 +360,27 @@ void cvmx_tra_setup(cvmx_tra_ctl_t control, cvmx_tra_filt_cmd_t filter,
  * @param address_mask
  *                Trigger address mask
  */
-void cvmx_tra_trig_setup(uint64_t trigger, cvmx_tra_filt_cmd_t filter,
-                         cvmx_tra_filt_sid_t source_filter, cvmx_tra_trig0_did_t dest_filter,
+void cvmx_tra_trig_setup(uint64_t trigger, cvmx_tra_filt_t filter,
+                         cvmx_tra_sid_t source_filter, cvmx_tra_did_t dest_filter,
                          uint64_t address, uint64_t address_mask)
 {
-    cvmx_write_csr(CVMX_TRA_TRIG0_CMD + trigger * 64,       filter.u64);
-    cvmx_write_csr(CVMX_TRA_TRIG0_SID + trigger * 64,       source_filter.u64);
-    cvmx_write_csr(CVMX_TRA_TRIG0_DID + trigger * 64,       dest_filter.u64);
+    cvmx_tra_filt_cmd_t tra_filt_cmd;
+    cvmx_tra_filt_sid_t tra_filt_sid;
+    cvmx_tra_filt_did_t tra_filt_did;
+
+    tra_filt_cmd.u64 = __cvmx_tra_set_filter_cmd_mask(filter);
+    tra_filt_sid.u64 = source_filter & CVMX_TRA_SOURCE_MASK;
+    tra_filt_did.u64 = dest_filter & CVMX_TRA_DESTINATION_MASK;
+
+    cvmx_write_csr(CVMX_TRA_TRIG0_CMD + trigger * 64,       tra_filt_cmd.u64);
+    cvmx_write_csr(CVMX_TRA_TRIG0_SID + trigger * 64,       tra_filt_sid.u64);
+    cvmx_write_csr(CVMX_TRA_TRIG0_DID + trigger * 64,       tra_filt_did.u64);
     cvmx_write_csr(CVMX_TRA_TRIG0_ADR_ADR + trigger * 64,   address);
     cvmx_write_csr(CVMX_TRA_TRIG0_ADR_MSK + trigger * 64,   address_mask);
 }
+#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
+EXPORT_SYMBOL(cvmx_tra_trig_setup);
+#endif
 
 
 /**
@@ -214,12 +390,26 @@ void cvmx_tra_trig_setup(uint64_t trigger, cvmx_tra_filt_cmd_t filter,
  */
 cvmx_tra_data_t cvmx_tra_read(void)
 {
+    uint64_t address = CVMX_TRA_READ_DAT;
     cvmx_tra_data_t result;
-    result.u64 = cvmx_read_csr(CVMX_TRA_READ_DAT);
+
+    /* The trace buffer format is wider than 64-bits in Octeon2 model,
+       read the register again to get the second part of the data. */
+    if (!OCTEON_IS_MODEL(OCTEON_CN3XXX) && !OCTEON_IS_MODEL(OCTEON_CN5XXX))
+    {
+        /* These reads need to be as close as possible to each other */
+        result.u128.data = cvmx_read_csr(address);
+        result.u128.datahi = cvmx_read_csr(address);
+    }
+    else
+    {
+        result.u128.data = cvmx_read_csr(address);
+        result.u128.datahi = 0;
+    }
+
     return result;
 }
 
-
 /**
  * Decode a TRA entry into human readable output
  *
@@ -228,48 +418,52 @@ cvmx_tra_data_t cvmx_tra_read(void)
  */
 void cvmx_tra_decode_text(cvmx_tra_ctl_t tra_ctl, cvmx_tra_data_t data)
 {
-    /* The type is a five bit field for some entries and 4 for other. The four
-        bit entries can be mis-typed if the top is set */
-    int type = data.cmn.type;
-    if (type >= 0x1a)
-        type &= 0xf;
-    switch (type)
+    if (OCTEON_IS_MODEL(OCTEON_CN3XXX) || OCTEON_IS_MODEL(OCTEON_CN5XXX))
     {
-        case CVMX_TRA_DATA_DWB:
-        case CVMX_TRA_DATA_PL2:
-        case CVMX_TRA_DATA_PSL1:
-        case CVMX_TRA_DATA_LDD:
-        case CVMX_TRA_DATA_LDI:
-        case CVMX_TRA_DATA_LDT:
-            cvmx_dprintf("0x%016llx %c%+10d %s %s 0x%016llx\n",
-                   (unsigned long long)data.u64,
-                   (data.cmn.discontinuity) ? 'D' : ' ',
-                   data.cmn.timestamp << (tra_ctl.s.time_grn*3),
-                   TYPE_ARRAY[type],
-                   SOURCE_ARRAY[data.cmn.source],
-                   (unsigned long long)data.cmn.address);
-            break;
-        case CVMX_TRA_DATA_STC:
-        case CVMX_TRA_DATA_STF:
-        case CVMX_TRA_DATA_STP:
-        case CVMX_TRA_DATA_STT:
-        case CVMX_TRA_DATA_SAA:
-            cvmx_dprintf("0x%016llx %c%+10d %s %s mask=0x%02x 0x%016llx\n",
-                   (unsigned long long)data.u64,
+        /* The type is a five bit field for some entries and 4 for other. The four
+           bit entries can be mis-typed if the top is set */
+        int type = data.cmn.type;
+
+        if (type >= 0x1a)
+            type &= 0xf;
+
+        switch (type)
+        {
+            case 0:  /* DWB */
+            case 1:  /* PL2 */
+            case 2:  /* PSL1 */
+            case 3:  /* LDD */
+            case 4:  /* LDI */
+            case 5:  /* LDT */
+                cvmx_dprintf("0x%016llx %c%+10d %s %s 0x%016llx\n",
+                    (unsigned long long)data.u128.data,
+                    (data.cmn.discontinuity) ? 'D' : ' ',
+                    data.cmn.timestamp << (tra_ctl.s.time_grn*3),
+                    TYPE_ARRAY[type],
+                    SOURCE_ARRAY[data.cmn.source],
+                    (unsigned long long)data.cmn.address);
+                break;
+            case 6:  /* STF */
+            case 7:  /* STC */
+            case 8:  /* STP */
+            case 9:  /* STT */
+            case 16: /* SAA */
+                cvmx_dprintf("0x%016llx %c%+10d %s %s mask=0x%02x 0x%016llx\n",
+                   (unsigned long long)data.u128.data,
                    (data.cmn.discontinuity) ? 'D' : ' ',
                    data.cmn.timestamp << (tra_ctl.s.time_grn*3),
                    TYPE_ARRAY[type],
                    SOURCE_ARRAY[data.store.source],
                    (unsigned int)data.store.mask,
                    (unsigned long long)data.store.address << 3);
-            break;
-        case CVMX_TRA_DATA_IOBLD8:
-        case CVMX_TRA_DATA_IOBLD16:
-        case CVMX_TRA_DATA_IOBLD32:
-        case CVMX_TRA_DATA_IOBLD64:
-        case CVMX_TRA_DATA_IOBST:
-            cvmx_dprintf("0x%016llx %c%+10d %s %s->%s subdid=0x%x 0x%016llx\n",
-                   (unsigned long long)data.u64,
+                break;
+            case 10:  /* IOBLD8 */
+            case 11:  /* IOBLD16 */
+            case 12:  /* IOBLD32 */
+            case 13:  /* IOBLD64 */
+            case 14:  /* IOBST */
+                cvmx_dprintf("0x%016llx %c%+10d %s %s->%s subdid=0x%x 0x%016llx\n",
+                   (unsigned long long)data.u128.data,
                    (data.cmn.discontinuity) ? 'D' : ' ',
                    data.cmn.timestamp << (tra_ctl.s.time_grn*3),
                    TYPE_ARRAY[type],
@@ -277,10 +471,10 @@ void cvmx_tra_decode_text(cvmx_tra_ctl_t tra_ctl, cvmx_tra_data_t data)
                    DEST_ARRAY[data.iobld.dest],
                    (unsigned int)data.iobld.subid,
                    (unsigned long long)data.iobld.address);
-            break;
-        case CVMX_TRA_DATA_IOBDMA:
-            cvmx_dprintf("0x%016llx %c%+10d %s %s->%s len=0x%x 0x%016llx\n",
-                   (unsigned long long)data.u64,
+                break;
+            case 15:  /* IOBDMA */
+                cvmx_dprintf("0x%016llx %c%+10d %s %s->%s len=0x%x 0x%016llx\n",
+                   (unsigned long long)data.u128.data,
                    (data.cmn.discontinuity) ? 'D' : ' ',
                    data.cmn.timestamp << (tra_ctl.s.time_grn*3),
                    TYPE_ARRAY[type],
@@ -288,16 +482,116 @@ void cvmx_tra_decode_text(cvmx_tra_ctl_t tra_ctl, cvmx_tra_data_t data)
                    DEST_ARRAY[data.iob.dest],
                    (unsigned int)data.iob.mask,
                    (unsigned long long)data.iob.address << 3);
-            break;
-        default:
-            cvmx_dprintf("0x%016llx %c%+10d Unknown format\n",
-                   (unsigned long long)data.u64,
+                break;
+            default:
+                cvmx_dprintf("0x%016llx %c%+10d Unknown format\n",
+                   (unsigned long long)data.u128.data,
                    (data.cmn.discontinuity) ? 'D' : ' ',
                    data.cmn.timestamp << (tra_ctl.s.time_grn*3));
-            break;
+                break;
+        }
     }
-}
+    else
+    {
+        int type;
 
+        type = data.cmn2.type;
+
+        switch (1ull<<type)
+        {
+            case CVMX_TRA_FILT_DECR64:
+            case CVMX_TRA_FILT_DECR32:
+            case CVMX_TRA_FILT_DECR16:
+            case CVMX_TRA_FILT_DECR8:
+            case CVMX_TRA_FILT_INCR64:
+            case CVMX_TRA_FILT_INCR32:
+            case CVMX_TRA_FILT_INCR16:
+            case CVMX_TRA_FILT_INCR8:
+            case CVMX_TRA_FILT_CLR64:
+            case CVMX_TRA_FILT_CLR32:
+            case CVMX_TRA_FILT_CLR16:
+            case CVMX_TRA_FILT_CLR8:
+            case CVMX_TRA_FILT_SET64:
+            case CVMX_TRA_FILT_SET32:
+            case CVMX_TRA_FILT_SET16:
+            case CVMX_TRA_FILT_SET8:
+            case CVMX_TRA_FILT_WBL2:
+            case CVMX_TRA_FILT_DWB:
+            case CVMX_TRA_FILT_RPL2:
+            case CVMX_TRA_FILT_PL2:
+            case CVMX_TRA_FILT_LDI:
+            case CVMX_TRA_FILT_LDT:
+                cvmx_dprintf("0x%016llx%016llx %c%+10d %s %s 0x%016llx%llx\n",
+                   (unsigned long long)data.u128.datahi, (unsigned long long)data.u128.data,
+                   (data.cmn2.discontinuity) ? 'D' : ' ',
+                   data.cmn2.timestamp << (tra_ctl.s.time_grn*3),
+                   TYPE_ARRAY2[type],
+                   SOURCE_ARRAY[data.cmn2.source],
+                   (unsigned long long)data.cmn2.addresshi,
+                   (unsigned long long)data.cmn2.addresslo);
+                break;
+            case CVMX_TRA_FILT_PSL1:
+            case CVMX_TRA_FILT_LDD:
+            case CVMX_TRA_FILT_FAS64:
+            case CVMX_TRA_FILT_FAS32:
+            case CVMX_TRA_FILT_FAA64:
+            case CVMX_TRA_FILT_FAA32:
+            case CVMX_TRA_FILT_SAA64:
+            case CVMX_TRA_FILT_SAA32:
+            case CVMX_TRA_FILT_STC:
+            case CVMX_TRA_FILT_STF:
+            case CVMX_TRA_FILT_STP:
+            case CVMX_TRA_FILT_STT:
+                cvmx_dprintf("0x%016llx%016llx %c%+10d %s %s mask=0x%02x 0x%016llx%llx\n",
+                   (unsigned long long)data.u128.datahi, (unsigned long long)data.u128.data,
+                   (data.cmn2.discontinuity) ? 'D' : ' ',
+                   data.cmn2.timestamp << (tra_ctl.s.time_grn*3),
+                   TYPE_ARRAY2[type],
+                   SOURCE_ARRAY[data.store2.source],
+                   (unsigned int)data.store2.mask,
+                   (unsigned long long)data.store2.addresshi,
+                   (unsigned long long)data.store2.addresslo);
+                break;
+            case CVMX_TRA_FILT_IOBST64:
+            case CVMX_TRA_FILT_IOBST32:
+            case CVMX_TRA_FILT_IOBST16:
+            case CVMX_TRA_FILT_IOBST8:
+            case CVMX_TRA_FILT_IOBLD64:
+            case CVMX_TRA_FILT_IOBLD32:
+            case CVMX_TRA_FILT_IOBLD16:
+            case CVMX_TRA_FILT_IOBLD8:
+                cvmx_dprintf("0x%016llx%016llx %c%+10d %s %s->%s subdid=0x%x 0x%016llx%llx\n",
+                   (unsigned long long)data.u128.datahi, (unsigned long long)data.u128.data,
+                   (data.cmn2.discontinuity) ? 'D' : ' ',
+                   data.cmn2.timestamp << (tra_ctl.s.time_grn*3),
+                   TYPE_ARRAY2[type],
+                   SOURCE_ARRAY[data.iobld2.source],
+                   DEST_ARRAY[data.iobld2.dest],
+                   (unsigned int)data.iobld2.subid,
+                   (unsigned long long)data.iobld2.addresshi,
+                   (unsigned long long)data.iobld2.addresslo);
+                break;
+            case CVMX_TRA_FILT_IOBDMA:
+                cvmx_dprintf("0x%016llx%016llx %c%+10d %s %s->%s len=0x%x 0x%016llx%llx\n",
+                   (unsigned long long)data.u128.datahi, (unsigned long long)data.u128.data,
+                   (data.iob2.discontinuity) ? 'D' : ' ',
+                   data.iob2.timestamp << (tra_ctl.s.time_grn*3),
+                   TYPE_ARRAY2[type],
+                   SOURCE_ARRAY[data.iob2.source],
+                   DEST_ARRAY[data.iob2.dest],
+                   (unsigned int)data.iob2.mask,
+                   (unsigned long long)data.iob2.addresshi << 3,
+                   (unsigned long long)data.iob2.addresslo << 3);
+                break;
+            default:
+                cvmx_dprintf("0x%016llx%016llx %c%+10d Unknown format\n",
+                   (unsigned long long)data.u128.datahi, (unsigned long long)data.u128.data,
+                   (data.cmn2.discontinuity) ? 'D' : ' ',
+                   data.cmn2.timestamp << (tra_ctl.s.time_grn*3));
+                break;
+        }
+    }
+}
 
 /**
  * Display the entire trace buffer. It is advised that you
@@ -309,14 +603,25 @@ void cvmx_tra_display(void)
 {
     cvmx_tra_ctl_t tra_ctl;
     cvmx_tra_data_t data;
+    int valid = 0;
 
     tra_ctl.u64 = cvmx_read_csr(CVMX_TRA_CTL);
 
     do
     {
         data = cvmx_tra_read();
-        if (data.cmn.valid)
+        if ((OCTEON_IS_MODEL(OCTEON_CN3XXX) || OCTEON_IS_MODEL(OCTEON_CN5XXX)) && data.cmn.valid)
+            valid = 1;
+        else if (data.cmn2.valid)
+            valid = 1;
+        else
+            valid = 0;
+
+        if (valid)
             cvmx_tra_decode_text(tra_ctl, data);
-    } while (data.cmn.valid);
-}
 
+    } while (valid);
+}
+#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
+EXPORT_SYMBOL(cvmx_tra_display);
+#endif