lkml.org 
[lkml]   [2018]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 039/168] RDMA/hns: Update the usage of sr_max and rr_max field
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: oulijun <oulijun@huawei.com>


    [ Upstream commit 4f3f7a704b3bff9e4eb322ab3c989b505f7562eb ]

    This patch fixes the usage with sr_max filed and rr_max of qp
    context when modify qp. Its modifications include:
    1. Adjust location of filling sr_max filed of qpc
    2. Only assign the number of responder resource if
    IB_QP_MAX_DEST_RD_ATOMIC bit is set
    3. Only assign the number of outstanding resource if
    IB_QP_MAX_QP_RD_ATOMIC
    4. Fix the assgin algorithms for the field of sr_max
    and rr_max of qp context

    Signed-off-by: Lijun Ou <oulijun@huawei.com>
    Signed-off-by: Yixian Liu <liuyixian@huawei.com>
    Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
    Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 27 ++++++++++++++++-----------
    1 file changed, 16 insertions(+), 11 deletions(-)

    --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    @@ -2463,11 +2463,14 @@ static int modify_qp_init_to_rtr(struct
    roce_set_bit(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_LBI_S, 0);
    }

    - roce_set_field(context->byte_140_raq, V2_QPC_BYTE_140_RR_MAX_M,
    - V2_QPC_BYTE_140_RR_MAX_S,
    - ilog2((unsigned int)attr->max_dest_rd_atomic));
    - roce_set_field(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RR_MAX_M,
    - V2_QPC_BYTE_140_RR_MAX_S, 0);
    + if ((attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) &&
    + attr->max_dest_rd_atomic) {
    + roce_set_field(context->byte_140_raq, V2_QPC_BYTE_140_RR_MAX_M,
    + V2_QPC_BYTE_140_RR_MAX_S,
    + fls(attr->max_dest_rd_atomic - 1));
    + roce_set_field(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RR_MAX_M,
    + V2_QPC_BYTE_140_RR_MAX_S, 0);
    + }

    roce_set_field(context->byte_56_dqpn_err, V2_QPC_BYTE_56_DQPN_M,
    V2_QPC_BYTE_56_DQPN_S, attr->dest_qp_num);
    @@ -2557,12 +2560,6 @@ static int modify_qp_init_to_rtr(struct
    V2_QPC_BYTE_168_LP_SGEN_INI_M,
    V2_QPC_BYTE_168_LP_SGEN_INI_S, 0);

    - roce_set_field(context->byte_208_irrl, V2_QPC_BYTE_208_SR_MAX_M,
    - V2_QPC_BYTE_208_SR_MAX_S,
    - ilog2((unsigned int)attr->max_rd_atomic));
    - roce_set_field(qpc_mask->byte_208_irrl, V2_QPC_BYTE_208_SR_MAX_M,
    - V2_QPC_BYTE_208_SR_MAX_S, 0);
    -
    roce_set_field(context->byte_28_at_fl, V2_QPC_BYTE_28_SL_M,
    V2_QPC_BYTE_28_SL_S, rdma_ah_get_sl(&attr->ah_attr));
    roce_set_field(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_SL_M,
    @@ -2766,6 +2763,14 @@ static int modify_qp_rtr_to_rts(struct i
    roce_set_field(qpc_mask->byte_196_sq_psn, V2_QPC_BYTE_196_SQ_MAX_PSN_M,
    V2_QPC_BYTE_196_SQ_MAX_PSN_S, 0);

    + if ((attr_mask & IB_QP_MAX_QP_RD_ATOMIC) && attr->max_rd_atomic) {
    + roce_set_field(context->byte_208_irrl, V2_QPC_BYTE_208_SR_MAX_M,
    + V2_QPC_BYTE_208_SR_MAX_S,
    + fls(attr->max_rd_atomic - 1));
    + roce_set_field(qpc_mask->byte_208_irrl,
    + V2_QPC_BYTE_208_SR_MAX_M,
    + V2_QPC_BYTE_208_SR_MAX_S, 0);
    + }
    return 0;
    }


    \
     
     \ /
      Last update: 2018-04-11 01:33    [W:4.058 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site