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

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index 518c7d8329a..32d9cc61015 100644
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -22,6 +22,18 @@
 
 #include <vlib/log.h>
 
+#define AVF_QUEUE_SZ_MAX                4096
+#define AVF_QUEUE_SZ_MIN                64
+
+#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)
@@ -38,6 +50,21 @@
 #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") \
@@ -45,7 +72,9 @@
   _(3, VA_DMA, "vaddr-dma") \
   _(4, LINK_UP, "link-up") \
   _(5, SHARED_TXQ_LOCK, "shared-txq-lock") \
-  _(6, ELOG, "elog")
+  _(6, ELOG, "elog") \
+  _(7, PROMISC, "promisc") \
+  _(8, RX_INT, "rx-interrupts")
 
 enum
 {
@@ -102,6 +131,7 @@ typedef struct
   u32 *bufs;
   u16 n_enqueued;
   u8 int_mode;
+  u8 buffer_pool_index;
 } avf_rxq_t;
 
 typedef struct
@@ -153,13 +183,16 @@ typedef struct
   u8 hwaddr[6];
   u16 num_queue_pairs;
   u16 max_vectors;
+  u16 n_rx_irqs;
   u16 max_mtu;
   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;
@@ -167,11 +200,13 @@ typedef struct
 
 #define AVF_RX_VECTOR_SZ VLIB_FRAME_SIZE
 
-enum
+typedef enum
 {
   AVF_PROCESS_EVENT_START = 1,
-  AVF_PROCESS_EVENT_STOP = 2,
+  AVF_PROCESS_EVENT_DELETE_IF = 2,
   AVF_PROCESS_EVENT_AQ_INT = 3,
+  AVF_PROCESS_EVENT_SET_PROMISC_ENABLE = 4,
+  AVF_PROCESS_EVENT_SET_PROMISC_DISABLE = 5,
 } avf_process_event_t;
 
 typedef struct
@@ -193,7 +228,7 @@ typedef struct
 {
   u16 msg_id_base;
 
-  avf_device_t *devices;
+  avf_device_t **devices;
   avf_per_thread_data_t *per_thread_data;
 
   vlib_log_class_t log_class;
@@ -216,9 +251,9 @@ typedef struct
 } avf_create_if_args_t;
 
 void avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args);
-void avf_delete_if (vlib_main_t * vm, avf_device_t * ad);
 
 extern vlib_node_registration_t avf_input_node;
+extern vlib_node_registration_t avf_process_node;
 extern vnet_device_class_t avf_device_class;
 
 /* format.c */
@@ -226,6 +261,12 @@ format_function_t format_avf_device;
 format_function_t format_avf_device_name;
 format_function_t format_avf_input_trace;
 
+static_always_inline avf_device_t *
+avf_get_device (u32 dev_instance)
+{
+  return pool_elt_at_index (avf_main.devices, dev_instance)[0];
+}
+
 static inline u32
 avf_get_u32 (void *start, int offset)
 {
@@ -299,13 +340,15 @@ avf_rxd_is_not_dd (avf_rx_desc_t * d)
 
 typedef struct
 {
-  u32 next_index;
+  u16 qid;
+  u16 next_index;
   u32 hw_if_index;
   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
 {