ethdev: remove jumbo offload flag

[dpdk.git] / drivers / net / octeontx2 / otx2_ethdev.h

diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
index 0fbf68b..4557a0e 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -13,6 +13,8 @@
 #include <rte_kvargs.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
+#include <rte_security_driver.h>
+#include <rte_spinlock.h>
 #include <rte_string_fns.h>
 #include <rte_time.h>
 
@@ -50,6 +52,8 @@
 /* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
 #define NIX_L2_OVERHEAD \
        (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8)
+#define NIX_L2_MAX_LEN \
+       (RTE_ETHER_MTU + NIX_L2_OVERHEAD)
 
 /* HW config of frame size doesn't include FCS */
 #define NIX_MAX_HW_FRS                 9212
@@ -119,7 +123,8 @@
 #define NIX_RSS_OFFLOAD                (ETH_RSS_PORT | ETH_RSS_IP | ETH_RSS_UDP |\
                                 ETH_RSS_TCP | ETH_RSS_SCTP | \
                                 ETH_RSS_TUNNEL | ETH_RSS_L2_PAYLOAD | \
-                                NIX_RSS_L3_L4_SRC_DST)
+                                NIX_RSS_L3_L4_SRC_DST | ETH_RSS_LEVEL_MASK | \
+                                ETH_RSS_C_VLAN)
 
 #define NIX_TX_OFFLOAD_CAPA ( \
        DEV_TX_OFFLOAD_MBUF_FAST_FREE   | \
@@ -143,7 +148,6 @@
        DEV_RX_OFFLOAD_SCTP_CKSUM       | \
        DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
        DEV_RX_OFFLOAD_SCATTER          | \
-       DEV_RX_OFFLOAD_JUMBO_FRAME      | \
        DEV_RX_OFFLOAD_OUTER_UDP_CKSUM  | \
        DEV_RX_OFFLOAD_VLAN_STRIP       | \
        DEV_RX_OFFLOAD_VLAN_FILTER      | \
@@ -160,6 +164,11 @@
 /* Additional timesync values. */
 #define OTX2_CYCLECOUNTER_MASK   0xffffffffffffffffULL
 
+#define OCTEONTX2_PMD                  net_octeontx2
+
+#define otx2_ethdev_is_same_driver(dev) \
+       (strcmp((dev)->device->driver->name, RTE_STR(OCTEONTX2_PMD)) == 0)
+
 enum nix_q_size_e {
        nix_q_size_16,  /* 16 entries */
        nix_q_size_64,  /* 64 entries */
@@ -173,6 +182,14 @@ enum nix_q_size_e {
        nix_q_size_max
 };
 
+enum nix_lso_tun_type {
+       NIX_LSO_TUN_V4V4,
+       NIX_LSO_TUN_V4V6,
+       NIX_LSO_TUN_V6V4,
+       NIX_LSO_TUN_V6V6,
+       NIX_LSO_TUN_MAX,
+};
+
 struct otx2_qint {
        struct rte_eth_dev *eth_dev;
        uint8_t qintx;
@@ -267,12 +284,17 @@ struct otx2_eth_dev {
        uint8_t tx_chan_cnt;
        uint8_t lso_tsov4_idx;
        uint8_t lso_tsov6_idx;
-       uint8_t lso_base_idx;
+       uint8_t lso_udp_tun_idx[NIX_LSO_TUN_MAX];
+       uint8_t lso_tun_idx[NIX_LSO_TUN_MAX];
+       uint64_t lso_tun_fmt;
        uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
        uint8_t mkex_pfl_name[MKEX_NAME_LEN];
        uint8_t max_mac_entries;
+       bool dmac_filter_enable;
        uint8_t lf_tx_stats;
        uint8_t lf_rx_stats;
+       uint8_t lock_rx_ctx;
+       uint8_t lock_tx_ctx;
        uint16_t flags;
        uint16_t cints;
        uint16_t qints;
@@ -334,6 +356,7 @@ struct otx2_eth_dev {
        bool sdp_link; /* SDP flag */
        /* Inline IPsec params */
        uint16_t ipsec_in_max_spi;
+       rte_spinlock_t ipsec_tbl_lock;
        uint8_t duplex;
        uint32_t speed;
 } __rte_cache_aligned;
@@ -347,6 +370,7 @@ struct otx2_eth_txq {
        rte_iova_t fc_iova;
        uint16_t sqes_per_sqb_log2;
        int16_t nb_sqb_bufs_adj;
+       uint64_t lso_tun_fmt;
        RTE_MARKER slow_path_start;
        uint16_t nb_sqb_bufs;
        uint16_t sq;
@@ -389,9 +413,8 @@ otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
 /* Ops */
 int otx2_nix_info_get(struct rte_eth_dev *eth_dev,
                      struct rte_eth_dev_info *dev_info);
-int otx2_nix_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
-                            enum rte_filter_type filter_type,
-                            enum rte_filter_op filter_op, void *arg);
+int otx2_nix_dev_flow_ops_get(struct rte_eth_dev *eth_dev,
+                             const struct rte_flow_ops **ops);
 int otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
                            size_t fw_size);
 int otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
@@ -407,9 +430,8 @@ int otx2_rx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
                           struct rte_eth_burst_mode *mode);
 int otx2_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
                           struct rte_eth_burst_mode *mode);
-uint32_t otx2_nix_rx_queue_count(struct rte_eth_dev *eth_dev, uint16_t qidx);
+uint32_t otx2_nix_rx_queue_count(void *rx_queue);
 int otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt);
-int otx2_nix_rx_descriptor_done(void *rxq, uint16_t offset);
 int otx2_nix_rx_descriptor_status(void *rx_queue, uint16_t offset);
 int otx2_nix_tx_descriptor_status(void *tx_queue, uint16_t offset);
 
@@ -434,12 +456,16 @@ int otx2_nix_set_mc_addr_list(struct rte_eth_dev *eth_dev,
 /* MTU */
 int otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu);
 int otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev);
+void otx2_nix_enable_mseg_on_jumbo(struct otx2_eth_rxq *rxq);
+
 
 /* Link */
 void otx2_nix_toggle_flag_link_cfg(struct otx2_eth_dev *dev, bool set);
 int otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete);
 void otx2_eth_dev_link_status_update(struct otx2_dev *dev,
                                     struct cgx_link_user_info *link);
+void otx2_eth_dev_link_status_get(struct otx2_dev *dev,
+                                 struct cgx_link_user_info *link);
 int otx2_nix_dev_set_link_up(struct rte_eth_dev *eth_dev);
 int otx2_nix_dev_set_link_down(struct rte_eth_dev *eth_dev);
 int otx2_apply_link_speed(struct rte_eth_dev *eth_dev);
@@ -486,8 +512,9 @@ int otx2_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev,
                              const uint64_t *ids,
                              uint64_t *values, unsigned int n);
 int otx2_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
+                                   const uint64_t *ids,
                                    struct rte_eth_xstat_name *xstats_names,
-                                   const uint64_t *ids, unsigned int limit);
+                                   unsigned int limit);
 
 /* RSS */
 void otx2_nix_rss_set_key(struct otx2_eth_dev *dev,