New upstream version 18.02

[deb_dpdk.git] / drivers / net / qede / qede_rxtx.h

diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h
index b551fd6..f1d3666 100644 (file)
--- a/drivers/net/qede/qede_rxtx.h
+++ b/drivers/net/qede/qede_rxtx.h
@@ -64,7 +64,7 @@
 #define QEDE_CEIL_TO_CACHE_LINE_SIZE(n) (((n) + (QEDE_FW_RX_ALIGN_END - 1)) & \
                                        ~(QEDE_FW_RX_ALIGN_END - 1))
 /* Note: QEDE_LLC_SNAP_HDR_LEN is optional */
-#define QEDE_ETH_OVERHEAD      ((ETHER_HDR_LEN) + ((2 * QEDE_VLAN_TAG_SIZE)) \
+#define QEDE_ETH_OVERHEAD      (((2 * QEDE_VLAN_TAG_SIZE)) - (ETHER_CRC_LEN) \
                                + (QEDE_LLC_SNAP_HDR_LEN))
 
 #define QEDE_RSS_OFFLOAD_ALL    (ETH_RSS_IPV4                  |\
@@ -73,7 +73,8 @@
                                 ETH_RSS_IPV6                   |\
                                 ETH_RSS_NONFRAG_IPV6_TCP       |\
                                 ETH_RSS_NONFRAG_IPV6_UDP       |\
-                                ETH_RSS_VXLAN)
+                                ETH_RSS_VXLAN                  |\
+                                ETH_RSS_GENEVE)
 
 #define QEDE_TXQ_FLAGS         ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS)
 
@@ -84,7 +85,8 @@
 
 /* Macros for non-tunnel packet types lkup table */
 #define QEDE_PKT_TYPE_UNKNOWN                          0x0
-#define QEDE_PKT_TYPE_MAX                              0xf
+#define QEDE_PKT_TYPE_MAX                              0x3f
+
 #define QEDE_PKT_TYPE_IPV4                             0x1
 #define QEDE_PKT_TYPE_IPV6                             0x2
 #define QEDE_PKT_TYPE_IPV4_TCP                         0x5
@@ -92,6 +94,20 @@
 #define QEDE_PKT_TYPE_IPV4_UDP                         0x9
 #define QEDE_PKT_TYPE_IPV6_UDP                         0xa
 
+/* For frag pkts, corresponding IP bits is set */
+#define QEDE_PKT_TYPE_IPV4_FRAG                                0x11
+#define QEDE_PKT_TYPE_IPV6_FRAG                                0x12
+
+#define QEDE_PKT_TYPE_IPV4_VLAN                                0x21
+#define QEDE_PKT_TYPE_IPV6_VLAN                                0x22
+#define QEDE_PKT_TYPE_IPV4_TCP_VLAN                    0x25
+#define QEDE_PKT_TYPE_IPV6_TCP_VLAN                    0x26
+#define QEDE_PKT_TYPE_IPV4_UDP_VLAN                    0x29
+#define QEDE_PKT_TYPE_IPV6_UDP_VLAN                    0x2a
+
+#define QEDE_PKT_TYPE_IPV4_VLAN_FRAG                   0x31
+#define QEDE_PKT_TYPE_IPV6_VLAN_FRAG                   0x32
+
 /* Macros for tunneled packets with next protocol lkup table */
 #define QEDE_PKT_TYPE_TUNN_GENEVE                      0x1
 #define QEDE_PKT_TYPE_TUNN_GRE                         0x2
@@ -99,12 +115,12 @@
 
 /* Bit 2 is don't care bit */
 #define QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_GENEVE     0x9
-#define QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_GRE        0xa
+#define QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_GRE                0xa
 #define QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_VXLAN      0xb
 
 #define QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_GENEVE       0xd
 #define QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_GRE          0xe
-#define QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_VXLAN        0xf
+#define QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_VXLAN                0xf
 
 
 #define QEDE_PKT_TYPE_TUNN_IPV4_TENID_NOEXIST_GENEVE    0x11
@@ -112,7 +128,7 @@
 #define QEDE_PKT_TYPE_TUNN_IPV4_TENID_NOEXIST_VXLAN     0x13
 
 #define QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_GENEVE     0x15
-#define QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_GRE        0x16
+#define QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_GRE                0x16
 #define QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_VXLAN      0x17
 
 
@@ -136,6 +152,7 @@
                              PKT_TX_QINQ_PKT           | \
                              PKT_TX_VLAN_PKT           | \
                              PKT_TX_TUNNEL_VXLAN       | \
+                             PKT_TX_TUNNEL_GENEVE      | \
                              PKT_TX_TUNNEL_MPLSINUDP)
 
 #define QEDE_TX_OFFLOAD_NOTSUP_MASK \