mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Edward Srouji <edwards@nvidia.com>
To: Leon Romanovsky <leon@kernel.org>, Jason Gunthorpe <jgg@ziepe.ca>,
	"Sabrina Dubroca" <sd@queasysnail.net>
Cc: <linux-rdma@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<netdev@vger.kernel.org>, Edward Srouji <edwards@nvidia.com>,
	"Akiva Goldberger" <agoldberger@nvidia.com>,
	Michael Gur <michaelgur@nvidia.com>
Subject: [PATCH rdma-next 07/11] RDMA/mlx5: Select the QP core device through its PD
Date: Tue, 17 Nov 2026 16:01:18 +0200	[thread overview]
Message-ID: <20261117-mlx5-sd-prep-v1-7-8efd124c7895@nvidia.com> (raw)
In-Reply-To: <20261117-mlx5-sd-prep-v1-0-8efd124c7895@nvidia.com>

From: Akiva Goldberger <agoldberger@nvidia.com>

Resolve the core device from the QP across the QP create and modify
paths, instead of accessing the core dev through dev->mdev.
Delay drop is armed once for the whole IB device, so it stays on
dev->mdev.

No functional change.

Signed-off-by: Akiva Goldberger <agoldberger@nvidia.com>
Reviewed-by: Michael Gur <michaelgur@nvidia.com>
Signed-off-by: Edward Srouji <edwards@nvidia.com>
---
 drivers/infiniband/hw/mlx5/gsi.c     |  13 +-
 drivers/infiniband/hw/mlx5/ib_rep.c  |   3 +-
 drivers/infiniband/hw/mlx5/main.c    |   6 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h |  14 +-
 drivers/infiniband/hw/mlx5/qp.c      | 415 +++++++++++++++++++----------------
 drivers/infiniband/hw/mlx5/wr.c      |   4 +-
 6 files changed, 244 insertions(+), 211 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c
index 16c2afbcef6ede74c703e95414f7e0e43974b808..62a570077585e1c98ce10f78c23eb1ea2781956f 100644
--- a/drivers/infiniband/hw/mlx5/gsi.c
+++ b/drivers/infiniband/hw/mlx5/gsi.c
@@ -38,9 +38,9 @@ struct mlx5_ib_gsi_wr {
 	bool completed:1;
 };
 
-static bool mlx5_ib_deth_sqpn_cap(struct mlx5_ib_dev *dev)
+static bool mlx5_ib_deth_sqpn_cap(struct mlx5_core_dev *mdev)
 {
-	return MLX5_CAP_GEN(dev->mdev, set_deth_sqpn);
+	return MLX5_CAP_GEN(mdev, set_deth_sqpn);
 }
 
 /* Call with gsi->lock locked */
@@ -89,15 +89,15 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
 		       struct ib_qp_init_attr *attr)
 {
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_gsi_qp *gsi;
 	struct ib_qp_init_attr hw_init_attr = *attr;
 	const u8 port_num = attr->port_num;
 	int num_qps = 0;
 	int ret;
 
-	if (mlx5_ib_deth_sqpn_cap(dev)) {
-		if (MLX5_CAP_GEN(dev->mdev,
-				 port_type) == MLX5_CAP_PORT_TYPE_IB)
+	if (mlx5_ib_deth_sqpn_cap(mdev)) {
+		if (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_IB)
 			num_qps = pd->device->attrs.max_pkeys;
 		else if (dev->lag_active)
 			num_qps = dev->lag_ports;
@@ -268,7 +268,8 @@ static void setup_qp(struct mlx5_ib_gsi_qp *gsi, u16 qp_index)
 	u16 pkey;
 	int ret;
 
-	if (MLX5_CAP_GEN(dev->mdev,  port_type) != MLX5_CAP_PORT_TYPE_IB)
+	if (MLX5_CAP_GEN(qp_to_mdev(gsi->rx_qp), port_type) !=
+	    MLX5_CAP_PORT_TYPE_IB)
 		pkey_index = 0;
 
 	ret = ib_query_pkey(device, gsi->port_num, pkey_index, &pkey);
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index b6bfc85c0c5703d1e7384a50caa2c46fbab8059e..416483ecb575620e48695871747ccbf6ab03d7e6 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -303,7 +303,8 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
 						   struct mlx5_ib_sq *sq,
 						   u32 port)
 {
-	struct mlx5_eswitch *esw = dev->mdev->priv.eswitch;
+	struct mlx5_core_dev *mdev = qp_to_mdev(sq->base.container_mibqp);
+	struct mlx5_eswitch *esw = mdev->priv.eswitch;
 	struct mlx5_eswitch_rep *rep;
 
 	if (!dev->is_rep || !port)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index f7ea8aa4ad210c51c2dfd82bbe16043af667b7d9..83b49f0fcdc06c9e7ccbad3c8765d2b6ca7d484d 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2311,7 +2311,7 @@ static int mlx5_ib_alloc_ucontext(struct ib_ucontext *uctx,
 	context->lib_caps = req.lib_caps;
 	print_lib_caps(dev, context->lib_caps);
 
-	if (mlx5_ib_lag_should_assign_affinity(dev)) {
+	if (mlx5_ib_lag_should_assign_affinity(dev, dev->mdev)) {
 		u32 port = mlx5_core_native_port_num(dev->mdev) - 1;
 
 		atomic_set(&context->tx_port_affinity,
@@ -2844,7 +2844,7 @@ static int mlx5_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 		return -EOPNOTSUPP;
 	}
 
-	err = mlx5_cmd_attach_mcg(dev->mdev, gid, ibqp->qp_num, uid);
+	err = mlx5_cmd_attach_mcg(qp_to_mdev(ibqp), gid, ibqp->qp_num, uid);
 	if (err)
 		mlx5_ib_warn(dev, "failed attaching QPN 0x%x, MGID %pI6\n",
 			     ibqp->qp_num, gid->raw);
@@ -2860,7 +2860,7 @@ static int mlx5_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
 	uid = ibqp->pd ?
 		to_mpd(ibqp->pd)->uid : 0;
-	err = mlx5_cmd_detach_mcg(dev->mdev, gid, ibqp->qp_num, uid);
+	err = mlx5_cmd_detach_mcg(qp_to_mdev(ibqp), gid, ibqp->qp_num, uid);
 	if (err)
 		mlx5_ib_warn(dev, "failed detaching QPN 0x%x, MGID %pI6\n",
 			     ibqp->qp_num, gid->raw);
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 8b878b33fcdff72ecfa37a860585193ab0ea9c13..48d5ab47b45c3d240409212f5ad18a68f1a14381 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1673,7 +1673,9 @@ static inline void mlx5r_deref_wait_odp_mkey(struct mlx5_ib_mkey *mmkey)
 	wait_event(mmkey->wait, refcount_read(&mmkey->usecount) == 0);
 }
 
-static inline bool mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev)
+static inline bool
+mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev,
+				   struct mlx5_core_dev *mdev)
 {
 	/*
 	 * If the driver is in hash mode and the port_select_flow_table_bypass cap
@@ -1683,16 +1685,16 @@ static inline bool mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev)
 	 * the port affinity by default.
 	 */
 	if (dev->lag_active &&
-	    mlx5_lag_mode_is_hash(dev->mdev) &&
-	    MLX5_CAP_PORT_SELECTION(dev->mdev, port_select_flow_table_bypass))
+	    mlx5_lag_mode_is_hash(mdev) &&
+	    MLX5_CAP_PORT_SELECTION(mdev, port_select_flow_table_bypass))
 		return 0;
 
-	if (mlx5_lag_is_lacp_owner(dev->mdev) && !dev->lag_active)
+	if (mlx5_lag_is_lacp_owner(mdev) && !dev->lag_active)
 		return 0;
 
 	return dev->lag_active ||
-		(MLX5_CAP_GEN(dev->mdev, num_lag_ports) > 1 &&
-		 MLX5_CAP_GEN(dev->mdev, lag_tx_port_affinity));
+		(MLX5_CAP_GEN(mdev, num_lag_ports) > 1 &&
+		 MLX5_CAP_GEN(mdev, lag_tx_port_affinity));
 }
 
 static inline bool rt_supported(int ts_cap)
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 2709e5465d3316eb08f25663a248fba62ebfe8c9..1135e710e339818aaa15f1077874561745ca6305 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -443,11 +443,12 @@ static void mlx5_ib_qp_event(struct mlx5_core_qp *qp, int type)
 static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
 		       int has_rq, struct mlx5_ib_qp *qp, struct mlx5_ib_create_qp *ucmd)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int wqe_size;
 	int wq_size;
 
 	/* Sanity check RQ size before proceeding */
-	if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz)))
+	if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz)))
 		return -EINVAL;
 
 	if (!has_rq) {
@@ -479,10 +480,10 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
 			wq_size = roundup_pow_of_two(cap->max_recv_wr) * wqe_size;
 			wq_size = max_t(int, wq_size, MLX5_SEND_WQE_BB);
 			qp->rq.wqe_cnt = wq_size / wqe_size;
-			if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq)) {
+			if (wqe_size > MLX5_CAP_GEN(mdev, max_wqe_sz_rq)) {
 				mlx5_ib_dbg(dev, "wqe_size %d, max %d\n",
 					    wqe_size,
-					    MLX5_CAP_GEN(dev->mdev,
+					    MLX5_CAP_GEN(mdev,
 							 max_wqe_sz_rq));
 				return -EINVAL;
 			}
@@ -598,6 +599,7 @@ static int get_send_sge(struct ib_qp_init_attr *attr, int wqe_size)
 static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 			struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int wqe_size;
 	int wq_size;
 
@@ -609,9 +611,9 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 	if (wqe_size < 0)
 		return wqe_size;
 
-	if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
+	if (wqe_size > MLX5_CAP_GEN(mdev, max_wqe_sz_sq)) {
 		mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n",
-			    wqe_size, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
+			    wqe_size, MLX5_CAP_GEN(mdev, max_wqe_sz_sq));
 		return -EINVAL;
 	}
 
@@ -621,11 +623,11 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 
 	wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);
 	qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
