RDMA/hns: Use new interfaces to write/read fields
Subsystems (2)
v4 cover RDMA/hns: Use new interfaces to write/read fields
hr_reg_*() is simpler than roce_set_*(), and the field/bit can be generated automatically and accurately. This series first fix two issues on hr_reg_*(), then do the replacement.
Changes since v3:
* Use "val ? 1 : 0" instead of "!!val" for hr_reg_write to avoid sparse
warnings.
* Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Changes since v2:
* Add a patch to solve the gcc warnings about PREP_FIELD() by adding a
check for mtu. Therefore only the parts which fix the sparse warning is
reserved in #1.
* Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Changes since v1:
* Add a patch to fix gcc warnings about PREP_FIELD().
* Fix a typo in #5.
* Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Lang Cheng (2):
RDMA/hns: Use new interface to modify QP context RDMA/hns: Use new interface to get CQE fields
Weihang Li (2):
RDMA/hns: Fix sparse warnings about hr_reg_write() RDMA/hns: Add a check to ensure integer mtu is positive
Xi Wang (1):
RDMA/hns: Clean SRQC structure definition
Yixing Liu (3):
RDMA/hns: Use new interface to write CQ context. RDMA/hns: Use new interface to write FRMR fields RDMA/hns: Use new interface to write DB related fields
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1110 ++++++++++------------------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 862 +++++++-------------- 2 files changed, 667 insertions(+), 1305 deletions(-)
Signature · 1 line
2.7.4
PATCH v4 1/8 RDMA/hns: Fix sparse warnings about hr_reg_write()
Fix complains from sparse about "dubious: x & !y" when calling hr_reg_write(ctx, field, !!val) by using "val ? 1 : 0" instead of "!!val".
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +7 -7
@@ -3013,15 +3013,15 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,hr_reg_enable (mpt_entry,MPT_L_INV_EN );hr_reg_write (mpt_entry,MPT_BIND_EN , - !!(mr->access &IB_ACCESS_MW_BIND )); + mr->access &IB_ACCESS_MW_BIND ?1 :0 );hr_reg_write (mpt_entry,MPT_ATOMIC_EN , - !!(mr->access &IB_ACCESS_REMOTE_ATOMIC )); + mr->access &IB_ACCESS_REMOTE_ATOMIC ?1 :0 );hr_reg_write (mpt_entry,MPT_RR_EN , - !!(mr->access &IB_ACCESS_REMOTE_READ )); + mr->access &IB_ACCESS_REMOTE_READ ?1 :0 );hr_reg_write (mpt_entry,MPT_RW_EN , - !!(mr->access &IB_ACCESS_REMOTE_WRITE )); + mr->access &IB_ACCESS_REMOTE_WRITE ?1 :0 );hr_reg_write (mpt_entry,MPT_LW_EN , - !!((mr->access &IB_ACCESS_LOCAL_WRITE ))); + mr->access &IB_ACCESS_LOCAL_WRITE ?1 :0 ); mpt_entry->len_l =cpu_to_le32 (lower_32_bits (mr->size)); mpt_entry->len_h =cpu_to_le32 (upper_32_bits (mr->size));
@@ -5617,7 +5617,7 @@ static int hns_roce_v2_write_srqc(struct hns_roce_srq *srq, void *mb_buf)hr_reg_write (ctx,SRQC_SRQ_ST ,1 );hr_reg_write (ctx,SRQC_SRQ_TYPE , - !!(srq->ibsrq.srq_type ==IB_SRQT_XRC )); + srq->ibsrq.srq_type ==IB_SRQT_XRC ?1 :0 );hr_reg_write (ctx,SRQC_PD ,to_hr_pd (srq->ibsrq.pd)->pdn);hr_reg_write (ctx,SRQC_SRQN , srq->srqn);hr_reg_write (ctx,SRQC_XRCD , srq->xrcdn);
@@ -6168,7 +6168,7 @@ static int config_eqc(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq,hr_reg_write (eqc,EQC_NEX_EQE_BA_L , eqe_ba[1 ] >>12 );hr_reg_write (eqc,EQC_NEX_EQE_BA_H , eqe_ba[1 ] >>44 );hr_reg_write (eqc,EQC_EQE_SIZE , - !!(eq->eqe_size ==HNS_ROCE_V3_EQE_SIZE )); + eq->eqe_size ==HNS_ROCE_V3_EQE_SIZE ?1 :0 );return 0 ; }
Signature · 1 line
2.7.4
Jason Gunthorpe
maintainerRe: [PATCH v4 for-next 1/8] RDMA/hns: Fix sparse warnings about hr_reg_write()
Quoted 16 lines · Weihang Li
Fix complains from sparse about "dubious: x & !y" when calling
hr_reg_write(ctx, field, !!val)by using "val ? 1 : 0" instead of "!!val".Fixes dc504774408b ("RDMA/hns: Use new interface to set MPT related fields")Fixes 495c24808ce7 ("RDMA/hns: Add XRC subtype in QPC and XRC type in SRQC")Fixes 782832f25404 ("RDMA/hns: Simplify the function config_eqc()")Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0
-0
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev, · line 3016
Quoted 5 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-1@@ -3013,15 +3013,15 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,hr_reg_enable (mpt_entry,MPT_L_INV_EN );hr_reg_write (mpt_entry,MPT_BIND_EN , - !!(mr->access &IB_ACCESS_MW_BIND )); + mr->access &IB_ACCESS_MW_BIND ?1 :0 );
Err, I'm still confused where the sparse warning is coming from
A hr_reg_write_bool() would be cleaner?
Jason
Re: [PATCH v4 for-next 1/8] RDMA/hns: Fix sparse warnings about hr_reg_write()
Quoted 20 lines · Jason Gunthorpe <[email protected]> 于2021年6月18日周五 下午8:49写道:
Quoted 18 lines · Weihang Li
Fix complains from sparse about "dubious: x & !y" when calling
hr_reg_write(ctx, field, !!val)by using "val ? 1 : 0" instead of "!!val".Fixes dc504774408b ("RDMA/hns: Use new interface to set MPT related fields")Fixes 495c24808ce7 ("RDMA/hns: Add XRC subtype in QPC and XRC type in SRQC")Fixes 782832f25404 ("RDMA/hns: Simplify the function config_eqc()")Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0
-0@@ -3013,15 +3013,15 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,hr_reg_enable (mpt_entry,MPT_L_INV_EN );
Quoted 5 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev, · line 3016
Quoted 3 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-1hr_reg_write (mpt_entry,MPT_BIND_EN , - !!(mr->access &IB_ACCESS_MW_BIND )); + mr->access &IB_ACCESS_MW_BIND ?1 :0 );Err, I'm still confused where the sparse warning is coming from
Hi, Jason, i found some code in sparse/evaluate.c:
const unsigned left_not = expr->left->type == EXPR_PREOP && expr->left->op == '!';
const unsigned right_not = expr->right->type == EXPR_PREOP && expr->right->op == '!';
if ((op == '&' || op == '|') && (left_not || right_not))
warning(expr->pos, "dubious: %sx %c %sy",
I guess the "dubious" is, if somebody use "&" or "|", maybe he want to bitwise operate a number instead of a bool.
Someone think sparse wants to remind whether he want to use a logical "&&" instead of a bitwise "&". Maybe it is a typo.
Quoted 4 lines
A
hr_reg_write_bool()would be cleaner?Jason
Jason Gunthorpe
maintainerRe: [PATCH v4 for-next 1/8] RDMA/hns: Fix sparse warnings about hr_reg_write()
Quoted 31 lines · hhh ching
Quoted 18 lines · Jason Gunthorpe <[email protected]> 于2021年6月18日周五 下午8:49写道:
Quoted 16 lines · Weihang Li
Fix complains from sparse about "dubious: x & !y" when calling
hr_reg_write(ctx, field, !!val)by using "val ? 1 : 0" instead of "!!val".Fixes dc504774408b ("RDMA/hns: Use new interface to set MPT related fields")Fixes 495c24808ce7 ("RDMA/hns: Add XRC subtype in QPC and XRC type in SRQC")Fixes 782832f25404 ("RDMA/hns: Simplify the function config_eqc()")Signed-off-by Weihang Li <[email protected]>drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-0+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c@@ -3013,15 +3013,15 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,hr_reg_enable (mpt_entry,MPT_L_INV_EN );Quoted 5 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev, · line 3016
Quoted 3 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-1hr_reg_write (mpt_entry,MPT_BIND_EN , - !!(mr->access &IB_ACCESS_MW_BIND )); + mr->access &IB_ACCESS_MW_BIND ?1 :0 );Err, I'm still confused where the sparse warning is coming from
Hi, Jason, i found some code in
sparse/evaluate.c:
const unsignedleft_not=expr->left->type==EXPR_PREOP&&expr->left->op== '!';
const unsignedright_not=expr->right->type==EXPR_PREOP&&expr->right->op== '!';
if ((op == '&' || op == '|') && (left_not||right_not))
Quoted 4 lines
warning(expr->pos, "dubious: %sx %c %sy",I guess the "dubious" is, if somebody use "&" or "|", maybe he want to bitwise operate a number instead of a bool.
Oh I see, yes, that does many some sense actually
Quoted 1 line
Quoted 1 line
A
hr_reg_write_bool()would be cleaner?
Which makes me further think this is the right direction
Jason
Re: [PATCH v4 for-next 1/8] RDMA/hns: Fix sparse warnings about hr_reg_write()
Quoted 37 lines · Jason Gunthorpe
Quoted 31 lines · hhh ching
Quoted 18 lines · Jason Gunthorpe <[email protected]> 于2021年6月18日周五 下午8:49写道:
Quoted 16 lines · Weihang Li
Fix complains from sparse about "dubious: x & !y" when calling
hr_reg_write(ctx, field, !!val)by using "val ? 1 : 0" instead of "!!val".Fixes dc504774408b ("RDMA/hns: Use new interface to set MPT related fields")Fixes 495c24808ce7 ("RDMA/hns: Add XRC subtype in QPC and XRC type in SRQC")Fixes 782832f25404 ("RDMA/hns: Simplify the function config_eqc()")Signed-off-by Weihang Li <[email protected]>drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-0+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c@@ -3013,15 +3013,15 @@ static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev,hr_reg_enable (mpt_entry,MPT_L_INV_EN );Quoted 5 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static int hns_roce_v2_write_mtpt(struct hns_roce_dev *hr_dev, · line 3016
Quoted 3 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1
-1hr_reg_write (mpt_entry,MPT_BIND_EN , - !!(mr->access &IB_ACCESS_MW_BIND )); + mr->access &IB_ACCESS_MW_BIND ?1 :0 );Err, I'm still confused where the sparse warning is coming from
Hi, Jason, i found some code in
sparse/evaluate.c:
const unsignedleft_not=expr->left->type==EXPR_PREOP&&expr->left->op== '!';
const unsignedright_not=expr->right->type==EXPR_PREOP&&expr->right->op== '!';
if ((op == '&' || op == '|') && (left_not||right_not))Quoted 4 lines
warning(expr->pos, "dubious: %sx %c %sy",I guess the "dubious" is, if somebody use "&" or "|", maybe he want to bitwise operate a number instead of a bool.
Quoted 8 lines
Oh I see, yes, that does many some sense actually
Quoted 1 line
Quoted 1 line
A
hr_reg_write_bool()would be cleaner?Which makes me further think this is the right direction
Jason
I see, thanks.
Weihang
PATCH v4 2/8 RDMA/hns: Add a check to ensure integer mtu is positive
In reply to Weihang LiGCC may reports an running time assert error when a value calculated from ib_mtu_enum_to_int() is using as 'val' in FIELD_PREDP:
include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_1524' declared with attribute error: FIELD_PREP:
value too large for the field
So a check is added about whether integer mtu from ib_mtu_enum_to_int() is negative to avoid this warning.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +10 -5
@@ -4412,12 +4412,13 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,struct ib_device *ibdev = &hr_dev->ib_dev;dma_addr_t trrl_ba;dma_addr_t irrl_ba; -enum ib_mtu mtu; +enum ib_mtu ib_mtu;u8 lp_pktn_ini;u64 *mtts;u8 *dmac;u8 *smac;u32 port; +int mtu;int ret; ret =config_qp_rq_buf (hr_dev, hr_qp, context, qpc_mask);
@@ -4501,19 +4502,23 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,roce_set_field (qpc_mask->byte_52_udpspn_dmac,V2_QPC_BYTE_52_DMAC_M ,V2_QPC_BYTE_52_DMAC_S ,0 ); - mtu =get_mtu (ibqp, attr); - hr_qp->path_mtu = mtu; + ib_mtu =get_mtu (ibqp, attr); + hr_qp->path_mtu = ib_mtu; + + mtu =ib_mtu_enum_to_int (ib_mtu); +if (WARN_ON (mtu <0 )) +return -EINVAL ;if (attr_mask &IB_QP_PATH_MTU ) {roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M , -V2_QPC_BYTE_24_MTU_S , mtu); +V2_QPC_BYTE_24_MTU_S , ib_mtu);roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M ,V2_QPC_BYTE_24_MTU_S ,0 ); }#define MAX_LP_MSG_LEN 65536/* MTU * (2 ^ LP_PKTN_INI) shouldn't be bigger than 64KB */ - lp_pktn_ini =ilog2 (MAX_LP_MSG_LEN /ib_mtu_enum_to_int (mtu)); + lp_pktn_ini =ilog2 (MAX_LP_MSG_LEN / mtu);roce_set_field (context->byte_56_dqpn_err,V2_QPC_BYTE_56_LP_PKTN_INI_M ,V2_QPC_BYTE_56_LP_PKTN_INI_S , lp_pktn_ini);
Signature · 1 line
2.7.4
PATCH v4 3/8 RDMA/hns: Use new interface to write CQ context.
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Use hr_reg_*() to write CQ context, it's simpler than roce_set_*().
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 111 ++++++++++------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 87 +++++++++++----------- 2 files changed, 78 insertions(+), 120 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +37 -74
@@ -3280,73 +3280,44 @@ static void hns_roce_v2_write_cqc(struct hns_roce_dev *hr_dev, cq_context = mb_buf;memset (cq_context,0 ,sizeof (*cq_context)); -roce_set_field (cq_context->byte_4_pg_ceqn,V2_CQC_BYTE_4_CQ_ST_M , -V2_CQC_BYTE_4_CQ_ST_S ,V2_CQ_STATE_VALID ); -roce_set_field (cq_context->byte_4_pg_ceqn,V2_CQC_BYTE_4_ARM_ST_M , -V2_CQC_BYTE_4_ARM_ST_S ,REG_NXT_CEQE ); -roce_set_field (cq_context->byte_4_pg_ceqn,V2_CQC_BYTE_4_SHIFT_M , -V2_CQC_BYTE_4_SHIFT_S ,ilog2 (hr_cq->cq_depth)); -roce_set_field (cq_context->byte_4_pg_ceqn,V2_CQC_BYTE_4_CEQN_M , -V2_CQC_BYTE_4_CEQN_S , hr_cq->vector); - -roce_set_field (cq_context->byte_8_cqn,V2_CQC_BYTE_8_CQN_M , -V2_CQC_BYTE_8_CQN_S , hr_cq->cqn); - -roce_set_field (cq_context->byte_8_cqn,V2_CQC_BYTE_8_CQE_SIZE_M , -V2_CQC_BYTE_8_CQE_SIZE_S , hr_cq->cqe_size == -HNS_ROCE_V3_CQE_SIZE ?1 :0 ); +hr_reg_write (cq_context,CQC_CQ_ST ,V2_CQ_STATE_VALID ); +hr_reg_write (cq_context,CQC_ARM_ST ,REG_NXT_CEQE ); +hr_reg_write (cq_context,CQC_SHIFT ,ilog2 (hr_cq->cq_depth)); +hr_reg_write (cq_context,CQC_CEQN , hr_cq->vector); +hr_reg_write (cq_context,CQC_CQN , hr_cq->cqn); + +if (hr_cq->cqe_size ==HNS_ROCE_V3_CQE_SIZE ) +hr_reg_write (cq_context,CQC_CQE_SIZE ,CQE_SIZE_64B );if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_STASH )hr_reg_enable (cq_context,CQC_STASH ); - cq_context->cqe_cur_blk_addr =cpu_to_le32 (to_hr_hw_page_addr (mtts[0 ])); - -roce_set_field (cq_context->byte_16_hop_addr, -V2_CQC_BYTE_16_CQE_CUR_BLK_ADDR_M , -V2_CQC_BYTE_16_CQE_CUR_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (mtts[0 ]))); -roce_set_field (cq_context->byte_16_hop_addr, -V2_CQC_BYTE_16_CQE_HOP_NUM_M , -V2_CQC_BYTE_16_CQE_HOP_NUM_S , hr_dev->caps.cqe_hop_num == -HNS_ROCE_HOP_NUM_0 ?0 : hr_dev->caps.cqe_hop_num); - - cq_context->cqe_nxt_blk_addr =cpu_to_le32 (to_hr_hw_page_addr (mtts[1 ])); -roce_set_field (cq_context->byte_24_pgsz_addr, -V2_CQC_BYTE_24_CQE_NXT_BLK_ADDR_M , -V2_CQC_BYTE_24_CQE_NXT_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (mtts[1 ]))); -roce_set_field (cq_context->byte_24_pgsz_addr, -V2_CQC_BYTE_24_CQE_BA_PG_SZ_M , -V2_CQC_BYTE_24_CQE_BA_PG_SZ_S , -to_hr_hw_page_shift (hr_cq->mtr.hem_cfg.ba_pg_shift)); -roce_set_field (cq_context->byte_24_pgsz_addr, -V2_CQC_BYTE_24_CQE_BUF_PG_SZ_M , -V2_CQC_BYTE_24_CQE_BUF_PG_SZ_S , -to_hr_hw_page_shift (hr_cq->mtr.hem_cfg.buf_pg_shift)); - - cq_context->cqe_ba =cpu_to_le32 (dma_handle >>3 ); - -roce_set_field (cq_context->byte_40_cqe_ba,V2_CQC_BYTE_40_CQE_BA_M , -V2_CQC_BYTE_40_CQE_BA_S , (dma_handle >> (32 +3 ))); - -roce_set_bit (cq_context->byte_44_db_record, -V2_CQC_BYTE_44_DB_RECORD_EN_S , +hr_reg_write (cq_context,CQC_CQE_CUR_BLK_ADDR_L , +to_hr_hw_page_addr (mtts[0 ])); +hr_reg_write (cq_context,CQC_CQE_CUR_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (mtts[0 ]))); +hr_reg_write (cq_context,CQC_CQE_HOP_NUM , hr_dev->caps.cqe_hop_num == +HNS_ROCE_HOP_NUM_0 ?0 : hr_dev->caps.cqe_hop_num); +hr_reg_write (cq_context,CQC_CQE_NEX_BLK_ADDR_L , +to_hr_hw_page_addr (mtts[1 ])); +hr_reg_write (cq_context,CQC_CQE_NEX_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (mtts[1 ]))); +hr_reg_write (cq_context,CQC_CQE_BAR_PG_SZ , +to_hr_hw_page_shift (hr_cq->mtr.hem_cfg.ba_pg_shift)); +hr_reg_write (cq_context,CQC_CQE_BUF_PG_SZ , +to_hr_hw_page_shift (hr_cq->mtr.hem_cfg.buf_pg_shift)); +hr_reg_write (cq_context,CQC_CQE_BA_L , dma_handle >>3 ); +hr_reg_write (cq_context,CQC_CQE_BA_H , (dma_handle >> (32 +3 ))); +hr_reg_write (cq_context,CQC_DB_RECORD_EN , (hr_cq->flags &HNS_ROCE_CQ_FLAG_RECORD_DB ) ?1 :0 ); - -roce_set_field (cq_context->byte_44_db_record, -V2_CQC_BYTE_44_DB_RECORD_ADDR_M , -V2_CQC_BYTE_44_DB_RECORD_ADDR_S , - ((u32 )hr_cq->db.dma) >>1 ); - cq_context->db_record_addr =cpu_to_le32 (hr_cq->db.dma >>32 ); - -roce_set_field (cq_context->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_MAX_CNT_M , -V2_CQC_BYTE_56_CQ_MAX_CNT_S , -HNS_ROCE_V2_CQ_DEFAULT_BURST_NUM ); -roce_set_field (cq_context->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_PERIOD_M , -V2_CQC_BYTE_56_CQ_PERIOD_S , -HNS_ROCE_V2_CQ_DEFAULT_INTERVAL ); +hr_reg_write (cq_context,CQC_CQE_DB_RECORD_ADDR_L , + ((u32 )hr_cq->db.dma) >>1 ); +hr_reg_write (cq_context,CQC_CQE_DB_RECORD_ADDR_H , + hr_cq->db.dma >>32 ); +hr_reg_write (cq_context,CQC_CQ_MAX_CNT , +HNS_ROCE_V2_CQ_DEFAULT_BURST_NUM ); +hr_reg_write (cq_context,CQC_CQ_PERIOD , +HNS_ROCE_V2_CQ_DEFAULT_INTERVAL ); } static int hns_roce_v2_req_notify_cq(struct ib_cq *ibcq,
@@ -5753,18 +5724,10 @@ static int hns_roce_v2_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period)memset (cqc_mask,0xff ,sizeof (*cqc_mask)); -roce_set_field (cq_context->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_MAX_CNT_M ,V2_CQC_BYTE_56_CQ_MAX_CNT_S , - cq_count); -roce_set_field (cqc_mask->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_MAX_CNT_M ,V2_CQC_BYTE_56_CQ_MAX_CNT_S , -0 ); -roce_set_field (cq_context->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_PERIOD_M ,V2_CQC_BYTE_56_CQ_PERIOD_S , - cq_period); -roce_set_field (cqc_mask->byte_56_cqe_period_maxcnt, -V2_CQC_BYTE_56_CQ_PERIOD_M ,V2_CQC_BYTE_56_CQ_PERIOD_S , -0 ); +hr_reg_write (cq_context,CQC_CQ_MAX_CNT , cq_count); +hr_reg_clear (cqc_mask,CQC_CQ_MAX_CNT ); +hr_reg_write (cq_context,CQC_CQ_PERIOD , cq_period); +hr_reg_clear (cqc_mask,CQC_CQ_PERIOD ); ret = hns_roce_cmd_mbox(hr_dev, mailbox->dma, 0, hr_cq->cqn, 1, HNS_ROCE_CMD_MODIFY_CQC,
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +41 -46
126 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 4/8 RDMA/hns: Use new interface to modify QP context
In reply to Weihang LiFrom: Lang Cheng <[email protected]>
Fill all QPC fileds with hr_reg_*() instead of roce_set_*(). SQPN is used for HIP08 ES only, it should be removed.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 777 ++++++++++------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 550 +++++++------------- 2 files changed, 448 insertions(+), 879 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +263 -514
@@ -4014,38 +4014,33 @@ static void set_access_flags(struct hns_roce_qp *hr_qp,if (!dest_rd_atomic) access_flags &=IB_ACCESS_REMOTE_WRITE ; -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S , - !!(access_flags &IB_ACCESS_REMOTE_READ )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RRE_S ,0 ); +hr_reg_write (context,QPC_RRE , + access_flags &IB_ACCESS_REMOTE_READ ?1 :0 ); +hr_reg_clear (qpc_mask,QPC_RRE ); -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S , - !!(access_flags &IB_ACCESS_REMOTE_WRITE )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_RWE_S ,0 ); +hr_reg_write (context,QPC_RWE , + access_flags &IB_ACCESS_REMOTE_WRITE ?1 :0 ); +hr_reg_clear (qpc_mask,QPC_RWE ); -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S , - !!(access_flags &IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_ATE_S ,0 ); -roce_set_bit (context->byte_76_srqn_op_en,V2_QPC_BYTE_76_EXT_ATE_S , - !!(access_flags &IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (qpc_mask->byte_76_srqn_op_en,V2_QPC_BYTE_76_EXT_ATE_S ,0 ); +hr_reg_write (context,QPC_ATE , + access_flags &IB_ACCESS_REMOTE_ATOMIC ?1 :0 ); +hr_reg_clear (qpc_mask,QPC_ATE ); +hr_reg_write (context,QPC_EXT_ATE , + access_flags &IB_ACCESS_REMOTE_ATOMIC ?1 :0 ); +hr_reg_clear (qpc_mask,QPC_EXT_ATE ); }static void set_qpc_wqe_cnt (struct hns_roce_qp *hr_qp,struct hns_roce_v2_qp_context *context,struct hns_roce_v2_qp_context *qpc_mask) { -roce_set_field (context->byte_4_sqpn_tst, -V2_QPC_BYTE_4_SGE_SHIFT_M ,V2_QPC_BYTE_4_SGE_SHIFT_S , -to_hr_hem_entries_shift (hr_qp->sge.sge_cnt, - hr_qp->sge.sge_shift)); +hr_reg_write (context,QPC_SGE_SHIFT , +to_hr_hem_entries_shift (hr_qp->sge.sge_cnt, + hr_qp->sge.sge_shift)); -roce_set_field (context->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SQ_SHIFT_M ,V2_QPC_BYTE_20_SQ_SHIFT_S , -ilog2 (hr_qp->sq.wqe_cnt)); +hr_reg_write (context,QPC_SQ_SHIFT ,ilog2 (hr_qp->sq.wqe_cnt)); -roce_set_field (context->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_RQ_SHIFT_M ,V2_QPC_BYTE_20_RQ_SHIFT_S , -ilog2 (hr_qp->rq.wqe_cnt)); +hr_reg_write (context,QPC_RQ_SHIFT ,ilog2 (hr_qp->rq.wqe_cnt)); }static inline int get_cqn (struct ib_cq *ib_cq)
@@ -4073,62 +4068,46 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,* we should set all bits of the relevant fields in context mask to * 0 at the same time, else set them to 0x1. */ -roce_set_field (context->byte_4_sqpn_tst,V2_QPC_BYTE_4_TST_M , -V2_QPC_BYTE_4_TST_S ,to_hr_qp_type (ibqp->qp_type)); +hr_reg_write (context,QPC_TST ,to_hr_qp_type (ibqp->qp_type)); -roce_set_field (context->byte_4_sqpn_tst,V2_QPC_BYTE_4_SQPN_M , -V2_QPC_BYTE_4_SQPN_S , hr_qp->qpn); +hr_reg_write (context,QPC_PD ,get_pdn (ibqp->pd)); -roce_set_field (context->byte_16_buf_ba_pg_sz,V2_QPC_BYTE_16_PD_M , -V2_QPC_BYTE_16_PD_S ,get_pdn (ibqp->pd)); - -roce_set_field (context->byte_20_smac_sgid_idx,V2_QPC_BYTE_20_RQWS_M , -V2_QPC_BYTE_20_RQWS_S ,ilog2 (hr_qp->rq.max_gs)); +hr_reg_write (context,QPC_RQWS ,ilog2 (hr_qp->rq.max_gs));set_qpc_wqe_cnt (hr_qp, context, qpc_mask);/* No VLAN need to set 0xFFF */ -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_VLAN_ID_M , -V2_QPC_BYTE_24_VLAN_ID_S ,0xfff ); +hr_reg_write (context,QPC_VLAN_ID ,0xfff );if (ibqp->qp_type ==IB_QPT_XRC_TGT ) { context->qkey_xrcd =cpu_to_le32 (hr_qp->xrcdn); -roce_set_bit (context->byte_80_rnr_rx_cqn, -V2_QPC_BYTE_80_XRC_QP_TYPE_S ,1 ); +hr_reg_enable (context,QPC_XRC_QP_TYPE ); }if (hr_qp->en_flags &HNS_ROCE_QP_CAP_RQ_RECORD_DB ) -roce_set_bit (context->byte_68_rq_db, -V2_QPC_BYTE_68_RQ_RECORD_EN_S ,1 ); +hr_reg_enable (context,QPC_RQ_RECORD_EN ); -roce_set_field (context->byte_68_rq_db, -V2_QPC_BYTE_68_RQ_DB_RECORD_ADDR_M , -V2_QPC_BYTE_68_RQ_DB_RECORD_ADDR_S , - ((u32 )hr_qp->rdb.dma) >>1 ); - context->rq_db_record_addr =cpu_to_le32 (hr_qp->rdb.dma >>32 ); +hr_reg_write (context,QPC_RQ_DB_RECORD_ADDR_L , +lower_32_bits (hr_qp->rdb.dma) >>1 ); +hr_reg_write (context,QPC_RQ_DB_RECORD_ADDR_H , +upper_32_bits (hr_qp->rdb.dma));if (ibqp->qp_type !=IB_QPT_UD && ibqp->qp_type !=IB_QPT_GSI ) -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_RQIE_S , - !!(hr_dev->caps.flags & -HNS_ROCE_CAP_FLAG_RQ_INLINE )); +hr_reg_write (context,QPC_RQIE , + hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_RQ_INLINE ? +1 :0 ); -roce_set_field (context->byte_80_rnr_rx_cqn,V2_QPC_BYTE_80_RX_CQN_M , -V2_QPC_BYTE_80_RX_CQN_S ,get_cqn (ibqp->recv_cq)); +hr_reg_write (context,QPC_RX_CQN ,get_cqn (ibqp->recv_cq));if (ibqp->srq) { -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQ_EN_S ,1 ); -roce_set_field (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQN_M ,V2_QPC_BYTE_76_SRQN_S , -to_hr_srq (ibqp->srq)->srqn); +hr_reg_enable (context,QPC_SRQ_EN ); +hr_reg_write (context,QPC_SRQN ,to_hr_srq (ibqp->srq)->srqn); } -roce_set_bit (context->byte_172_sq_psn,V2_QPC_BYTE_172_FRE_S ,1 ); +hr_reg_enable (context,QPC_FRE ); -roce_set_field (context->byte_252_err_txcqn,V2_QPC_BYTE_252_TX_CQN_M , -V2_QPC_BYTE_252_TX_CQN_S ,get_cqn (ibqp->send_cq)); +hr_reg_write (context,QPC_TX_CQN ,get_cqn (ibqp->send_cq));if (hr_dev->caps.qpc_sz <HNS_ROCE_V3_QPC_SZ )return ;
@@ -4150,49 +4129,28 @@ static void modify_qp_init_to_init(struct ib_qp *ibqp,* we should set all bits of the relevant fields in context mask to * 0 at the same time, else set them to 0x1. */ -roce_set_field (context->byte_4_sqpn_tst,V2_QPC_BYTE_4_TST_M , -V2_QPC_BYTE_4_TST_S ,to_hr_qp_type (ibqp->qp_type)); -roce_set_field (qpc_mask->byte_4_sqpn_tst,V2_QPC_BYTE_4_TST_M , -V2_QPC_BYTE_4_TST_S ,0 ); - -roce_set_field (context->byte_16_buf_ba_pg_sz,V2_QPC_BYTE_16_PD_M , -V2_QPC_BYTE_16_PD_S ,get_pdn (ibqp->pd)); +hr_reg_write (context,QPC_TST ,to_hr_qp_type (ibqp->qp_type)); +hr_reg_clear (qpc_mask,QPC_TST ); -roce_set_field (qpc_mask->byte_16_buf_ba_pg_sz,V2_QPC_BYTE_16_PD_M , -V2_QPC_BYTE_16_PD_S ,0 ); +hr_reg_write (context,QPC_PD ,get_pdn (ibqp->pd)); +hr_reg_clear (qpc_mask,QPC_PD ); -roce_set_field (context->byte_80_rnr_rx_cqn,V2_QPC_BYTE_80_RX_CQN_M , -V2_QPC_BYTE_80_RX_CQN_S ,get_cqn (ibqp->recv_cq)); -roce_set_field (qpc_mask->byte_80_rnr_rx_cqn,V2_QPC_BYTE_80_RX_CQN_M , -V2_QPC_BYTE_80_RX_CQN_S ,0 ); +hr_reg_write (context,QPC_RX_CQN ,get_cqn (ibqp->recv_cq)); +hr_reg_clear (qpc_mask,QPC_RX_CQN ); -roce_set_field (context->byte_252_err_txcqn,V2_QPC_BYTE_252_TX_CQN_M , -V2_QPC_BYTE_252_TX_CQN_S ,get_cqn (ibqp->send_cq)); -roce_set_field (qpc_mask->byte_252_err_txcqn,V2_QPC_BYTE_252_TX_CQN_M , -V2_QPC_BYTE_252_TX_CQN_S ,0 ); +hr_reg_write (context,QPC_TX_CQN ,get_cqn (ibqp->send_cq)); +hr_reg_clear (qpc_mask,QPC_TX_CQN );if (ibqp->srq) { -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQ_EN_S ,1 ); -roce_set_bit (qpc_mask->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQ_EN_S ,0 ); -roce_set_field (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQN_M ,V2_QPC_BYTE_76_SRQN_S , -to_hr_srq (ibqp->srq)->srqn); -roce_set_field (qpc_mask->byte_76_srqn_op_en, -V2_QPC_BYTE_76_SRQN_M ,V2_QPC_BYTE_76_SRQN_S ,0 ); - } - -roce_set_field (context->byte_4_sqpn_tst,V2_QPC_BYTE_4_SQPN_M , -V2_QPC_BYTE_4_SQPN_S , hr_qp->qpn); -roce_set_field (qpc_mask->byte_4_sqpn_tst,V2_QPC_BYTE_4_SQPN_M , -V2_QPC_BYTE_4_SQPN_S ,0 ); +hr_reg_enable (context,QPC_SRQ_EN ); +hr_reg_clear (qpc_mask,QPC_SRQ_EN ); +hr_reg_write (context,QPC_SRQN ,to_hr_srq (ibqp->srq)->srqn); +hr_reg_clear (qpc_mask,QPC_SRQN ); + }if (attr_mask &IB_QP_DEST_QPN ) { -roce_set_field (context->byte_56_dqpn_err,V2_QPC_BYTE_56_DQPN_M , -V2_QPC_BYTE_56_DQPN_S , hr_qp->qpn); -roce_set_field (qpc_mask->byte_56_dqpn_err, -V2_QPC_BYTE_56_DQPN_M ,V2_QPC_BYTE_56_DQPN_S ,0 ); +hr_reg_write (context,QPC_DQPN , hr_qp->qpn); +hr_reg_clear (qpc_mask,QPC_DQPN ); } }
@@ -4223,74 +4181,46 @@ static int config_qp_rq_buf(struct hns_roce_dev *hr_dev,* we should set all bits of the relevant fields in context mask to * 0 at the same time, else set them to 0x1. */ -roce_set_field (context->byte_12_sq_hop,V2_QPC_BYTE_12_WQE_SGE_BA_M , -V2_QPC_BYTE_12_WQE_SGE_BA_S , wqe_sge_ba >> (32 +3 )); -roce_set_field (qpc_mask->byte_12_sq_hop,V2_QPC_BYTE_12_WQE_SGE_BA_M , -V2_QPC_BYTE_12_WQE_SGE_BA_S ,0 ); - -roce_set_field (context->byte_12_sq_hop,V2_QPC_BYTE_12_SQ_HOP_NUM_M , -V2_QPC_BYTE_12_SQ_HOP_NUM_S , -to_hr_hem_hopnum (hr_dev->caps.wqe_sq_hop_num, - hr_qp->sq.wqe_cnt)); -roce_set_field (qpc_mask->byte_12_sq_hop,V2_QPC_BYTE_12_SQ_HOP_NUM_M , -V2_QPC_BYTE_12_SQ_HOP_NUM_S ,0 ); - -roce_set_field (context->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SGE_HOP_NUM_M , -V2_QPC_BYTE_20_SGE_HOP_NUM_S , -to_hr_hem_hopnum (hr_dev->caps.wqe_sge_hop_num, - hr_qp->sge.sge_cnt)); -roce_set_field (qpc_mask->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SGE_HOP_NUM_M , -V2_QPC_BYTE_20_SGE_HOP_NUM_S ,0 ); - -roce_set_field (context->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_RQ_HOP_NUM_M , -V2_QPC_BYTE_20_RQ_HOP_NUM_S , -to_hr_hem_hopnum (hr_dev->caps.wqe_rq_hop_num, - hr_qp->rq.wqe_cnt)); - -roce_set_field (qpc_mask->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_RQ_HOP_NUM_M , -V2_QPC_BYTE_20_RQ_HOP_NUM_S ,0 ); - -roce_set_field (context->byte_16_buf_ba_pg_sz, -V2_QPC_BYTE_16_WQE_SGE_BA_PG_SZ_M , -V2_QPC_BYTE_16_WQE_SGE_BA_PG_SZ_S , -to_hr_hw_page_shift (hr_qp->mtr.hem_cfg.ba_pg_shift)); -roce_set_field (qpc_mask->byte_16_buf_ba_pg_sz, -V2_QPC_BYTE_16_WQE_SGE_BA_PG_SZ_M , -V2_QPC_BYTE_16_WQE_SGE_BA_PG_SZ_S ,0 ); - -roce_set_field (context->byte_16_buf_ba_pg_sz, -V2_QPC_BYTE_16_WQE_SGE_BUF_PG_SZ_M , -V2_QPC_BYTE_16_WQE_SGE_BUF_PG_SZ_S , -to_hr_hw_page_shift (hr_qp->mtr.hem_cfg.buf_pg_shift)); -roce_set_field (qpc_mask->byte_16_buf_ba_pg_sz, -V2_QPC_BYTE_16_WQE_SGE_BUF_PG_SZ_M , -V2_QPC_BYTE_16_WQE_SGE_BUF_PG_SZ_S ,0 ); +hr_reg_write (context,QPC_WQE_SGE_BA_H , wqe_sge_ba >> (32 +3 )); +hr_reg_clear (qpc_mask,QPC_WQE_SGE_BA_H ); + +hr_reg_write (context,QPC_SQ_HOP_NUM , +to_hr_hem_hopnum (hr_dev->caps.wqe_sq_hop_num, + hr_qp->sq.wqe_cnt)); +hr_reg_clear (qpc_mask,QPC_SQ_HOP_NUM ); + +hr_reg_write (context,QPC_SGE_HOP_NUM , +to_hr_hem_hopnum (hr_dev->caps.wqe_sge_hop_num, + hr_qp->sge.sge_cnt)); +hr_reg_clear (qpc_mask,QPC_SGE_HOP_NUM ); + +hr_reg_write (context,QPC_RQ_HOP_NUM , +to_hr_hem_hopnum (hr_dev->caps.wqe_rq_hop_num, + hr_qp->rq.wqe_cnt)); + +hr_reg_clear (qpc_mask,QPC_RQ_HOP_NUM ); + +hr_reg_write (context,QPC_WQE_SGE_BA_PG_SZ , +to_hr_hw_page_shift (hr_qp->mtr.hem_cfg.ba_pg_shift)); +hr_reg_clear (qpc_mask,QPC_WQE_SGE_BA_PG_SZ ); + +hr_reg_write (context,QPC_WQE_SGE_BUF_PG_SZ , +to_hr_hw_page_shift (hr_qp->mtr.hem_cfg.buf_pg_shift)); +hr_reg_clear (qpc_mask,QPC_WQE_SGE_BUF_PG_SZ ); context->rq_cur_blk_addr =cpu_to_le32 (to_hr_hw_page_addr (mtts[0 ])); qpc_mask->rq_cur_blk_addr =0 ; -roce_set_field (context->byte_92_srq_info, -V2_QPC_BYTE_92_RQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_92_RQ_CUR_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (mtts[0 ]))); -roce_set_field (qpc_mask->byte_92_srq_info, -V2_QPC_BYTE_92_RQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_92_RQ_CUR_BLK_ADDR_S ,0 ); +hr_reg_write (context,QPC_RQ_CUR_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (mtts[0 ]))); +hr_reg_clear (qpc_mask,QPC_RQ_CUR_BLK_ADDR_H ); context->rq_nxt_blk_addr =cpu_to_le32 (to_hr_hw_page_addr (mtts[1 ])); qpc_mask->rq_nxt_blk_addr =0 ; -roce_set_field (context->byte_104_rq_sge, -V2_QPC_BYTE_104_RQ_NXT_BLK_ADDR_M , -V2_QPC_BYTE_104_RQ_NXT_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (mtts[1 ]))); -roce_set_field (qpc_mask->byte_104_rq_sge, -V2_QPC_BYTE_104_RQ_NXT_BLK_ADDR_M , -V2_QPC_BYTE_104_RQ_NXT_BLK_ADDR_S ,0 ); +hr_reg_write (context,QPC_RQ_NXT_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (mtts[1 ]))); +hr_reg_clear (qpc_mask,QPC_RQ_NXT_BLK_ADDR_H );return 0 ; }
@@ -4329,37 +4259,26 @@ static int config_qp_sq_buf(struct hns_roce_dev *hr_dev,* we should set all bits of the relevant fields in context mask to * 0 at the same time, else set them to 0x1. */ - context->sq_cur_blk_addr =cpu_to_le32 (to_hr_hw_page_addr (sq_cur_blk)); -roce_set_field (context->byte_168_irrl_idx, -V2_QPC_BYTE_168_SQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_168_SQ_CUR_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (sq_cur_blk))); - qpc_mask->sq_cur_blk_addr =0 ; -roce_set_field (qpc_mask->byte_168_irrl_idx, -V2_QPC_BYTE_168_SQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_168_SQ_CUR_BLK_ADDR_S ,0 ); - - context->sq_cur_sge_blk_addr = -cpu_to_le32 (to_hr_hw_page_addr (sge_cur_blk)); -roce_set_field (context->byte_184_irrl_idx, -V2_QPC_BYTE_184_SQ_CUR_SGE_BLK_ADDR_M , -V2_QPC_BYTE_184_SQ_CUR_SGE_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (sge_cur_blk))); - qpc_mask->sq_cur_sge_blk_addr =0 ; -roce_set_field (qpc_mask->byte_184_irrl_idx, -V2_QPC_BYTE_184_SQ_CUR_SGE_BLK_ADDR_M , -V2_QPC_BYTE_184_SQ_CUR_SGE_BLK_ADDR_S ,0 ); - - context->rx_sq_cur_blk_addr = -cpu_to_le32 (to_hr_hw_page_addr (sq_cur_blk)); -roce_set_field (context->byte_232_irrl_sge, -V2_QPC_BYTE_232_RX_SQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_232_RX_SQ_CUR_BLK_ADDR_S , -upper_32_bits (to_hr_hw_page_addr (sq_cur_blk))); - qpc_mask->rx_sq_cur_blk_addr =0 ; -roce_set_field (qpc_mask->byte_232_irrl_sge, -V2_QPC_BYTE_232_RX_SQ_CUR_BLK_ADDR_M , -V2_QPC_BYTE_232_RX_SQ_CUR_BLK_ADDR_S ,0 ); +hr_reg_write (context,QPC_SQ_CUR_BLK_ADDR_L , +lower_32_bits (to_hr_hw_page_addr (sq_cur_blk))); +hr_reg_write (context,QPC_SQ_CUR_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (sq_cur_blk))); +hr_reg_clear (qpc_mask,QPC_SQ_CUR_BLK_ADDR_L ); +hr_reg_clear (qpc_mask,QPC_SQ_CUR_BLK_ADDR_H ); + +hr_reg_write (context,QPC_SQ_CUR_SGE_BLK_ADDR_L , +lower_32_bits (to_hr_hw_page_addr (sge_cur_blk))); +hr_reg_write (context,QPC_SQ_CUR_SGE_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (sge_cur_blk))); +hr_reg_clear (qpc_mask,QPC_SQ_CUR_SGE_BLK_ADDR_L ); +hr_reg_clear (qpc_mask,QPC_SQ_CUR_SGE_BLK_ADDR_H ); + +hr_reg_write (context,QPC_RX_SQ_CUR_BLK_ADDR_L , +lower_32_bits (to_hr_hw_page_addr (sq_cur_blk))); +hr_reg_write (context,QPC_RX_SQ_CUR_BLK_ADDR_H , +upper_32_bits (to_hr_hw_page_addr (sq_cur_blk))); +hr_reg_clear (qpc_mask,QPC_RX_SQ_CUR_BLK_ADDR_L ); +hr_reg_clear (qpc_mask,QPC_RX_SQ_CUR_BLK_ADDR_H );return 0 ; }
@@ -4420,33 +4339,23 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,return -EINVAL ; } -roce_set_field (context->byte_132_trrl,V2_QPC_BYTE_132_TRRL_BA_M , -V2_QPC_BYTE_132_TRRL_BA_S , trrl_ba >>4 ); -roce_set_field (qpc_mask->byte_132_trrl,V2_QPC_BYTE_132_TRRL_BA_M , -V2_QPC_BYTE_132_TRRL_BA_S ,0 ); +hr_reg_write (context,QPC_TRRL_BA_L , trrl_ba >>4 ); +hr_reg_clear (qpc_mask,QPC_TRRL_BA_L ); context->trrl_ba =cpu_to_le32 (trrl_ba >> (16 +4 )); qpc_mask->trrl_ba =0 ; -roce_set_field (context->byte_140_raq,V2_QPC_BYTE_140_TRRL_BA_M , -V2_QPC_BYTE_140_TRRL_BA_S , - (u32)(trrl_ba >> (32 +16 +4 ))); -roce_set_field (qpc_mask->byte_140_raq,V2_QPC_BYTE_140_TRRL_BA_M , -V2_QPC_BYTE_140_TRRL_BA_S ,0 ); +hr_reg_write (context,QPC_TRRL_BA_H , trrl_ba >> (32 +16 +4 )); +hr_reg_clear (qpc_mask,QPC_TRRL_BA_H ); context->irrl_ba =cpu_to_le32 (irrl_ba >>6 ); qpc_mask->irrl_ba =0 ; -roce_set_field (context->byte_208_irrl,V2_QPC_BYTE_208_IRRL_BA_M , -V2_QPC_BYTE_208_IRRL_BA_S , - irrl_ba >> (32 +6 )); -roce_set_field (qpc_mask->byte_208_irrl,V2_QPC_BYTE_208_IRRL_BA_M , -V2_QPC_BYTE_208_IRRL_BA_S ,0 ); +hr_reg_write (context,QPC_IRRL_BA_H , irrl_ba >> (32 +6 )); +hr_reg_clear (qpc_mask,QPC_IRRL_BA_H ); -roce_set_bit (context->byte_208_irrl,V2_QPC_BYTE_208_RMT_E2E_S ,1 ); -roce_set_bit (qpc_mask->byte_208_irrl,V2_QPC_BYTE_208_RMT_E2E_S ,0 ); +hr_reg_enable (context,QPC_RMT_E2E ); +hr_reg_clear (qpc_mask,QPC_RMT_E2E ); -roce_set_bit (context->byte_252_err_txcqn,V2_QPC_BYTE_252_SIG_TYPE_S , - hr_qp->sq_signal_bits); -roce_set_bit (qpc_mask->byte_252_err_txcqn,V2_QPC_BYTE_252_SIG_TYPE_S , -0 ); +hr_reg_write (context,QPC_SIG_TYPE , hr_qp->sq_signal_bits); +hr_reg_clear (qpc_mask,QPC_SIG_TYPE ); port = (attr_mask &IB_QP_PORT ) ? (attr->port_num -1 ) : hr_qp->port;
@@ -4455,23 +4364,19 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,/* when dmac equals smac or loop_idc is 1, it should loopback */ if (ether_addr_equal_unaligned (dmac, smac) || hr_dev->loop_idc ==0x1 ) { -roce_set_bit (context->byte_28_at_fl,V2_QPC_BYTE_28_LBI_S ,1 ); -roce_set_bit (qpc_mask->byte_28_at_fl,V2_QPC_BYTE_28_LBI_S ,0 ); +hr_reg_write (context,QPC_LBI , hr_dev->loop_idc); +hr_reg_clear (qpc_mask,QPC_LBI ); }if (attr_mask &IB_QP_DEST_QPN ) { -roce_set_field (context->byte_56_dqpn_err,V2_QPC_BYTE_56_DQPN_M , -V2_QPC_BYTE_56_DQPN_S , attr->dest_qp_num); -roce_set_field (qpc_mask->byte_56_dqpn_err, -V2_QPC_BYTE_56_DQPN_M ,V2_QPC_BYTE_56_DQPN_S ,0 ); +hr_reg_write (context,QPC_DQPN , attr->dest_qp_num); +hr_reg_clear (qpc_mask,QPC_DQPN ); }memcpy (&(context->dmac), dmac,sizeof (u32)); -roce_set_field (context->byte_52_udpspn_dmac,V2_QPC_BYTE_52_DMAC_M , -V2_QPC_BYTE_52_DMAC_S , *((u16 *)(&dmac[4 ]))); +hr_reg_write (context,QPC_DMAC_H , *((u16 *)(&dmac[4 ]))); qpc_mask->dmac =0 ; -roce_set_field (qpc_mask->byte_52_udpspn_dmac,V2_QPC_BYTE_52_DMAC_M , -V2_QPC_BYTE_52_DMAC_S ,0 ); +hr_reg_clear (qpc_mask,QPC_DMAC_H ); ib_mtu =get_mtu (ibqp, attr); hr_qp->path_mtu = ib_mtu;
@@ -4481,51 +4386,34 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,return -EINVAL ;if (attr_mask &IB_QP_PATH_MTU ) { -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M , -V2_QPC_BYTE_24_MTU_S , ib_mtu); -roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M , -V2_QPC_BYTE_24_MTU_S ,0 ); +hr_reg_write (context,QPC_MTU , ib_mtu); +hr_reg_clear (qpc_mask,QPC_MTU ); }#define MAX_LP_MSG_LEN 65536/* MTU * (2 ^ LP_PKTN_INI) shouldn't be bigger than 64KB */ lp_pktn_ini =ilog2 (MAX_LP_MSG_LEN / mtu); -roce_set_field (context->byte_56_dqpn_err,V2_QPC_BYTE_56_LP_PKTN_INI_M , -V2_QPC_BYTE_56_LP_PKTN_INI_S , lp_pktn_ini); -roce_set_field (qpc_mask->byte_56_dqpn_err,V2_QPC_BYTE_56_LP_PKTN_INI_M , -V2_QPC_BYTE_56_LP_PKTN_INI_S ,0 ); +hr_reg_write (context,QPC_LP_PKTN_INI , lp_pktn_ini); +hr_reg_clear (qpc_mask,QPC_LP_PKTN_INI );/* ACK_REQ_FREQ should be larger than or equal to LP_PKTN_INI */ -roce_set_field (context->byte_172_sq_psn,V2_QPC_BYTE_172_ACK_REQ_FREQ_M , -V2_QPC_BYTE_172_ACK_REQ_FREQ_S , lp_pktn_ini); -roce_set_field (qpc_mask->byte_172_sq_psn, -V2_QPC_BYTE_172_ACK_REQ_FREQ_M , -V2_QPC_BYTE_172_ACK_REQ_FREQ_S ,0 ); - -roce_set_bit (qpc_mask->byte_108_rx_reqepsn, -V2_QPC_BYTE_108_RX_REQ_PSN_ERR_S ,0 ); -roce_set_field (qpc_mask->byte_96_rx_reqmsn,V2_QPC_BYTE_96_RX_REQ_MSN_M , -V2_QPC_BYTE_96_RX_REQ_MSN_S ,0 ); -roce_set_field (qpc_mask->byte_108_rx_reqepsn, -V2_QPC_BYTE_108_RX_REQ_LAST_OPTYPE_M , -V2_QPC_BYTE_108_RX_REQ_LAST_OPTYPE_S ,0 ); +hr_reg_write (context,QPC_ACK_REQ_FREQ , lp_pktn_ini); +hr_reg_clear (qpc_mask,QPC_ACK_REQ_FREQ ); + +hr_reg_clear (qpc_mask,QPC_RX_REQ_PSN_ERR ); +hr_reg_clear (qpc_mask,QPC_RX_REQ_MSN ); +hr_reg_clear (qpc_mask,QPC_RX_REQ_LAST_OPTYPE ); context->rq_rnr_timer =0 ; qpc_mask->rq_rnr_timer =0 ; -roce_set_field (qpc_mask->byte_132_trrl,V2_QPC_BYTE_132_TRRL_HEAD_MAX_M , -V2_QPC_BYTE_132_TRRL_HEAD_MAX_S ,0 ); -roce_set_field (qpc_mask->byte_132_trrl,V2_QPC_BYTE_132_TRRL_TAIL_MAX_M , -V2_QPC_BYTE_132_TRRL_TAIL_MAX_S ,0 ); +hr_reg_clear (qpc_mask,QPC_TRRL_HEAD_MAX ); +hr_reg_clear (qpc_mask,QPC_TRRL_TAIL_MAX );/* rocee send 2^lp_sgen_ini segs every time */ -roce_set_field (context->byte_168_irrl_idx, -V2_QPC_BYTE_168_LP_SGEN_INI_M , -V2_QPC_BYTE_168_LP_SGEN_INI_S ,3 ); -roce_set_field (qpc_mask->byte_168_irrl_idx, -V2_QPC_BYTE_168_LP_SGEN_INI_M , -V2_QPC_BYTE_168_LP_SGEN_INI_S ,0 ); +hr_reg_write (context,QPC_LP_SGEN_INI ,3 ); +hr_reg_clear (qpc_mask,QPC_LP_SGEN_INI );return 0 ; }
@@ -4557,44 +4445,26 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,* of all fields in context are zero, we need not set them to 0 again. * but we should set the relevant fields of context mask to 0. */ -roce_set_field (qpc_mask->byte_232_irrl_sge, -V2_QPC_BYTE_232_IRRL_SGE_IDX_M , -V2_QPC_BYTE_232_IRRL_SGE_IDX_S ,0 ); +hr_reg_clear (qpc_mask,QPC_IRRL_SGE_IDX ); -roce_set_field (qpc_mask->byte_240_irrl_tail, -V2_QPC_BYTE_240_RX_ACK_MSN_M , -V2_QPC_BYTE_240_RX_ACK_MSN_S ,0 ); +hr_reg_clear (qpc_mask,QPC_RX_ACK_MSN ); -roce_set_field (qpc_mask->byte_248_ack_psn, -V2_QPC_BYTE_248_ACK_LAST_OPTYPE_M , -V2_QPC_BYTE_248_ACK_LAST_OPTYPE_S ,0 ); -roce_set_bit (qpc_mask->byte_248_ack_psn, -V2_QPC_BYTE_248_IRRL_PSN_VLD_S ,0 ); -roce_set_field (qpc_mask->byte_248_ack_psn, -V2_QPC_BYTE_248_IRRL_PSN_M , -V2_QPC_BYTE_248_IRRL_PSN_S ,0 ); +hr_reg_clear (qpc_mask,QPC_ACK_LAST_OPTYPE ); +hr_reg_clear (qpc_mask,QPC_IRRL_PSN_VLD ); +hr_reg_clear (qpc_mask,QPC_IRRL_PSN ); -roce_set_field (qpc_mask->byte_240_irrl_tail, -V2_QPC_BYTE_240_IRRL_TAIL_REAL_M , -V2_QPC_BYTE_240_IRRL_TAIL_REAL_S ,0 ); +hr_reg_clear (qpc_mask,QPC_IRRL_TAIL_REAL ); -roce_set_field (qpc_mask->byte_220_retry_psn_msn, -V2_QPC_BYTE_220_RETRY_MSG_MSN_M , -V2_QPC_BYTE_220_RETRY_MSG_MSN_S ,0 ); +hr_reg_clear (qpc_mask,QPC_RETRY_MSG_MSN ); -roce_set_bit (qpc_mask->byte_248_ack_psn, -V2_QPC_BYTE_248_RNR_RETRY_FLAG_S ,0 ); +hr_reg_clear (qpc_mask,QPC_RNR_RETRY_FLAG ); -roce_set_field (qpc_mask->byte_212_lsn,V2_QPC_BYTE_212_CHECK_FLG_M , -V2_QPC_BYTE_212_CHECK_FLG_S ,0 ); +hr_reg_clear (qpc_mask,QPC_CHECK_FLG ); -roce_set_field (context->byte_212_lsn,V2_QPC_BYTE_212_LSN_M , -V2_QPC_BYTE_212_LSN_S ,0x100 ); -roce_set_field (qpc_mask->byte_212_lsn,V2_QPC_BYTE_212_LSN_M , -V2_QPC_BYTE_212_LSN_S ,0 ); +hr_reg_write (context,QPC_LSN ,0x100 ); +hr_reg_clear (qpc_mask,QPC_LSN ); -roce_set_field (qpc_mask->byte_196_sq_psn,V2_QPC_BYTE_196_IRRL_HEAD_M , -V2_QPC_BYTE_196_IRRL_HEAD_S ,0 ); +hr_reg_clear (qpc_mask,QPC_V2_IRRL_HEAD );return 0 ; }
@@ -4719,14 +4589,14 @@ static int fill_cong_field(struct ib_qp *ibqp, const struct ib_qp_attr *attr,hr_reg_write (context,QPC_CONG_ALGO_TMPL_ID , hr_dev->cong_algo_tmpl_id + hr_dev->caps.cong_type *HNS_ROCE_CONG_SIZE ); -hr_reg_write (qpc_mask,QPC_CONG_ALGO_TMPL_ID ,0 ); +hr_reg_clear (qpc_mask,QPC_CONG_ALGO_TMPL_ID );hr_reg_write (&context->ext,QPCEX_CONG_ALG_SEL , cong_field.alg_sel); -hr_reg_write (&qpc_mask->ext,QPCEX_CONG_ALG_SEL ,0 ); +hr_reg_clear (&qpc_mask->ext,QPCEX_CONG_ALG_SEL );hr_reg_write (&context->ext,QPCEX_CONG_ALG_SUB_SEL , cong_field.alg_sub_sel); -hr_reg_write (&qpc_mask->ext,QPCEX_CONG_ALG_SUB_SEL ,0 ); +hr_reg_clear (&qpc_mask->ext,QPCEX_CONG_ALG_SUB_SEL );hr_reg_write (&context->ext,QPCEX_DIP_CTX_IDX_VLD , cong_field.dip_vld); -hr_reg_write (&qpc_mask->ext,QPCEX_DIP_CTX_IDX_VLD ,0 ); +hr_reg_clear (&qpc_mask->ext,QPCEX_DIP_CTX_IDX_VLD );/* if dip is disabled, there is no need to set dip idx */ if (cong_field.dip_vld ==0 )
@@ -4781,20 +4651,14 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp,/* Only HIP08 needs to set the vlan_en bits in QPC */ if (vlan_id <VLAN_N_VID && hr_dev->pci_dev->revision ==PCI_REVISION_ID_HIP08 ) { -roce_set_bit (context->byte_76_srqn_op_en, -V2_QPC_BYTE_76_RQ_VLAN_EN_S ,1 ); -roce_set_bit (qpc_mask->byte_76_srqn_op_en, -V2_QPC_BYTE_76_RQ_VLAN_EN_S ,0 ); -roce_set_bit (context->byte_168_irrl_idx, -V2_QPC_BYTE_168_SQ_VLAN_EN_S ,1 ); -roce_set_bit (qpc_mask->byte_168_irrl_idx, -V2_QPC_BYTE_168_SQ_VLAN_EN_S ,0 ); +hr_reg_enable (qpc_mask,QPC_RQ_VLAN_EN ); +hr_reg_clear (qpc_mask,QPC_RQ_VLAN_EN ); +hr_reg_enable (qpc_mask,QPC_SQ_VLAN_EN ); +hr_reg_clear (qpc_mask,QPC_SQ_VLAN_EN ); } -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_VLAN_ID_M , -V2_QPC_BYTE_24_VLAN_ID_S , vlan_id); -roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_VLAN_ID_M , -V2_QPC_BYTE_24_VLAN_ID_S ,0 ); +hr_reg_write (context,QPC_VLAN_ID , vlan_id); +hr_reg_clear (qpc_mask,QPC_VLAN_ID );if (grh->sgid_index >= hr_dev->caps.gid_table_len[hr_port]) { ibdev_err(ibdev, "sgid_index(%u) too large. max is %d\n",
@@ -4807,39 +4671,28 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp,return -EINVAL ; } -roce_set_field (context->byte_52_udpspn_dmac,V2_QPC_BYTE_52_UDPSPN_M , -V2_QPC_BYTE_52_UDPSPN_S , - is_udp ?get_udp_sport (grh->flow_label, ibqp->qp_num, - attr->dest_qp_num) :0 ); +hr_reg_write (context,QPC_UDPSPN , + is_udp ?get_udp_sport (grh->flow_label, ibqp->qp_num, + attr->dest_qp_num) :0 ); -roce_set_field (qpc_mask->byte_52_udpspn_dmac,V2_QPC_BYTE_52_UDPSPN_M , -V2_QPC_BYTE_52_UDPSPN_S ,0 ); +hr_reg_clear (qpc_mask,QPC_UDPSPN ); -roce_set_field (context->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SGID_IDX_M ,V2_QPC_BYTE_20_SGID_IDX_S , - grh->sgid_index); +hr_reg_write (context,QPC_GMV_IDX , grh->sgid_index); -roce_set_field (qpc_mask->byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SGID_IDX_M ,V2_QPC_BYTE_20_SGID_IDX_S ,0 ); +hr_reg_clear (qpc_mask,QPC_GMV_IDX ); -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_HOP_LIMIT_M , -V2_QPC_BYTE_24_HOP_LIMIT_S , grh->hop_limit); -roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_HOP_LIMIT_M , -V2_QPC_BYTE_24_HOP_LIMIT_S ,0 ); +hr_reg_write (context,QPC_HOPLIMIT , grh->hop_limit); +hr_reg_clear (qpc_mask,QPC_HOPLIMIT ); ret =fill_cong_field (ibqp, attr, context, qpc_mask);if (ret)return ret; -roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M , -V2_QPC_BYTE_24_TC_S ,get_tclass (&attr->ah_attr.grh)); -roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_TC_M , -V2_QPC_BYTE_24_TC_S ,0 ); +hr_reg_write (context,QPC_TC ,get_tclass (&attr->ah_attr.grh)); +hr_reg_clear (qpc_mask,QPC_TC ); -roce_set_field (context->byte_28_at_fl,V2_QPC_BYTE_28_FL_M , -V2_QPC_BYTE_28_FL_S , grh->flow_label); -roce_set_field (qpc_mask->byte_28_at_fl,V2_QPC_BYTE_28_FL_M , -V2_QPC_BYTE_28_FL_S ,0 ); +hr_reg_write (context,QPC_FL , grh->flow_label); +hr_reg_clear (qpc_mask,QPC_FL );memcpy (context->dgid, grh->dgid.raw,sizeof (grh->dgid.raw));memset (qpc_mask->dgid,0 ,sizeof (grh->dgid.raw));
@@ -4851,10 +4704,8 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp,return -EINVAL ; } -roce_set_field (context->byte_28_at_fl,V2_QPC_BYTE_28_SL_M , -V2_QPC_BYTE_28_SL_S , hr_qp->sl); -roce_set_field (qpc_mask->byte_28_at_fl,V2_QPC_BYTE_28_SL_M , -V2_QPC_BYTE_28_SL_S ,0 ); +hr_reg_write (context,QPC_SL , hr_qp->sl); +hr_reg_clear (qpc_mask,QPC_SL );return 0 ; }
@@ -4936,12 +4787,8 @@ static int hns_roce_v2_set_opt_fields(struct ib_qp *ibqp,if (attr_mask &IB_QP_TIMEOUT ) {if (attr->timeout <31 ) { -roce_set_field (context->byte_28_at_fl, -V2_QPC_BYTE_28_AT_M ,V2_QPC_BYTE_28_AT_S , - attr->timeout); -roce_set_field (qpc_mask->byte_28_at_fl, -V2_QPC_BYTE_28_AT_M ,V2_QPC_BYTE_28_AT_S , -0 ); +hr_reg_write (context,QPC_AT , attr->timeout); +hr_reg_clear (qpc_mask,QPC_AT ); }else {ibdev_warn (&hr_dev->ib_dev,"Local ACK timeout shall be 0 to 30.\n" );
@@ -4949,128 +4796,68 @@ static int hns_roce_v2_set_opt_fields(struct ib_qp *ibqp, }if (attr_mask &IB_QP_RETRY_CNT ) { -roce_set_field (context->byte_212_lsn, -V2_QPC_BYTE_212_RETRY_NUM_INIT_M , -V2_QPC_BYTE_212_RETRY_NUM_INIT_S , - attr->retry_cnt); -roce_set_field (qpc_mask->byte_212_lsn, -V2_QPC_BYTE_212_RETRY_NUM_INIT_M , -V2_QPC_BYTE_212_RETRY_NUM_INIT_S ,0 ); - -roce_set_field (context->byte_212_lsn, -V2_QPC_BYTE_212_RETRY_CNT_M , -V2_QPC_BYTE_212_RETRY_CNT_S , attr->retry_cnt); -roce_set_field (qpc_mask->byte_212_lsn, -V2_QPC_BYTE_212_RETRY_CNT_M , -V2_QPC_BYTE_212_RETRY_CNT_S ,0 ); +hr_reg_write (context,QPC_RETRY_NUM_INIT , attr->retry_cnt); +hr_reg_clear (qpc_mask,QPC_RETRY_NUM_INIT ); + +hr_reg_write (context,QPC_RETRY_CNT , attr->retry_cnt); +hr_reg_clear (qpc_mask,QPC_RETRY_CNT ); }if (attr_mask &IB_QP_RNR_RETRY ) { -roce_set_field (context->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RNR_NUM_INIT_M , -V2_QPC_BYTE_244_RNR_NUM_INIT_S , attr->rnr_retry); -roce_set_field (qpc_mask->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RNR_NUM_INIT_M , -V2_QPC_BYTE_244_RNR_NUM_INIT_S ,0 ); +hr_reg_write (context,QPC_RNR_NUM_INIT , attr->rnr_retry); +hr_reg_clear (qpc_mask,QPC_RNR_NUM_INIT ); -roce_set_field (context->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RNR_CNT_M , -V2_QPC_BYTE_244_RNR_CNT_S , attr->rnr_retry); -roce_set_field (qpc_mask->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RNR_CNT_M , -V2_QPC_BYTE_244_RNR_CNT_S ,0 ); +hr_reg_write (context,QPC_RNR_CNT , attr->rnr_retry); +hr_reg_clear (qpc_mask,QPC_RNR_CNT ); }if (attr_mask &IB_QP_SQ_PSN ) { -roce_set_field (context->byte_172_sq_psn, -V2_QPC_BYTE_172_SQ_CUR_PSN_M , -V2_QPC_BYTE_172_SQ_CUR_PSN_S , attr->sq_psn); -roce_set_field (qpc_mask->byte_172_sq_psn, -V2_QPC_BYTE_172_SQ_CUR_PSN_M , -V2_QPC_BYTE_172_SQ_CUR_PSN_S ,0 ); - -roce_set_field (context->byte_196_sq_psn, -V2_QPC_BYTE_196_SQ_MAX_PSN_M , -V2_QPC_BYTE_196_SQ_MAX_PSN_S , attr->sq_psn); -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 ); - -roce_set_field (context->byte_220_retry_psn_msn, -V2_QPC_BYTE_220_RETRY_MSG_PSN_M , -V2_QPC_BYTE_220_RETRY_MSG_PSN_S , attr->sq_psn); -roce_set_field (qpc_mask->byte_220_retry_psn_msn, -V2_QPC_BYTE_220_RETRY_MSG_PSN_M , -V2_QPC_BYTE_220_RETRY_MSG_PSN_S ,0 ); - -roce_set_field (context->byte_224_retry_msg, -V2_QPC_BYTE_224_RETRY_MSG_PSN_M , -V2_QPC_BYTE_224_RETRY_MSG_PSN_S , - attr->sq_psn >>V2_QPC_BYTE_220_RETRY_MSG_PSN_S ); -roce_set_field (qpc_mask->byte_224_retry_msg, -V2_QPC_BYTE_224_RETRY_MSG_PSN_M , -V2_QPC_BYTE_224_RETRY_MSG_PSN_S ,0 ); - -roce_set_field (context->byte_224_retry_msg, -V2_QPC_BYTE_224_RETRY_MSG_FPKT_PSN_M , -V2_QPC_BYTE_224_RETRY_MSG_FPKT_PSN_S , - attr->sq_psn); -roce_set_field (qpc_mask->byte_224_retry_msg, -V2_QPC_BYTE_224_RETRY_MSG_FPKT_PSN_M , -V2_QPC_BYTE_224_RETRY_MSG_FPKT_PSN_S ,0 ); - -roce_set_field (context->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RX_ACK_EPSN_M , -V2_QPC_BYTE_244_RX_ACK_EPSN_S , attr->sq_psn); -roce_set_field (qpc_mask->byte_244_rnr_rxack, -V2_QPC_BYTE_244_RX_ACK_EPSN_M , -V2_QPC_BYTE_244_RX_ACK_EPSN_S ,0 ); +hr_reg_write (context,QPC_SQ_CUR_PSN , attr->sq_psn); +hr_reg_clear (qpc_mask,QPC_SQ_CUR_PSN ); + +hr_reg_write (context,QPC_SQ_MAX_PSN , attr->sq_psn); +hr_reg_clear (qpc_mask,QPC_SQ_MAX_PSN ); + +hr_reg_write (context,QPC_RETRY_MSG_PSN_L , attr->sq_psn); +hr_reg_clear (qpc_mask,QPC_RETRY_MSG_PSN_L ); + +hr_reg_write (context,QPC_RETRY_MSG_PSN_H , + attr->sq_psn >>RETRY_MSG_PSN_SHIFT ); +hr_reg_clear (qpc_mask,QPC_RETRY_MSG_PSN_H ); + +hr_reg_write (context,QPC_RETRY_MSG_FPKT_PSN , attr->sq_psn); +hr_reg_clear (qpc_mask,QPC_RETRY_MSG_FPKT_PSN ); + +hr_reg_write (context,QPC_RX_ACK_EPSN , attr->sq_psn); +hr_reg_clear (qpc_mask,QPC_RX_ACK_EPSN ); }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 ); +hr_reg_write (context,QPC_RR_MAX , +fls (attr->max_dest_rd_atomic -1 )); +hr_reg_clear (qpc_mask,QPC_RR_MAX ); }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 ); +hr_reg_write (context,QPC_SR_MAX ,fls (attr->max_rd_atomic -1 )); +hr_reg_clear (qpc_mask,QPC_SR_MAX ); }if (attr_mask & (IB_QP_ACCESS_FLAGS |IB_QP_MAX_DEST_RD_ATOMIC ))set_access_flags (hr_qp, context, qpc_mask, attr, attr_mask);if (attr_mask &IB_QP_MIN_RNR_TIMER ) { -roce_set_field (context->byte_80_rnr_rx_cqn, -V2_QPC_BYTE_80_MIN_RNR_TIME_M , -V2_QPC_BYTE_80_MIN_RNR_TIME_S , - attr->min_rnr_timer); -roce_set_field (qpc_mask->byte_80_rnr_rx_cqn, -V2_QPC_BYTE_80_MIN_RNR_TIME_M , -V2_QPC_BYTE_80_MIN_RNR_TIME_S ,0 ); +hr_reg_write (context,QPC_MIN_RNR_TIME , attr->min_rnr_timer); +hr_reg_clear (qpc_mask,QPC_MIN_RNR_TIME ); }if (attr_mask &IB_QP_RQ_PSN ) { -roce_set_field (context->byte_108_rx_reqepsn, -V2_QPC_BYTE_108_RX_REQ_EPSN_M , -V2_QPC_BYTE_108_RX_REQ_EPSN_S , attr->rq_psn); -roce_set_field (qpc_mask->byte_108_rx_reqepsn, -V2_QPC_BYTE_108_RX_REQ_EPSN_M , -V2_QPC_BYTE_108_RX_REQ_EPSN_S ,0 ); +hr_reg_write (context,QPC_RX_REQ_EPSN , attr->rq_psn); +hr_reg_clear (qpc_mask,QPC_RX_REQ_EPSN ); -roce_set_field (context->byte_152_raq,V2_QPC_BYTE_152_RAQ_PSN_M , -V2_QPC_BYTE_152_RAQ_PSN_S , attr->rq_psn -1 ); -roce_set_field (qpc_mask->byte_152_raq, -V2_QPC_BYTE_152_RAQ_PSN_M , -V2_QPC_BYTE_152_RAQ_PSN_S ,0 ); +hr_reg_write (context,QPC_RAQ_PSN , attr->rq_psn -1 ); +hr_reg_clear (qpc_mask,QPC_RAQ_PSN ); }if (attr_mask &IB_QP_QKEY ) {
@@ -5123,6 +4910,32 @@ static void clear_qp(struct hns_roce_qp *hr_qp) hr_qp->next_sge =0 ; } +static void v2_set_flushed_fields (struct ib_qp *ibqp, +struct hns_roce_v2_qp_context *context, +struct hns_roce_v2_qp_context *qpc_mask) +{ +struct hns_roce_qp *hr_qp =to_hr_qp (ibqp); +unsigned long sq_flag =0 ; +unsigned long rq_flag =0 ; + +if (ibqp->qp_type ==IB_QPT_XRC_TGT ) +return ; + +spin_lock_irqsave (&hr_qp->sq.lock, sq_flag); +hr_reg_write (context,QPC_SQ_PRODUCER_IDX , hr_qp->sq.head); +hr_reg_clear (qpc_mask,QPC_SQ_PRODUCER_IDX ); + hr_qp->state =IB_QPS_ERR ; +spin_unlock_irqrestore (&hr_qp->sq.lock, sq_flag); + +if (ibqp->srq || ibqp->qp_type ==IB_QPT_XRC_INI )/* no RQ */ +return ; + +spin_lock_irqsave (&hr_qp->rq.lock, rq_flag); +hr_reg_write (context,QPC_RQ_PRODUCER_IDX , hr_qp->rq.head); +hr_reg_clear (qpc_mask,QPC_RQ_PRODUCER_IDX ); +spin_unlock_irqrestore (&hr_qp->rq.lock, rq_flag); +} + static int hns_roce_v2_modify_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, int attr_mask, enum ib_qp_state cur_state,
@@ -5134,8 +4947,6 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,struct hns_roce_v2_qp_context *context = ctx;struct hns_roce_v2_qp_context *qpc_mask = ctx +1 ;struct ib_device *ibdev = &hr_dev->ib_dev; -unsigned long sq_flag =0 ; -unsigned long rq_flag =0 ;int ret;if (attr_mask & ~IB_QP_ATTR_STANDARD_BITS )
@@ -5156,34 +4967,8 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp, goto out;/* When QP state is err, SQ and RQ WQE should be flushed */ -if (new_state ==IB_QPS_ERR ) { -if (ibqp->qp_type !=IB_QPT_XRC_TGT ) { -spin_lock_irqsave (&hr_qp->sq.lock, sq_flag); - hr_qp->state =IB_QPS_ERR ; -roce_set_field (context->byte_160_sq_ci_pi, -V2_QPC_BYTE_160_SQ_PRODUCER_IDX_M , -V2_QPC_BYTE_160_SQ_PRODUCER_IDX_S , - hr_qp->sq.head); -roce_set_field (qpc_mask->byte_160_sq_ci_pi, -V2_QPC_BYTE_160_SQ_PRODUCER_IDX_M , -V2_QPC_BYTE_160_SQ_PRODUCER_IDX_S ,0 ); -spin_unlock_irqrestore (&hr_qp->sq.lock, sq_flag); - } - -if (!ibqp->srq && ibqp->qp_type !=IB_QPT_XRC_INI && - ibqp->qp_type !=IB_QPT_XRC_TGT ) { -spin_lock_irqsave (&hr_qp->rq.lock, rq_flag); - hr_qp->state =IB_QPS_ERR ; -roce_set_field (context->byte_84_rq_ci_pi, -V2_QPC_BYTE_84_RQ_PRODUCER_IDX_M , -V2_QPC_BYTE_84_RQ_PRODUCER_IDX_S , - hr_qp->rq.head); -roce_set_field (qpc_mask->byte_84_rq_ci_pi, -V2_QPC_BYTE_84_RQ_PRODUCER_IDX_M , -V2_QPC_BYTE_84_RQ_PRODUCER_IDX_S ,0 ); -spin_unlock_irqrestore (&hr_qp->rq.lock, rq_flag); - } - } +if (new_state ==IB_QPS_ERR ) +v2_set_flushed_fields (ibqp, context, qpc_mask);/* Configure the optional fields */ ret = hns_roce_v2_set_opt_fields(ibqp, attr, attr_mask, context,
@@ -5191,17 +4976,14 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,if (ret) goto out; -roce_set_bit (context->byte_108_rx_reqepsn,V2_QPC_BYTE_108_INV_CREDIT_S , +hr_reg_write (context,QPC_INV_CREDIT , ((to_hr_qp_type (hr_qp->ibqp.qp_type) ==SERV_TYPE_XRC ) || ibqp->srq) ?1 :0 ); -roce_set_bit (qpc_mask->byte_108_rx_reqepsn, -V2_QPC_BYTE_108_INV_CREDIT_S ,0 ); +hr_reg_clear (qpc_mask,QPC_INV_CREDIT );/* Every status migrate must change state */ -roce_set_field (context->byte_60_qpst_tempid,V2_QPC_BYTE_60_QP_ST_M , -V2_QPC_BYTE_60_QP_ST_S , new_state); -roce_set_field (qpc_mask->byte_60_qpst_tempid,V2_QPC_BYTE_60_QP_ST_M , -V2_QPC_BYTE_60_QP_ST_S ,0 ); +hr_reg_write (context,QPC_QP_ST , new_state); +hr_reg_clear (qpc_mask,QPC_QP_ST );/* SW pass context to HW */ ret =hns_roce_v2_qp_modify (hr_dev, context, qpc_mask, hr_qp);
@@ -5291,8 +5073,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, goto out; } - state =roce_get_field (context.byte_60_qpst_tempid, -V2_QPC_BYTE_60_QP_ST_M ,V2_QPC_BYTE_60_QP_ST_S ); + state =hr_reg_read (&context,QPC_QP_ST ); tmp_qp_state =to_ib_qp_st ((enum hns_roce_v2_qp_state )state);if (tmp_qp_state ==-1 ) {ibdev_err (ibdev,"Illegal ib_qp_state\n" );
@@ -5301,77 +5082,45 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, } hr_qp->state = (u8 )tmp_qp_state; qp_attr->qp_state = (enum ib_qp_state )hr_qp->state; - qp_attr->path_mtu = (enum ib_mtu )roce_get_field (context.byte_24_mtu_tc, -V2_QPC_BYTE_24_MTU_M , -V2_QPC_BYTE_24_MTU_S ); + qp_attr->path_mtu = (enum ib_mtu )hr_reg_read (&context,QPC_MTU ); qp_attr->path_mig_state =IB_MIG_ARMED ; - qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ; + qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ;if (hr_qp->ibqp.qp_type ==IB_QPT_UD ) qp_attr->qkey =le32_to_cpu (context.qkey_xrcd); - qp_attr->rq_psn =roce_get_field (context.byte_108_rx_reqepsn, -V2_QPC_BYTE_108_RX_REQ_EPSN_M , -V2_QPC_BYTE_108_RX_REQ_EPSN_S ); - qp_attr->sq_psn = (u32 )roce_get_field (context.byte_172_sq_psn, -V2_QPC_BYTE_172_SQ_CUR_PSN_M , -V2_QPC_BYTE_172_SQ_CUR_PSN_S ); - qp_attr->dest_qp_num = (u8 )roce_get_field (context.byte_56_dqpn_err, -V2_QPC_BYTE_56_DQPN_M , -V2_QPC_BYTE_56_DQPN_S ); - qp_attr->qp_access_flags = ((roce_get_bit (context.byte_76_srqn_op_en, -V2_QPC_BYTE_76_RRE_S )) <<V2_QP_RRE_S ) | - ((roce_get_bit (context.byte_76_srqn_op_en, -V2_QPC_BYTE_76_RWE_S )) <<V2_QP_RWE_S ) | - ((roce_get_bit (context.byte_76_srqn_op_en, -V2_QPC_BYTE_76_ATE_S )) <<V2_QP_ATE_S ); + qp_attr->rq_psn =hr_reg_read (&context,QPC_RX_REQ_EPSN ); + qp_attr->sq_psn = (u32 )hr_reg_read (&context,QPC_SQ_CUR_PSN ); + qp_attr->dest_qp_num = (u8 )hr_reg_read (&context,QPC_DQPN ); + qp_attr->qp_access_flags = + ((hr_reg_read (&context,QPC_RRE )) <<V2_QP_RRE_S ) | + ((hr_reg_read (&context,QPC_RWE )) <<V2_QP_RWE_S ) | + ((hr_reg_read (&context,QPC_ATE )) <<V2_QP_ATE_S );if (hr_qp->ibqp.qp_type ==IB_QPT_RC || hr_qp->ibqp.qp_type ==IB_QPT_XRC_INI || hr_qp->ibqp.qp_type ==IB_QPT_XRC_TGT ) {struct ib_global_route *grh = -rdma_ah_retrieve_grh (&qp_attr->ah_attr); +rdma_ah_retrieve_grh (&qp_attr->ah_attr);rdma_ah_set_sl (&qp_attr->ah_attr, -roce_get_field (context.byte_28_at_fl, -V2_QPC_BYTE_28_SL_M , -V2_QPC_BYTE_28_SL_S )); - grh->flow_label =roce_get_field (context.byte_28_at_fl, -V2_QPC_BYTE_28_FL_M , -V2_QPC_BYTE_28_FL_S ); - grh->sgid_index =roce_get_field (context.byte_20_smac_sgid_idx, -V2_QPC_BYTE_20_SGID_IDX_M , -V2_QPC_BYTE_20_SGID_IDX_S ); - grh->hop_limit =roce_get_field (context.byte_24_mtu_tc, -V2_QPC_BYTE_24_HOP_LIMIT_M , -V2_QPC_BYTE_24_HOP_LIMIT_S ); - grh->traffic_class =roce_get_field (context.byte_24_mtu_tc, -V2_QPC_BYTE_24_TC_M , -V2_QPC_BYTE_24_TC_S ); +hr_reg_read (&context,QPC_SL )); + grh->flow_label =hr_reg_read (&context,QPC_FL ); + grh->sgid_index =hr_reg_read (&context,QPC_GMV_IDX ); + grh->hop_limit =hr_reg_read (&context,QPC_HOPLIMIT ); + grh->traffic_class =hr_reg_read (&context,QPC_TC );memcpy (grh->dgid.raw, context.dgid,sizeof (grh->dgid.raw)); } qp_attr->port_num = hr_qp->port +1 ; qp_attr->sq_draining =0 ; - qp_attr->max_rd_atomic =1 <<roce_get_field (context.byte_208_irrl, -V2_QPC_BYTE_208_SR_MAX_M , -V2_QPC_BYTE_208_SR_MAX_S ); - qp_attr->max_dest_rd_atomic =1 <<roce_get_field (context.byte_140_raq, -V2_QPC_BYTE_140_RR_MAX_M , -V2_QPC_BYTE_140_RR_MAX_S ); - - qp_attr->min_rnr_timer = (u8 )roce_get_field (context.byte_80_rnr_rx_cqn, -V2_QPC_BYTE_80_MIN_RNR_TIME_M , -V2_QPC_BYTE_80_MIN_RNR_TIME_S ); - qp_attr->timeout = (u8 )roce_get_field (context.byte_28_at_fl, -V2_QPC_BYTE_28_AT_M , -V2_QPC_BYTE_28_AT_S ); - qp_attr->retry_cnt =roce_get_field (context.byte_212_lsn, -V2_QPC_BYTE_212_RETRY_NUM_INIT_M , -V2_QPC_BYTE_212_RETRY_NUM_INIT_S ); - qp_attr->rnr_retry =roce_get_field (context.byte_244_rnr_rxack, -V2_QPC_BYTE_244_RNR_NUM_INIT_M , -V2_QPC_BYTE_244_RNR_NUM_INIT_S ); + qp_attr->max_rd_atomic =1 <<hr_reg_read (&context,QPC_SR_MAX ); + qp_attr->max_dest_rd_atomic =1 <<hr_reg_read (&context,QPC_RR_MAX ); + + qp_attr->min_rnr_timer = (u8 )hr_reg_read (&context,QPC_MIN_RNR_TIME ); + qp_attr->timeout = (u8 )hr_reg_read (&context,QPC_AT ); + qp_attr->retry_cnt =hr_reg_read (&context,QPC_RETRY_NUM_INIT ); + qp_attr->rnr_retry =hr_reg_read (&context,QPC_RNR_NUM_INIT ); done: qp_attr->cur_qp_state = qp_attr->qp_state;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +185 -365
557 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 5/8 RDMA/hns: Use new interface to get CQE fields
In reply to Weihang LiFrom: Lang Cheng <[email protected]>
WQE_INDEX and OPCODE and QPN of CQE use redundant masks. Just remove them.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 68 +++++++++----------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 77 ++++++++++-------------------- 2 files changed, 48 insertions(+), 97 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +23 -45
@@ -3188,8 +3188,8 @@ static void *get_sw_cqe_v2(struct hns_roce_cq *hr_cq, unsigned int n)struct hns_roce_v2_cqe *cqe =get_cqe_v2 (hr_cq, n & hr_cq->ib_cq.cqe);/* Get cqe when Owner bit is Conversely with the MSB of cons_idx */ -return (roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_OWNER_S ) ^ - !!(n & hr_cq->cq_depth)) ? cqe :NULL ; +return (hr_reg_read (cqe,CQE_OWNER ) ^ !!(n & hr_cq->cq_depth)) ? cqe : +NULL ; } static inline void update_cq_db(struct hns_roce_dev *hr_dev,
@@ -3235,25 +3235,18 @@ static void __hns_roce_v2_cq_clean(struct hns_roce_cq *hr_cq, u32 qpn,*/ while ((int ) --prod_index - (int ) hr_cq->cons_index >=0 ) { cqe =get_cqe_v2 (hr_cq, prod_index & hr_cq->ib_cq.cqe); -if ((roce_get_field (cqe->byte_16,V2_CQE_BYTE_16_LCL_QPN_M , -V2_CQE_BYTE_16_LCL_QPN_S ) & -HNS_ROCE_V2_CQE_QPN_MASK ) == qpn) { -if (srq && -roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_S_R_S )) { - wqe_index =roce_get_field (cqe->byte_4, -V2_CQE_BYTE_4_WQE_INDX_M , -V2_CQE_BYTE_4_WQE_INDX_S ); +if (hr_reg_read (cqe,CQE_LCL_QPN ) == qpn) { +if (srq &&hr_reg_read (cqe,CQE_S_R )) { + wqe_index =hr_reg_read (cqe,CQE_WQE_IDX );hns_roce_free_srq_wqe (srq, wqe_index); } ++nfreed; }else if (nfreed) { dest =get_cqe_v2 (hr_cq, (prod_index + nfreed) & hr_cq->ib_cq.cqe); - owner_bit =roce_get_bit (dest->byte_4, -V2_CQE_BYTE_4_OWNER_S ); + owner_bit =hr_reg_read (dest,CQE_OWNER );memcpy (dest, cqe,sizeof (*cqe)); -roce_set_bit (dest->byte_4,V2_CQE_BYTE_4_OWNER_S , - owner_bit); +hr_reg_write (dest,CQE_OWNER , owner_bit); } }
@@ -3358,8 +3351,7 @@ static int hns_roce_handle_recv_inl_wqe(struct hns_roce_v2_cqe *cqe,u32 sge_cnt, data_len, size;void *wqe_buf; - wr_num =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_WQE_INDX_M , -V2_CQE_BYTE_4_WQE_INDX_S ) &0xffff ; + wr_num =hr_reg_read (cqe,CQE_WQE_IDX ); wr_cnt = wr_num & (qp->rq.wqe_cnt -1 ); sge_list = qp->rq_inl_buf.wqe_list[wr_cnt].sg_list;
@@ -3458,8 +3450,7 @@ static void get_cqe_status(struct hns_roce_dev *hr_dev, struct hns_roce_qp *qp, { HNS_ROCE_CQE_V2_GENERAL_ERR, IB_WC_GENERAL_ERR} }; -u32 cqe_status =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_STATUS_M , -V2_CQE_BYTE_4_STATUS_S ); +u32 cqe_status =hr_reg_read (cqe,CQE_STATUS );int i; wc->status =IB_WC_GENERAL_ERR ;
@@ -3505,9 +3496,7 @@ static int get_cur_qp(struct hns_roce_cq *hr_cq, struct hns_roce_v2_cqe *cqe,struct hns_roce_qp *hr_qp = *cur_qp;u32 qpn; - qpn =roce_get_field (cqe->byte_16,V2_CQE_BYTE_16_LCL_QPN_M , -V2_CQE_BYTE_16_LCL_QPN_S ) & -HNS_ROCE_V2_CQE_QPN_MASK ; + qpn =hr_reg_read (cqe,CQE_LCL_QPN );if (!hr_qp || qpn != hr_qp->qpn) { hr_qp =__hns_roce_qp_lookup (hr_dev, qpn);
@@ -3581,8 +3570,7 @@ static void fill_send_wc(struct ib_wc *wc, struct hns_roce_v2_cqe *cqe) wc->wc_flags =0 ; - hr_opcode =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_OPCODE_M , -V2_CQE_BYTE_4_OPCODE_S ) &0x1f ; + hr_opcode =hr_reg_read (cqe,CQE_OPCODE );switch (hr_opcode) {case HNS_ROCE_V2_WQE_OP_RDMA_READ : wc->byte_len =le32_to_cpu (cqe->byte_cnt);
@@ -3614,12 +3602,11 @@ static void fill_send_wc(struct ib_wc *wc, struct hns_roce_v2_cqe *cqe)static inline bool is_rq_inl_enabled (struct ib_wc *wc,u32 hr_opcode,struct hns_roce_v2_cqe *cqe) { -return wc->qp->qp_type !=IB_QPT_UD && - wc->qp->qp_type !=IB_QPT_GSI && +return wc->qp->qp_type !=IB_QPT_UD && wc->qp->qp_type !=IB_QPT_GSI && (hr_opcode ==HNS_ROCE_V2_OPCODE_SEND || hr_opcode ==HNS_ROCE_V2_OPCODE_SEND_WITH_IMM || hr_opcode ==HNS_ROCE_V2_OPCODE_SEND_WITH_INV ) && -roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_RQ_INLINE_S ); +hr_reg_read (cqe,CQE_RQ_INLINE ); }static int fill_recv_wc (struct ib_wc *wc,struct hns_roce_v2_cqe *cqe)
@@ -3631,8 +3618,7 @@ static int fill_recv_wc(struct ib_wc *wc, struct hns_roce_v2_cqe *cqe) wc->byte_len =le32_to_cpu (cqe->byte_cnt); - hr_opcode =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_OPCODE_M , -V2_CQE_BYTE_4_OPCODE_S ) &0x1f ; + hr_opcode =hr_reg_read (cqe,CQE_OPCODE );switch (hr_opcode) {case HNS_ROCE_V2_OPCODE_RDMA_WRITE_IMM :case HNS_ROCE_V2_OPCODE_SEND_WITH_IMM :
@@ -3659,28 +3645,21 @@ static int fill_recv_wc(struct ib_wc *wc, struct hns_roce_v2_cqe *cqe)return ret; } - wc->sl =roce_get_field (cqe->byte_32,V2_CQE_BYTE_32_SL_M , -V2_CQE_BYTE_32_SL_S ); - wc->src_qp =roce_get_field (cqe->byte_32,V2_CQE_BYTE_32_RMT_QPN_M , -V2_CQE_BYTE_32_RMT_QPN_S ); + wc->sl =hr_reg_read (cqe,CQE_SL ); + wc->src_qp =hr_reg_read (cqe,CQE_RMT_QPN ); wc->slid =0 ; - wc->wc_flags |=roce_get_bit (cqe->byte_32,V2_CQE_BYTE_32_GRH_S ) ? -IB_WC_GRH :0 ; - wc->port_num =roce_get_field (cqe->byte_32,V2_CQE_BYTE_32_PORTN_M , -V2_CQE_BYTE_32_PORTN_S ); + wc->wc_flags |=hr_reg_read (cqe,CQE_GRH ) ?IB_WC_GRH :0 ; + wc->port_num =hr_reg_read (cqe,CQE_PORTN ); wc->pkey_index =0 ; -if (roce_get_bit (cqe->byte_28,V2_CQE_BYTE_28_VID_VLD_S )) { - wc->vlan_id =roce_get_field (cqe->byte_28,V2_CQE_BYTE_28_VID_M , -V2_CQE_BYTE_28_VID_S ); +if (hr_reg_read (cqe,CQE_VID_VLD )) { + wc->vlan_id =hr_reg_read (cqe,CQE_VID ); wc->wc_flags |=IB_WC_WITH_VLAN ; }else { wc->vlan_id =0xffff ; } - wc->network_hdr_type =roce_get_field (cqe->byte_28, -V2_CQE_BYTE_28_PORT_TYPE_M , -V2_CQE_BYTE_28_PORT_TYPE_S ); + wc->network_hdr_type =hr_reg_read (cqe,CQE_PORT_TYPE );return 0 ; }
@@ -3712,10 +3691,9 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq, wc->qp = &qp->ibqp; wc->vendor_err =0 ; - wqe_idx =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_WQE_INDX_M , -V2_CQE_BYTE_4_WQE_INDX_S ); + wqe_idx =hr_reg_read (cqe,CQE_WQE_IDX ); - is_send = !roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_S_R_S ); + is_send = !hr_reg_read (cqe,CQE_S_R );if (is_send) { wq = &qp->sq;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +25 -52
89 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 6/8 RDMA/hns: Use new interface to write FRMR fields
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Use "hr_reg_write" to replace "roce_set_filed".
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 29 ++++++++++++++--------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 26 ++++++++++++-------------- 2 files changed, 26 insertions(+), 29 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +14 -15
@@ -105,16 +105,16 @@ static void set_frmr_seg(struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,u64 pbl_ba;/* use ib_access_flags */ -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_BIND_EN_S , - !!(wr->access &IB_ACCESS_MW_BIND )); -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_ATOMIC_S , - !!(wr->access &IB_ACCESS_REMOTE_ATOMIC )); -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_RR_S , - !!(wr->access &IB_ACCESS_REMOTE_READ )); -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_RW_S , - !!(wr->access &IB_ACCESS_REMOTE_WRITE )); -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_LW_S , - !!(wr->access &IB_ACCESS_LOCAL_WRITE )); +hr_reg_write (fseg,FRMR_BIND_EN , + wr->access &IB_ACCESS_MW_BIND ?1 :0 ); +hr_reg_write (fseg,FRMR_ATOMIC , + wr->access &IB_ACCESS_REMOTE_ATOMIC ?1 :0 ); +hr_reg_write (fseg,FRMR_RR , + wr->access &IB_ACCESS_REMOTE_READ ?1 :0 ); +hr_reg_write (fseg,FRMR_RW , + wr->access &IB_ACCESS_REMOTE_WRITE ?1 :0 ); +hr_reg_write (fseg,FRMR_LW , + wr->access &IB_ACCESS_LOCAL_WRITE ?1 :0 );/* Data structure reuse may lead to confusion */ pbl_ba = mr->pbl_mtr.hem_cfg.root_ba;
@@ -126,11 +126,10 @@ static void set_frmr_seg(struct hns_roce_v2_rc_send_wqe *rc_sq_wqe, rc_sq_wqe->rkey =cpu_to_le32 (wr->key); rc_sq_wqe->va =cpu_to_le64 (wr->mr->iova); - fseg->pbl_size =cpu_to_le32 (mr->npages); -roce_set_field (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_PBL_BUF_PG_SZ_M , -V2_RC_FRMR_WQE_BYTE_40_PBL_BUF_PG_SZ_S , -to_hr_hw_page_shift (mr->pbl_mtr.hem_cfg.buf_pg_shift)); -roce_set_bit (fseg->byte_40,V2_RC_FRMR_WQE_BYTE_40_BLK_MODE_S ,0 ); +hr_reg_write (fseg,FRMR_PBL_SIZE , mr->npages); +hr_reg_write (fseg,FRMR_PBL_BUF_PG_SZ , +to_hr_hw_page_shift (mr->pbl_mtr.hem_cfg.buf_pg_shift)); +hr_reg_clear (fseg,FRMR_BLK_MODE ); } static void set_atomic_seg(const struct ib_send_wr *wr,
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +12 -14
@@ -1062,16 +1062,6 @@ struct hns_roce_v2_rc_send_wqe {#define V2_RC_SEND_WQE_BYTE_4_INLINE_S 12 -#define V2_RC_FRMR_WQE_BYTE_40_BIND_EN_S 10 - -#define V2_RC_FRMR_WQE_BYTE_40_ATOMIC_S 11 - -#define V2_RC_FRMR_WQE_BYTE_40_RR_S 12 - -#define V2_RC_FRMR_WQE_BYTE_40_RW_S 13 - -#define V2_RC_FRMR_WQE_BYTE_40_LW_S 14 -#define V2_RC_SEND_WQE_BYTE_4_FLAG_S 31#define V2_RC_SEND_WQE_BYTE_16_XRC_SRQN_S 0
@@ -1090,10 +1080,18 @@ struct hns_roce_wqe_frmr_seg {__le32 byte_40; }; -#define V2_RC_FRMR_WQE_BYTE_40_PBL_BUF_PG_SZ_S 4 -#define V2_RC_FRMR_WQE_BYTE_40_PBL_BUF_PG_SZ_M GENMASK(7, 4) - -#define V2_RC_FRMR_WQE_BYTE_40_BLK_MODE_S 8 +#define FRMR_WQE_FIELD_LOC (h, l) FIELD_LOC(struct hns_roce_wqe_frmr_seg, h, l) + +#define FRMR_PBL_SIZE FRMR_WQE_FIELD_LOC(31, 0) +#define FRMR_BLOCK_SIZE FRMR_WQE_FIELD_LOC(35, 32) +#define FRMR_PBL_BUF_PG_SZ FRMR_WQE_FIELD_LOC(39, 36) +#define FRMR_BLK_MODE FRMR_WQE_FIELD_LOC(40, 40) +#define FRMR_ZBVA FRMR_WQE_FIELD_LOC(41, 41) +#define FRMR_BIND_EN FRMR_WQE_FIELD_LOC(42, 42) +#define FRMR_ATOMIC FRMR_WQE_FIELD_LOC(43, 43) +#define FRMR_RR FRMR_WQE_FIELD_LOC(44, 44) +#define FRMR_RW FRMR_WQE_FIELD_LOC(45, 45) +#define FRMR_LW FRMR_WQE_FIELD_LOC(46, 46)struct hns_roce_v2_wqe_data_seg {__le32 len;
Signature · 1 line
2.7.4
PATCH v4 7/8 RDMA/hns: Use new interface to write DB related fields
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Use hr_write_reg() instead of roce_set_field().
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 85 ++++++++++++------------------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 42 ++++++--------- 2 files changed, 49 insertions(+), 78 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +34 -51
@@ -643,17 +643,10 @@ static inline void update_sq_db(struct hns_roce_dev *hr_dev, }else {struct hns_roce_v2_db sq_db = {}; -roce_set_field (sq_db.byte_4,V2_DB_TAG_M ,V2_DB_TAG_S , - qp->doorbell_qpn); -roce_set_field (sq_db.byte_4,V2_DB_CMD_M ,V2_DB_CMD_S , -HNS_ROCE_V2_SQ_DB ); - -/* indicates data on new BAR, 0 : SQ doorbell, 1 : DWQE */ -roce_set_bit (sq_db.byte_4,V2_DB_FLAG_S ,0 ); -roce_set_field (sq_db.parameter,V2_DB_PRODUCER_IDX_M , -V2_DB_PRODUCER_IDX_S , qp->sq.head); -roce_set_field (sq_db.parameter,V2_DB_SL_M ,V2_DB_SL_S , - qp->sl); +hr_reg_write (&sq_db,DB_TAG , qp->doorbell_qpn); +hr_reg_write (&sq_db,DB_CMD ,HNS_ROCE_V2_SQ_DB ); +hr_reg_write (&sq_db,DB_PI , qp->sq.head); +hr_reg_write (&sq_db,DB_SL , qp->sl);hns_roce_write64 (hr_dev, (__le32 *)&sq_db, qp->sq.db_reg); }
@@ -681,12 +674,9 @@ static inline void update_rq_db(struct hns_roce_dev *hr_dev, }else {struct hns_roce_v2_db rq_db = {}; -roce_set_field (rq_db.byte_4,V2_DB_TAG_M ,V2_DB_TAG_S , - qp->qpn); -roce_set_field (rq_db.byte_4,V2_DB_CMD_M ,V2_DB_CMD_S , -HNS_ROCE_V2_RQ_DB ); -roce_set_field (rq_db.parameter,V2_DB_PRODUCER_IDX_M , -V2_DB_PRODUCER_IDX_S , qp->rq.head); +hr_reg_write (&rq_db,DB_TAG , qp->qpn); +hr_reg_write (&rq_db,DB_CMD ,HNS_ROCE_V2_RQ_DB ); +hr_reg_write (&rq_db,DB_PI , qp->rq.head);hns_roce_write64 (hr_dev, (__le32 *)&rq_db, qp->rq.db_reg);
@@ -1003,6 +993,13 @@ static void fill_wqe_idx(struct hns_roce_srq *srq, unsigned int wqe_idx) idx_que->head++; } +static void update_srq_db (struct hns_roce_v2_db *db,struct hns_roce_srq *srq) +{ +hr_reg_write (db,DB_TAG , srq->srqn); +hr_reg_write (db,DB_CMD ,HNS_ROCE_V2_SRQ_DB ); +hr_reg_write (db,DB_PI , srq->idx_que.head); +} +static int hns_roce_v2_post_srq_recv (struct ib_srq *ibsrq,const struct ib_recv_wr *wr,const struct ib_recv_wr **bad_wr)
@@ -1040,12 +1037,7 @@ static int hns_roce_v2_post_srq_recv(struct ib_srq *ibsrq, }if (likely (nreq)) { -roce_set_field (srq_db.byte_4,V2_DB_TAG_M ,V2_DB_TAG_S , - srq->srqn); -roce_set_field (srq_db.byte_4,V2_DB_CMD_M ,V2_DB_CMD_S , -HNS_ROCE_V2_SRQ_DB ); -roce_set_field (srq_db.parameter,V2_DB_PRODUCER_IDX_M , -V2_DB_PRODUCER_IDX_S , srq->idx_que.head); +update_srq_db (&srq_db, srq);hns_roce_write64 (hr_dev, (__le32 *)&srq_db, srq->db_reg); }
@@ -3199,14 +3191,10 @@ static inline void update_cq_db(struct hns_roce_dev *hr_dev, }else {struct hns_roce_v2_db cq_db = {}; -roce_set_field (cq_db.byte_4,V2_DB_TAG_M ,V2_DB_TAG_S , - hr_cq->cqn); -roce_set_field (cq_db.byte_4,V2_DB_CMD_M ,V2_DB_CMD_S , -HNS_ROCE_V2_CQ_DB ); -roce_set_field (cq_db.parameter,V2_CQ_DB_CONS_IDX_M , -V2_CQ_DB_CONS_IDX_S , hr_cq->cons_index); -roce_set_field (cq_db.parameter,V2_CQ_DB_CMD_SN_M , -V2_CQ_DB_CMD_SN_S ,1 ); +hr_reg_write (&cq_db,DB_TAG , hr_cq->cqn); +hr_reg_write (&cq_db,DB_CMD ,HNS_ROCE_V2_CQ_DB ); +hr_reg_write (&cq_db,DB_CQ_CI , hr_cq->cons_index); +hr_reg_write (&cq_db,DB_CQ_CMD_SN ,1 );hns_roce_write64 (hr_dev, (__le32 *)&cq_db, hr_cq->db_reg); }
@@ -3327,14 +3315,11 @@ static int hns_roce_v2_req_notify_cq(struct ib_cq *ibcq, notify_flag = (flags &IB_CQ_SOLICITED_MASK ) ==IB_CQ_SOLICITED ?V2_CQ_DB_REQ_NOT :V2_CQ_DB_REQ_NOT_SOL ; -roce_set_field (cq_db.byte_4,V2_DB_TAG_M ,V2_DB_TAG_S , hr_cq->cqn); -roce_set_field (cq_db.byte_4,V2_DB_CMD_M ,V2_DB_CMD_S , -HNS_ROCE_V2_CQ_DB_NOTIFY ); -roce_set_field (cq_db.parameter,V2_CQ_DB_CONS_IDX_M , -V2_CQ_DB_CONS_IDX_S , hr_cq->cons_index); -roce_set_field (cq_db.parameter,V2_CQ_DB_CMD_SN_M , -V2_CQ_DB_CMD_SN_S , hr_cq->arm_sn); -roce_set_bit (cq_db.parameter,V2_CQ_DB_NOTIFY_TYPE_S , notify_flag); +hr_reg_write (&cq_db,DB_TAG , hr_cq->cqn); +hr_reg_write (&cq_db,DB_CMD ,HNS_ROCE_V2_CQ_DB_NOTIFY ); +hr_reg_write (&cq_db,DB_CQ_CI , hr_cq->cons_index); +hr_reg_write (&cq_db,DB_CQ_CMD_SN , hr_cq->arm_sn); +hr_reg_write (&cq_db,DB_CQ_NOTIFY , notify_flag);hns_roce_write64 (hr_dev, (__le32 *)&cq_db, hr_cq->db_reg);
@@ -5554,22 +5539,20 @@ static void update_eq_db(struct hns_roce_eq *eq)struct hns_roce_v2_db eq_db = {};if (eq->type_flag ==HNS_ROCE_AEQ ) { -roce_set_field (eq_db.byte_4,V2_EQ_DB_CMD_M ,V2_EQ_DB_CMD_S , - eq->arm_st ==HNS_ROCE_V2_EQ_ALWAYS_ARMED ? -HNS_ROCE_EQ_DB_CMD_AEQ : -HNS_ROCE_EQ_DB_CMD_AEQ_ARMED ); +hr_reg_write (&eq_db,EQ_DB_CMD , + eq->arm_st ==HNS_ROCE_V2_EQ_ALWAYS_ARMED ? +HNS_ROCE_EQ_DB_CMD_AEQ : +HNS_ROCE_EQ_DB_CMD_AEQ_ARMED ); }else { -roce_set_field (eq_db.byte_4,V2_EQ_DB_TAG_M ,V2_EQ_DB_TAG_S , - eq->eqn); +hr_reg_write (&eq_db,EQ_DB_TAG , eq->eqn); -roce_set_field (eq_db.byte_4,V2_EQ_DB_CMD_M ,V2_EQ_DB_CMD_S , - eq->arm_st ==HNS_ROCE_V2_EQ_ALWAYS_ARMED ? -HNS_ROCE_EQ_DB_CMD_CEQ : -HNS_ROCE_EQ_DB_CMD_CEQ_ARMED ); +hr_reg_write (&eq_db,EQ_DB_CMD , + eq->arm_st ==HNS_ROCE_V2_EQ_ALWAYS_ARMED ? +HNS_ROCE_EQ_DB_CMD_CEQ : +HNS_ROCE_EQ_DB_CMD_CEQ_ARMED ); } -roce_set_field (eq_db.parameter,V2_EQ_DB_CONS_IDX_M , -V2_EQ_DB_CONS_IDX_S , eq->cons_index); +hr_reg_write (&eq_db,EQ_DB_CI , eq->cons_index);hns_roce_write64 (hr_dev, (__le32 *)&eq_db, eq->db_reg); }
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +15 -27
69 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 8/8 RDMA/hns: Clean SRQC structure definition
In reply to Weihang LiFrom: Xi Wang <[email protected]>
Remove unused members in srq context structure.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 ++---- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 82 +----------------------------- 2 files changed, 4 insertions(+), 93 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -12
@@ -5358,12 +5358,8 @@ static int hns_roce_v2_modify_srq(struct ib_srq *ibsrq,memset (srqc_mask,0xff ,sizeof (*srqc_mask)); -roce_set_field (srq_context->byte_8_limit_wl, -SRQC_BYTE_8_SRQ_LIMIT_WL_M , -SRQC_BYTE_8_SRQ_LIMIT_WL_S , srq_attr->srq_limit); -roce_set_field (srqc_mask->byte_8_limit_wl, -SRQC_BYTE_8_SRQ_LIMIT_WL_M , -SRQC_BYTE_8_SRQ_LIMIT_WL_S ,0 ); +hr_reg_write (srq_context,SRQC_LIMIT_WL , srq_attr->srq_limit); +hr_reg_clear (srqc_mask,SRQC_LIMIT_WL ); ret = hns_roce_cmd_mbox(hr_dev, mailbox->dma, 0, srq->srqn, 0, HNS_ROCE_CMD_MODIFY_SRQC,
@@ -5386,7 +5382,6 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr)struct hns_roce_srq *srq =to_hr_srq (ibsrq);struct hns_roce_srq_context *srq_context;struct hns_roce_cmd_mailbox *mailbox; -int limit_wl;int ret; mailbox =hns_roce_alloc_cmd_mailbox (hr_dev);
@@ -5404,11 +5399,7 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) goto out; } - limit_wl =roce_get_field (srq_context->byte_8_limit_wl, -SRQC_BYTE_8_SRQ_LIMIT_WL_M , -SRQC_BYTE_8_SRQ_LIMIT_WL_S ); - - attr->srq_limit = limit_wl; + attr->srq_limit =hr_reg_read (srq_context,SRQC_LIMIT_WL ); attr->max_wr = srq->wqe_cnt; attr->max_sge = srq->max_gs - srq->rsv_sge;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -81
94 lines not on this page · raw message
Signature · 1 line
2.7.4