net/sfc: move EvQ entries to the EvQ control structure

[dpdk.git] / drivers / net / sfc / sfc_ev.h

diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h
index 346e3ec..a0addd7 100644 (file)
--- a/drivers/net/sfc/sfc_ev.h
+++ b/drivers/net/sfc/sfc_ev.h
@@ -1,5 +1,7 @@
 /*-
- * Copyright (c) 2016 Solarflare Communications Inc.
+ *   BSD LICENSE
+ *
+ * Copyright (c) 2016-2017 Solarflare Communications Inc.
  * All rights reserved.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -30,8 +32,12 @@
 #ifndef _SFC_EV_H_
 #define _SFC_EV_H_
 
+#include <rte_ethdev.h>
+
 #include "efx.h"
 
+#include "sfc.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -40,8 +46,8 @@ extern "C" {
 #define SFC_MGMT_EVQ_ENTRIES   (EFX_EVQ_MINNEVS)
 
 struct sfc_adapter;
-struct sfc_rxq;
-struct sfc_txq;
+struct sfc_dp_rxq;
+struct sfc_dp_txq;
 
 enum sfc_evq_state {
        SFC_EVQ_UNINITIALIZED = 0,
@@ -52,28 +58,33 @@ enum sfc_evq_state {
        SFC_EVQ_NSTATES
 };
 
+enum sfc_evq_type {
+       SFC_EVQ_TYPE_MGMT = 0,
+       SFC_EVQ_TYPE_RX,
+       SFC_EVQ_TYPE_TX,
+
+       SFC_EVQ_NTYPES
+};
+
 struct sfc_evq {
        /* Used on datapath */
-       efx_evq_t               *common;
-       unsigned int            read_ptr;
-       boolean_t               exception;
-       efsys_mem_t             mem;
-       struct sfc_rxq          *rxq;
-       struct sfc_txq          *txq;
+       efx_evq_t                       *common;
+       const efx_ev_callbacks_t        *callbacks;
+       unsigned int                    read_ptr;
+       boolean_t                       exception;
+       efsys_mem_t                     mem;
+       struct sfc_dp_rxq               *dp_rxq;
+       struct sfc_dp_txq               *dp_txq;
 
        /* Not used on datapath */
-       struct sfc_adapter      *sa;
-       unsigned int            evq_index;
-       enum sfc_evq_state      init_state;
+       struct sfc_adapter              *sa;
+       unsigned int                    evq_index;
+       enum sfc_evq_state              init_state;
+       enum sfc_evq_type               type;
+       unsigned int                    entries;
 };
 
 struct sfc_evq_info {
-       /* Maximum number of EVQ entries taken into account when buffer
-        * table space is allocated.
-        */
-       unsigned int            max_entries;
-       /* Real number of EVQ entries, less or equal to max_entries */
-       unsigned int            entries;
        /* Event queue creation flags */
        uint32_t                flags;
        /* NUMA-aware EVQ data structure used on datapath */
@@ -97,21 +108,6 @@ sfc_ev_qcount(struct sfc_adapter *sa)
        return 1 + dev_data->nb_rx_queues + dev_data->nb_tx_queues;
 }
 
-static inline unsigned int
-sfc_evq_max_entries(struct sfc_adapter *sa, unsigned int sw_index)
-{
-       unsigned int max_entries;
-
-       if (sw_index == sa->mgmt_evq_index)
-               max_entries = SFC_MGMT_EVQ_ENTRIES;
-       else if (sw_index <= sa->eth_dev->data->nb_rx_queues)
-               max_entries = EFX_RXQ_MAXNDESCS;
-       else
-               max_entries = efx_nic_cfg_get(sa->nic)->enc_txq_max_ndescs;
-
-       return max_entries;
-}
-
 static inline unsigned int
 sfc_evq_index_by_rxq_sw_index(__rte_unused struct sfc_adapter *sa,
                              unsigned int rxq_sw_index)
@@ -131,6 +127,7 @@ int sfc_ev_start(struct sfc_adapter *sa);
 void sfc_ev_stop(struct sfc_adapter *sa);
 
 int sfc_ev_qinit(struct sfc_adapter *sa, unsigned int sw_index,
+                enum sfc_evq_type type, unsigned int type_index,
                 unsigned int entries, int socket_id);
 void sfc_ev_qfini(struct sfc_adapter *sa, unsigned int sw_index);
 int sfc_ev_qstart(struct sfc_adapter *sa, unsigned int sw_index);