-	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
+	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) {
 		mlx5_ib_dbg(dev, "send queue size (%d * %d / %d -> %d) exceeds limits(%d)\n",
 			    attr->cap.max_send_wr, wqe_size, MLX5_SEND_WQE_BB,
 			    qp->sq.wqe_cnt,
-			    1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
+			    1 << MLX5_CAP_GEN(mdev, log_max_qp_sz));
 		return -ENOMEM;
 	}
 	qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);
@@ -646,12 +648,13 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
 			    struct mlx5_ib_qp_base *base,
 			    struct ib_qp_init_attr *attr)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int desc_sz = 1 << qp->sq.wqe_shift;
 	int rq_buf_size, sq_buf_size;
 
-	if (desc_sz > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
+	if (desc_sz > MLX5_CAP_GEN(mdev, max_wqe_sz_sq)) {
 		mlx5_ib_warn(dev, "desc_sz %d, max_sq_desc_sz %d\n",
-			     desc_sz, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
+			     desc_sz, MLX5_CAP_GEN(mdev, max_wqe_sz_sq));
 		return -EINVAL;
 	}
 
@@ -663,10 +666,10 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
 
 	qp->sq.wqe_cnt = ucmd->sq_wqe_count;
 
-	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
+	if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) {
 		mlx5_ib_warn(dev, "wqe_cnt %d, max_wqes %d\n",
 			     qp->sq.wqe_cnt,
-			     1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
+			     1 << MLX5_CAP_GEN(mdev, log_max_qp_sz));
 		return -EINVAL;
 	}
 
@@ -1100,6 +1103,7 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 static void destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		       struct mlx5_ib_qp_base *base, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_ucontext *context = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
 
@@ -1124,9 +1128,9 @@ static void destroy_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	kvfree(qp->sq.wr_data);
 	kvfree(qp->rq.wrid);
 	if (qp->db.db)
-		mlx5_db_free(dev->mdev, &qp->db);
+		mlx5_db_free(mdev, &qp->db);
 	if (qp->buf.frags)
-		mlx5_frag_buf_free(dev->mdev, &qp->buf);
+		mlx5_frag_buf_free(mdev, &qp->buf);
 }
 
 static int _create_kernel_qp(struct mlx5_ib_dev *dev,
@@ -1134,6 +1138,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 			     struct mlx5_ib_qp *qp, u32 **in, int *inlen,
 			     struct mlx5_ib_qp_base *base)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int uar_index;
 	void *qpc;
 	int err;
@@ -1147,7 +1152,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	/* We need to divide by two since each register is comprised of
 	 * two buffers of identical size, namely odd and even
 	 */
-	qp->bf.buf_size = (1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size)) / 2;
+	qp->bf.buf_size = (1 << MLX5_CAP_GEN(mdev, log_bf_reg_size)) / 2;
 	uar_index = qp->bf.bfreg->index;
 
 	err = calc_sq_size(dev, init_attr, qp);
@@ -1160,8 +1165,8 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	qp->sq.offset = qp->rq.wqe_cnt << qp->rq.wqe_shift;
 	base->ubuffer.buf_size = err + (qp->rq.wqe_cnt << qp->rq.wqe_shift);
 
-	err = mlx5_frag_buf_alloc_node(dev->mdev, base->ubuffer.buf_size,
-				       &qp->buf, dev->mdev->priv.numa_node);
+	err = mlx5_frag_buf_alloc_node(mdev, base->ubuffer.buf_size,
+				       &qp->buf, mdev->priv.numa_node);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		return err;
@@ -1193,7 +1198,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 
 	qpc = MLX5_ADDR_OF(create_qp_in, *in, qpc);
 	MLX5_SET(qpc, qpc, uar_page, uar_index);
-	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(dev->mdev));
+	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));
 	MLX5_SET(qpc, qpc, log_page_size, qp->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT);
 
 	/* Set "fast registration enabled" for all kernel QPs */
@@ -1207,7 +1212,7 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 				  (__be64 *)MLX5_ADDR_OF(create_qp_in,
 							 *in, pas));
 
-	err = mlx5_db_alloc(dev->mdev, &qp->db);
+	err = mlx5_db_alloc(mdev, &qp->db);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		goto err_free;
@@ -1237,13 +1242,13 @@ static int _create_kernel_qp(struct mlx5_ib_dev *dev,
 	kvfree(qp->sq.wrid);
 	kvfree(qp->sq.wr_data);
 	kvfree(qp->rq.wrid);
-	mlx5_db_free(dev->mdev, &qp->db);
+	mlx5_db_free(mdev, &qp->db);
 
 err_free:
 	kvfree(*in);
 
 err_buf:
-	mlx5_frag_buf_free(dev->mdev, &qp->buf);
+	mlx5_frag_buf_free(mdev, &qp->buf);
 	return err;
 }
 
@@ -1263,24 +1268,24 @@ static int create_raw_packet_qp_tis(struct mlx5_ib_dev *dev,
 				    struct mlx5_ib_sq *sq, u32 tdn,
 				    struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	u32 in[MLX5_ST_SZ_DW(create_tis_in)] = {};
 	void *tisc = MLX5_ADDR_OF(create_tis_in, in, ctx);
 
 	MLX5_SET(create_tis_in, in, uid, to_mpd(pd)->uid);
 	MLX5_SET(tisc, tisc, transport_domain, tdn);
-	if (!mlx5_ib_lag_should_assign_affinity(dev) &&
-	    mlx5_lag_is_lacp_owner(dev->mdev))
+	if (!mlx5_ib_lag_should_assign_affinity(dev, mdev) &&
+	    mlx5_lag_is_lacp_owner(mdev))
 		MLX5_SET(tisc, tisc, strict_lag_tx_port_affinity, 1);
 	if (qp->flags & IB_QP_CREATE_SOURCE_QPN)
 		MLX5_SET(tisc, tisc, underlay_qpn, qp->underlay_qpn);
 
-	return mlx5_core_create_tis(dev->mdev, in, &sq->tisn);
+	return mlx5_core_create_tis(mdev, in, &sq->tisn);
 }
 
-static void destroy_raw_packet_qp_tis(struct mlx5_ib_dev *dev,
-				      struct mlx5_ib_sq *sq, struct ib_pd *pd)
+static void destroy_raw_packet_qp_tis(struct mlx5_ib_sq *sq, struct ib_pd *pd)
 {
-	mlx5_cmd_destroy_tis(dev->mdev, sq->tisn, to_mpd(pd)->uid);
+	mlx5_cmd_destroy_tis(pd_to_mdev(pd), sq->tisn, to_mpd(pd)->uid);
 }
 
 static void destroy_flow_rule_vport_sq(struct mlx5_ib_sq *sq)
@@ -1296,9 +1301,10 @@ static bool fr_supported(int ts_cap)
 	       ts_cap == MLX5_TIMESTAMP_FORMAT_CAP_FREE_RUNNING_AND_REAL_TIME;
 }
 
