MIPS: Octeon: Turn hardware bitfields and structures inside out.

Although the proper way to do this for bitfields would be to use
the macro that Ralf has provided, this is a little easier to
understand as a diff.

Signed-off-by: Paul Martin <paul.martin@codethink.co.uk>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9628/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 71 insertions, 0 deletions

diff --git a/arch/mips/include/asm/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h
index aa0d3d0de75c..2d6d0c7127a7 100644
--- a/arch/mips/include/asm/octeon/cvmx-wqe.h
+++ b/arch/mips/include/asm/octeon/cvmx-wqe.h
@@ -57,6 +57,7 @@ typedef union {
 
         /* Use this struct if the hardware determines that the packet is IP */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /* HW sets this to the number of buffers used by this packet */
                 uint64_t bufs:8;
                 /* HW sets to the number of L2 bytes prior to the IP */
@@ -166,13 +167,45 @@ typedef union {
                  * the slow path */
                 /* type is cvmx_pip_err_t */
                 uint64_t err_code:8;
+#else
+                uint64_t err_code:8;
+                uint64_t rcv_error:1;
+                uint64_t not_IP:1;
+                uint64_t is_mcast:1;
+                uint64_t is_bcast:1;
+                uint64_t IP_exc:1;
+                uint64_t is_frag:1;
+                uint64_t L4_error:1;
+                uint64_t software:1;
+                uint64_t is_v6:1;
+                uint64_t dec_ipsec:1;
+                uint64_t tcp_or_udp:1;
+                uint64_t dec_ipcomp:1;
+                uint64_t unassigned2:4;
+                uint64_t unassigned2a:4;
+                uint64_t pr:4;
+                uint64_t vlan_id:12;
+                uint64_t vlan_cfi:1;
+                uint64_t unassigned:1;
+                uint64_t vlan_stacked:1;
+                uint64_t vlan_valid:1;
+                uint64_t ip_offset:8;
+                uint64_t bufs:8;
+#endif
         } s;
 
         /* use this to get at the 16 vlan bits */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t unused1:16;
                 uint64_t vlan:16;
                 uint64_t unused2:32;
+#else
+                uint64_t unused2:32;
+                uint64_t vlan:16;
+                uint64_t unused1:16;
+
+#endif
         } svlan;
 
         /*
@@ -180,6 +213,7 @@ typedef union {
          * the packet is ip.
          */
         struct {
+#ifdef __BIG_ENDIAN_BITFIELD
                 /*
                  * HW sets this to the number of buffers used by this
                  * packet.
@@ -296,6 +330,27 @@ typedef union {
                  */
                 /* type is cvmx_pip_err_t (union, so can't use directly */
                 uint64_t err_code:8;
+#else
+                uint64_t err_code:8;
+                uint64_t rcv_error:1;
+                uint64_t not_IP:1;
+                uint64_t is_mcast:1;
+                uint64_t is_bcast:1;
+                uint64_t is_arp:1;
+                uint64_t is_rarp:1;
+                uint64_t unassigned3:1;
+                uint64_t software:1;
+                uint64_t unassigned2:4;
+                uint64_t unassigned2a:8;
+                uint64_t pr:4;
+                uint64_t vlan_id:12;
+                uint64_t vlan_cfi:1;
+                uint64_t unassigned:1;
+                uint64_t vlan_stacked:1;
+                uint64_t vlan_valid:1;
+                uint64_t unused:8;
+                uint64_t bufs:8;
+#endif
         } snoip;
 
 } cvmx_pip_wqe_word2;
@@ -312,6 +367,7 @@ typedef struct {
      *  HW WRITE: the following 64 bits are filled by HW when a packet arrives
      */
 
+#ifdef __BIG_ENDIAN_BITFIELD
     /**
      * raw chksum result generated by the HW
      */
@@ -327,12 +383,18 @@ typedef struct {
      * (Only 36 bits used in Octeon 1)
      */
         uint64_t next_ptr:40;
+#else
+        uint64_t next_ptr:40;
+        uint8_t unused;
+        uint16_t hw_chksum;
+#endif
 
     /*****************************************************************
      * WORD 1
      *  HW WRITE: the following 64 bits are filled by HW when a packet arrives
      */
 
+#ifdef __BIG_ENDIAN_BITFIELD
     /**
      * HW sets to the total number of bytes in the packet
      */
@@ -359,6 +421,15 @@ typedef struct {
      * the synchronization/ordering tag
      */
         uint64_t tag:32;
+#else
+        uint64_t tag:32;
+        uint64_t tag_type:2;
+        uint64_t zero_2:1;
+        uint64_t grp:4;
+        uint64_t qos:3;
+        uint64_t ipprt:6;
+        uint64_t len:16;
+#endif
 
     /**
      * WORD 2 HW WRITE: the following 64-bits are filled in by