net/liquidio: fix jumbo frame flag condition for MTU set

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

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index ba2a8c4..3836a96 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -467,13 +467,7 @@ struct mlx5_flow_counter_mng {
 struct mlx5_aso_cq {
        uint16_t log_desc_n;
        uint32_t cq_ci:24;
-       struct mlx5_devx_obj *cq;
-       struct mlx5dv_devx_umem *umem_obj;
-       union {
-               volatile void *umem_buf;
-               volatile struct mlx5_cqe *cqes;
-       };
-       volatile uint32_t *db_rec;
+       struct mlx5_devx_cq cq_obj;
        uint64_t errors;
 };
 
@@ -493,13 +487,7 @@ struct mlx5_aso_sq_elem {
 struct mlx5_aso_sq {
        uint16_t log_desc_n;
        struct mlx5_aso_cq cq;
-       struct mlx5_devx_obj *sq;
-       struct mlx5dv_devx_umem *wqe_umem; /* SQ buffer umem. */
-       union {
-               volatile void *umem_buf;
-               volatile struct mlx5_aso_wqe *wqes;
-       };
-       volatile uint32_t *db_rec;
+       struct mlx5_devx_sq sq_obj;
        volatile uint64_t *uar_addr;
        struct mlx5_aso_devx_mr mr;
        uint16_t pi;
@@ -621,15 +609,9 @@ struct mlx5_txpp_wq {
        uint32_t cq_ci:24;
        uint32_t arm_sn:2;
        /* Send Queue related data.*/
-       struct mlx5_devx_obj *sq;
-       void *sq_umem;
-       union {
-               volatile void *sq_buf;
-               volatile struct mlx5_wqe *wqes;
-       };
+       struct mlx5_devx_sq sq_obj;
        uint16_t sq_size; /* Number of WQEs in the queue. */
        uint16_t sq_ci; /* Next WQE to execute. */
-       volatile uint32_t *sq_dbrec;
 };
 
 /* Tx packet pacing internal timestamp. */
@@ -689,7 +671,6 @@ struct mlx5_dev_ctx_shared {
        uint16_t bond_dev; /* Bond primary device id. */
        uint32_t devx:1; /* Opened with DV. */
        uint32_t flow_hit_aso_en:1; /* Flow Hit ASO is supported. */
-       uint32_t eqn; /* Event Queue number. */
        uint32_t max_port; /* Maximal IB device port index. */
        void *ctx; /* Verbs/DV/DevX context. */
        void *pd; /* Protection Domain. */
@@ -795,9 +776,10 @@ struct mlx5_rxq_obj {
                        void *ibv_cq; /* Completion Queue. */
                        void *ibv_channel;
                };
+               struct mlx5_devx_obj *rq; /* DevX RQ object for hairpin. */
                struct {
-                       struct mlx5_devx_obj *rq; /* DevX Rx Queue object. */
-                       struct mlx5_devx_obj *devx_cq; /* DevX CQ object. */
+                       struct mlx5_devx_rq rq_obj; /* DevX RQ object. */
+                       struct mlx5_devx_cq cq_obj; /* DevX CQ object. */
                        void *devx_channel;
                };
        };
@@ -853,16 +835,10 @@ struct mlx5_txq_obj {
                };
                struct {
                        struct rte_eth_dev *dev;
-                       struct mlx5_devx_obj *cq_devx;
-                       void *cq_umem;
-                       void *cq_buf;
-                       int64_t cq_dbrec_offset;
-                       struct mlx5_devx_dbr_page *cq_dbrec_page;
-                       struct mlx5_devx_obj *sq_devx;
-                       void *sq_umem;
-                       void *sq_buf;
-                       int64_t sq_dbrec_offset;
-                       struct mlx5_devx_dbr_page *sq_dbrec_page;
+                       struct mlx5_devx_cq cq_obj;
+                       /* DevX CQ object and its resources. */
+                       struct mlx5_devx_sq sq_obj;
+                       /* DevX SQ object and its resources. */
                };
        };
 };
@@ -979,7 +955,6 @@ struct mlx5_priv {
        /* Context for Verbs allocator. */
        int nl_socket_rdma; /* Netlink socket (NETLINK_RDMA). */
        int nl_socket_route; /* Netlink socket (NETLINK_ROUTE). */
-       struct mlx5_dbr_page_list dbrpgs; /* Door-bell pages. */
        struct mlx5_nl_vlan_vmwa_context *vmwa_context; /* VLAN WA context. */
        struct mlx5_hlist *mreg_cp_tbl;
        /* Hash table of Rx metadata register copy table. */