-static int get_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
-			 bool fr_sup, bool rt_sup)
+static int get_ts_format(struct mlx5_ib_cq *cq, bool fr_sup, bool rt_sup)
 {
+	struct mlx5_ib_dev *dev = to_dev(cq->ibcq.device);
+
 	if (cq->private_flags & MLX5_IB_CQ_PR_FLAGS_REAL_TIME_TS) {
 		if (!rt_sup) {
 			mlx5_ib_dbg(dev,
@@ -1319,35 +1325,37 @@ static int get_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 			MLX5_TIMESTAMP_FORMAT_DEFAULT;
 }
 
-static int get_rq_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *recv_cq)
+static int get_rq_ts_format(struct mlx5_core_dev *mdev,
+			    struct mlx5_ib_cq *recv_cq)
 {
-	u8 ts_cap = MLX5_CAP_GEN(dev->mdev, rq_ts_format);
+	u8 ts_cap = MLX5_CAP_GEN(mdev, rq_ts_format);
 
-	return get_ts_format(dev, recv_cq, fr_supported(ts_cap),
+	return get_ts_format(recv_cq, fr_supported(ts_cap),
 			     rt_supported(ts_cap));
 }
 
-static int get_sq_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq)
+static int get_sq_ts_format(struct mlx5_core_dev *mdev,
+			    struct mlx5_ib_cq *send_cq)
 {
-	u8 ts_cap = MLX5_CAP_GEN(dev->mdev, sq_ts_format);
+	u8 ts_cap = MLX5_CAP_GEN(mdev, sq_ts_format);
 
-	return get_ts_format(dev, send_cq, fr_supported(ts_cap),
+	return get_ts_format(send_cq, fr_supported(ts_cap),
 			     rt_supported(ts_cap));
 }
 
-static int get_qp_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq,
+static int get_qp_ts_format(struct mlx5_ib_qp *qp, struct mlx5_ib_cq *send_cq,
 			    struct mlx5_ib_cq *recv_cq)
 {
-	u8 ts_cap = MLX5_CAP_ROCE(dev->mdev, qp_ts_format);
+	u8 ts_cap = MLX5_CAP_ROCE(qp_to_mdev(qp), qp_ts_format);
 	bool fr_sup = fr_supported(ts_cap);
 	bool rt_sup = rt_supported(ts_cap);
 	u8 default_ts = fr_sup ? MLX5_TIMESTAMP_FORMAT_FREE_RUNNING :
 				 MLX5_TIMESTAMP_FORMAT_DEFAULT;
 	int send_ts_format =
-		send_cq ? get_ts_format(dev, send_cq, fr_sup, rt_sup) :
+		send_cq ? get_ts_format(send_cq, fr_sup, rt_sup) :
 			  default_ts;
 	int recv_ts_format =
-		recv_cq ? get_ts_format(dev, recv_cq, fr_sup, rt_sup) :
+		recv_cq ? get_ts_format(recv_cq, fr_sup, rt_sup) :
 			  default_ts;
 
 	if (send_ts_format < 0 || recv_ts_format < 0)
@@ -1357,7 +1365,7 @@ static int get_qp_ts_format(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *send_cq,
 	    recv_ts_format != MLX5_TIMESTAMP_FORMAT_DEFAULT &&
 	    send_ts_format != recv_ts_format) {
 		mlx5_ib_dbg(
-			dev,
+			to_dev(qp->ibqp.device),
 			"The send ts_format does not match the receive ts_format\n");
 		return -EOPNOTSUPP;
 	}
@@ -1371,6 +1379,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 				   struct mlx5_ib_sq *sq, void *qpin,
 				   struct ib_pd *pd, struct mlx5_ib_cq *cq)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_ubuffer *ubuffer = &sq->ubuffer;
 	__be64 *pas;
 	void *in;
@@ -1383,7 +1392,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	unsigned long page_size;
 	int ts_format;
 
-	ts_format = get_sq_ts_format(dev, cq);
+	ts_format = get_sq_ts_format(mdev, cq);
 	if (ts_format < 0)
 		return ts_format;
 
@@ -1413,7 +1422,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	MLX5_SET(create_sq_in, in, uid, to_mpd(pd)->uid);
 	sqc = MLX5_ADDR_OF(create_sq_in, in, ctx);
 	MLX5_SET(sqc, sqc, flush_in_error_en, 1);
-	if (MLX5_CAP_ETH(dev->mdev, multi_pkt_send_wqe))
+	if (MLX5_CAP_ETH(mdev, multi_pkt_send_wqe))
 		MLX5_SET(sqc, sqc, allow_multi_pkt_send_wqe, 1);
 	MLX5_SET(sqc, sqc, state, MLX5_SQC_STATE_RST);
 	MLX5_SET(sqc, sqc, ts_format, ts_format);
@@ -1421,8 +1430,8 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
 	MLX5_SET(sqc, sqc, cqn, MLX5_GET(qpc, qpc, cqn_snd));
 	MLX5_SET(sqc, sqc, tis_lst_sz, 1);
 	MLX5_SET(sqc, sqc, tis_num_0, sq->tisn);
-	if (MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
-	    MLX5_CAP_ETH(dev->mdev, swp))
+	if (MLX5_CAP_GEN(mdev, eth_net_offloads) &&
+	    MLX5_CAP_ETH(mdev, swp))
 		MLX5_SET(sqc, sqc, allow_swp, 1);
 
 	wq = MLX5_ADDR_OF(sqc, sqc, wq);
@@ -1462,8 +1471,7 @@ static void destroy_raw_packet_qp_sq(struct ib_pd *pd, struct mlx5_ib_sq *sq)
 	ib_umem_release(sq->ubuffer.umem);
 }
 
-static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
-				   struct mlx5_ib_rq *rq, void *qpin,
+static int create_raw_packet_qp_rq(struct mlx5_ib_rq *rq, void *qpin,
 				   struct ib_pd *pd, struct mlx5_ib_cq *cq)
 {
 	struct mlx5_ib_qp *mqp = rq->base.container_mibqp;
@@ -1479,7 +1487,7 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
 	size_t inlen;
 	int err;
 
-	ts_format = get_rq_ts_format(dev, cq);
+	ts_format = get_rq_ts_format(pd_to_mdev(pd), cq);
 	if (ts_format < 0)
 		return ts_format;
 
@@ -1545,7 +1553,7 @@ static void destroy_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 	if (qp_flags_en & (MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_UC |
 			   MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_MC))
 		mlx5_ib_disable_lb(dev, false, true);
-	mlx5_cmd_destroy_tir(dev->mdev, rq->tirn, to_mpd(pd)->uid);
+	mlx5_cmd_destroy_tir(pd_to_mdev(pd), rq->tirn, to_mpd(pd)->uid);
 }
 
 static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
@@ -1553,6 +1561,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 				    u32 *qp_flags_en, struct ib_pd *pd,
 				    u32 *out)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	u8 lb_flag = 0;
 	u32 *in;
 	void *tirc;
@@ -1585,7 +1594,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
 
 	MLX5_SET(tirc, tirc, self_lb_block, lb_flag);
 	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);
-	err = mlx5_cmd_exec_inout(dev->mdev, create_tir, in, out);
+	err = mlx5_cmd_exec_inout(mdev, create_tir, in, out);
 	rq->tirn = MLX5_GET(create_tir_out, out, tirn);
 	if (!err && MLX5_GET(tirc, tirc, self_lb_block)) {
 		err = mlx5_ib_enable_lb(dev, false, true);
@@ -1650,7 +1659,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			rq->flags |= MLX5_IB_RQ_CVLAN_STRIPPING;
 		if (qp->flags & IB_QP_CREATE_PCI_WRITE_END_PADDING)
 			rq->flags |= MLX5_IB_RQ_PCI_WRITE_END_PADDING;
-		err = create_raw_packet_qp_rq(dev, rq, in, pd,
+		err = create_raw_packet_qp_rq(rq, in, pd,
 					      to_mcq(init_attr->recv_cq));
 		if (err)
 			goto err_destroy_sq;
@@ -1665,8 +1674,10 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			resp->comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_RQN;
 			resp->tirn = rq->tirn;
 			resp->comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_TIRN;
-			if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner) ||
-			    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner_v2)) {
+			if (MLX5_CAP_FLOWTABLE_NIC_RX(pd_to_mdev(pd),
+						      sw_owner) ||
+			    MLX5_CAP_FLOWTABLE_NIC_RX(pd_to_mdev(pd),
+						      sw_owner_v2)) {
 				resp->tir_icm_addr = MLX5_GET(
 					create_tir_out, out, icm_address_31_0);
 				resp->tir_icm_addr |=
@@ -1694,7 +1705,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		return err;
 	destroy_raw_packet_qp_sq(pd, sq);
 err_destroy_tis:
-	destroy_raw_packet_qp_tis(dev, sq, pd);
+	destroy_raw_packet_qp_tis(sq, pd);
 
 	return err;
 }
@@ -1713,7 +1724,7 @@ static void destroy_raw_packet_qp(struct mlx5_ib_dev *dev,
 
 	if (qp->sq.wqe_cnt) {
 		destroy_raw_packet_qp_sq(qp->ibqp.pd, sq);
-		destroy_raw_packet_qp_tis(dev, sq, qp->ibqp.pd);
+		destroy_raw_packet_qp_tis(sq, qp->ibqp.pd);
 	}
 }
 
@@ -1731,10 +1742,11 @@ static void raw_packet_qp_copy_info(struct mlx5_ib_qp *qp,
 
 static void destroy_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	if (qp->flags_en & (MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_UC |
 			    MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_MC))
 		mlx5_ib_disable_lb(dev, false, true);
-	mlx5_cmd_destroy_tir(dev->mdev, qp->rss_qp.tirn,
+	mlx5_cmd_destroy_tir(mdev, qp->rss_qp.tirn,
 			     to_mpd(qp->ibqp.pd)->uid);
 }
 
@@ -1755,6 +1767,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 				 struct mlx5_ib_qp *qp,
 				 struct mlx5_create_qp_params *params)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct ib_qp_init_attr *init_attr = params->attr;
 	struct mlx5_ib_create_qp_rss *ucmd = params->ucmd;
 	struct ib_udata *udata = params->udata;
@@ -1912,14 +1925,14 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 
 create_tir:
 	MLX5_SET(create_tir_in, in, opcode, MLX5_CMD_OP_CREATE_TIR);
-	err = mlx5_cmd_exec_inout(dev->mdev, create_tir, in, out);
+	err = mlx5_cmd_exec_inout(mdev, create_tir, in, out);
 
 	qp->rss_qp.tirn = MLX5_GET(create_tir_out, out, tirn);
 	if (!err && MLX5_GET(tirc, tirc, self_lb_block)) {
 		err = mlx5_ib_enable_lb(dev, false, true);
 
 		if (err)
-			mlx5_cmd_destroy_tir(dev->mdev, qp->rss_qp.tirn,
+			mlx5_cmd_destroy_tir(mdev, qp->rss_qp.tirn,
 					     to_mpd(pd)->uid);
 	}
 
@@ -1929,8 +1942,8 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (mucontext->devx_uid) {
 		params->resp.comp_mask |= MLX5_IB_CREATE_QP_RESP_MASK_TIRN;
 		params->resp.tirn = qp->rss_qp.tirn;
-		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner) ||
-		    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, sw_owner_v2)) {
+		if (MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner) ||
+		    MLX5_CAP_FLOWTABLE_NIC_RX(mdev, sw_owner_v2)) {
 			params->resp.tir_icm_addr =
 				MLX5_GET(create_tir_out, out, icm_address_31_0);
 			params->resp.tir_icm_addr |=
@@ -1957,11 +1970,11 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	return err;
 }
 
-static void configure_requester_scat_cqe(struct mlx5_ib_dev *dev,
-					 struct mlx5_ib_qp *qp,
+static void configure_requester_scat_cqe(struct mlx5_ib_qp *qp,
 					 struct ib_qp_init_attr *init_attr,
 					 void *qpc)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int scqe_sz;
 	bool allow_scat_cqe = false;
 
@@ -1977,7 +1990,7 @@ static void configure_requester_scat_cqe(struct mlx5_ib_dev *dev,
 	}
 
 	if (init_attr->qp_type != MLX5_IB_QPT_DCI ||
-	    MLX5_CAP_GEN(dev->mdev, dc_req_scat_data_cqe))
+	    MLX5_CAP_GEN(mdev, dc_req_scat_data_cqe))
 		MLX5_SET(qpc, qpc, cs_req, MLX5_REQ_SCAT_DATA32_CQE);
 }
 
