From: Jason Gunthorpe <jgg@nvidia.com>
Date: Tue, 24 May 2022 15:40:28 +0000 (-0300)
Subject: Merge tag 'v5.18' into rdma.git for-next
X-Git-Tag: v6.1-rc5~1241^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6f844da39af8046798ba5cadf92a0c54da80b26;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v5.18' into rdma.git for-next

Following patches have dependencies.

Resolve the merge conflict in
drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names
for the fs functions following linux-next:

https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---

a6f844da39af8046798ba5cadf92a0c54da80b26
diff --cc drivers/infiniband/sw/rdmavt/qp.c
index 3bac4f9,8ef112f..3acab56
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@@ -3190,11 -3188,13 +3190,15 @@@ serr
  	spin_unlock_irqrestore(&qp->r_lock, flags);
  serr_no_r_lock:
  	spin_lock_irqsave(&sqp->s_lock, flags);
 +	spin_lock(&sqp->r_lock);
  	rvt_send_complete(sqp, wqe, send_status);
 +	spin_unlock(&sqp->r_lock);
  	if (sqp->ibqp.qp_type == IB_QPT_RC) {
- 		int lastwqe = rvt_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
+ 		int lastwqe;
+ 
+ 		spin_lock(&sqp->r_lock);
+ 		lastwqe = rvt_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
+ 		spin_unlock(&sqp->r_lock);
  
  		sqp->s_flags &= ~RVT_S_BUSY;
  		spin_unlock_irqrestore(&sqp->s_lock, flags);
diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index d504c8c,ef196cb..e5871fd
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -1181,7 -1192,15 +1190,7 @@@ static int mlx5_load(struct mlx5_core_d
  		goto err_fpga_start;
  	}
  
- 	err = mlx5_init_fs(dev);
 -	mlx5_accel_ipsec_init(dev);
 -
 -	err = mlx5_accel_tls_init(dev);
 -	if (err) {
 -		mlx5_core_err(dev, "TLS device start failed %d\n", err);
 -		goto err_tls_start;
 -	}
 -
+ 	err = mlx5_fs_core_init(dev);
  	if (err) {
  		mlx5_core_err(dev, "Failed to init flow steering\n");
  		goto err_fs;
@@@ -1226,8 -1245,11 +1235,8 @@@ err_ec
  err_vhca:
  	mlx5_vhca_event_stop(dev);
  err_set_hca:
- 	mlx5_cleanup_fs(dev);
+ 	mlx5_fs_core_cleanup(dev);
  err_fs:
 -	mlx5_accel_tls_cleanup(dev);
 -err_tls_start:
 -	mlx5_accel_ipsec_cleanup(dev);
  	mlx5_fpga_device_stop(dev);
  err_fpga_start:
  	mlx5_rsc_dump_cleanup(dev);
@@@ -1252,7 -1274,9 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
  	mlx5_ec_cleanup(dev);
  	mlx5_sf_hw_table_destroy(dev);
  	mlx5_vhca_event_stop(dev);
- 	mlx5_cleanup_fs(dev);
+ 	mlx5_fs_core_cleanup(dev);
 -	mlx5_accel_ipsec_cleanup(dev);
 -	mlx5_accel_tls_cleanup(dev);
  	mlx5_fpga_device_stop(dev);
  	mlx5_rsc_dump_cleanup(dev);
  	mlx5_hv_vhca_cleanup(dev->hv_vhca);