|
@@ -2536,11 +2536,14 @@ 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) &&
|
|
|
+ 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);
|
|
@@ -2630,12 +2633,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,
|
|
@@ -2839,6 +2836,14 @@ 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) && 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;
|
|
|
}
|
|
|
|