@@ -2000,11 +2013,11 @@ static int atomic_size_to_mode(int size_mask)
 	return MLX5_ATOMIC_MODE_8B;
 }
 
-static int get_atomic_mode(struct mlx5_ib_dev *dev,
-			   struct mlx5_ib_qp *qp)
+static int get_atomic_mode(struct mlx5_ib_qp *qp)
 {
-	u8 atomic_operations = MLX5_CAP_ATOMIC(dev->mdev, atomic_operations);
-	u8 atomic = MLX5_CAP_GEN(dev->mdev, atomic);
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+	u8 atomic_operations = MLX5_CAP_ATOMIC(mdev, atomic_operations);
+	u8 atomic = MLX5_CAP_GEN(mdev, atomic);
 	int atomic_mode = -EOPNOTSUPP;
 	int atomic_size_mask;
 
@@ -2012,9 +2025,9 @@ static int get_atomic_mode(struct mlx5_ib_dev *dev,
 		return -EOPNOTSUPP;
 
 	if (qp->type == MLX5_IB_QPT_DCT)
-		atomic_size_mask = MLX5_CAP_ATOMIC(dev->mdev, atomic_size_dc);
+		atomic_size_mask = MLX5_CAP_ATOMIC(mdev, atomic_size_dc);
 	else
-		atomic_size_mask = MLX5_CAP_ATOMIC(dev->mdev, atomic_size_qp);
+		atomic_size_mask = MLX5_CAP_ATOMIC(mdev, atomic_size_qp);
 
 	if ((atomic_operations & MLX5_ATOMIC_OPS_EXTENDED_CMP_SWAP) ||
 	    (atomic_operations & MLX5_ATOMIC_OPS_EXTENDED_FETCH_ADD))
@@ -2040,7 +2053,7 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	struct mlx5_ib_resources *devr = &dev->devr;
 	u32 out[MLX5_ST_SZ_DW(create_qp_out)] = {};
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_qp_base *base;
 	unsigned long flags;
 	void *qpc;
@@ -2069,7 +2082,7 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	if (qp->flags & IB_QP_CREATE_MANAGED_RECV)
 		MLX5_SET(qpc, qpc, cd_slave_receive, 1);
 
-	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(dev->mdev));
+	MLX5_SET(qpc, qpc, ts_format, mlx5_get_qp_default_ts(mdev));
 	MLX5_SET(qpc, qpc, rq_type, MLX5_SRQ_RQ);
 	MLX5_SET(qpc, qpc, no_sq, 1);
 	MLX5_SET(qpc, qpc, cqn_rcv, to_mcq(devr->c0)->mcq.cqn);
@@ -2119,7 +2132,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	u32 uidx = params->uidx;
 	struct mlx5_ib_resources *devr = &dev->devr;
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2156,7 +2169,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (ucmd->sq_wqe_count > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz)))
 		return -EINVAL;
 
