pci: introduce library and driver

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

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index e77639e..7f11bf2 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -34,6 +34,8 @@
 
 #include <stdbool.h>
 
+#include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_ethdev.h>
 #include <rte_kvargs.h>
 #include <rte_spinlock.h>
@@ -46,12 +48,7 @@
 extern "C" {
 #endif
 
-#define SFC_DEV_TO_PCI(eth_dev) \
-       RTE_DEV_TO_PCI((eth_dev)->device)
-
 #if EFSYS_OPT_RX_SCALE
-/** RSS key length (bytes) */
-#define SFC_RSS_KEY_SIZE       40
 /** RSS hash offloads mask */
 #define SFC_RSS_OFFLOADS       (ETH_RSS_IP | ETH_RSS_TCP)
 #endif
@@ -64,20 +61,20 @@ extern "C" {
  *     V                       |
  * +---------------+------------+
  * |  INITIALIZED  |
- * +---------------+<-----------+
- *     |.dev_configure         |
- *     V                       |
- * +---------------+           |
- * |  CONFIGURING  |------------^
- * +---------------+ failed    |
- *     |success                |
- *     |               +---------------+
- *     |               |    CLOSING    |
- *     |               +---------------+
- *     |                       ^
- *     V                       |.dev_close
- * +---------------+------------+
- * |  CONFIGURED   |
+ * +---------------+<-----------<---------------+
+ *     |.dev_configure         |               |
+ *     V                       |failed         |
+ * +---------------+------------+              |
+ * |  CONFIGURING  |                           |
+ * +---------------+----+                      |
+ *     |success        |                       |
+ *     |               |               +---------------+
+ *     |               |               |    CLOSING    |
+ *     |               |               +---------------+
+ *     |               |                       ^
+ *     V               |.dev_configure         |
+ * +---------------+----+                      |.dev_close
+ * |  CONFIGURED   |----------------------------+
  * +---------------+<-----------+
  *     |.dev_start             |
  *     V                       |
@@ -139,7 +136,6 @@ struct sfc_intr {
        boolean_t                       lsc_intr;
 };
 
-struct sfc_evq_info;
 struct sfc_rxq_info;
 struct sfc_txq_info;
 struct sfc_dp_rx;
@@ -154,6 +150,11 @@ struct sfc_port {
        boolean_t                       flow_ctrl_autoneg;
        size_t                          pdu;
 
+       /*
+        * Flow API isolated mode overrides promisc and allmulti settings;
+        * they won't be applied if isolated mode is active
+        */
+       boolean_t                       isolated;
        boolean_t                       promisc;
        boolean_t                       allmulti;
 
@@ -163,6 +164,7 @@ struct sfc_port {
 
        rte_spinlock_t                  mac_stats_lock;
        uint64_t                        *mac_stats_buf;
+       unsigned int                    mac_stats_nb_supported;
        efsys_mem_t                     mac_stats_dma_mem;
        boolean_t                       mac_stats_reset_pending;
        uint16_t                        mac_stats_update_period_ms;
@@ -183,6 +185,8 @@ struct sfc_adapter {
         */
        rte_spinlock_t                  lock;
        enum sfc_adapter_state          state;
+       struct rte_pci_addr             pci_addr;
+       uint16_t                        port_id;
        struct rte_eth_dev              *eth_dev;
        struct rte_kvargs               *kvargs;
        bool                            debug_init;
@@ -204,10 +208,10 @@ struct sfc_adapter {
 
        uint32_t                        evq_flags;
        unsigned int                    evq_count;
-       struct sfc_evq_info             *evq_info;
 
        unsigned int                    mgmt_evq_index;
        rte_spinlock_t                  mgmt_evq_lock;
+       struct sfc_evq                  *mgmt_evq;
 
        unsigned int                    rxq_count;
        struct sfc_rxq_info             *rxq_info;
@@ -220,14 +224,25 @@ struct sfc_adapter {
        unsigned int                    rss_channels;
 
 #if EFSYS_OPT_RX_SCALE
-       efx_rx_scale_support_t          rss_support;
+       efx_rx_scale_context_type_t     rss_support;
        efx_rx_hash_support_t           hash_support;
        efx_rx_hash_type_t              rss_hash_types;
        unsigned int                    rss_tbl[EFX_RSS_TBL_SIZE];
-       uint8_t                         rss_key[SFC_RSS_KEY_SIZE];
+       uint8_t                         rss_key[EFX_RSS_KEY_SIZE];
 #endif
 
+       /*
+        * Shared memory copy of the Rx datapath name to be used by
+        * the secondary process to find Rx datapath to be used.
+        */
+       char                            *dp_rx_name;
        const struct sfc_dp_rx          *dp_rx;
+
+       /*
+        * Shared memory copy of the Tx datapath name to be used by
+        * the secondary process to find Rx datapath to be used.
+        */
+       char                            *dp_tx_name;
        const struct sfc_dp_tx          *dp_tx;
 };
 
@@ -303,8 +318,10 @@ void sfc_intr_close(struct sfc_adapter *sa);
 int sfc_intr_start(struct sfc_adapter *sa);
 void sfc_intr_stop(struct sfc_adapter *sa);
 
-int sfc_port_init(struct sfc_adapter *sa);
-void sfc_port_fini(struct sfc_adapter *sa);
+int sfc_port_attach(struct sfc_adapter *sa);
+void sfc_port_detach(struct sfc_adapter *sa);
+int sfc_port_configure(struct sfc_adapter *sa);
+void sfc_port_close(struct sfc_adapter *sa);
 int sfc_port_start(struct sfc_adapter *sa);
 void sfc_port_stop(struct sfc_adapter *sa);
 void sfc_port_link_mode_to_info(efx_link_mode_t link_mode,