net/ice: remove VSI update on DCF reset by PF

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

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 5da5cea..a3b2a3d 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -270,9 +270,6 @@ struct mlx5_dev_config {
                /* Rx queue count threshold to enable MPRQ. */
        } mprq; /* Configurations for Multi-Packet RQ. */
        int mps; /* Multi-packet send supported mode. */
-       unsigned int flow_prio; /* Number of flow priorities. */
-       enum modify_reg flow_mreg_c[MLX5_MREG_C_NUM];
-       /* Availibility of mreg_c's. */
        unsigned int tso_max_payload_sz; /* Maximum TCP payload for TSO. */
        unsigned int ind_table_max_size; /* Maximum indirection table size. */
        unsigned int max_dump_files_num; /* Maximum dump files per queue. */
@@ -996,7 +993,7 @@ struct mlx5_dev_txpp {
        uint32_t tick; /* Completion tick duration in nanoseconds. */
        uint32_t test; /* Packet pacing test mode. */
        int32_t skew; /* Scheduling skew. */
-       struct rte_intr_handle intr_handle; /* Periodic interrupt. */
+       struct rte_intr_handle *intr_handle; /* Periodic interrupt. */
        void *echan; /* Event Channel. */
        struct mlx5_txpp_wq clock_queue; /* Clock Queue. */
        struct mlx5_txpp_wq rearm_queue; /* Clock Queue. */
@@ -1120,6 +1117,10 @@ struct mlx5_dev_ctx_shared {
        uint32_t tunnel_header_0_1:1; /* tunnel_header_0_1 is supported. */
        uint32_t misc5_cap:1; /* misc5 matcher parameter is supported. */
        uint32_t reclaim_mode:1; /* Reclaim memory. */
+       uint32_t dr_drop_action_en:1; /* Use DR drop action. */
+       uint32_t drop_action_check_flag:1; /* Check Flag for drop action. */
+       uint32_t flow_priority_check_flag:1; /* Check Flag for flow priority. */
+       uint32_t metadata_regc_check_flag:1; /* Check Flag for metadata REGC. */
        uint32_t max_port; /* Maximal IB device port index. */
        struct mlx5_bond_info bond; /* Bonding information. */
        struct mlx5_common_device *cdev; /* Backend mlx5 device. */
@@ -1160,8 +1161,8 @@ struct mlx5_dev_ctx_shared {
        struct mlx5_indexed_pool *ipool[MLX5_IPOOL_MAX];
        struct mlx5_indexed_pool *mdh_ipools[MLX5_MAX_MODIFY_NUM];
        /* Shared interrupt handler section. */
-       struct rte_intr_handle intr_handle; /* Interrupt handler for device. */
-       struct rte_intr_handle intr_handle_devx; /* DEVX interrupt handler. */
+       struct rte_intr_handle *intr_handle; /* Interrupt handler for device. */
+       struct rte_intr_handle *intr_handle_devx; /* DEVX interrupt handler. */
        void *devx_comp; /* DEVX async comp obj. */
        struct mlx5_devx_obj *tis[16]; /* TIS object. */
        struct mlx5_devx_obj *td; /* Transport domain. */
@@ -1180,6 +1181,9 @@ struct mlx5_dev_ctx_shared {
        struct mlx5_aso_ct_pools_mng *ct_mng;
        /* Management data for ASO connection tracking. */
        struct mlx5_lb_ctx self_lb; /* QP to enable self loopback for Devx. */
+       unsigned int flow_max_priority;
+       enum modify_reg flow_mreg_c[MLX5_MREG_C_NUM];
+       /* Availability of mreg_c's. */
        struct mlx5_dev_shared_port port[]; /* per device port data array. */
 };
 
@@ -1685,7 +1689,7 @@ int mlx5_counter_query(struct rte_eth_dev *dev, uint32_t cnt,
 int mlx5_flow_dev_dump(struct rte_eth_dev *dev, struct rte_flow *flow,
                        FILE *file, struct rte_flow_error *error);
 int save_dump_file(const unsigned char *data, uint32_t size,
-               uint32_t type, uint32_t id, void *arg, FILE *file);
+               uint32_t type, uint64_t id, void *arg, FILE *file);
 int mlx5_flow_query_counter(struct rte_eth_dev *dev, struct rte_flow *flow,
        struct rte_flow_query_count *count, struct rte_flow_error *error);
 #ifdef HAVE_IBV_FLOW_DV_SUPPORT