X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Favf.h;h=744b58370e4bdcd5d572404d85f4b0480aca528b;hb=f7ab7b2d9bc0f42c1e766d22d49dd0dc4f28abb6;hp=eeb4fa21759de12a43c244f7dc540659fd5bb285;hpb=fcf9497d3bcd34b8b5090ee053575296cf56c5e6;p=vpp.git

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index eeb4fa21759..744b58370e4 100644
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -22,11 +22,51 @@
 
 #include <vlib/log.h>
 
+#define AVF_AQ_ENQ_SUSPEND_TIME		50e-6
+#define AVF_AQ_ENQ_MAX_WAIT_TIME	250e-3
+
+#define AVF_RESET_SUSPEND_TIME		20e-3
+#define AVF_RESET_MAX_WAIT_TIME		1
+
+#define AVF_SEND_TO_PF_SUSPEND_TIME	10e-3
+#define AVF_SEND_TO_PF_MAX_WAIT_TIME	1
+
+#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 avf_log_err(dev, f, ...)                        \
+  vlib_log (VLIB_LOG_LEVEL_ERR, avf_main.log_class, "%U: " f, \
+            format_vlib_pci_addr, &dev->pci_addr, \
+            ## __VA_ARGS__)
+
+#define avf_log_warn(dev, f, ...)                        \
+  vlib_log (VLIB_LOG_LEVEL_WARNING, avf_main.log_class, "%U: " f, \
+            format_vlib_pci_addr, &dev->pci_addr, \
+            ## __VA_ARGS__)
+
+#define avf_log_debug(dev, f, ...)                        \
+  vlib_log (VLIB_LOG_LEVEL_DEBUG, avf_main.log_class, "%U: " f, \
+            format_vlib_pci_addr, &dev->pci_addr, \
+            ## __VA_ARGS__)
+
 #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")
@@ -86,6 +126,7 @@ typedef struct
   u32 *bufs;
   u16 n_enqueued;
   u8 int_mode;
+  u8 buffer_pool_index;
 } avf_rxq_t;
 
 typedef struct
@@ -98,6 +139,7 @@ typedef struct
   avf_tx_desc_t *descs;
   u32 *bufs;
   u16 n_enqueued;
+  u16 *rs_slots;
 } avf_txq_t;
 
 typedef struct
@@ -110,7 +152,9 @@ 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;
@@ -138,27 +182,19 @@ typedef struct
   u32 rss_key_size;
   u32 rss_lut_size;
   virtchnl_link_speed_t link_speed;
+  vlib_pci_addr_t pci_addr;
 
   /* stats */
   virtchnl_eth_stats_t eth_stats;
+  virtchnl_eth_stats_t last_cleared_eth_stats;
 
   /* error */
   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
+typedef enum
 {
   AVF_PROCESS_EVENT_START = 1,
   AVF_PROCESS_EVENT_STOP = 2,
@@ -167,20 +203,18 @@ enum
 
 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 buffer_template;
-} 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
 {
@@ -188,13 +222,8 @@ typedef struct
 
   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;
@@ -202,7 +231,9 @@ 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 */
@@ -281,15 +312,29 @@ 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;
+  u16 qid;
+  u16 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")
+  _(SEGMENT_SIZE_EXCEEDED, "segment size exceeded")	\
+  _(NO_FREE_SLOTS, "no free tx slots")
 
 typedef enum
 {