-	ts_format = get_qp_ts_format(dev, to_mcq(init_attr->send_cq),
+	ts_format = get_qp_ts_format(qp, to_mcq(init_attr->send_cq),
 				     to_mcq(init_attr->recv_cq));
 
 	if (ts_format < 0)
@@ -2183,7 +2196,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	if (qp->flags & IB_QP_CREATE_MANAGED_SEND)
 		MLX5_SET(qpc, qpc, cd_slave_send, 1);
 	if (qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE)
-		configure_requester_scat_cqe(dev, qp, init_attr, qpc);
+		configure_requester_scat_cqe(qp, init_attr, qpc);
 
 	if (qp->rq.wqe_cnt) {
 		MLX5_SET(qpc, qpc, log_rq_stride, qp->rq.wqe_shift - 4);
@@ -2280,7 +2293,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	u32 uidx = params->uidx;
 	struct mlx5_ib_resources *devr = &dev->devr;
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2324,7 +2337,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 		return -EINVAL;
 
 	if (init_attr->qp_type != IB_QPT_RAW_PACKET) {
-		ts_format = get_qp_ts_format(dev, to_mcq(init_attr->send_cq),
+		ts_format = get_qp_ts_format(qp, to_mcq(init_attr->send_cq),
 					     to_mcq(init_attr->recv_cq));
 		if (ts_format < 0)
 			return ts_format;
@@ -2371,7 +2384,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	}
 	if ((qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE) &&
 	    (qp->type == MLX5_IB_QPT_DCI || qp->type == IB_QPT_RC))
-		configure_requester_scat_cqe(dev, qp, init_attr, qpc);
+		configure_requester_scat_cqe(qp, init_attr, qpc);
 
 	if (qp->rq.wqe_cnt) {
 		MLX5_SET(qpc, qpc, log_rq_stride, qp->rq.wqe_shift - 4);
@@ -2482,7 +2495,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	struct mlx5_ib_resources *devr = &dev->devr;
 	u32 out[MLX5_ST_SZ_DW(create_qp_out)] = {};
 	int inlen = MLX5_ST_SZ_BYTES(create_qp_in);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_cq *send_cq;
 	struct mlx5_ib_cq *recv_cq;
 	unsigned long flags;
@@ -2702,6 +2715,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			      struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_cq *send_cq, *recv_cq;
 	struct mlx5_ib_qp_base *base;
 	unsigned long flags;
@@ -2766,7 +2780,7 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			mlx5_ib_warn(dev, "failed to destroy QP 0x%x\n",
 				     base->mqp.qpn);
 		if (qp->rl.rate) {
-			mlx5_rl_remove_rate(dev->mdev, &qp->rl);
+			mlx5_rl_remove_rate(mdev, &qp->rl);
 			memset(&qp->rl, 0, sizeof(qp->rl));
 		}
 	}
@@ -2774,16 +2788,17 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 	destroy_qp(dev, qp, base, udata);
 }
 
-static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
+static int create_dct(struct ib_pd *pd,
 		      struct mlx5_ib_qp *qp,
 		      struct mlx5_create_qp_params *params)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct ib_qp_init_attr *attr = params->attr;
 	struct mlx5_ib_create_qp *ucmd = params->ucmd;
 	u32 uidx = params->uidx;
 	void *dctc;
 
-	if (mlx5_lag_is_active(dev->mdev) && !MLX5_CAP_GEN(dev->mdev, lag_dct))
+	if (mlx5_lag_is_active(mdev) && !MLX5_CAP_GEN(mdev, lag_dct))
 		return -EOPNOTSUPP;
 
 	qp->dct.in = kzalloc(MLX5_ST_SZ_BYTES(create_dct_in), GFP_KERNEL);
@@ -2797,7 +2812,7 @@ static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	MLX5_SET(dctc, dctc, cqn, to_mcq(attr->recv_cq)->mcq.cqn);
 	MLX5_SET64(dctc, dctc, dc_access_key, ucmd->access_key);
 	MLX5_SET(dctc, dctc, user_index, uidx);
-	if (MLX5_CAP_GEN(dev->mdev, ece_support))
+	if (MLX5_CAP_GEN(mdev, ece_support))
 		MLX5_SET(dctc, dctc, ece, ucmd->ece_options);
 
 	if (qp->flags_en & MLX5_QP_FLAG_SCATTER_CQE) {
@@ -2811,16 +2826,19 @@ static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	return 0;
 }
 
-static int check_qp_type(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
+static int check_qp_type(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 			 enum ib_qp_type *type)
 {
-	if (attr->qp_type == IB_QPT_DRIVER && !MLX5_CAP_GEN(dev->mdev, dct))
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
+
+	if (attr->qp_type == IB_QPT_DRIVER && !MLX5_CAP_GEN(mdev, dct))
 		goto out;
 
 	switch (attr->qp_type) {
 	case IB_QPT_XRC_TGT:
 	case IB_QPT_XRC_INI:
-		if (!MLX5_CAP_GEN(dev->mdev, xrc))
+		if (!MLX5_CAP_GEN(mdev, xrc))
 			goto out;
 		fallthrough;
 	case IB_QPT_RC:
@@ -2943,7 +2961,7 @@ static void process_vendor_flag(struct mlx5_ib_dev *dev, int *flags, int flag,
 static int process_vendor_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 				void *ucmd, struct ib_qp_init_attr *attr)
 {
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	bool cond;
 	int flags;
 
@@ -3037,7 +3055,7 @@ static int process_create_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 				struct ib_qp_init_attr *attr)
 {
 	enum ib_qp_type qp_type = qp->type;
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int create_flags = attr->create_flags;
 	bool cond;
 
@@ -3048,7 +3066,7 @@ static int process_create_flags(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		return (create_flags) ? -EINVAL : 0;
 
 	process_create_flag(dev, &create_flags, IB_QP_CREATE_NETIF_QP,
-			    mlx5_get_flow_namespace(dev->mdev,
+			    mlx5_get_flow_namespace(mdev,
 						    MLX5_FLOW_NAMESPACE_BYPASS),
 			    qp);
 	process_create_flag(dev, &create_flags,
@@ -3159,7 +3177,7 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 	switch (qp->type) {
 	case MLX5_IB_QPT_DCT:
 		rdma_restrack_no_track(&qp->ibqp.res);
-		err = create_dct(dev, pd, qp, params);
+		err = create_dct(pd, qp, params);
 		break;
 	case MLX5_IB_QPT_DCI:
 		err = create_dci(dev, pd, qp, params);
@@ -3314,7 +3332,7 @@ int mlx5_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
 	if (err)
 		return err;
 
-	err = check_qp_type(dev, attr, &type);
+	err = check_qp_type(ibqp, attr, &type);
 	if (err)
 		return err;
 
@@ -3420,7 +3438,6 @@ static int set_qpc_atomic_flags(struct mlx5_ib_qp *qp,
 				const struct ib_qp_attr *attr, int attr_mask,
 				void *qpc)
 {
-	struct mlx5_ib_dev *dev = to_dev(qp->ibqp.device);
 	u8 dest_rd_atomic;
 	u32 access_flags;
 
@@ -3442,7 +3459,7 @@ static int set_qpc_atomic_flags(struct mlx5_ib_qp *qp,
 	if (access_flags & IB_ACCESS_REMOTE_ATOMIC) {
 		int atomic_mode;
 
-		atomic_mode = get_atomic_mode(dev, qp);
+		atomic_mode = get_atomic_mode(qp);
 		if (atomic_mode < 0)
 			return -EOPNOTSUPP;
 
@@ -3516,8 +3533,7 @@ int mlx5r_ib_rate(struct mlx5_core_dev *mdev, u8 rate)
 	return ib_to_mlx5_rate_map(rate);
 }
 
-static int modify_raw_packet_eth_prio(struct mlx5_core_dev *mdev,
-				      struct mlx5_ib_sq *sq, u8 sl,
+static int modify_raw_packet_eth_prio(struct mlx5_ib_sq *sq, u8 sl,
 				      struct ib_pd *pd)
 {
 	void *in;
@@ -3536,15 +3552,14 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *mdev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, prio, ((sl & 0x7) << 1));
 
-	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
+	err = mlx5_core_modify_tis(pd_to_mdev(pd), sq->tisn, in);
 
 	kvfree(in);
 
 	return err;
 }
 
-static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *mdev,
-					 struct mlx5_ib_sq *sq, u8 tx_affinity,
+static int modify_raw_packet_tx_affinity(struct mlx5_ib_sq *sq, u8 tx_affinity,
 					 struct ib_pd *pd)
 {
 	void *in;
@@ -3563,7 +3578,7 @@ static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *mdev,
 	tisc = MLX5_ADDR_OF(modify_tis_in, in, ctx);
 	MLX5_SET(tisc, tisc, lag_tx_port_affinity, tx_affinity);
 
-	err = mlx5_core_modify_tis(mdev, sq->tisn, in);
+	err = mlx5_core_modify_tis(pd_to_mdev(pd), sq->tisn, in);
 
 	kvfree(in);
 
@@ -3659,8 +3674,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 			 alt ? attr->alt_timeout : attr->timeout);
 
 	if ((qp->type == IB_QPT_RAW_PACKET) && qp->sq.wqe_cnt)
-		return modify_raw_packet_eth_prio(dev->mdev,
-						  &qp->raw_packet_qp.sq,
+		return modify_raw_packet_eth_prio(&qp->raw_packet_qp.sq,
 						  sl & 0xf, qp->ibqp.pd);
 
 	return 0;
@@ -3855,6 +3869,7 @@ static int modify_raw_packet_qp_rq(
 	struct mlx5_ib_dev *dev, struct mlx5_ib_rq *rq, int new_state,
 	const struct mlx5_modify_raw_qp_param *raw_qp_param, struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	void *in;
 	void *rqc;
 	int inlen;
@@ -3872,7 +3887,7 @@ static int modify_raw_packet_qp_rq(
 	MLX5_SET(rqc, rqc, state, new_state);
 
 	if (raw_qp_param->set_mask & MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID) {
-		if (MLX5_CAP_GEN(dev->mdev, modify_rq_counter_set_id)) {
+		if (MLX5_CAP_GEN(mdev, modify_rq_counter_set_id)) {
 			MLX5_SET64(modify_rq_in, in, modify_bitmask,
 				   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 			MLX5_SET(rqc, rqc, counter_set_id, raw_qp_param->rq_q_ctr_id);
@@ -3882,7 +3897,7 @@ static int modify_raw_packet_qp_rq(
 				"RAW PACKET QP counters are not supported on current FW\n");
 	}
 
-	err = mlx5_core_modify_rq(dev->mdev, rq->base.mqp.qpn, in);
+	err = mlx5_core_modify_rq(mdev, rq->base.mqp.qpn, in);
 	if (err)
 		goto out;
 
@@ -3893,43 +3908,45 @@ static int modify_raw_packet_qp_rq(
 	return err;
 }
 
-static bool qp_rate_limit_supported(struct mlx5_ib_dev *dev,
-				    struct mlx5_ib_qp *qp)
+static bool qp_rate_limit_supported(struct mlx5_ib_qp *qp)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+
 	if (qp->type == IB_QPT_RAW_PACKET ||
 	    qp->flags & IB_QP_CREATE_SOURCE_QPN)
 		return true;
 
 	if (qp->type == IB_QPT_UD)
-		return MLX5_CAP_QOS(dev->mdev, packet_pacing_req_ud);
+		return MLX5_CAP_QOS(mdev, packet_pacing_req_ud);
 
 	if (qp->type == IB_QPT_UC)
-		return MLX5_CAP_QOS(dev->mdev, packet_pacing_req_uc);
+		return MLX5_CAP_QOS(mdev, packet_pacing_req_uc);
 
 	return false;
 }
 
-static int qp_rl_parse(struct mlx5_ib_dev *dev,
-		       struct mlx5_ib_qp *qp,
+static int qp_rl_parse(struct mlx5_ib_qp *qp,
 		       const struct ib_qp_attr *attr,
 		       const struct mlx5_ib_modify_qp *ucmd,
 		       struct mlx5_rate_limit *rl_desired)
 {
-	if (!qp_rate_limit_supported(dev, qp))
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
+
+	if (!qp_rate_limit_supported(qp))
 		return -EOPNOTSUPP;
 
 	rl_desired->rate = attr->rate_limit;
 
 	if (ucmd->burst_info.max_burst_sz) {
 		if (!attr->rate_limit ||
-		    !MLX5_CAP_QOS(dev->mdev, packet_pacing_burst_bound))
+		    !MLX5_CAP_QOS(mdev, packet_pacing_burst_bound))
 			return -EINVAL;
 		rl_desired->max_burst_sz = ucmd->burst_info.max_burst_sz;
 	}
 
 	if (ucmd->burst_info.typical_pkt_sz) {
 		if (!attr->rate_limit ||
-		    !MLX5_CAP_QOS(dev->mdev, packet_pacing_typical_size))
+		    !MLX5_CAP_QOS(mdev, packet_pacing_typical_size))
 			return -EINVAL;
 		rl_desired->typical_pkt_sz = ucmd->burst_info.typical_pkt_sz;
 	}
@@ -3937,10 +3954,10 @@ static int qp_rl_parse(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static int qp_rl_prepare(struct mlx5_ib_dev *dev,
-			 struct mlx5_ib_qp *qp, u16 op,
+static int qp_rl_prepare(struct mlx5_ib_qp *qp, u16 op,
 			 struct mlx5_rate_limit_ctx *ctx)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	int err;
 
 	ctx->rl_old = qp->rl;
@@ -3955,7 +3972,7 @@ static int qp_rl_prepare(struct mlx5_ib_dev *dev,
 	ctx->rl_changed = true;
 
 	if (ctx->rl_desired.rate) {
-		err = mlx5_rl_add_rate(dev->mdev, &ctx->rl_desired_index,
+		err = mlx5_rl_add_rate(mdev, &ctx->rl_desired_index,
 				       &ctx->rl_desired);
 		if (err) {
 			pr_err("Failed configuring rate limit(err %d): rate %u, max_burst_sz %u, typical_pkt_sz %u\n",
@@ -3969,18 +3986,18 @@ static int qp_rl_prepare(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static void qp_rl_rollback(struct mlx5_core_dev *mdev,
+static void qp_rl_rollback(struct mlx5_ib_qp *qp,
 			   struct mlx5_rate_limit_ctx *ctx)
 {
 	if (ctx->rl_desired_index)
-		mlx5_rl_remove_rate(mdev, &ctx->rl_desired);
+		mlx5_rl_remove_rate(qp_to_mdev(qp), &ctx->rl_desired);
 }
 
-static void qp_rl_commit(struct mlx5_core_dev *mdev,
-			 struct mlx5_ib_qp *qp,
+static void qp_rl_commit(struct mlx5_ib_qp *qp,
 			 struct mlx5_rate_limit_ctx *ctx,
 			 enum ib_qp_state new_state)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	if (ctx->rl_changed) {
 		if (ctx->rl_old.rate)
 			mlx5_rl_remove_rate(mdev, &ctx->rl_old);
@@ -3999,9 +4016,10 @@ static void qp_rl_commit(struct mlx5_core_dev *mdev,
 }
 
 static int modify_raw_packet_qp_sq(
-	struct mlx5_core_dev *mdev, struct mlx5_ib_sq *sq, int new_state,
+	struct mlx5_ib_sq *sq, int new_state,
 	const struct mlx5_modify_raw_qp_param *raw_qp_param, struct ib_pd *pd)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	const struct mlx5_rate_limit_ctx *rl_ctx = &raw_qp_param->rl_ctx;
 	struct mlx5_ib_qp *ibqp = sq->base.container_mibqp;
 	void *in;
@@ -4105,7 +4123,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		struct mlx5_flow_handle *flow_rule;
 
 		if (tx_affinity) {
-			err = modify_raw_packet_tx_affinity(dev->mdev, sq,
+			err = modify_raw_packet_tx_affinity(sq,
 							    tx_affinity,
 							    qp->ibqp.pd);
 			if (err)
@@ -4117,7 +4135,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 		if (IS_ERR(flow_rule))
 			return PTR_ERR(flow_rule);
 
-		err = modify_raw_packet_qp_sq(dev->mdev, sq, sq_state,
+		err = modify_raw_packet_qp_sq(sq, sq_state,
 					      raw_qp_param, qp->ibqp.pd);
 		if (err) {
 			if (flow_rule)
@@ -4137,11 +4155,12 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
 }
 
 static unsigned int get_tx_affinity_rr(struct mlx5_ib_dev *dev,
+				       struct mlx5_core_dev *mdev,
 				       struct ib_udata *udata)
 {
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
-	u8 port_num = mlx5_core_native_port_num(dev->mdev) - 1;
+	u8 port_num = mlx5_core_native_port_num(mdev) - 1;
 	atomic_t *tx_port_affinity;
 
 	if (ucontext)
@@ -4150,7 +4169,8 @@ static unsigned int get_tx_affinity_rr(struct mlx5_ib_dev *dev,
 		tx_port_affinity = &dev->port[port_num].roce.tx_port_affinity;
 
 	return (unsigned int)atomic_add_return(1, tx_port_affinity) %
-		(dev->lag_active ? dev->lag_ports : MLX5_CAP_GEN(dev->mdev, num_lag_ports)) + 1;
+		(dev->lag_active ? dev->lag_ports :
+				   MLX5_CAP_GEN(mdev, num_lag_ports)) + 1;
 }
 
 static bool qp_supports_affinity(struct mlx5_ib_qp *qp)
@@ -4168,6 +4188,7 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 				    int attr_mask, u8 init,
 				    struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_ucontext *ucontext = rdma_udata_to_drv_context(
 		udata, struct mlx5_ib_ucontext, ibucontext);
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
@@ -4175,17 +4196,17 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 	struct mlx5_ib_qp_base *qp_base;
 	unsigned int tx_affinity;
 
-	if (!(mlx5_ib_lag_should_assign_affinity(dev) &&
+	if (!(mlx5_ib_lag_should_assign_affinity(dev, mdev) &&
 	      qp_supports_affinity(mqp)))
 		return 0;
 
 	if (mqp->flags & MLX5_IB_QP_CREATE_SQPN_QP1)
 		tx_affinity = mqp->gsi_lag_port;
 	else if (init)
-		tx_affinity = get_tx_affinity_rr(dev, udata);
+		tx_affinity = get_tx_affinity_rr(dev, mdev, udata);
 	else if ((attr_mask & IB_QP_AV) && attr->xmit_slave)
 		tx_affinity =
-			mlx5_lag_get_slave_port(dev->mdev, attr->xmit_slave);
+			mlx5_lag_get_slave_port(mdev, attr->xmit_slave);
 	else
 		return 0;
 
@@ -4199,8 +4220,7 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 	return tx_affinity;
 }
 
-static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
-					   struct mlx5_core_dev *mdev)
+static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id)
 {
 	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;
 	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
@@ -4220,12 +4240,13 @@ static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
 		   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 	MLX5_SET(rqc, rqc, counter_set_id, set_id);
 
-	return mlx5_core_modify_rq(mdev, rq->base.mqp.qpn, in);
+	return mlx5_core_modify_rq(qp_to_mdev(qp), rq->base.mqp.qpn, in);
 }
 
 static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 				    struct rdma_counter *counter)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
 	u32 in[MLX5_ST_SZ_DW(rts2rts_qp_in)] = {};
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
@@ -4239,7 +4260,7 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 		set_id = mlx5_ib_get_counters_id(dev, mqp->port - 1);
 
 	if (mqp->type == IB_QPT_RAW_PACKET)
-		return __mlx5_ib_qp_set_raw_qp_counter(mqp, set_id, dev->mdev);
+		return __mlx5_ib_qp_set_raw_qp_counter(mqp, set_id);
 
 	base = &mqp->trans_qp.base;
 	MLX5_SET(rts2rts_qp_in, in, opcode, MLX5_CMD_OP_RTS2RTS_QP);
@@ -4250,7 +4271,7 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 
 	qpc = MLX5_ADDR_OF(rts2rts_qp_in, in, qpc);
 	MLX5_SET(qpc, qpc, counter_set_id, set_id);
-	return mlx5_cmd_exec_in(dev->mdev, rts2rts_qp, in);
+	return mlx5_cmd_exec_in(mdev, rts2rts_qp, in);
 }
 
 static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
@@ -4261,6 +4282,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 			       struct mlx5_ib_modify_qp_resp *resp,
 			       struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	static const u16 optab[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE] = {
 		[MLX5_QP_STATE_RST] = {
 			[MLX5_QP_STATE_RST]	= MLX5_CMD_OP_2RST_QP,
@@ -4347,7 +4369,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 	MLX5_SET(qpc, qpc, lag_tx_port_affinity, tx_affinity);
 	if (tx_affinity && new_state == IB_QPS_RTR &&
-	    MLX5_CAP_GEN(dev->mdev, init2_lag_tx_port_affinity))
+	    MLX5_CAP_GEN(mdev, init2_lag_tx_port_affinity))
 		optpar |= MLX5_QP_OPTPAR_LAG_TX_AFF;
 
 	if (is_sqp(qp->type)) {
@@ -4367,7 +4389,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 		}
 		MLX5_SET(qpc, qpc, mtu, attr->path_mtu);
 		MLX5_SET(qpc, qpc, log_msg_max,
-			 MLX5_CAP_GEN(dev->mdev, log_max_msg));
+			 MLX5_CAP_GEN(mdev, log_max_msg));
 	}
 
 	if (attr_mask & IB_QP_DEST_QPN)
@@ -4495,7 +4517,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 	}
 
 	if (attr_mask & IB_QP_RATE_LIMIT) {
-		err = qp_rl_parse(dev, qp, attr, ucmd, &rl_ctx.rl_desired);
+		err = qp_rl_parse(qp, attr, ucmd, &rl_ctx.rl_desired);
 		if (err)
 			goto out;
 	} else {
@@ -4504,7 +4526,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 	op = optab[mlx5_cur][mlx5_new];
 	if (!mlx5_rl_are_equal(&rl_ctx.rl_desired, &qp->rl)) {
-		err = qp_rl_prepare(dev, qp, op, &rl_ctx);
+		err = qp_rl_prepare(qp, op, &rl_ctx);
 		if (err)
 			goto out;
 	}
@@ -4532,11 +4554,11 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 
 		err = modify_raw_packet_qp(dev, qp, &raw_qp_param, tx_affinity);
 		if (err) {
-			qp_rl_rollback(dev->mdev, &raw_qp_param.rl_ctx);
+			qp_rl_rollback(qp, &raw_qp_param.rl_ctx);
 			goto out;
 		}
 
-		qp_rl_commit(dev->mdev, qp, &raw_qp_param.rl_ctx, new_state);
+		qp_rl_commit(qp, &raw_qp_param.rl_ctx, new_state);
 	} else {
 		if (rl_ctx.rl_changed) {
 			MLX5_SET(qpc, qpc, packet_pacing_rate_limit_index,
@@ -4546,7 +4568,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 		if (udata) {
 			/* For the kernel flows, the resp will stay zero */
 			resp->ece_options =
-				MLX5_CAP_GEN(dev->mdev, ece_support) ?
+				MLX5_CAP_GEN(mdev, ece_support) ?
 					ucmd->ece_options : 0;
 			resp->response_length = sizeof(*resp);
 		}
@@ -4554,11 +4576,11 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
 					  &resp->ece_options);
 
 		if (err) {
-			qp_rl_rollback(dev->mdev, &rl_ctx);
+			qp_rl_rollback(qp, &rl_ctx);
 			goto out;
 		}
 
-		qp_rl_commit(dev->mdev, qp, &rl_ctx, new_state);
+		qp_rl_commit(qp, &rl_ctx, new_state);
 	}
 
 	if (err)
@@ -4666,6 +4688,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			      int attr_mask, struct mlx5_ib_modify_qp *ucmd,
 			      struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	enum ib_qp_state cur_state, new_state;
@@ -4680,7 +4703,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 	new_state = attr->qp_state;
 
 	dctc = MLX5_ADDR_OF(create_dct_in, qp->dct.in, dct_context_entry);
-	if (MLX5_CAP_GEN(dev->mdev, ece_support) && ucmd->ece_options)
+	if (MLX5_CAP_GEN(mdev, ece_support) && ucmd->ece_options)
 		/*
 		 * DCT doesn't initialize QP till modify command is executed,
 		 * so we need to overwrite previously set ECE field if user
@@ -4709,7 +4732,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		if (attr->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC) {
 			int atomic_mode;
 
-			atomic_mode = get_atomic_mode(dev, qp);
+			atomic_mode = get_atomic_mode(qp);
 			if (atomic_mode < 0)
 				return -EOPNOTSUPP;
 
@@ -4717,9 +4740,9 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			MLX5_SET(dctc, dctc, rae, 1);
 		}
 		MLX5_SET(dctc, dctc, pkey_index, attr->pkey_index);
-		if (mlx5_lag_is_active(dev->mdev))
+		if (mlx5_lag_is_active(mdev))
 			MLX5_SET(dctc, dctc, port,
-				 get_tx_affinity_rr(dev, udata));
+				 get_tx_affinity_rr(dev, mdev, udata));
 		else
 			MLX5_SET(dctc, dctc, port, attr->port_num);
 
@@ -4762,11 +4785,11 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 					   qp->dct.in,
 					   MLX5_ST_SZ_BYTES(create_dct_in), out,
 					   sizeof(out));
-		err = mlx5_cmd_check(dev->mdev, err, qp->dct.in, out);
+		err = mlx5_cmd_check(mdev, err, qp->dct.in, out);
 		if (err)
 			return err;
 		resp.dctn = qp->dct.mdct.mqp.qpn;
-		if (MLX5_CAP_GEN(dev->mdev, ece_support))
+		if (MLX5_CAP_GEN(mdev, ece_support))
 			resp.ece_options = MLX5_GET(create_dct_out, out, ece);
 		err = ib_respond_udata(udata, resp);
 		if (err) {
@@ -4795,22 +4818,20 @@ static bool mlx5_ib_modify_qp_allowed(struct mlx5_ib_dev *dev,
 	return false;
 }
 
-static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
+static int validate_rd_atomic(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			      int attr_mask, enum ib_qp_type qp_type)
 {
+	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	int log_max_ra_res;
 	int log_max_ra_req;
 
 	if (qp_type == MLX5_IB_QPT_DCI) {
-		log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_res_dc);
-		log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_req_dc);
+		log_max_ra_res = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_dc);
+		log_max_ra_req = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_dc);
 	} else {
-		log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_res_qp);
-		log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
-						   log_max_ra_req_qp);
+		log_max_ra_res = 1 << MLX5_CAP_GEN(mdev, log_max_ra_res_qp);
+		log_max_ra_req = 1 << MLX5_CAP_GEN(mdev, log_max_ra_req_qp);
 	}
 
 	if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
@@ -4832,6 +4853,7 @@ static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
 int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		      int attr_mask, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
 	struct mlx5_ib_modify_qp_resp resp = {};
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
@@ -4860,7 +4882,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			return -EOPNOTSUPP;
 
 		if (ucmd.comp_mask & MLX5_IB_MODIFY_QP_OOO_DP) {
-			if (!get_dp_ooo_cap(dev->mdev, qp->type))
+			if (!get_dp_ooo_cap(mdev, qp->type))
 				return -EOPNOTSUPP;
 			qp->is_ooo_rq = 1;
 		}
@@ -4888,7 +4910,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 	} else if (attr_mask == IB_QP_RATE_LIMIT && cur_state != IB_QPS_RTS) {
 		struct mlx5_rate_limit rl_desired = {};
 
-		err = qp_rl_parse(dev, qp, attr, &ucmd, &rl_desired);
+		err = qp_rl_parse(qp, attr, &ucmd, &rl_desired);
 		if (!err)
 			qp->rl_desired = rl_desired;
 		goto out;
@@ -4920,7 +4942,7 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		goto out;
 	}
 
-	if (!validate_rd_atomic(dev, attr, attr_mask, qp_type))
+	if (!validate_rd_atomic(ibqp, attr, attr_mask, qp_type))
 		goto out;
 
 	if (cur_state == new_state && cur_state == IB_QPS_RESET) {
@@ -4998,13 +5020,14 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev,
 	}
 }
 
-static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
+static int query_raw_packet_qp_sq_state(struct ib_pd *pd,
 					struct mlx5_ib_sq *sq,
 					u8 *sq_state)
 {
 	int err;
 
-	err = mlx5_core_query_sq_state(dev->mdev, sq->base.mqp.qpn, sq_state);
+	err = mlx5_core_query_sq_state(pd_to_mdev(pd), sq->base.mqp.qpn,
+				       sq_state);
 	if (err)
 		goto out;
 	sq->state = *sq_state;
@@ -5013,7 +5036,7 @@ static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
 	return err;
 }
 
-static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev,
+static int query_raw_packet_qp_rq_state(struct ib_pd *pd,
 					struct mlx5_ib_rq *rq,
 					u8 *rq_state)
 {
@@ -5027,7 +5050,7 @@ static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev,
 	if (!out)
 		return -ENOMEM;
 
-	err = mlx5_core_query_rq(dev->mdev, rq->base.mqp.qpn, out);
+	err = mlx5_core_query_rq(pd_to_mdev(pd), rq->base.mqp.qpn, out);
 	if (err)
 		goto out;
 
@@ -5085,8 +5108,7 @@ static int sqrq_state_to_qp_state(u8 sq_state, u8 rq_state,
 	return 0;
 }
 
-static int query_raw_packet_qp_state(struct mlx5_ib_dev *dev,
-				     struct mlx5_ib_qp *qp,
+static int query_raw_packet_qp_state(struct mlx5_ib_qp *qp,
 				     u8 *raw_packet_qp_state)
 {
 	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;
@@ -5097,13 +5119,13 @@ static int query_raw_packet_qp_state(struct mlx5_ib_dev *dev,
 	u8 rq_state = MLX5_RQ_STATE_NA;
 
 	if (qp->sq.wqe_cnt) {
-		err = query_raw_packet_qp_sq_state(dev, sq, &sq_state);
+		err = query_raw_packet_qp_sq_state(qp->ibqp.pd, sq, &sq_state);
 		if (err)
 			return err;
 	}
 
 	if (qp->rq.wqe_cnt) {
-		err = query_raw_packet_qp_rq_state(dev, rq, &rq_state);
+		err = query_raw_packet_qp_rq_state(qp->ibqp.pd, rq, &rq_state);
 		if (err)
 			return err;
 	}
@@ -5268,7 +5290,7 @@ int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
 
 	if (qp->type == IB_QPT_RAW_PACKET ||
 	    qp->flags & IB_QP_CREATE_SOURCE_QPN) {
-		err = query_raw_packet_qp_state(dev, qp, &raw_packet_qp_state);
+		err = query_raw_packet_qp_state(qp, &raw_packet_qp_state);
 		if (err)
 			goto out;
 		qp->state = raw_packet_qp_state;
@@ -5379,6 +5401,7 @@ static int set_delay_drop(struct mlx5_ib_dev *dev)
 static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		      struct ib_wq_init_attr *init_attr)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_dev *dev;
 	int has_net_offloads;
 	__be64 *rq_pas0;
@@ -5391,7 +5414,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 
 	dev = to_dev(pd->device);
 
-	ts_format = get_rq_ts_format(dev, to_mcq(init_attr->cq));
+	ts_format = get_rq_ts_format(mdev, to_mcq(init_attr->cq));
 	if (ts_format < 0)
 		return ts_format;
 
@@ -5414,7 +5437,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		 rwq->create_flags & MLX5_IB_WQ_FLAGS_STRIDING_RQ ?
 		 MLX5_WQ_TYPE_CYCLIC_STRIDING_RQ : MLX5_WQ_TYPE_CYCLIC);
 	if (init_attr->create_flags & IB_WQ_FLAGS_PCI_WRITE_END_PADDING) {
-		if (!MLX5_CAP_GEN(dev->mdev, end_pad)) {
+		if (!MLX5_CAP_GEN(mdev, end_pad)) {
 			mlx5_ib_dbg(dev, "Scatter end padding is not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5446,9 +5469,9 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	MLX5_SET(wq, wq, log_wq_pg_sz, rwq->log_page_size);
 	MLX5_SET(wq, wq, wq_signature, rwq->wq_sig);
 	MLX5_SET64(wq, wq, dbr_addr, rwq->db.dma);
-	has_net_offloads = MLX5_CAP_GEN(dev->mdev, eth_net_offloads);
+	has_net_offloads = MLX5_CAP_GEN(mdev, eth_net_offloads);
 	if (init_attr->create_flags & IB_WQ_FLAGS_CVLAN_STRIPPING) {
-		if (!(has_net_offloads && MLX5_CAP_ETH(dev->mdev, vlan_cap))) {
+		if (!(has_net_offloads && MLX5_CAP_ETH(mdev, vlan_cap))) {
 			mlx5_ib_dbg(dev, "VLAN offloads are not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5457,7 +5480,7 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 		MLX5_SET(rqc, rqc, vsd, 1);
 	}
 	if (init_attr->create_flags & IB_WQ_FLAGS_SCATTER_FCS) {
-		if (!(has_net_offloads && MLX5_CAP_ETH(dev->mdev, scatter_fcs))) {
+		if (!(has_net_offloads && MLX5_CAP_ETH(mdev, scatter_fcs))) {
 			mlx5_ib_dbg(dev, "Scatter FCS is not supported\n");
 			err = -EOPNOTSUPP;
 			goto out;
@@ -5491,13 +5514,13 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
 	return err;
 }
 
-static int set_user_rq_size(struct mlx5_ib_dev *dev,
+static int set_user_rq_size(struct mlx5_core_dev *mdev,
 			    struct ib_wq_init_attr *wq_init_attr,
 			    struct mlx5_ib_create_wq *ucmd,
 			    struct mlx5_ib_rwq *rwq)
 {
 	/* Sanity check RQ size before proceeding */
-	if (wq_init_attr->max_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_wq_sz)))
+	if (wq_init_attr->max_wr > (1 << MLX5_CAP_GEN(mdev, log_max_wq_sz)))
 		return -EINVAL;
 
 	if (!ucmd->rq_wqe_count)
@@ -5513,13 +5536,14 @@ static int set_user_rq_size(struct mlx5_ib_dev *dev,
 	return 0;
 }
 
-static bool log_of_strides_valid(struct mlx5_ib_dev *dev, u32 log_num_strides)
+static bool log_of_strides_valid(struct mlx5_core_dev *mdev,
+				 u32 log_num_strides)
 {
 	if ((log_num_strides > MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES) ||
 	    (log_num_strides < MLX5_EXT_MIN_SINGLE_WQE_LOG_NUM_STRIDES))
 		return false;
 
-	if (!MLX5_CAP_GEN(dev->mdev, ext_stride_num_range) &&
+	if (!MLX5_CAP_GEN(mdev, ext_stride_num_range) &&
 	    (log_num_strides < MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES))
 		return false;
 
@@ -5531,6 +5555,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 			   struct ib_udata *udata,
 			   struct mlx5_ib_rwq *rwq)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	struct mlx5_ib_dev *dev = to_dev(pd->device);
 	struct mlx5_ib_create_wq ucmd;
 	int err;
@@ -5544,7 +5569,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 	}
 
 	if (ucmd.comp_mask & MLX5_IB_CREATE_WQ_STRIDING_RQ) {
-		if (!MLX5_CAP_GEN(dev->mdev, striding_rq)) {
+		if (!MLX5_CAP_GEN(mdev, striding_rq)) {
 			mlx5_ib_dbg(dev, "Striding RQ is not supported\n");
 			return -EOPNOTSUPP;
 		}
@@ -5558,13 +5583,13 @@ static int prepare_user_rq(struct ib_pd *pd,
 				    MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES);
 			return -EINVAL;
 		}
-		if (!log_of_strides_valid(dev,
+		if (!log_of_strides_valid(mdev,
 					  ucmd.single_wqe_log_num_of_strides)) {
 			mlx5_ib_dbg(
 				dev,
 				"Invalid log num strides (%u. Range is %u - %u)\n",
 				ucmd.single_wqe_log_num_of_strides,
-				MLX5_CAP_GEN(dev->mdev, ext_stride_num_range) ?
+				MLX5_CAP_GEN(mdev, ext_stride_num_range) ?
 					MLX5_EXT_MIN_SINGLE_WQE_LOG_NUM_STRIDES :
 					MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES,
 				MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES);
@@ -5577,7 +5602,7 @@ static int prepare_user_rq(struct ib_pd *pd,
 		rwq->create_flags |= MLX5_IB_WQ_FLAGS_STRIDING_RQ;
 	}
 
-	err = set_user_rq_size(dev, init_attr, &ucmd, rwq);
+	err = set_user_rq_size(mdev, init_attr, &ucmd, rwq);
 	if (err) {
 		mlx5_ib_dbg(dev, "err %d\n", err);
 		return err;
@@ -5677,6 +5702,8 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl =
 		to_mrwq_ind_table(ib_rwq_ind_table);
 	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_table->device);
+	struct ib_pd *pd = init_attr->ind_tbl[0]->pd;
+	struct mlx5_core_dev *mdev = pd_to_mdev(pd);
 	int sz = 1 << init_attr->log_ind_tbl_size;
 	struct mlx5_ib_create_rwq_ind_tbl_resp resp = {};
 	size_t min_resp_len;
@@ -5691,10 +5718,10 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 		return err;
 
 	if (init_attr->log_ind_tbl_size >
-	    MLX5_CAP_GEN(dev->mdev, log_max_rqt_size)) {
+	    MLX5_CAP_GEN(mdev, log_max_rqt_size)) {
 		mlx5_ib_dbg(dev, "log_ind_tbl_size = %d is bigger than supported = %d\n",
 			    init_attr->log_ind_tbl_size,
-			    MLX5_CAP_GEN(dev->mdev, log_max_rqt_size));
+			    MLX5_CAP_GEN(mdev, log_max_rqt_size));
 		return -EINVAL;
 	}
 
@@ -5716,10 +5743,10 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	for (i = 0; i < sz; i++)
 		MLX5_SET(rqtc, rqtc, rq_num[i], init_attr->ind_tbl[i]->wq_num);
 
-	rwq_ind_tbl->uid = to_mpd(init_attr->ind_tbl[0]->pd)->uid;
+	rwq_ind_tbl->uid = to_mpd(pd)->uid;
 	MLX5_SET(create_rqt_in, in, uid, rwq_ind_tbl->uid);
 
-	err = mlx5_core_create_rqt(dev->mdev, in, inlen, &rwq_ind_tbl->rqtn);
+	err = mlx5_core_create_rqt(mdev, in, inlen, &rwq_ind_tbl->rqtn);
 	kvfree(in);
 	if (err)
 		return err;
@@ -5737,21 +5764,23 @@ int mlx5_ib_create_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_table,
 	return 0;
 
 err_copy:
-	mlx5_cmd_destroy_rqt(dev->mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
+	mlx5_cmd_destroy_rqt(mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
 	return err;
 }
 
 int mlx5_ib_destroy_rwq_ind_table(struct ib_rwq_ind_table *ib_rwq_ind_tbl)
 {
 	struct mlx5_ib_rwq_ind_table *rwq_ind_tbl = to_mrwq_ind_table(ib_rwq_ind_tbl);
-	struct mlx5_ib_dev *dev = to_dev(ib_rwq_ind_tbl->device);
+	struct ib_pd *pd = ib_rwq_ind_tbl->ind_tbl[0]->pd;
 
-	return mlx5_cmd_destroy_rqt(dev->mdev, rwq_ind_tbl->rqtn, rwq_ind_tbl->uid);
+	return mlx5_cmd_destroy_rqt(pd_to_mdev(pd), rwq_ind_tbl->rqtn,
+				    rwq_ind_tbl->uid);
 }
 
 int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 		      u32 wq_attr_mask, struct ib_udata *udata)
 {
+	struct mlx5_core_dev *mdev = pd_to_mdev(wq->pd);
 	struct mlx5_ib_dev *dev = to_dev(wq->device);
 	struct mlx5_ib_rwq *rwq = to_mrwq(wq);
 	struct mlx5_ib_modify_wq ucmd = {};
@@ -5788,8 +5817,8 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 
 	if (wq_attr_mask & IB_WQ_FLAGS) {
 		if (wq_attr->flags_mask & IB_WQ_FLAGS_CVLAN_STRIPPING) {
-			if (!(MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
-			      MLX5_CAP_ETH(dev->mdev, vlan_cap))) {
+			if (!(MLX5_CAP_GEN(mdev, eth_net_offloads) &&
+			      MLX5_CAP_ETH(mdev, vlan_cap))) {
 				mlx5_ib_dbg(dev, "VLAN offloads are not supported\n");
 				err = -EOPNOTSUPP;
 				goto out;
@@ -5811,7 +5840,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 		u16 set_id;
 
 		set_id = mlx5_ib_get_counters_id(dev, 0);
-		if (MLX5_CAP_GEN(dev->mdev, modify_rq_counter_set_id)) {
+		if (MLX5_CAP_GEN(mdev, modify_rq_counter_set_id)) {
 			MLX5_SET64(modify_rq_in, in, modify_bitmask,
 				   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
 			MLX5_SET(rqc, rqc, counter_set_id, set_id);
@@ -5821,7 +5850,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
 				"Receive WQ counters are not supported on current FW\n");
 	}
 
-	err = mlx5_core_modify_rq(dev->mdev, rwq->core_qp.qpn, in);
+	err = mlx5_core_modify_rq(mdev, rwq->core_qp.qpn, in);
 	if (!err)
 		rwq->ibwq.state = (wq_state == MLX5_RQC_STATE_ERR) ? IB_WQS_ERR : wq_state;
 
@@ -5909,7 +5938,7 @@ void mlx5_ib_drain_sq(struct ib_qp *qp)
 	};
 	int ret;
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
 	if (ret && mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
@@ -5938,7 +5967,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
 	const struct ib_recv_wr *bad_rwr;
 	int ret;
 	struct mlx5_ib_dev *dev = to_dev(qp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 
 	ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
 	if (ret && mdev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR) {
@@ -5965,7 +5994,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp)
  */
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter)
 {
-	struct mlx5_ib_dev *dev = to_dev(qp->device);
+	struct mlx5_core_dev *mdev = qp_to_mdev(qp);
 	struct mlx5_ib_qp *mqp = to_mqp(qp);
 	int err = 0;
 
@@ -5975,7 +6004,7 @@ int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter)
 		goto out;
 	}
 
-	if (!MLX5_CAP_GEN(dev->mdev, rts2rts_qp_counters_set_id)) {
+	if (!MLX5_CAP_GEN(mdev, rts2rts_qp_counters_set_id)) {
 		err = -EOPNOTSUPP;
 		goto out;
 	}
diff --git a/drivers/infiniband/hw/mlx5/wr.c b/drivers/infiniband/hw/mlx5/wr.c
index 7d1a64d24df181ad5b23580c00d68a3b48baf960..dda89cfb2c56be27e68a00f5da350a1f88f6b22a 100644
--- a/drivers/infiniband/hw/mlx5/wr.c
+++ b/drivers/infiniband/hw/mlx5/wr.c
@@ -1055,7 +1055,7 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,
 {
 	struct mlx5_wqe_ctrl_seg *ctrl = NULL;  /* compiler warning */
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	struct mlx5_ib_qp *qp = to_mqp(ibqp);
 	struct mlx5_wqe_xrc_seg *xrc;
 	void *cur_edge;
@@ -1212,7 +1212,7 @@ int mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,
 	struct mlx5_wqe_data_seg *scat;
 	struct mlx5_rwqe_sig *sig;
 	struct mlx5_ib_dev *dev = to_dev(ibqp->device);
-	struct mlx5_core_dev *mdev = dev->mdev;
+	struct mlx5_core_dev *mdev = qp_to_mdev(ibqp);
 	unsigned long flags;
 	int err = 0;
 	int nreq;

-- 
2.49.0


  parent reply	other threads:[~2026-11-17 14:02 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 14:01 [PATCH rdma-next 00/11] RDMA/mlx5: Preparation for SD support Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 01/11] RDMA/mlx5: Enforce dev/mdev naming for device pointers Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 02/11] RDMA/mlx5: Rename to_mdev() helpers that return an IB device Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 03/11] RDMA/mlx5: Select the PD and SRQ core device through the PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 04/11] RDMA/mlx5: Select the core device through PD for QP commands Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 05/11] RDMA/mlx5: Cache the MR core device and resolve the MW's via its PD Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 06/11] RDMA/mlx5: Select the AH core device through their PD Edward Srouji
2026-11-17 14:01 ` Edward Srouji [this message]
2026-11-17 14:01 ` [PATCH rdma-next 08/11] RDMA/mlx5: Resolve core device from ucontext for DEVX resources Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 09/11] RDMA/mlx5: Cache the CQ core device and resolve it via cq_to_mdev() Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 10/11] RDMA/mlx5: Resolve the bfreg UAR-index core device from the ucontext Edward Srouji
2026-11-17 14:01 ` [PATCH rdma-next 11/11] RDMA/mlx5: Resolve UAR and mmap core devices via " Edward Srouji

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117-mlx5-sd-prep-v1-7-8efd124c7895@nvidia.com \
    --to=edwards@nvidia.com \
    --cc=agoldberger@nvidia.com \
    --cc=jgg@ziepe.ca \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=michaelgur@nvidia.com \
    --cc=netdev@vger.kernel.org \
    --cc=sd@queasysnail.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®