Merge tag 'v5.3-rc8' into rdma.git for-next

To resolve dependencies in following patches

mlx5_ib.h conflict resolved by keeing both hunks

Linux 5.3-rc8

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

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/counters.c
Simple merge

diff --cc drivers/infiniband/core/nldev.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
index 6abfbf3a69b7b0a989237e7dbe87eb54d0e7ca45,9ae587b74b121ddc637ad22b697a141e25cf3878..c3ea299fe6c9b8e3ad2b21e2115777c31b935622
--- 1/drivers/infiniband/hw/mlx5/mlx5_ib.h
--- 2/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@@ -1476,5 -1475,18 +1476,19 @@@ int bfregn_to_uar_index(struct mlx5_ib_
                        bool dyn_bfreg);
  
  int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);
 +u16 mlx5_ib_get_counters_id(struct mlx5_ib_dev *dev, u8 port_num);
+ 
+ static inline bool mlx5_ib_can_use_umr(struct mlx5_ib_dev *dev,
+                                      bool do_modify_atomic)
+ {
+       if (MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))
+               return false;
+ 
+       if (do_modify_atomic &&
+           MLX5_CAP_GEN(dev->mdev, atomic) &&
+           MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
+               return false;
+ 
+       return true;
+ }
  #endif /* MLX5_IB_H */

diff --cc drivers/infiniband/hw/mlx5/mr.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/odp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/sw/siw/siw_qp_tx.c
index eb83fe183318fd3adf4a250b03e8bc81e35dcd5f,438a2917a47c20e3cb5b1cdb130632fd045c42c1..8e72f955921dca7f20194ab8a562688e496fd29f
--- 1/drivers/infiniband/sw/siw/siw_qp_tx.c
--- 2/drivers/infiniband/sw/siw/siw_qp_tx.c
+++ b/drivers/infiniband/sw/siw/siw_qp_tx.c
@@@ -520,16 -518,15 +518,16 @@@ static int siw_tx_hdt(struct siw_iwarp_
                                                        c_tx->mpa_crc_hd,
                                                        iov[seg].iov_base,
                                                        plen);
 -                              } else if (do_crc)
 -                                      crypto_shash_update(
 -                                              c_tx->mpa_crc_hd,
 -                                              page_address(p) + fp_off,
 -                                              plen);
 +                              } else if (do_crc) {
 +                                      crypto_shash_update(c_tx->mpa_crc_hd,
 +                                                          kmap(p) + fp_off,
 +                                                          plen);
 +                                      kunmap(p);
 +                              }
                        } else {
-                               u64 pa = ((sge->laddr + sge_off) & PAGE_MASK);
+                               u64 va = sge->laddr + sge_off;
  
-                               page_array[seg] = virt_to_page(pa);
+                               page_array[seg] = virt_to_page(va & PAGE_MASK);
                                if (do_crc)
                                        crypto_shash_update(
                                                c_tx->mpa_crc_hd,

diff --cc drivers/infiniband/sw/siw/siw_verbs.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge