bus/fslmc: switch sequence number to dynamic mbuf field

[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.h

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index 030c625..94cf253 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016-2019 NXP
+ *   Copyright 2016-2020 NXP
  *
  */
 
@@ -91,7 +91,7 @@
 #define DPAA2_PKT_TYPE_VLAN_2          0x0260
 
 /* enable timestamp in mbuf*/
-extern enum pmd_dpaa2_ts dpaa2_enable_ts;
+extern bool dpaa2_enable_ts[];
 
 #define DPAA2_QOS_TABLE_RECONFIGURE    1
 #define DPAA2_FS_TABLE_RECONFIGURE     2
@@ -99,6 +99,7 @@ extern enum pmd_dpaa2_ts dpaa2_enable_ts;
 #define DPAA2_QOS_TABLE_IPADDR_EXTRACT 4
 #define DPAA2_FS_TABLE_IPADDR_EXTRACT 8
 
+#define DPAA2_FLOW_MAX_KEY_SIZE                16
 
 /*Externaly defined*/
 extern const struct rte_flow_ops dpaa2_flow_ops;
@@ -145,6 +146,9 @@ struct dpaa2_dev_priv {
        uint8_t max_mac_filters;
        uint8_t max_vlan_filters;
        uint8_t num_rx_tc;
+       uint16_t qos_entries;
+       uint16_t fs_entries;
+       uint8_t dist_queues;
        uint8_t flags; /*dpaa2 config flags */
        uint8_t en_ordered;
        uint8_t en_loose_ordered;
@@ -152,13 +156,10 @@ struct dpaa2_dev_priv {
        uint8_t cgid_in_use[MAX_RX_QUEUES];
 
        struct extract_s extract;
-       uint8_t *qos_index;
-       uint8_t *fs_index;
 
        uint16_t ss_offset;
        uint64_t ss_iova;
        uint64_t ss_param_iova;
-#if defined(RTE_LIBRTE_IEEE1588)
        /*stores timestamp of last received packet on dev*/
        uint64_t rx_timestamp;
        /*stores timestamp of last received tx confirmation packet on dev*/
@@ -167,7 +168,6 @@ struct dpaa2_dev_priv {
         * it corresponds to last packet transmitted
         */
        struct dpaa2_queue *next_tx_conf_queue;
-#endif
 
        struct rte_eth_dev *eth_dev; /**< Pointer back to holding ethdev */
 
@@ -178,7 +178,7 @@ int dpaa2_distset_to_dpkg_profile_cfg(uint64_t req_dist_set,
                                      struct dpkg_profile_cfg *kg_cfg);
 
 int dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
-                         uint64_t req_dist_set);
+               uint64_t req_dist_set, int tc_index);
 
 int dpaa2_remove_flow_dist(struct rte_eth_dev *eth_dev,
                           uint8_t tc_index);
@@ -225,7 +225,6 @@ void dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci);
 void dpaa2_flow_clean(struct rte_eth_dev *dev);
 uint16_t dpaa2_dev_tx_conf(void *queue)  __rte_unused;
 
-#if defined(RTE_LIBRTE_IEEE1588)
 int dpaa2_timesync_enable(struct rte_eth_dev *dev);
 int dpaa2_timesync_disable(struct rte_eth_dev *dev);
 int dpaa2_timesync_read_time(struct rte_eth_dev *dev,
@@ -238,5 +237,4 @@ int dpaa2_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
                                                uint32_t flags __rte_unused);
 int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
                                          struct timespec *timestamp);
-#endif
 #endif /* _DPAA2_ETHDEV_H */