From: Doug Ledford Date: Tue, 4 Dec 2018 18:36:57 +0000 (-0500) Subject: Merge 'mlx5-next' into mlx5-devx X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f33cb7e760dee94dd2b2d7a7f6225578a66a17d5;p=linux.git Merge 'mlx5-next' into mlx5-devx The enhanced devx support series needs commit: 9d43faac02e3 ("net/mlx5: Update mlx5_ifc with DEVX UCTX capabilities bits") Signed-off-by: Doug Ledford --- f33cb7e760dee94dd2b2d7a7f6225578a66a17d5 diff --cc drivers/infiniband/hw/mlx5/main.c index 5236169c42d0e,96515a8c9d2cb..b3986bc961ca5 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@@ -6238,6 -6336,12 +6328,9 @@@ static const struct mlx5_ib_profile pf_ STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR, NULL, mlx5_ib_stage_pre_ib_reg_umr_cleanup), - STAGE_CREATE(MLX5_IB_STAGE_SPECS, - mlx5_ib_stage_populate_specs, - NULL), + STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID, + mlx5_ib_stage_devx_init, + mlx5_ib_stage_devx_cleanup), STAGE_CREATE(MLX5_IB_STAGE_IB_REG, mlx5_ib_stage_ib_reg_init, mlx5_ib_stage_ib_reg_cleanup), diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h index 93772434b9e37,861b68f2e3308..59e1664a107f8 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@@ -783,6 -784,8 +786,7 @@@ enum mlx5_ib_stages MLX5_IB_STAGE_UAR, MLX5_IB_STAGE_BFREG, MLX5_IB_STAGE_PRE_IB_REG_UMR, - MLX5_IB_STAGE_SPECS, + MLX5_IB_STAGE_WHITELIST_UID, MLX5_IB_STAGE_IB_REG, MLX5_IB_STAGE_POST_IB_REG_UMR, MLX5_IB_STAGE_DELAY_DROP, @@@ -892,7 -896,9 +897,8 @@@ struct mlx5_ib_pf_eq struct mlx5_ib_dev { struct ib_device ib_dev; - const struct uverbs_object_tree_def *driver_trees[7]; struct mlx5_core_dev *mdev; + struct notifier_block mdev_events; struct mlx5_roce roce[MLX5_MAX_PORTS]; int num_ports; /* serialize update of capability mask