diff mbox

[dpdk-dev,v2,02/16] fm10k/base: add macro definitions that are needed

Message ID 1453866647-16215-3-git-send-email-xiao.w.wang@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Bruce Richardson
Headers

Commit Message

Xiao Wang Jan. 27, 2016, 3:50 a.m. UTC 
  Some macros such as FM10K_RXINT_TIMER_SHIFT are removed in the share
code drop, but they are needed in dpdk/fm10k. This patch put all these
necessary macros into fm10k_osdep.h

Signed-off-by: Wang Xiao W <xiao.w.wang@intel.com>
---
 drivers/net/fm10k/base/fm10k_osdep.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Comments

Bruce Richardson Feb. 16, 2016, 10:52 a.m. UTC | #1 
On Wed, Jan 27, 2016 at 11:50:33AM +0800, Wang Xiao W wrote:
> Some macros such as FM10K_RXINT_TIMER_SHIFT are removed in the share
> code drop, but they are needed in dpdk/fm10k. This patch put all these
> necessary macros into fm10k_osdep.h
> 
> Signed-off-by: Wang Xiao W <xiao.w.wang@intel.com>
> ---
>  drivers/net/fm10k/base/fm10k_osdep.h | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
Compilation fails with this patch applied. Each patch of the set must leave the
repository in a compilable state. Please do a V3 patchset to fix.

Thanks,
/Bruce

  CC fm10k_ethdev.o
In file included from /home/bruce/next-net/dpdk-next-net/drivers/net/fm10k/fm10k.h:43:0,
                   from /home/bruce/next-net/dpdk-next-net/drivers/net/fm10k/fm10k_ethdev.c:41:
/home/bruce/next-net/dpdk-next-net/drivers/net/fm10k/base/fm10k_type.h:904:6: error: nested redefiniti on of ‘enum fm10k_rdesc_pkt_type’
    enum fm10k_rdesc_pkt_type {
          ^
compilation terminated due to -Wfatal-errors.
/home/bruce/next-net/dpdk-next-net/mk/internal/rte.compile-pre.mk:126: recipe for target 'fm10k_ethdev .o' failed
make[5]: *** [fm10k_ethdev.o] Error 1
diff mbox

Patch

diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h
index 6852ef0..869af1b 100644
--- a/drivers/net/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/fm10k/base/fm10k_osdep.h
@@ -150,6 +150,36 @@  typedef int        bool;
 #define fm10k_read_reg FM10K_READ_REG
 #endif
 
+#define FM10K_INTEL_VENDOR_ID       0x8086
+#define FM10K_DMA_CTRL_MINMSS_SHIFT		9
+#define FM10K_EICR_PCA_FAULT			0x00000001
+#define FM10K_EICR_THI_FAULT			0x00000004
+#define FM10K_EICR_FUM_FAULT			0x00000020
+#define FM10K_EICR_SRAMERROR			0x00000400
+#define FM10K_SRAM_IP		0x13003
+#define FM10K_RXINT_TIMER_SHIFT			8
+#define FM10K_TXINT_TIMER_SHIFT			8
+#define FM10K_RXD_PKTTYPE_MASK		0x03F0
+#define FM10K_RXD_PKTTYPE_SHIFT		4
+enum fm10k_rdesc_pkt_type {
+	/* L3 type */
+	FM10K_PKTTYPE_OTHER	= 0x00,
+	FM10K_PKTTYPE_IPV4	= 0x01,
+	FM10K_PKTTYPE_IPV4_EX	= 0x02,
+	FM10K_PKTTYPE_IPV6	= 0x03,
+	FM10K_PKTTYPE_IPV6_EX	= 0x04,
+
+	/* L4 type */
+	FM10K_PKTTYPE_TCP	= 0x08,
+	FM10K_PKTTYPE_UDP	= 0x10,
+	FM10K_PKTTYPE_GRE	= 0x18,
+	FM10K_PKTTYPE_VXLAN	= 0x20,
+	FM10K_PKTTYPE_NVGRE	= 0x28,
+	FM10K_PKTTYPE_GENEVE	= 0x30
+};
+#define FM10K_RXD_STATUS_IPCS		0x0008 /* Indicates IPv4 csum */
+#define FM10K_RXD_STATUS_HBO		0x0400 /* header buffer overrun */
+
 #define FM10K_TSO_MINMSS \
 	(FM10K_DMA_CTRL_MINMSS_64 >> FM10K_DMA_CTRL_MINMSS_SHIFT)
 #define FM10K_TSO_MIN_HEADERLEN			54