X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Favf.h;h=518c7d8329aa25a3021093e86797514ae13a1e93;hb=d2bfb78f4f8fbfae204424467a4106530b89e608;hp=5db40746541b65764b306f09dfb640b61c01a592;hpb=b5236cb975c766154a36d0d59731850683635ea4;p=vpp.git

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index 5db40746541..518c7d8329a 100644
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -15,15 +15,34 @@
  *------------------------------------------------------------------
  */
 
+#ifndef _AVF_H_
+#define _AVF_H_
+
 #include <avf/virtchnl.h>
 
 #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") \
   _(2, ADMIN_UP, "admin-up") \
-  _(3, IOVA, "iova") \
+  _(3, VA_DMA, "vaddr-dma") \
   _(4, LINK_UP, "link-up") \
   _(5, SHARED_TXQ_LOCK, "shared-txq-lock") \
   _(6, ELOG, "elog")
@@ -35,19 +54,39 @@ enum
 #undef _
 };
 
-typedef struct
+typedef volatile struct
 {
-  u64 qword[4];
+  union
+  {
+    struct
+    {
+      u64 mirr:13;
+      u64 rsv1:3;
+      u64 l2tag1:16;
+      u64 filter_status:32;
+      u64 status:19;
+      u64 error:8;
+      u64 rsv2:3;
+      u64 ptype:8;
+      u64 length:26;
+    };
+    u64 qword[4];
+#ifdef CLIB_HAVE_VEC256
+    u64x4 as_u64x4;
+#endif
+  };
 } avf_rx_desc_t;
 
 STATIC_ASSERT_SIZEOF (avf_rx_desc_t, 32);
 
-typedef struct
+typedef volatile struct
 {
   union
   {
     u64 qword[2];
+#ifdef CLIB_HAVE_VEC128
     u64x2 as_u64x2;
+#endif
   };
 } avf_tx_desc_t;
 
@@ -61,7 +100,8 @@ typedef struct
   u16 size;
   avf_rx_desc_t *descs;
   u32 *bufs;
-  u16 n_bufs;
+  u16 n_enqueued;
+  u8 int_mode;
 } avf_rxq_t;
 
 typedef struct
@@ -73,7 +113,8 @@ typedef struct
   clib_spinlock_t lock;
   avf_tx_desc_t *descs;
   u32 *bufs;
-  u16 n_bufs;
+  u16 n_enqueued;
+  u16 *rs_slots;
 } avf_txq_t;
 
 typedef struct
@@ -86,11 +127,15 @@ typedef struct
   u32 sw_if_index;
   u32 hw_if_index;
   vlib_pci_dev_handle_t pci_dev_handle;
+  u32 numa_node;
   void *bar0;
+  u8 *name;
 
   /* queues */
   avf_rxq_t *rxqs;
   avf_txq_t *txqs;
+  u16 n_tx_queues;
+  u16 n_rx_queues;
 
   /* Admin queues */
   avf_aq_desc_t *atq;
@@ -120,18 +165,6 @@ typedef struct
   clib_error_t *error;
 } avf_device_t;
 
-typedef struct
-{
-  u32 bi;
-  u32 status;
-  u16 length;
-  u16 tail_length;
-  u8 ptype;
-  u8 error;
-} avf_rx_vector_entry_t;
-
-STATIC_ASSERT_SIZEOF (avf_rx_vector_entry_t, 16);
-
 #define AVF_RX_VECTOR_SZ VLIB_FRAME_SIZE
 
 enum
@@ -143,31 +176,27 @@ enum
 
 typedef struct
 {
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  avf_rx_vector_entry_t rx_vector[AVF_RX_VECTOR_SZ];
-  u32 *to_free;
-} avf_per_thread_data_t;
+  u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+  u32 buffers[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+} avf_rx_tail_t;
 
 typedef struct
 {
-  u8 next_node;
-  i8 buffer_advance;
-  u32 flags;
-} avf_ptype_t;
-
-STATIC_ASSERT (VNET_DEVICE_INPUT_N_NEXT_NODES < 256, "too many next nodes");
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  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;
 
 typedef struct
 {
+  u16 msg_id_base;
+
   avf_device_t *devices;
   avf_per_thread_data_t *per_thread_data;
-  vlib_physmem_region_index_t physmem_region;
-  int physmem_region_alloc;
 
   vlib_log_class_t log_class;
-
-  /* 256 element array for ptype based lookup */
-  avf_ptype_t *ptypes;
 } avf_main_t;
 
 extern avf_main_t avf_main;
@@ -175,9 +204,14 @@ extern avf_main_t avf_main;
 typedef struct
 {
   vlib_pci_addr_t addr;
+  u8 *name;
   int enable_elog;
+  u16 rxq_num;
+  u16 rxq_size;
+  u16 txq_size;
   /* return */
   int rv;
+  u32 sw_if_index;
   clib_error_t *error;
 } avf_create_if_args_t;
 
@@ -186,8 +220,6 @@ void avf_delete_if (vlib_main_t * vm, avf_device_t * ad);
 
 extern vlib_node_registration_t avf_input_node;
 extern vnet_device_class_t avf_device_class;
-uword avf_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node,
-			vlib_frame_t * frame);
 
 /* format.c */
 format_function_t format_avf_device;
@@ -253,13 +285,38 @@ 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	       \
+_(NO_FREE_SLOTS, "no free tx slots")
+
+typedef enum
+{
+#define _(f,s) AVF_TX_ERROR_##f,
+  foreach_avf_tx_func_error
+#undef _
+    AVF_TX_N_ERROR,
+} avf_tx_func_error_t;
+
+#endif /* AVF_H */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *