On Sat, Dec 23, 2017 at 04:22:18PM +0800, Lijun Ou wrote:
> 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@xxxxxxxxxx>
> ---
> drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 33 ++++++++++++++++++++----------
> 1 file changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> index b17dcfa..092f133 100644
> --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
> @@ -2531,11 +2531,17 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
> 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) {
> + if (attr->max_dest_rd_atomic) {
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);
> @@ -2625,12 +2631,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
> 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,
> @@ -2834,6 +2834,17 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,
> 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) {
> + if (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;
> }
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Attachment:
signature.asc
Description: PGP signature
