X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Favf.h;h=60d49e7ce183a20eea61ace72e8468e541ed609f;hb=c879c149d66d556b9b8183374c601004cecbf982;hp=ecd67802b154e7d988fe4ddf1db06269d6f70802;hpb=e430b6ec123dbe117b579d8284d7201da635be8d;p=vpp.git

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index ecd67802b15..60d49e7ce18 100644
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -22,6 +22,22 @@
 
 #include <vlib/log.h>
 
+#define AVF_RXD_STATUS(x)		(1ULL << x)
+#define AVF_RXD_STATUS_DD		AVF_RXD_STATUS(0)
+#define AVF_RXD_STATUS_EOP		AVF_RXD_STATUS(1)
+#define AVF_RXD_ERROR_SHIFT		19
+#define AVF_RXD_PTYPE_SHIFT		30
+#define AVF_RXD_LEN_SHIFT		38
+#define AVF_RX_MAX_DESC_IN_CHAIN	5
+
+#define AVF_RXD_ERROR_IPE		(1ULL << (AVF_RXD_ERROR_SHIFT + 3))
+#define AVF_RXD_ERROR_L4E		(1ULL << (AVF_RXD_ERROR_SHIFT + 4))
+
+#define AVF_TXD_CMD(x)			(1 << (x + 4))
+#define AVF_TXD_CMD_EOP			AVF_TXD_CMD(0)
+#define AVF_TXD_CMD_RS			AVF_TXD_CMD(1)
+#define AVF_TXD_CMD_RSV			AVF_TXD_CMD(2)
+
 #define foreach_avf_device_flags \
   _(0, INITIALIZED, "initialized") \
   _(1, ERROR, "error") \
@@ -98,6 +114,7 @@ typedef struct
   avf_tx_desc_t *descs;
   u32 *bufs;
   u16 n_enqueued;
+  u16 *rs_slots;
 } avf_txq_t;
 
 typedef struct
@@ -147,16 +164,6 @@ typedef struct
   clib_error_t *error;
 } avf_device_t;
 
-typedef struct
-{
-  u32 status;
-  u16 length;
-  u8 ptype;
-  u8 error;
-} avf_rx_vector_entry_t;
-
-STATIC_ASSERT_SIZEOF (avf_rx_vector_entry_t, 8);
-
 #define AVF_RX_VECTOR_SZ VLIB_FRAME_SIZE
 
 enum
@@ -166,11 +173,18 @@ enum
   AVF_PROCESS_EVENT_AQ_INT = 3,
 } avf_process_event_t;
 
+typedef struct
+{
+  u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+  u32 buffers[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+} avf_rx_tail_t;
+
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  avf_rx_vector_entry_t rx_vector[AVF_RX_VECTOR_SZ];
-  u32 *to_free;
+  vlib_buffer_t *bufs[AVF_RX_VECTOR_SZ];
+  u64 qw1s[AVF_RX_VECTOR_SZ];
+  avf_rx_tail_t tails[AVF_RX_VECTOR_SZ];
   vlib_buffer_t buffer_template;
 } avf_per_thread_data_t;
 
@@ -270,11 +284,23 @@ avf_reg_flush (avf_device_t * ad)
   asm volatile ("":::"memory");
 }
 
+static_always_inline int
+avf_rxd_is_not_eop (avf_rx_desc_t * d)
+{
+  return (d->qword[1] & AVF_RXD_STATUS_EOP) == 0;
+}
+
+static_always_inline int
+avf_rxd_is_not_dd (avf_rx_desc_t * d)
+{
+  return (d->qword[1] & AVF_RXD_STATUS_DD) == 0;
+}
+
 typedef struct
 {
   u32 next_index;
   u32 hw_if_index;
-  avf_rx_vector_entry_t rxve;
+  u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN];
 } avf_input_trace_t;
 
 #define foreach_avf_tx_func_error	       \