From: Jason Gunthorpe Date: Thu, 12 Sep 2019 15:49:56 +0000 (-0300) Subject: Merge tag 'v5.3-rc8' into rdma.git for-next X-Git-Tag: v5.4-rc1~91^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75c66515e4fea4e9bb488b6125e014220f846c61;p=thirdparty%2Fkernel%2Flinux.git 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 --- 75c66515e4fea4e9bb488b6125e014220f846c61 diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h index 6abfbf3a69b7b,9ae587b74b121..c3ea299fe6c9b --- a/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/sw/siw/siw_qp_tx.c index eb83fe183318f,438a2917a47c2..8e72f955921dc --- a/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,