From: Mark Bloch <markb@mellanox.com>
Date: Mon, 1 Jan 2018 13:07:02 +0200
Subject: IB/mlx5: Move loopback initialization to the corresponding stage
Patch-mainline: v4.16-rc1
Git-commit: c8b8992446a945c103ac74ebd5e05672d9b3c48a
References: bsc#1103991 FATE#326007
The loopback stage only initializes a lock, move it to be in
the CAPS initialization phase and get rid loopback step completely.
Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/infiniband/hw/mlx5/main.c | 18 +++++-------------
drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 -
2 files changed, 5 insertions(+), 14 deletions(-)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4205,6 +4205,11 @@ static int mlx5_ib_stage_caps_init(struc
INIT_LIST_HEAD(&dev->qp_list);
spin_lock_init(&dev->reset_flow_resource_lock);
+ if ((MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) &&
+ (MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) ||
+ MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))
+ mutex_init(&dev->lb_mutex);
+
return 0;
}
@@ -4386,16 +4391,6 @@ static int mlx5_ib_stage_class_attr_init
return 0;
}
-static int mlx5_ib_stage_loopback_init(struct mlx5_ib_dev *dev)
-{
- if ((MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) &&
- (MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) ||
- MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))
- mutex_init(&dev->lb_mutex);
-
- return 0;
-}
-
static void __mlx5_ib_remove(struct mlx5_ib_dev *dev,
const struct mlx5_ib_profile *profile,
int stage)
@@ -4484,9 +4479,6 @@ static const struct mlx5_ib_profile pf_p
STAGE_CREATE(MLX5_IB_STAGE_CLASS_ATTR,
mlx5_ib_stage_class_attr_init,
NULL),
- STAGE_CREATE(MLX5_IB_STAGE_LOOPBACK,
- mlx5_ib_stage_loopback_init,
- NULL),
};
static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -729,7 +729,6 @@ enum mlx5_ib_stages {
MLX5_IB_STAGE_UMR_RESOURCES,
MLX5_IB_STAGE_DELAY_DROP,
MLX5_IB_STAGE_CLASS_ATTR,
- MLX5_IB_STAGE_LOOPBACK,
MLX5_IB_STAGE_MAX,
};