On Mon, Aug 29, 2022 at 06:52:03PM +0800, Wenpeng Liang wrote:
> From: Yangyang Li <liyangyang20@xxxxxxxxxx>
>
> Currently, local invalidate operation doesn't work well. So the hns driver
> does not support it temporarily and removes related code.
Please add Fixes line, and provide some context, so we can take it to
-rc and to all stable@ trees so this feature will be deleted from
previous kernel versions too.
Thanks
>
> Signed-off-by: Yangyang Li <liyangyang20@xxxxxxxxxx>
> Signed-off-by: Wenpeng Liang <liangwenpeng@xxxxxxxxxx>
> ---
> drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 -----------
> drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 --
> 2 files changed, 13 deletions(-)
>
> diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> index fa78b141dff2..2b5a4bd7beeb 100644
> --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> @@ -118,7 +118,6 @@ static const u32 hns_roce_op_code[] = {
> HR_OPC_MAP(ATOMIC_CMP_AND_SWP, ATOM_CMP_AND_SWAP),
> HR_OPC_MAP(ATOMIC_FETCH_AND_ADD, ATOM_FETCH_AND_ADD),
> HR_OPC_MAP(SEND_WITH_INV, SEND_WITH_INV),
> - HR_OPC_MAP(LOCAL_INV, LOCAL_INV),
> HR_OPC_MAP(MASKED_ATOMIC_CMP_AND_SWP, ATOM_MSK_CMP_AND_SWAP),
> HR_OPC_MAP(MASKED_ATOMIC_FETCH_AND_ADD, ATOM_MSK_FETCH_AND_ADD),
> HR_OPC_MAP(REG_MR, FAST_REG_PMR),
> @@ -560,9 +559,6 @@ static int set_rc_opcode(struct hns_roce_dev *hr_dev,
> else
> ret = -EOPNOTSUPP;
> break;
> - case IB_WR_LOCAL_INV:
> - hr_reg_enable(rc_sq_wqe, RC_SEND_WQE_SO);
> - fallthrough;
> case IB_WR_SEND_WITH_INV:
> rc_sq_wqe->inv_key = cpu_to_le32(wr->ex.invalidate_rkey);
> break;
> @@ -3227,7 +3223,6 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,
>
> hr_reg_write(mpt_entry, MPT_ST, V2_MPT_ST_VALID);
> hr_reg_write(mpt_entry, MPT_PD, mr->pd);
> - hr_reg_enable(mpt_entry, MPT_L_INV_EN);
>
> hr_reg_write_bool(mpt_entry, MPT_BIND_EN,
> mr->access & IB_ACCESS_MW_BIND);
> @@ -3318,7 +3313,6 @@ static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev,
>
> hr_reg_enable(mpt_entry, MPT_RA_EN);
> hr_reg_enable(mpt_entry, MPT_R_INV_EN);
> - hr_reg_enable(mpt_entry, MPT_L_INV_EN);
>
> hr_reg_enable(mpt_entry, MPT_FRE);
> hr_reg_clear(mpt_entry, MPT_MR_MW);
> @@ -3350,7 +3344,6 @@ static int hns_roce_v2_mw_write_mtpt(void *mb_buf, struct hns_roce_mw *mw)
> hr_reg_write(mpt_entry, MPT_PD, mw->pdn);
>
> hr_reg_enable(mpt_entry, MPT_R_INV_EN);
> - hr_reg_enable(mpt_entry, MPT_L_INV_EN);
> hr_reg_enable(mpt_entry, MPT_LW_EN);
>
> hr_reg_enable(mpt_entry, MPT_MR_MW);
> @@ -3799,7 +3792,6 @@ static const u32 wc_send_op_map[] = {
> HR_WC_OP_MAP(RDMA_READ, RDMA_READ),
> HR_WC_OP_MAP(RDMA_WRITE, RDMA_WRITE),
> HR_WC_OP_MAP(RDMA_WRITE_WITH_IMM, RDMA_WRITE),
> - HR_WC_OP_MAP(LOCAL_INV, LOCAL_INV),
> HR_WC_OP_MAP(ATOM_CMP_AND_SWAP, COMP_SWAP),
> HR_WC_OP_MAP(ATOM_FETCH_AND_ADD, FETCH_ADD),
> HR_WC_OP_MAP(ATOM_MSK_CMP_AND_SWAP, MASKED_COMP_SWAP),
> @@ -3849,9 +3841,6 @@ static void fill_send_wc(struct ib_wc *wc, struct hns_roce_v2_cqe *cqe)
> case HNS_ROCE_V2_WQE_OP_RDMA_WRITE_WITH_IMM:
> wc->wc_flags |= IB_WC_WITH_IMM;
> break;
> - case HNS_ROCE_V2_WQE_OP_LOCAL_INV:
> - wc->wc_flags |= IB_WC_WITH_INVALIDATE;
> - break;
> case HNS_ROCE_V2_WQE_OP_ATOM_CMP_AND_SWAP:
> case HNS_ROCE_V2_WQE_OP_ATOM_FETCH_AND_ADD:
> case HNS_ROCE_V2_WQE_OP_ATOM_MSK_CMP_AND_SWAP:
> diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
> index ae29780dd63a..7222ed00bb90 100644
> --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
> +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
> @@ -182,7 +182,6 @@ enum {
> HNS_ROCE_V2_WQE_OP_ATOM_MSK_CMP_AND_SWAP = 0x8,
> HNS_ROCE_V2_WQE_OP_ATOM_MSK_FETCH_AND_ADD = 0x9,
> HNS_ROCE_V2_WQE_OP_FAST_REG_PMR = 0xa,
> - HNS_ROCE_V2_WQE_OP_LOCAL_INV = 0xb,
> HNS_ROCE_V2_WQE_OP_BIND_MW = 0xc,
> HNS_ROCE_V2_WQE_OP_MASK = 0x1f,
> };
> @@ -917,7 +916,6 @@ struct hns_roce_v2_rc_send_wqe {
> #define RC_SEND_WQE_OWNER RC_SEND_WQE_FIELD_LOC(7, 7)
> #define RC_SEND_WQE_CQE RC_SEND_WQE_FIELD_LOC(8, 8)
> #define RC_SEND_WQE_FENCE RC_SEND_WQE_FIELD_LOC(9, 9)
> -#define RC_SEND_WQE_SO RC_SEND_WQE_FIELD_LOC(10, 10)
> #define RC_SEND_WQE_SE RC_SEND_WQE_FIELD_LOC(11, 11)
> #define RC_SEND_WQE_INLINE RC_SEND_WQE_FIELD_LOC(12, 12)
> #define RC_SEND_WQE_WQE_INDEX RC_SEND_WQE_FIELD_LOC(30, 15)
> --
> 2.30.0
>
