RDMA/hns: Refactor and reorganization
Subsystems (2)
v2 cover RDMA/hns: Refactor and reorganization
Refactor the process of polling CQ and several control paths in the hns driver.
Changes since v1:
- Avoid wrapping a function in another one.
- Make a rebase.
- Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
P.S. This version is made based on "RDMA/hns: Support to select congestion
control algorithm" at https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Sorry for just finding out there's merge conflict between these two series,
I will send a new version ASAP if something needs to be updated.
Weihang Li (1):
RDMA/hns: Refactor hns_roce_v2_poll_one()
Xi Wang (3):
RDMA/hns: Refactor reset state checking flow
RDMA/hns: Reorganize process of setting HEM
RDMA/hns: Simplify command fields for HEM base address configuration
Yixing Liu (1):
RDMA/hns: Reorganize hns_roce_create_cq()
drivers/infiniband/hw/hns/hns_roce_cmd.c | 35 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 86 ++- drivers/infiniband/hw/hns/hns_roce_device.h | 11 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 971 +++++++++++++++------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 116 ++-- 6 files changed, 625 insertions(+), 596 deletions(-)
Signature · 1 line
2.8.1
PATCH v2 1/5 RDMA/hns: Refactor hns_roce_v2_poll_one()
Encapsulate the process of obtaining the current QP and filling WC as functions, also merge some duplicate code.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 403 ++++++++++++++++------------- 1 file changed, 224 insertions(+), 179 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +224 -179
@@ -3303,8 +3303,8 @@ static int hns_roce_v2_req_notify_cq(struct ib_cq *ibcq, }static int hns_roce_handle_recv_inl_wqe (struct hns_roce_v2_cqe *cqe, -struct hns_roce_qp **cur_qp, -struct ib_wc *wc) +struct hns_roce_qp *qp, +struct ib_wc *wc) {struct hns_roce_rinl_sge *sge_list;u32 wr_num, wr_cnt, sge_num;
@@ -3313,11 +3313,11 @@ static int hns_roce_handle_recv_inl_wqe(struct hns_roce_v2_cqe *cqe, wr_num =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_WQE_INDX_M ,V2_CQE_BYTE_4_WQE_INDX_S ) &0xffff ; - wr_cnt = wr_num & ((*cur_qp)->rq.wqe_cnt -1 ); + wr_cnt = wr_num & (qp->rq.wqe_cnt -1 ); - sge_list = (*cur_qp)->rq_inl_buf.wqe_list[wr_cnt].sg_list; - sge_num = (*cur_qp)->rq_inl_buf.wqe_list[wr_cnt].sge_cnt; - wqe_buf =hns_roce_get_recv_wqe (*cur_qp, wr_cnt); + sge_list = qp->rq_inl_buf.wqe_list[wr_cnt].sg_list; + sge_num = qp->rq_inl_buf.wqe_list[wr_cnt].sge_cnt; + wqe_buf =hns_roce_get_recv_wqe (qp, wr_cnt); data_len = wc->byte_len;for (sge_cnt =0 ; (sge_cnt < sge_num) && (data_len); sge_cnt++) {
@@ -3451,21 +3451,205 @@ static void get_cqe_status(struct hns_roce_dev *hr_dev, struct hns_roce_qp *qp,init_flush_work (hr_dev, qp); } +static int get_cur_qp (struct hns_roce_cq *hr_cq,struct hns_roce_v2_cqe *cqe, +struct hns_roce_qp **cur_qp) +{ +struct hns_roce_dev *hr_dev =to_hr_dev (hr_cq->ib_cq.device); +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 ; + +if (!hr_qp || qpn != hr_qp->qpn) { + hr_qp =__hns_roce_qp_lookup (hr_dev, qpn); +if (unlikely (!hr_qp)) { +ibdev_err (&hr_dev->ib_dev, +"CQ %06lx with entry for unknown QPN %06x\n" , + hr_cq->cqn, qpn); +return -EINVAL ; + } + *cur_qp = hr_qp; + } + +return 0 ; +} + +/* +* mapped-value = 1 + real-value +* The ib wc opcode's real value is start from 0, In order to distinguish +* between initialized and uninitialized map values, we plus 1 to the actual +* value when defining the mapping, so that the validity can be identified by +* checking whether the mapped value is greater than 0. +*/ +#define HR_WC_OP_MAP (hr_key, ib_key) \ + [HNS_ROCE_V2_WQE_OP_ ## hr_key] = 1 + IB_WC_ ## ib_key + +static const u32 wc_send_op_map[] = { +HR_WC_OP_MAP (SEND ,SEND ), +HR_WC_OP_MAP (SEND_WITH_INV ,SEND ), +HR_WC_OP_MAP (SEND_WITH_IMM ,SEND ), +HR_WC_OP_MAP (RDMA_READ ,RDMA_READ ), +HR_WC_OP_MAP (RDMA_WRITE ,RDMA_WRITE ), +HR_WC_OP_MAP (RDMA_WRITE_WITH_IMM ,RDMA_WRITE ), +HR_WC_OP_MAP (LOCAL_INV ,LOCAL_INV ), +HR_WC_OP_MAP (ATOM_CMP_AND_SWAP ,COMP_SWAP ), +HR_WC_OP_MAP (ATOM_FETCH_AND_ADD ,FETCH_ADD ), +HR_WC_OP_MAP (ATOM_MSK_CMP_AND_SWAP ,MASKED_COMP_SWAP ), +HR_WC_OP_MAP (ATOM_MSK_FETCH_AND_ADD ,MASKED_FETCH_ADD ), +HR_WC_OP_MAP (FAST_REG_PMR ,REG_MR ), +HR_WC_OP_MAP (BIND_MW ,REG_MR ), +}; + +static int to_ib_wc_send_op (u32 hr_opcode) +{ +if (hr_opcode >=ARRAY_SIZE (wc_send_op_map)) +return -EINVAL ; + +return wc_send_op_map[hr_opcode] ? wc_send_op_map[hr_opcode] -1 : + -EINVAL ; +} + +static const u32 wc_recv_op_map[] = { +HR_WC_OP_MAP (RDMA_WRITE_WITH_IMM ,WITH_IMM ), +HR_WC_OP_MAP (SEND ,RECV ), +HR_WC_OP_MAP (SEND_WITH_IMM ,WITH_IMM ), +HR_WC_OP_MAP (SEND_WITH_INV ,RECV ), +}; + +static int to_ib_wc_recv_op (u32 hr_opcode) +{ +if (hr_opcode >=ARRAY_SIZE (wc_recv_op_map)) +return -EINVAL ; + +return wc_recv_op_map[hr_opcode] ? wc_recv_op_map[hr_opcode] -1 : + -EINVAL ; +} + +static void fill_send_wc (struct ib_wc *wc,struct hns_roce_v2_cqe *cqe) +{ +u32 hr_opcode; +int ib_opcode; + + 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 ; +switch (hr_opcode) { +case HNS_ROCE_V2_WQE_OP_RDMA_READ : + wc->byte_len =le32_to_cpu (cqe->byte_cnt); +break ; +case HNS_ROCE_V2_WQE_OP_SEND_WITH_IMM : +case HNS_ROCE_V2_WQE_OP_RDMA_WRITE_WITH_IMM : + wc->wc_flags |=IB_WC_WITH_IMM ; +break ; +case HNS_ROCE_V2_WQE_OP_LOCAL_INV : + wc->wc_flags |=IB_WC_WITH_INVALIDATE ; +break ; +case HNS_ROCE_V2_WQE_OP_ATOM_CMP_AND_SWAP : +case HNS_ROCE_V2_WQE_OP_ATOM_FETCH_AND_ADD : +case HNS_ROCE_V2_WQE_OP_ATOM_MSK_CMP_AND_SWAP : +case HNS_ROCE_V2_WQE_OP_ATOM_MSK_FETCH_AND_ADD : + wc->byte_len =8 ; +break ; +default : +break ; + } + + ib_opcode =to_ib_wc_send_op (hr_opcode); +if (ib_opcode <0 ) + wc->status =IB_WC_GENERAL_ERR ; +else + wc->opcode = ib_opcode; +} + +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 && + (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 ); +} + +static int fill_recv_wc (struct ib_wc *wc,struct hns_roce_v2_cqe *cqe) +{ +struct hns_roce_qp *qp =to_hr_qp (wc->qp); +u32 hr_opcode; +int ib_opcode; +int ret; + + 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 ; +switch (hr_opcode) { +case HNS_ROCE_V2_OPCODE_RDMA_WRITE_IMM : +case HNS_ROCE_V2_OPCODE_SEND_WITH_IMM : + wc->wc_flags =IB_WC_WITH_IMM ; + wc->ex.imm_data =cpu_to_be32 (le32_to_cpu (cqe->immtdata)); +break ; +case HNS_ROCE_V2_OPCODE_SEND_WITH_INV : + wc->wc_flags =IB_WC_WITH_INVALIDATE ; + wc->ex.invalidate_rkey =le32_to_cpu (cqe->rkey); +break ; +default : + wc->wc_flags =0 ; + } + + ib_opcode =to_ib_wc_recv_op (hr_opcode); +if (ib_opcode <0 ) + wc->status =IB_WC_GENERAL_ERR ; +else + wc->opcode = ib_opcode; + +if (is_rq_inl_enabled (wc, hr_opcode, cqe)) { + ret =hns_roce_handle_recv_inl_wqe (cqe, qp, wc); +if (unlikely (ret)) +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->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->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 ); + 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 ); + +return 0 ; +} +static int hns_roce_v2_poll_one (struct hns_roce_cq *hr_cq,struct hns_roce_qp **cur_qp,struct ib_wc *wc) {struct hns_roce_dev *hr_dev =to_hr_dev (hr_cq->ib_cq.device); +struct hns_roce_qp *qp = *cur_qp;struct hns_roce_srq *srq =NULL ;struct hns_roce_v2_cqe *cqe; -struct hns_roce_qp *hr_qp;struct hns_roce_wq *wq;int is_send; -u16 wqe_ctr; -u32 opcode; -u32 qpn; +u16 wqe_idx;int ret; -/* Find cqe according to consumer index */ cqe =get_sw_cqe_v2 (hr_cq, hr_cq->cons_index);if (!cqe)return -EAGAIN ;
@@ -3474,189 +3658,50 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq,/* Memory barrier */ rmb (); -/* 0->SQ, 1->RQ */ - is_send = !roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_S_R_S ); - - qpn =roce_get_field (cqe->byte_16,V2_CQE_BYTE_16_LCL_QPN_M , -V2_CQE_BYTE_16_LCL_QPN_S ); - -if (!*cur_qp || (qpn &HNS_ROCE_V2_CQE_QPN_MASK ) != (*cur_qp)->qpn) { - hr_qp =__hns_roce_qp_lookup (hr_dev, qpn); -if (unlikely (!hr_qp)) { -ibdev_err (&hr_dev->ib_dev, -"CQ %06lx with entry for unknown QPN %06x\n" , - hr_cq->cqn, qpn &HNS_ROCE_V2_CQE_QPN_MASK ); -return -EINVAL ; - } - *cur_qp = hr_qp; - } + ret =get_cur_qp (hr_cq, cqe, &qp); +if (ret) +return ret; - wc->qp = &(*cur_qp)->ibqp; + 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 ); + + is_send = !roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_S_R_S );if (is_send) { - wq = &(*cur_qp)->sq; -if ((*cur_qp)->sq_signal_bits) { -/* -* If sg_signal_bit is 1, -* firstly tail pointer updated to wqe -* which current cqe correspond to -*/ - wqe_ctr = (u16 )roce_get_field (cqe->byte_4, -V2_CQE_BYTE_4_WQE_INDX_M , -V2_CQE_BYTE_4_WQE_INDX_S ); - wq->tail += (wqe_ctr - (u16 )wq->tail) & + wq = &qp->sq; + +/* If sg_signal_bit is set, tail pointer will be updated to +* the WQE corresponding to the current CQE. +*/ +if (qp->sq_signal_bits) + wq->tail += (wqe_idx - (u16 )wq->tail) & (wq->wqe_cnt -1 ); - } wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt -1 )]; ++wq->tail; - }else if ((*cur_qp)->ibqp.srq) { - srq =to_hr_srq ((*cur_qp)->ibqp.srq); - wqe_ctr = (u16 )roce_get_field (cqe->byte_4, -V2_CQE_BYTE_4_WQE_INDX_M , -V2_CQE_BYTE_4_WQE_INDX_S ); - wc->wr_id = srq->wrid[wqe_ctr]; -hns_roce_free_srq_wqe (srq, wqe_ctr); - }else { -/* Update tail pointer, record wr_id */ - wq = &(*cur_qp)->rq; - wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt -1 )]; - ++wq->tail; - } -get_cqe_status (hr_dev, *cur_qp, hr_cq, cqe, wc); -if (unlikely (wc->status !=IB_WC_SUCCESS )) -return 0 ; - -if (is_send) { - wc->wc_flags =0 ; -/* SQ corresponding to CQE */ -switch (roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_OPCODE_M , -V2_CQE_BYTE_4_OPCODE_S ) &0x1f ) { -case HNS_ROCE_V2_WQE_OP_SEND : - wc->opcode =IB_WC_SEND ; -break ; -case HNS_ROCE_V2_WQE_OP_SEND_WITH_INV : - wc->opcode =IB_WC_SEND ; -break ; -case HNS_ROCE_V2_WQE_OP_SEND_WITH_IMM : - wc->opcode =IB_WC_SEND ; - wc->wc_flags |=IB_WC_WITH_IMM ; -break ; -case HNS_ROCE_V2_WQE_OP_RDMA_READ : - wc->opcode =IB_WC_RDMA_READ ; - wc->byte_len =le32_to_cpu (cqe->byte_cnt); -break ; -case HNS_ROCE_V2_WQE_OP_RDMA_WRITE : - wc->opcode =IB_WC_RDMA_WRITE ; -break ; -case HNS_ROCE_V2_WQE_OP_RDMA_WRITE_WITH_IMM : - wc->opcode =IB_WC_RDMA_WRITE ; - wc->wc_flags |=IB_WC_WITH_IMM ; -break ; -case HNS_ROCE_V2_WQE_OP_LOCAL_INV : - wc->opcode =IB_WC_LOCAL_INV ; - wc->wc_flags |=IB_WC_WITH_INVALIDATE ; -break ; -case HNS_ROCE_V2_WQE_OP_ATOM_CMP_AND_SWAP : - wc->opcode =IB_WC_COMP_SWAP ; - wc->byte_len =8 ; -break ; -case HNS_ROCE_V2_WQE_OP_ATOM_FETCH_AND_ADD : - wc->opcode =IB_WC_FETCH_ADD ; - wc->byte_len =8 ; -break ; -case HNS_ROCE_V2_WQE_OP_ATOM_MSK_CMP_AND_SWAP : - wc->opcode =IB_WC_MASKED_COMP_SWAP ; - wc->byte_len =8 ; -break ; -case HNS_ROCE_V2_WQE_OP_ATOM_MSK_FETCH_AND_ADD : - wc->opcode =IB_WC_MASKED_FETCH_ADD ; - wc->byte_len =8 ; -break ; -case HNS_ROCE_V2_WQE_OP_FAST_REG_PMR : - wc->opcode =IB_WC_REG_MR ; -break ; -case HNS_ROCE_V2_WQE_OP_BIND_MW : - wc->opcode =IB_WC_REG_MR ; -break ; -default : - wc->status =IB_WC_GENERAL_ERR ; -break ; - } +fill_send_wc (wc, cqe); }else { -/* RQ correspond to CQE */ - wc->byte_len =le32_to_cpu (cqe->byte_cnt); - - opcode =roce_get_field (cqe->byte_4,V2_CQE_BYTE_4_OPCODE_M , -V2_CQE_BYTE_4_OPCODE_S ); -switch (opcode &0x1f ) { -case HNS_ROCE_V2_OPCODE_RDMA_WRITE_IMM : - wc->opcode =IB_WC_RECV_RDMA_WITH_IMM ; - wc->wc_flags =IB_WC_WITH_IMM ; - wc->ex.imm_data = -cpu_to_be32 (le32_to_cpu (cqe->immtdata)); -break ; -case HNS_ROCE_V2_OPCODE_SEND : - wc->opcode =IB_WC_RECV ; - wc->wc_flags =0 ; -break ; -case HNS_ROCE_V2_OPCODE_SEND_WITH_IMM : - wc->opcode =IB_WC_RECV ; - wc->wc_flags =IB_WC_WITH_IMM ; - wc->ex.imm_data = -cpu_to_be32 (le32_to_cpu (cqe->immtdata)); -break ; -case HNS_ROCE_V2_OPCODE_SEND_WITH_INV : - wc->opcode =IB_WC_RECV ; - wc->wc_flags =IB_WC_WITH_INVALIDATE ; - wc->ex.invalidate_rkey =le32_to_cpu (cqe->rkey); -break ; -default : - wc->status =IB_WC_GENERAL_ERR ; -break ; - } - -if ((wc->qp->qp_type ==IB_QPT_RC || - wc->qp->qp_type ==IB_QPT_UC ) && - (opcode ==HNS_ROCE_V2_OPCODE_SEND || - opcode ==HNS_ROCE_V2_OPCODE_SEND_WITH_IMM || - opcode ==HNS_ROCE_V2_OPCODE_SEND_WITH_INV ) && - (roce_get_bit (cqe->byte_4,V2_CQE_BYTE_4_RQ_INLINE_S ))) { - ret =hns_roce_handle_recv_inl_wqe (cqe, cur_qp, wc); -if (unlikely (ret)) -return -EAGAIN ; - } - - wc->sl = (u8 )roce_get_field (cqe->byte_32,V2_CQE_BYTE_32_SL_M , -V2_CQE_BYTE_32_SL_S ); - wc->src_qp = (u8 )roce_get_field (cqe->byte_32, -V2_CQE_BYTE_32_RMT_QPN_M , -V2_CQE_BYTE_32_RMT_QPN_S ); - 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->pkey_index =0 ; - -if (roce_get_bit (cqe->byte_28,V2_CQE_BYTE_28_VID_VLD_S )) { - wc->vlan_id = (u16 )roce_get_field (cqe->byte_28, -V2_CQE_BYTE_28_VID_M , -V2_CQE_BYTE_28_VID_S ); - wc->wc_flags |=IB_WC_WITH_VLAN ; +if (qp->ibqp.srq) { + srq =to_hr_srq (qp->ibqp.srq); + wc->wr_id = srq->wrid[wqe_idx]; +hns_roce_free_srq_wqe (srq, wqe_idx); }else { - wc->vlan_id =0xffff ; + wq = &qp->rq; + wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt -1 )]; + ++wq->tail; } - wc->network_hdr_type =roce_get_field (cqe->byte_28, -V2_CQE_BYTE_28_PORT_TYPE_M , -V2_CQE_BYTE_28_PORT_TYPE_S ); + ret =fill_recv_wc (wc, cqe); } -return 0 ; +get_cqe_status (hr_dev, qp, hr_cq, cqe, wc); +if (unlikely (wc->status !=IB_WC_SUCCESS )) +return 0 ; + +return ret; } static int hns_roce_v2_poll_cq(struct ib_cq *ibcq, int num_entries,
Signature · 1 line
2.8.1
PATCH v2 2/5 RDMA/hns: Reorganize hns_roce_create_cq()
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Encapsulate two subprocesses into functions.
--- drivers/infiniband/hw/hns/hns_roce_cq.c | 86 ++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 28 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cq.c +58 -28
@@ -276,6 +276,57 @@ static void free_cq_db(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, } } +static int verify_cq_create_attr (struct hns_roce_dev *hr_dev, +const struct ib_cq_init_attr *attr) +{ +struct ib_device *ibdev = &hr_dev->ib_dev; + +if (!attr->cqe || attr->cqe > hr_dev->caps.max_cqes) { +ibdev_err (ibdev,"failed to check CQ count %u, max = %u.\n" , + attr->cqe, hr_dev->caps.max_cqes); +return -EINVAL ; + } + +if (attr->comp_vector >= hr_dev->caps.num_comp_vectors) { +ibdev_err (ibdev,"failed to check CQ vector = %u, max = %d.\n" , + attr->comp_vector, hr_dev->caps.num_comp_vectors); +return -EINVAL ; + } + +return 0 ; +} + +static int get_cq_ucmd (struct hns_roce_cq *hr_cq,struct ib_udata *udata, +struct hns_roce_ib_create_cq *ucmd) +{ +struct ib_device *ibdev = hr_cq->ib_cq.device; +int ret; + + ret =ib_copy_from_udata (ucmd, udata,min (udata->inlen,sizeof (*ucmd))); +if (ret) { +ibdev_err (ibdev,"failed to copy CQ udata, ret = %d.\n" , ret); +return ret; + } + +return 0 ; +} + +static void set_cq_param (struct hns_roce_cq *hr_cq,u32 cq_entries,int vector, +struct hns_roce_ib_create_cq *ucmd) +{ +struct hns_roce_dev *hr_dev =to_hr_dev (hr_cq->ib_cq.device); + + cq_entries =max (cq_entries, hr_dev->caps.min_cqes); + cq_entries =roundup_pow_of_two (cq_entries); + hr_cq->ib_cq.cqe = cq_entries -1 ;/* used as cqe index */ + hr_cq->cq_depth = cq_entries; + hr_cq->vector = vector; + +spin_lock_init (&hr_cq->lock); +INIT_LIST_HEAD (&hr_cq->sq_list); +INIT_LIST_HEAD (&hr_cq->rq_list); +} +static void set_cqe_size (struct hns_roce_cq *hr_cq,struct ib_udata *udata,struct hns_roce_ib_create_cq *ucmd) {
@@ -299,44 +350,23 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,struct hns_roce_cq *hr_cq =to_hr_cq (ib_cq);struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_ib_create_cq ucmd = {}; -int vector = attr->comp_vector; -u32 cq_entries = attr->cqe;int ret;if (attr->flags)return -EOPNOTSUPP ; -if (cq_entries <1 || cq_entries > hr_dev->caps.max_cqes) { -ibdev_err (ibdev,"failed to check CQ count %u, max = %u.\n" , - cq_entries, hr_dev->caps.max_cqes); -return -EINVAL ; - } - -if (vector >= hr_dev->caps.num_comp_vectors) { -ibdev_err (ibdev,"failed to check CQ vector = %d, max = %d.\n" , - vector, hr_dev->caps.num_comp_vectors); -return -EINVAL ; - } - - cq_entries =max (cq_entries, hr_dev->caps.min_cqes); - cq_entries =roundup_pow_of_two (cq_entries); - hr_cq->ib_cq.cqe = cq_entries -1 ;/* used as cqe index */ - hr_cq->cq_depth = cq_entries; - hr_cq->vector = vector; -spin_lock_init (&hr_cq->lock); -INIT_LIST_HEAD (&hr_cq->sq_list); -INIT_LIST_HEAD (&hr_cq->rq_list); + ret =verify_cq_create_attr (hr_dev, attr); +if (ret) +return ret;if (udata) { - ret =ib_copy_from_udata (&ucmd, udata, -min (udata->inlen,sizeof (ucmd))); -if (ret) { -ibdev_err (ibdev,"failed to copy CQ udata, ret = %d.\n" , - ret); + ret =get_cq_ucmd (hr_cq, udata, &ucmd); +if (ret)return ret; - } } +set_cq_param (hr_cq, attr->cqe, attr->comp_vector, &ucmd); +set_cqe_size (hr_cq, udata, &ucmd); ret =alloc_cq_buf (hr_dev, hr_cq, udata, ucmd.buf_addr);
Signature · 1 line
2.8.1
PATCH v2 3/5 RDMA/hns: Refactor reset state checking flow
In reply to Weihang LiFrom: Xi Wang <[email protected]>
The 'HNS_ROCE_OPC_QUERY_MB_ST' command will response the mailbox complete status and hardware busy flag, and the complete status is only valid when the busy flag is 0, so it's better to query these two fields at a time rather than separately.
--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 35 +-- drivers/infiniband/hw/hns/hns_roce_device.h | 11 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 360 +++++++++++++++------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 12 +- 5 files changed, 220 insertions(+), 200 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cmd.c +11 -24
@@ -73,7 +73,7 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,return ret; } -return hr_dev->hw->chk_mbox (hr_dev, timeout); +return hr_dev->hw->poll_mbox_done (hr_dev, timeout); } static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,
@@ -175,33 +175,20 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, unsigned long in_modifier, u8 op_modifier, u16 op, unsigned int timeout) { - int ret; + bool is_busy; -if (hr_dev->hw->rst_prc_mbox) { - ret = hr_dev->hw->rst_prc_mbox (hr_dev); -if (ret ==CMD_RST_PRC_SUCCESS ) -return 0 ; -else if (ret ==CMD_RST_PRC_EBUSY ) -return -EBUSY ; - } +if (hr_dev->hw->chk_mbox_avail) +if (!hr_dev->hw->chk_mbox_avail (hr_dev, &is_busy)) +return is_busy ? -EBUSY :0 ;if (hr_dev->cmd.use_events) - ret =hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, - in_modifier, op_modifier, op, - timeout); +return hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, + in_modifier, op_modifier, op, + timeout);else - ret =hns_roce_cmd_mbox_poll (hr_dev, in_param, out_param, - in_modifier, op_modifier, op, - timeout); - -if (ret ==CMD_RST_PRC_EBUSY ) -return -EBUSY ; - -if (ret && (hr_dev->hw->rst_prc_mbox && - hr_dev->hw->rst_prc_mbox (hr_dev) ==CMD_RST_PRC_SUCCESS )) -return 0 ; - -return ret; +return hns_roce_cmd_mbox_poll (hr_dev, in_param, out_param, + in_modifier, op_modifier, op, + timeout); }int hns_roce_cmd_init (struct hns_roce_dev *hr_dev)
drivers/infiniband/hw/hns/hns_roce_device.h +3 -8
@@ -218,12 +218,6 @@ enum { HNS_ROCE_RST_DIRECT_RETURN = 0, }; -enum { -CMD_RST_PRC_OTHERS , -CMD_RST_PRC_SUCCESS , -CMD_RST_PRC_EBUSY , -}; -#define HNS_ROCE_CMD_SUCCESS 1/* The minimum page size is 4K for hardware */
@@ -896,8 +890,9 @@ struct hns_roce_hw {int (*post_mbox)(struct hns_roce_dev *hr_dev,u64 in_param,u64 out_param,u32 in_modifier,u8 op_modifier,u16 op,u16 token,int event); -int (*chk_mbox)(struct hns_roce_dev *hr_dev,unsigned int timeout); -int (*rst_prc_mbox)(struct hns_roce_dev *hr_dev); +int (*poll_mbox_done)(struct hns_roce_dev *hr_dev, +unsigned int timeout); +bool (*chk_mbox_avail)(struct hns_roce_dev *hr_dev,bool *is_busy);int (*set_gid)(struct hns_roce_dev *hr_dev,u32 port,int gid_index,const union ib_gid *gid,const struct ib_gid_attr *attr);int (*set_mac)(struct hns_roce_dev *hr_dev,u8 phy_port,u8 *addr);
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +1 -1
@@ -4349,7 +4349,7 @@ static const struct hns_roce_hw hns_roce_hw_v1 = { .hw_init = hns_roce_v1_init, .hw_exit = hns_roce_v1_exit, .post_mbox = hns_roce_v1_post_mbox, - .chk_mbox = hns_roce_v1_chk_mbox, + .poll_mbox_done = hns_roce_v1_chk_mbox, .set_gid = hns_roce_v1_set_gid, .set_mac = hns_roce_v1_set_mac, .set_mtu = hns_roce_v1_set_mtu,
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +198 -162
515 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +7 -5
@@ -1588,6 +1588,13 @@ struct hns_roce_mbox_status {__le32 rsv[5 ]; }; +#define HNS_ROCE_V2_GO_BIT_TIMEOUT_MSECS 10000 + +#define MB_ST_HW_RUN_M BIT(31) +#define MB_ST_COMPLETE_M GENMASK(7, 0) + +#define MB_ST_COMPLETE_SUCC 1 +struct hns_roce_cfg_bt_attr {__le32 vf_qpc_cfg;__le32 vf_srqc_cfg;
@@ -1893,11 +1900,6 @@ struct hns_roce_cmq_desc { }; -#define HNS_ROCE_V2_GO_BIT_TIMEOUT_MSECS 10000 - -#define HNS_ROCE_HW_RUN_BIT_SHIFT 31 -#define HNS_ROCE_HW_MB_STATUS_MASK 0xFF -struct hns_roce_v2_cmq_ring {dma_addr_t desc_dma_addr;struct hns_roce_cmq_desc *desc;
Signature · 1 line
2.8.1
PATCH v2 4/5 RDMA/hns: Reorganize process of setting HEM
In reply to Weihang LiFrom: Xi Wang <[email protected]>
Encapsulate configuring GMV base address and other type of HEM table into two separate functions to make process of setting HEM clearer.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 77 +++++++++++++++++------------- 1 file changed, 44 insertions(+), 33 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +44 -33
@@ -1400,6 +1400,21 @@ static int hns_roce_cmq_send(struct hns_roce_dev *hr_dev,return ret; } +static int config_hem_ba_to_hw (struct hns_roce_dev *hr_dev,unsigned long obj, +dma_addr_t base_addr,u16 op) +{ +struct hns_roce_cmd_mailbox *mbox =hns_roce_alloc_cmd_mailbox (hr_dev); +int ret; + +if (IS_ERR (mbox)) +return PTR_ERR (mbox); + + ret =hns_roce_cmd_mbox (hr_dev, base_addr, mbox->dma, obj,0 , op, +HNS_ROCE_CMD_TIMEOUT_MSECS ); +hns_roce_free_cmd_mailbox (hr_dev, mbox); +return ret; +} +static int hns_roce_cmq_query_hw_info (struct hns_roce_dev *hr_dev) {struct hns_roce_query_version *resp;
@@ -3779,12 +3794,9 @@ static int hns_roce_v2_poll_cq(struct ib_cq *ibcq, int num_entries, }static int get_op_for_set_hem (struct hns_roce_dev *hr_dev,u32 type, -int step_idx) +int step_idx,u16 *mbox_op) { -int op; - -if (type ==HEM_TYPE_SCCC && step_idx) -return -EINVAL ; +u16 op;switch (type) {case HEM_TYPE_QPC :
@@ -3809,51 +3821,50 @@ static int get_op_for_set_hem(struct hns_roce_dev *hr_dev, u32 type, op =HNS_ROCE_CMD_WRITE_CQC_TIMER_BT0 ;break ;default : -dev_warn (hr_dev->dev, -"table %u not to be written by mailbox!\n" , type); +dev_warn (hr_dev->dev,"failed to check hem type %u.\n" , type);return -EINVAL ; } -return op + step_idx; + *mbox_op = op + step_idx; + +return 0 ; } -static int set_hem_to_hw (struct hns_roce_dev *hr_dev,int obj,u64 bt_ba, -u32 hem_type,int step_idx) +static int config_gmv_ba_to_hw (struct hns_roce_dev *hr_dev,unsigned long obj, +dma_addr_t base_addr) { -struct hns_roce_cmd_mailbox *mailbox;struct hns_roce_cmq_desc desc;struct hns_roce_cfg_gmv_bt *gmv_bt = (struct hns_roce_cfg_gmv_bt *)desc.data; -int ret; -int op; +u64 addr =to_hr_hw_page_addr (base_addr); -if (hem_type ==HEM_TYPE_GMV ) { -hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_GMV_BT , - false); +hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_GMV_BT , false); - gmv_bt->gmv_ba_l =cpu_to_le32 (bt_ba >>HNS_HW_PAGE_SHIFT ); - gmv_bt->gmv_ba_h =cpu_to_le32 (bt_ba >> (HNS_HW_PAGE_SHIFT + -32 )); - gmv_bt->gmv_bt_idx =cpu_to_le32 (obj / - (HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz)); + gmv_bt->gmv_ba_l =cpu_to_le32 (lower_32_bits (addr)); + gmv_bt->gmv_ba_h =cpu_to_le32 (upper_32_bits (addr)); + gmv_bt->gmv_bt_idx =cpu_to_le32 (obj / + (HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz)); -return hns_roce_cmq_send (hr_dev, &desc,1 ); - } +return hns_roce_cmq_send (hr_dev, &desc,1 ); +} - op =get_op_for_set_hem (hr_dev, hem_type, step_idx); -if (op <0 ) -return 0 ; +static int set_hem_to_hw (struct hns_roce_dev *hr_dev,int obj, +dma_addr_t base_addr,u32 hem_type,int step_idx) +{ +int ret; +u16 op; - mailbox =hns_roce_alloc_cmd_mailbox (hr_dev); -if (IS_ERR (mailbox)) -return PTR_ERR (mailbox); +if (unlikely (hem_type ==HEM_TYPE_GMV )) +return config_gmv_ba_to_hw (hr_dev, obj, base_addr); - ret =hns_roce_cmd_mbox (hr_dev, bt_ba, mailbox->dma, obj, -0 , op,HNS_ROCE_CMD_TIMEOUT_MSECS ); +if (unlikely (hem_type ==HEM_TYPE_SCCC && step_idx)) +return 0 ; -hns_roce_free_cmd_mailbox (hr_dev, mailbox); + ret =get_op_for_set_hem (hr_dev, hem_type, step_idx, &op); +if (ret <0 ) +return ret; -return ret; +return config_hem_ba_to_hw (hr_dev, obj, base_addr, op); } static int hns_roce_v2_set_hem(struct hns_roce_dev *hr_dev,
Signature · 1 line
2.8.1
PATCH v2 5/5 RDMA/hns: Simplify command fields for HEM base address configuration
In reply to Weihang LiFrom: Xi Wang <[email protected]>
Use hr_reg_write() instead of roce_set_field() to simplify codes about configuring HEM BA.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 139 +++++++++++------------------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 104 +++++++-------------- 2 files changed, 83 insertions(+), 160 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +50 -89
@@ -1796,71 +1796,46 @@ static int hns_roce_alloc_vf_resource(struct hns_roce_dev *hr_dev)static int hns_roce_v2_set_bt (struct hns_roce_dev *hr_dev) { -u8 srqc_hop_num = hr_dev->caps.srqc_hop_num; -u8 qpc_hop_num = hr_dev->caps.qpc_hop_num; -u8 cqc_hop_num = hr_dev->caps.cqc_hop_num; -u8 mpt_hop_num = hr_dev->caps.mpt_hop_num; -u8 sccc_hop_num = hr_dev->caps.sccc_hop_num; -struct hns_roce_cfg_bt_attr *req;struct hns_roce_cmq_desc desc; +struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data; +struct hns_roce_caps *caps = &hr_dev->caps;hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_BT_ATTR , false); - req = (struct hns_roce_cfg_bt_attr *)desc.data; -memset (req,0 ,sizeof (*req)); -roce_set_field (req->vf_qpc_cfg,CFG_BT_ATTR_DATA_0_VF_QPC_BA_PGSZ_M , -CFG_BT_ATTR_DATA_0_VF_QPC_BA_PGSZ_S , - hr_dev->caps.qpc_ba_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_qpc_cfg,CFG_BT_ATTR_DATA_0_VF_QPC_BUF_PGSZ_M , -CFG_BT_ATTR_DATA_0_VF_QPC_BUF_PGSZ_S , - hr_dev->caps.qpc_buf_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_qpc_cfg,CFG_BT_ATTR_DATA_0_VF_QPC_HOPNUM_M , -CFG_BT_ATTR_DATA_0_VF_QPC_HOPNUM_S , - qpc_hop_num ==HNS_ROCE_HOP_NUM_0 ?0 : qpc_hop_num); - -roce_set_field (req->vf_srqc_cfg,CFG_BT_ATTR_DATA_1_VF_SRQC_BA_PGSZ_M , -CFG_BT_ATTR_DATA_1_VF_SRQC_BA_PGSZ_S , - hr_dev->caps.srqc_ba_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_srqc_cfg,CFG_BT_ATTR_DATA_1_VF_SRQC_BUF_PGSZ_M , -CFG_BT_ATTR_DATA_1_VF_SRQC_BUF_PGSZ_S , - hr_dev->caps.srqc_buf_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_srqc_cfg,CFG_BT_ATTR_DATA_1_VF_SRQC_HOPNUM_M , -CFG_BT_ATTR_DATA_1_VF_SRQC_HOPNUM_S , - srqc_hop_num ==HNS_ROCE_HOP_NUM_0 ?0 : srqc_hop_num); - -roce_set_field (req->vf_cqc_cfg,CFG_BT_ATTR_DATA_2_VF_CQC_BA_PGSZ_M , -CFG_BT_ATTR_DATA_2_VF_CQC_BA_PGSZ_S , - hr_dev->caps.cqc_ba_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_cqc_cfg,CFG_BT_ATTR_DATA_2_VF_CQC_BUF_PGSZ_M , -CFG_BT_ATTR_DATA_2_VF_CQC_BUF_PGSZ_S , - hr_dev->caps.cqc_buf_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_cqc_cfg,CFG_BT_ATTR_DATA_2_VF_CQC_HOPNUM_M , -CFG_BT_ATTR_DATA_2_VF_CQC_HOPNUM_S , - cqc_hop_num ==HNS_ROCE_HOP_NUM_0 ?0 : cqc_hop_num); - -roce_set_field (req->vf_mpt_cfg,CFG_BT_ATTR_DATA_3_VF_MPT_BA_PGSZ_M , -CFG_BT_ATTR_DATA_3_VF_MPT_BA_PGSZ_S , - hr_dev->caps.mpt_ba_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_mpt_cfg,CFG_BT_ATTR_DATA_3_VF_MPT_BUF_PGSZ_M , -CFG_BT_ATTR_DATA_3_VF_MPT_BUF_PGSZ_S , - hr_dev->caps.mpt_buf_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_mpt_cfg,CFG_BT_ATTR_DATA_3_VF_MPT_HOPNUM_M , -CFG_BT_ATTR_DATA_3_VF_MPT_HOPNUM_S , - mpt_hop_num ==HNS_ROCE_HOP_NUM_0 ?0 : mpt_hop_num); - -roce_set_field (req->vf_sccc_cfg, -CFG_BT_ATTR_DATA_4_VF_SCCC_BA_PGSZ_M , -CFG_BT_ATTR_DATA_4_VF_SCCC_BA_PGSZ_S , - hr_dev->caps.sccc_ba_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_sccc_cfg, -CFG_BT_ATTR_DATA_4_VF_SCCC_BUF_PGSZ_M , -CFG_BT_ATTR_DATA_4_VF_SCCC_BUF_PGSZ_S , - hr_dev->caps.sccc_buf_pg_sz +PG_SHIFT_OFFSET ); -roce_set_field (req->vf_sccc_cfg, -CFG_BT_ATTR_DATA_4_VF_SCCC_HOPNUM_M , -CFG_BT_ATTR_DATA_4_VF_SCCC_HOPNUM_S , - sccc_hop_num == -HNS_ROCE_HOP_NUM_0 ?0 : sccc_hop_num); +hr_reg_write (req,CFG_BT_ATTR_QPC_BA_PGSZ , + caps->qpc_ba_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_QPC_BUF_PGSZ , + caps->qpc_buf_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_QPC_HOPNUM , +to_hr_hem_hopnum (caps->qpc_hop_num, caps->num_qps)); + +hr_reg_write (req,CFG_BT_ATTR_SRQC_BA_PGSZ , + caps->srqc_ba_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_SRQC_BUF_PGSZ , + caps->srqc_buf_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_SRQC_HOPNUM , +to_hr_hem_hopnum (caps->srqc_hop_num, caps->num_srqs)); + +hr_reg_write (req,CFG_BT_ATTR_CQC_BA_PGSZ , + caps->cqc_ba_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_CQC_BUF_PGSZ , + caps->cqc_buf_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_CQC_HOPNUM , +to_hr_hem_hopnum (caps->cqc_hop_num, caps->num_cqs)); + +hr_reg_write (req,CFG_BT_ATTR_MPT_BA_PGSZ , + caps->mpt_ba_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_MPT_BUF_PGSZ , + caps->mpt_buf_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_MPT_HOPNUM , +to_hr_hem_hopnum (caps->mpt_hop_num, caps->num_mtpts)); + +hr_reg_write (req,CFG_BT_ATTR_SCCC_BA_PGSZ , + caps->sccc_ba_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_SCCC_BUF_PGSZ , + caps->sccc_buf_pg_sz +PG_SHIFT_OFFSET ); +hr_reg_write (req,CFG_BT_ATTR_SCCC_HOPNUM , +to_hr_hem_hopnum (caps->sccc_hop_num, caps->num_qps));return hns_roce_cmq_send (hr_dev, &desc,1 ); }
@@ -2276,50 +2251,37 @@ static int hns_roce_query_pf_caps(struct hns_roce_dev *hr_dev)return 0 ; } -static int hns_roce_config_qpc_size (struct hns_roce_dev *hr_dev) +static int config_hem_entry_size (struct hns_roce_dev *hr_dev,u32 type,u32 val) {struct hns_roce_cmq_desc desc; -struct hns_roce_cfg_entry_size *cfg_size = - (struct hns_roce_cfg_entry_size *)desc.data; +struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data;hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_ENTRY_SIZE , false); - cfg_size->type =cpu_to_le32 (HNS_ROCE_CFG_QPC_SIZE ); - cfg_size->size =cpu_to_le32 (hr_dev->caps.qpc_sz); - -return hns_roce_cmq_send (hr_dev, &desc,1 ); -} - -static int hns_roce_config_sccc_size (struct hns_roce_dev *hr_dev) -{ -struct hns_roce_cmq_desc desc; -struct hns_roce_cfg_entry_size *cfg_size = - (struct hns_roce_cfg_entry_size *)desc.data; - -hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_ENTRY_SIZE , - false); - - cfg_size->type =cpu_to_le32 (HNS_ROCE_CFG_SCCC_SIZE ); - cfg_size->size =cpu_to_le32 (hr_dev->caps.sccc_sz); +hr_reg_write (req,CFG_HEM_ENTRY_SIZE_TYPE , type); +hr_reg_write (req,CFG_HEM_ENTRY_SIZE_VALUE , val);return hns_roce_cmq_send (hr_dev, &desc,1 ); }static int hns_roce_config_entry_size (struct hns_roce_dev *hr_dev) { +struct hns_roce_caps *caps = &hr_dev->caps;int ret;if (hr_dev->pci_dev->revision <PCI_REVISION_ID_HIP09 )return 0 ; - ret =hns_roce_config_qpc_size (hr_dev); + ret =config_hem_entry_size (hr_dev,HNS_ROCE_CFG_QPC_SIZE , + caps->qpc_sz);if (ret) {dev_err (hr_dev->dev,"failed to cfg qpc sz, ret = %d.\n" , ret);return ret; } - ret =hns_roce_config_sccc_size (hr_dev); + ret =config_hem_entry_size (hr_dev,HNS_ROCE_CFG_SCCC_SIZE , + caps->sccc_sz);if (ret)dev_err (hr_dev->dev,"failed to cfg sccc sz, ret = %d.\n" , ret);
@@ -3834,16 +3796,15 @@ static int config_gmv_ba_to_hw(struct hns_roce_dev *hr_dev, unsigned long obj, dma_addr_t base_addr) {struct hns_roce_cmq_desc desc; -struct hns_roce_cfg_gmv_bt *gmv_bt = - (struct hns_roce_cfg_gmv_bt *)desc.data; +struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data; +u32 idx = obj / (HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz);u64 addr =to_hr_hw_page_addr (base_addr);hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_GMV_BT , false); - gmv_bt->gmv_ba_l =cpu_to_le32 (lower_32_bits (addr)); - gmv_bt->gmv_ba_h =cpu_to_le32 (upper_32_bits (addr)); - gmv_bt->gmv_bt_idx =cpu_to_le32 (obj / - (HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz)); +hr_reg_write (req,CFG_GMV_BT_BA_L ,lower_32_bits (addr)); +hr_reg_write (req,CFG_GMV_BT_BA_H ,upper_32_bits (addr)); +hr_reg_write (req,CFG_GMV_BT_IDX , idx);return hns_roce_cmq_send (hr_dev, &desc,1 ); }
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +33 -71
131 lines not on this page · raw message
Signature · 1 line
2.8.1
Quoted 16 lines · Weihang Li
Refactor the process of polling CQ and several control paths in the hns driver.
Changes since v1:
- Avoid wrapping a function in another one.
- Make a rebase.
- Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
P.S. This version is made based on "RDMA/hns: Support to select congestion
control algorithm" at https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Sorry for just finding out there's merge conflict between these two series,
I will send a new version ASAP if something needs to be updated.Weihang Li (1):
RDMA/hns: Refactorhns_roce_v2_poll_one()
Quoted 7 lines
Xi Wang (3):
RDMA/hns: Refactor reset state checking flow
RDMA/hns: Reorganize process of setting HEM
RDMA/hns: Simplify command fields for HEM base address configurationYixing Liu (1):
RDMA/hns: Reorganizehns_roce_create_cq()
Applied to for-next, thanks
Jason