Patch "RDMA/hns: Update the usage of sr_max and rr_max field" has been added to the 4.15-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
RDMA/hns: Update the usage of sr_max and rr_max field
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rdma-hns-update-the-usage-of-sr_max-and-rr_max-field.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 10:16:32 CEST 2018
From: oulijun <[email protected]>
Date: Wed, 3 Jan 2018 10:44:04 +0800
Subject: RDMA/hns: Update the usage of sr_max and rr_max field
From: oulijun <[email protected]>
[ 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
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +16 -11
@@ -2463,11 +2463,14 @@ static int modify_qp_init_to_rtr(structroce_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(structV2_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 iroce_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 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/rdma-hns-update-the-usage-of-sr_max-and-rr_max-field.patch