drivers: remove direct access to interrupt handle

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

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 452ce21..fee1738 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -27,68 +27,19 @@
 #include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_filter.h"
+#include "sfc_flow_tunnel.h"
 #include "sfc_sriov.h"
 #include "sfc_mae.h"
 #include "sfc_dp.h"
 #include "sfc_sw_stats.h"
 #include "sfc_repr_proxy.h"
 #include "sfc_service.h"
+#include "sfc_ethdev_state.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
- * +---------------+
- * | UNINITIALIZED |<-----------+
- * +---------------+           |
- *     |.eth_dev_init          |.eth_dev_uninit
- *     V                       |
- * +---------------+------------+
- * |  INITIALIZED  |
- * +---------------+<-----------<---------------+
- *     |.dev_configure         |               |
- *     V                       |failed         |
- * +---------------+------------+              |
- * |  CONFIGURING  |                           |
- * +---------------+----+                      |
- *     |success        |                       |
- *     |               |               +---------------+
- *     |               |               |    CLOSING    |
- *     |               |               +---------------+
- *     |               |                       ^
- *     V               |.dev_configure         |
- * +---------------+----+                      |.dev_close
- * |  CONFIGURED   |----------------------------+
- * +---------------+<-----------+
- *     |.dev_start             |
- *     V                       |
- * +---------------+           |
- * |   STARTING    |------------^
- * +---------------+ failed    |
- *     |success                |
- *     |               +---------------+
- *     |               |   STOPPING    |
- *     |               +---------------+
- *     |                       ^
- *     V                       |.dev_stop
- * +---------------+------------+
- * |    STARTED    |
- * +---------------+
- */
-enum sfc_adapter_state {
-       SFC_ADAPTER_UNINITIALIZED = 0,
-       SFC_ADAPTER_INITIALIZED,
-       SFC_ADAPTER_CONFIGURING,
-       SFC_ADAPTER_CONFIGURED,
-       SFC_ADAPTER_CLOSING,
-       SFC_ADAPTER_STARTING,
-       SFC_ADAPTER_STARTED,
-       SFC_ADAPTER_STOPPING,
-
-       SFC_ADAPTER_NSTATES
-};
-
 enum sfc_dev_filter_mode {
        SFC_DEV_FILTER_MODE_PROMISC = 0,
        SFC_DEV_FILTER_MODE_ALLMULTI,
@@ -267,7 +218,7 @@ struct sfc_adapter {
         * change its state should acquire the lock.
         */
        rte_spinlock_t                  lock;
-       enum sfc_adapter_state          state;
+       enum sfc_ethdev_state           state;
        struct rte_eth_dev              *eth_dev;
        struct rte_kvargs               *kvargs;
        int                             socket_id;
@@ -284,6 +235,8 @@ struct sfc_adapter {
        struct sfc_intr                 intr;
        struct sfc_port                 port;
        struct sfc_sw_stats             sw_stats;
+       /* Registry of tunnel offload contexts */
+       struct sfc_flow_tunnel          flow_tunnels[SFC_FT_MAX_NTUNNELS];
        struct sfc_filter               filter;
        struct sfc_mae                  mae;
        struct sfc_repr_proxy           repr_proxy;
@@ -339,6 +292,8 @@ struct sfc_adapter {
        boolean_t                       tso;
        boolean_t                       tso_encap;
 
+       uint64_t                        negotiated_rx_metadata;
+
        uint32_t                        rxd_wait_timeout_ns;
 
        bool                            switchdev;
@@ -448,6 +403,7 @@ uint32_t sfc_register_logtype(const struct rte_pci_addr *pci_addr,
 int sfc_probe(struct sfc_adapter *sa);
 void sfc_unprobe(struct sfc_adapter *sa);
 int sfc_attach(struct sfc_adapter *sa);
+void sfc_pre_detach(struct sfc_adapter *sa);
 void sfc_detach(struct sfc_adapter *sa);
 int sfc_start(struct sfc_adapter *sa);
 void sfc_stop(struct sfc_adapter *sa);