summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorMark Bloch <markb@mellanox.com>2018-01-01 13:07:00 +0200
committerJason Gunthorpe <jgg@mellanox.com>2018-01-03 17:26:59 -0700
commit07321b3c674bc2f4d1e47431e38365af523fe34f (patch)
tree048a83bf5b91b2acc112dd249835b1e6de98cbed /drivers/infiniband
parentc11a226a1e023508a663a07ff822f6ff33e7868c (diff)
downloadop-kernel-dev-07321b3c674bc2f4d1e47431e38365af523fe34f.zip
op-kernel-dev-07321b3c674bc2f4d1e47431e38365af523fe34f.tar.gz
IB/mlx5: Move ODP initialization to the corresponding stage
Now that we have a stage just for ODP, move all relevant initialization logic into one place. Signed-off-by: Mark Bloch <markb@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/mlx5/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 9a5de24..0733161 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4170,8 +4170,6 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
dev->ib_dev.disassociate_ucontext = mlx5_ib_disassociate_ucontext;
- mlx5_ib_internal_fill_odp_caps(dev);
-
dev->umr_fence = mlx5_get_umr_fence(MLX5_CAP_GEN(mdev, umr_fence));
if (MLX5_CAP_GEN(mdev, imaicl)) {
@@ -4272,6 +4270,8 @@ static void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)
static int mlx5_ib_stage_odp_init(struct mlx5_ib_dev *dev)
{
+ mlx5_ib_internal_fill_odp_caps(dev);
+
return mlx5_ib_odp_init_one(dev);
}
OpenPOWER on IntegriCloud