net/ice: enable flow redirect on switch

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

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 2c67150..cf95eba 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
@@ -108,6 +108,7 @@ struct sfc_intr {
        efx_intr_type_t                 type;
        rte_intr_callback_fn            handler;
        boolean_t                       lsc_intr;
+       boolean_t                       rxq_intr;
 };
 
 struct sfc_rxq;
@@ -131,11 +132,10 @@ struct sfc_port {
         * 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;
 
-       struct ether_addr               default_mac_addr;
+       struct rte_ether_addr           default_mac_addr;
 
        unsigned int                    max_mcast_addrs;
        unsigned int                    nb_mcast_addrs;
@@ -182,6 +182,11 @@ struct sfc_adapter_shared {
        unsigned int                    txq_count;
        struct sfc_txq_info             *txq_info;
 
+       struct sfc_rss                  rss;
+
+       boolean_t                       isolated;
+       uint32_t                        tunnel_encaps;
+
        struct rte_pci_addr             pci_addr;
        uint16_t                        port_id;
 
@@ -215,12 +220,6 @@ struct sfc_adapter {
         */
        struct sfc_adapter_priv         priv;
 
-       /*
-        * Temporary placeholder for multi-process shared data for
-        * transition.
-        */
-       struct sfc_adapter_shared       _shared;
-
        /*
         * PMD setup and configuration is not thread safe. Since it is not
         * performance sensitive, it is better to guarantee thread-safety
@@ -243,10 +242,19 @@ struct sfc_adapter {
        struct sfc_port                 port;
        struct sfc_filter               filter;
 
+       struct sfc_flow_list            flow_list;
+
        unsigned int                    rxq_max;
        unsigned int                    txq_max;
 
+       unsigned int                    rxq_max_entries;
+       unsigned int                    rxq_min_entries;
+
        unsigned int                    txq_max_entries;
+       unsigned int                    txq_min_entries;
+
+       unsigned int                    evq_max_entries;
+       unsigned int                    evq_min_entries;
 
        uint32_t                        evq_flags;
        unsigned int                    evq_count;
@@ -281,18 +289,27 @@ struct sfc_adapter {
        struct sfc_txq                  *txq_ctrl;
 
        boolean_t                       tso;
+       boolean_t                       tso_encap;
 
        uint32_t                        rxd_wait_timeout_ns;
-
-       struct sfc_rss                  rss;
 };
 
 static inline struct sfc_adapter_shared *
 sfc_adapter_shared_by_eth_dev(struct rte_eth_dev *eth_dev)
 {
-       struct sfc_adapter *sa = eth_dev->data->dev_private;
+       struct sfc_adapter_shared *sas = eth_dev->data->dev_private;
 
-       return sa->priv.shared;
+       return sas;
+}
+
+static inline struct sfc_adapter *
+sfc_adapter_by_eth_dev(struct rte_eth_dev *eth_dev)
+{
+       struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(eth_dev);
+
+       SFC_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
+
+       return container_of(sap, struct sfc_adapter, priv);
 }
 
 static inline struct sfc_adapter_shared *
@@ -390,6 +407,7 @@ void sfc_port_link_mode_to_info(efx_link_mode_t link_mode,
 int sfc_port_update_mac_stats(struct sfc_adapter *sa);
 int sfc_port_reset_mac_stats(struct sfc_adapter *sa);
 int sfc_set_rx_mode(struct sfc_adapter *sa);
+int sfc_set_rx_mode_unchecked(struct sfc_adapter *sa);
 
 
 #ifdef __cplusplus