nat: Include platform specific headers on FreeBSD

[vpp.git] / src / plugins / avf / avf.h

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index ea931dc..f6f79cf 100644 (file)
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -19,6 +19,7 @@
 #define _AVF_H_
 
 #include <avf/virtchnl.h>
+#include <avf/avf_advanced_flow.h>
 
 #include <vppinfra/types.h>
 #include <vppinfra/error_bootstrap.h>
@@ -37,6 +38,7 @@
 
 #define AVF_AQ_ENQ_SUSPEND_TIME                50e-6
 #define AVF_AQ_ENQ_MAX_WAIT_TIME       250e-3
+#define AVF_AQ_BUF_SIZE                        4096
 
 #define AVF_RESET_SUSPEND_TIME         20e-3
 #define AVF_RESET_MAX_WAIT_TIME                1
@@ -85,6 +87,7 @@
 
 
 extern vlib_log_class_registration_t avf_log;
+extern vlib_log_class_registration_t avf_stats_log;
 
 #define avf_log_err(dev, f, ...)                        \
   vlib_log (VLIB_LOG_LEVEL_ERR, avf_log.class, "%U: " f, \
@@ -101,13 +104,16 @@ extern vlib_log_class_registration_t avf_log;
             format_vlib_pci_addr, &dev->pci_addr, \
             ## __VA_ARGS__)
 
+#define avf_stats_log_debug(dev, f, ...)                                      \
+  vlib_log (VLIB_LOG_LEVEL_DEBUG, avf_stats_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, VA_DMA, "vaddr-dma")                                                  \
   _ (4, LINK_UP, "link-up")                                                   \
-  _ (5, SHARED_TXQ_LOCK, "shared-txq-lock")                                   \
   _ (6, ELOG, "elog")                                                         \
   _ (7, PROMISC, "promisc")                                                   \
   _ (8, RX_INT, "rx-interrupts")                                              \
@@ -191,13 +197,16 @@ typedef struct
 
   avf_tx_desc_t *tmp_descs;
   u32 *tmp_bufs;
+  u32 queue_index;
 } avf_txq_t;
 
 typedef struct
 {
   u32 flow_index;
   u32 mark;
+  u8 flow_type_flag;
   struct avf_fdir_conf *rcfg;
+  struct virtchnl_rss_cfg *rss_cfg;
 } avf_flow_entry_t;
 
 typedef struct
@@ -286,6 +295,7 @@ typedef struct
   u32 calling_process_index;
   u8 eth_addr[6];
   int is_add, is_enable;
+  enum virthnl_adv_ops vc_op;
 
   /* below parameters are used for 'program flow' event */
   u8 *rule;
@@ -329,6 +339,7 @@ typedef struct
   u8 *name;
   int enable_elog;
   u16 rxq_num;
+  u16 txq_num;
   u16 rxq_size;
   u16 txq_size;
   /* return */
@@ -343,7 +354,8 @@ extern vlib_node_registration_t avf_input_node;
 extern vlib_node_registration_t avf_process_node;
 extern vnet_device_class_t avf_device_class;
 
-clib_error_t *avf_program_flow (u32 dev_instance, int is_add, u8 *rule,
+clib_error_t *avf_program_flow (u32 dev_instance, int is_add,
+                               enum virthnl_adv_ops vc_op, u8 *rule,
                                u32 rule_len, u8 *program_status,
                                u32 status_len);
 
@@ -355,6 +367,7 @@ format_function_t format_avf_vf_cap_flags;
 format_function_t format_avf_vlan_supported_caps;
 format_function_t format_avf_vlan_caps;
 format_function_t format_avf_vlan_support;
+format_function_t format_avf_eth_stats;
 vnet_flow_dev_ops_function_t avf_flow_ops_fn;
 
 static_always_inline avf_device_t *
@@ -363,6 +376,13 @@ avf_get_device (u32 dev_instance)
   return pool_elt_at_index (avf_main.devices, dev_instance)[0];
 }
 
+/* elog.c */
+void avf_elog_init ();
+void avf_elog_reg (avf_device_t *ad, u32 addr, u32 val, int is_read);
+void avf_elog_aq_enq_req (avf_device_t *ad, avf_aq_desc_t *d);
+void avf_elog_aq_enq_resp (avf_device_t *ad, avf_aq_desc_t *d);
+void avf_elog_arq_desc (avf_device_t *ad, avf_aq_desc_t *d);
+
 static inline u32
 avf_get_u32 (void *start, int offset)
 {
@@ -406,13 +426,20 @@ avf_set_u32 (void *start, int offset, u32 value)
 static inline void
 avf_reg_write (avf_device_t * ad, u32 addr, u32 val)
 {
-  *(volatile u32 *) ((u8 *) ad->bar0 + addr) = val;
+  if (ad->flags & AVF_DEVICE_F_ELOG)
+    avf_elog_reg (ad, addr, val, 0);
+  __atomic_store_n ((u32 *) ((u8 *) ad->bar0 + addr), val, __ATOMIC_RELEASE);
 }
 
 static inline u32
 avf_reg_read (avf_device_t * ad, u32 addr)
 {
-  return *(volatile u32 *) (ad->bar0 + addr);
+  u32 val = *(volatile u32 *) (ad->bar0 + addr);
+
+  if (ad->flags & AVF_DEVICE_F_ELOG)
+    avf_elog_reg (ad, addr, val, 1);
+
+  return val;
 }
 
 static inline void