From: Jason Gunthorpe <jgg@mellanox.com>
Date: Wed, 28 Aug 2019 14:25:37 +0000 (-0300)
Subject: Merge branch 'mlx5-odp-dc' into rdma.git for-next
X-Git-Tag: v5.4-rc1~91^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0d8994b305b76fb38448b5b8961fafbe37b7abe;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mlx5-odp-dc' into rdma.git for-next

Michael Guralnik says:

====================
The series adds support for on-demand paging for DC transport.

As DC is a mlx-only transport, the capabilities are exposed to the user
using DEVX objects and later on through mlx5dv_query_device.
====================

Based on the mlx5-next branch from
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux for
dependencies

* branch 'mlx5-odp-dc':
  IB/mlx5: Add page fault handler for DC initiator WQE
  IB/mlx5: Remove check of FW capabilities in ODP page fault handling
  net/mlx5: Set ODP capabilities for DC transport to max
---

a0d8994b305b76fb38448b5b8961fafbe37b7abe
diff --cc drivers/infiniband/hw/mlx5/odp.c
index 817c924e72897,429c72407d7fe..905936423a033
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@@ -1001,9 -1000,11 +990,8 @@@ static int mlx5_ib_mr_initiator_pfault_
  {
  	struct mlx5_wqe_ctrl_seg *ctrl = *wqe;
  	u16 wqe_index = pfault->wqe.wqe_index;
- 	u32 transport_caps;
  	struct mlx5_base_av *av;
  	unsigned ds, opcode;
 -#if defined(DEBUG)
 -	u32 ctrl_wqe_index, ctrl_qpn;
 -#endif
  	u32 qpn = qp->trans_qp.base.mqp.qpn;
  
  	ds = be32_to_cpu(ctrl->qpn_ds) & MLX5_WQE_CTRL_DS_MASK;