RDMA/hns: Support RoCE on virtual functions of HIP09
Subsystems (2)
cover RDMA/hns: Support RoCE on virtual functions of HIP09
This series first do necessary refactor on function's resource code to reduce the complexity of subsequent patches. Then the RoCE support for VFs is introduced.
Wei Xu (4):
RDMA/hns: Query the number of functions supported by the PF RDMA/hns: Reserve the resource for the VFs RDMA/hns: Set parameters of all the functions belong to a PF RDMA/hns: Enable RoCE on virtual functions
Xi Wang (2):
RDMA/hns: Simplify function's resource related command RDMA/hns: Remove duplicated hem page size config code
drivers/infiniband/hw/hns/hns_roce_common.h | 11 + drivers/infiniband/hw/hns/hns_roce_device.h | 6 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 553 ++++++++++++++++------------ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 236 +++--------- 4 files changed, 386 insertions(+), 420 deletions(-)
Signature · 1 line
2.8.1
PATCH 1/6 RDMA/hns: Simplify function's resource related command
From: Xi Wang <[email protected]>
Use hr_reg_write/read() to simplify codes about configuring function's resource. And because the design of PF/VF fields is same, they can be defined only once.
--- drivers/infiniband/hw/hns/hns_roce_common.h | 11 ++ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 161 ++++++-------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 223 +++++----------------------- 3 files changed, 90 insertions(+), 305 deletions(-)
drivers/infiniband/hw/hns/hns_roce_common.h +11 -0
@@ -87,6 +87,17 @@#define hr_reg_write (ptr, field, val) _hr_reg_write(ptr, field, val) +#define _hr_reg_read (ptr, field_type, field_h, field_l) \ + ({ \ + const field_type *_ptr = ptr; \ + BUILD_BUG_ON(((field_h) / 32) != ((field_l) / 32)); \ + ((le32_to_cpu(*((__le32 *)_ptr + (field_h) / 32)) & \ + GENMASK((field_h) % 32, (field_l) % 32)) >> \ + ((field_l) % 32)); \ + }) + +#define hr_reg_read (ptr, field) _hr_reg_read(ptr, field) +#define ROCEE_GLB_CFG_ROCEE_DB_SQ_MODE_S 3#define ROCEE_GLB_CFG_ROCEE_DB_OTH_MODE_S 4
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +43 -118
208 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +36 -187
230 lines not on this page · raw message
Signature · 1 line
2.8.1
Re: [PATCH for-next 1/6] RDMA/hns: Simplify function's resource related command
Quoted 20 lines · Weihang Li
From: Xi Wang <[email protected]>
Use hr_reg_write/read() to simplify codes about configuring function's resource. And because the design of PF/VF fields is same, they can be defined only once.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_common.h | 11 ++ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 161 ++++++-------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 223 +++++----------------------- 3 files changed, 90 insertions(+), 305 deletions(-)drivers/infiniband/hw/hns/hns_roce_common.h +0
-0@@ -87,6 +87,17 @@
drivers/infiniband/hw/hns/hns_roce_common.h line 97
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_common.h +8
-0#define hr_reg_write (ptr, field, val) _hr_reg_write(ptr, field, val) +#define _hr_reg_read (ptr, field_type, field_h, field_l) \ + ({ \ + const field_type *_ptr = ptr; \ + BUILD_BUG_ON(((field_h) / 32) != ((field_l) / 32)); \ + ((le32_to_cpu(*((__le32 *)_ptr + (field_h) / 32)) & \ + GENMASK((field_h) % 32, (field_l) % 32)) >> \ + ((field_l) % 32)); \ + })
I will try this:
#define _hr_reg_read(ptr, field_type, field_h, field_l)
({
const field_type *_ptr = ptr;
FIELD_GET(GENMASK((field_h) % 32, (field_l) % 32),
le32_to_cpu(*((__le32 *)_ptr +(field_h)/32)))
+ BUILD_BUG_ON_ZERO(((field_h) / 32) != ((field_l) / 32));
})Thanks.
Quoted 448 lines
drivers/infiniband/hw/hns/hns_roce_common.h +3
-0+ +#define hr_reg_read (ptr, field) _hr_reg_read(ptr, field) +#define ROCEE_GLB_CFG_ROCEE_DB_SQ_MODE_S 3#define ROCEE_GLB_CFG_ROCEE_DB_OTH_MODE_S 4drivers/infiniband/hw/hns/hns_roce_hw_v2.c +43
-118@@ -1623,21 +1623,14 @@ static int hns_roce_query_func_info(struct hns_roce_dev *hr_dev)static int hns_roce_config_global_param (struct hns_roce_dev *hr_dev) { -struct hns_roce_cfg_global_param *req;struct hns_roce_cmq_desc desc; +struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data;hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CFG_GLOBAL_PARAM , false); - req = (struct hns_roce_cfg_global_param *)desc.data; -memset (req,0 ,sizeof (*req)); -roce_set_field (req->time_cfg_udp_port, -CFG_GLOBAL_PARAM_DATA_0_ROCEE_TIME_1US_CFG_M , -CFG_GLOBAL_PARAM_DATA_0_ROCEE_TIME_1US_CFG_S ,0x3e8 ); -roce_set_field (req->time_cfg_udp_port, -CFG_GLOBAL_PARAM_DATA_0_ROCEE_UDP_PORT_M , -CFG_GLOBAL_PARAM_DATA_0_ROCEE_UDP_PORT_S , -ROCE_V2_UDP_DPORT ); +hr_reg_write (req,CFG_GLOBAL_PARAM_1US_CYCLES ,0x3e8 ); +hr_reg_write (req,CFG_GLOBAL_PARAM_UDP_PORT ,ROCE_V2_UDP_DPORT );return hns_roce_cmq_send (hr_dev, &desc,1 ); }@@ -1645,55 +1638,36 @@ static int hns_roce_config_global_param(struct hns_roce_dev *hr_dev)static int hns_roce_query_pf_resource (struct hns_roce_dev *hr_dev) {struct hns_roce_cmq_desc desc[2 ]; -struct hns_roce_pf_res_a *req_a; -struct hns_roce_pf_res_b *req_b; +struct hns_roce_cmq_req *r_a = (struct hns_roce_cmq_req *)desc[0 ].data; +struct hns_roce_cmq_req *r_b = (struct hns_roce_cmq_req *)desc[1 ].data; +enum hns_roce_opcode_type opcode =HNS_ROCE_OPC_QUERY_PF_RES ; +struct hns_roce_caps *caps = &hr_dev->caps;int ret; -hns_roce_cmq_setup_basic_desc (&desc[0 ],HNS_ROCE_OPC_QUERY_PF_RES , - true); +hns_roce_cmq_setup_basic_desc (&desc[0 ], opcode, true); desc[0 ].flag |=cpu_to_le16 (HNS_ROCE_CMD_FLAG_NEXT ); - -hns_roce_cmq_setup_basic_desc (&desc[1 ],HNS_ROCE_OPC_QUERY_PF_RES , - true); +hns_roce_cmq_setup_basic_desc (&desc[1 ], opcode, true); ret =hns_roce_cmq_send (hr_dev, desc,2 );if (ret)return ret; - req_a = (struct hns_roce_pf_res_a *)desc[0 ].data; - req_b = (struct hns_roce_pf_res_b *)desc[1 ].data; - - hr_dev->caps.qpc_bt_num =roce_get_field (req_a->qpc_bt_idx_num, -PF_RES_DATA_1_PF_QPC_BT_NUM_M , -PF_RES_DATA_1_PF_QPC_BT_NUM_S ); - hr_dev->caps.srqc_bt_num =roce_get_field (req_a->srqc_bt_idx_num, -PF_RES_DATA_2_PF_SRQC_BT_NUM_M , -PF_RES_DATA_2_PF_SRQC_BT_NUM_S ); - hr_dev->caps.cqc_bt_num =roce_get_field (req_a->cqc_bt_idx_num, -PF_RES_DATA_3_PF_CQC_BT_NUM_M , -PF_RES_DATA_3_PF_CQC_BT_NUM_S ); - hr_dev->caps.mpt_bt_num =roce_get_field (req_a->mpt_bt_idx_num, -PF_RES_DATA_4_PF_MPT_BT_NUM_M , -PF_RES_DATA_4_PF_MPT_BT_NUM_S ); - - hr_dev->caps.sl_num =roce_get_field (req_b->qid_idx_sl_num, -PF_RES_DATA_3_PF_SL_NUM_M , -PF_RES_DATA_3_PF_SL_NUM_S ); - hr_dev->caps.sccc_bt_num =roce_get_field (req_b->sccc_bt_idx_num, -PF_RES_DATA_4_PF_SCCC_BT_NUM_M , -PF_RES_DATA_4_PF_SCCC_BT_NUM_S ); - - hr_dev->caps.gmv_bt_num =roce_get_field (req_b->gmv_idx_num, -PF_RES_DATA_5_PF_GMV_BT_NUM_M , -PF_RES_DATA_5_PF_GMV_BT_NUM_S ); + caps->qpc_bt_num =hr_reg_read (r_a,FUNC_RES_A_QPC_BT_NUM ); + caps->srqc_bt_num =hr_reg_read (r_a,FUNC_RES_A_SRQC_BT_NUM ); + caps->cqc_bt_num =hr_reg_read (r_a,FUNC_RES_A_CQC_BT_NUM ); + caps->mpt_bt_num =hr_reg_read (r_a,FUNC_RES_A_MPT_BT_NUM ); + caps->sccc_bt_num =hr_reg_read (r_b,FUNC_RES_B_SCCC_BT_NUM ); + caps->sl_num =hr_reg_read (r_b,FUNC_RES_B_QID_NUM ); + caps->gmv_bt_num =hr_reg_read (r_b,FUNC_RES_B_GMV_BT_NUM );return 0 ; }static int hns_roce_query_pf_timer_resource (struct hns_roce_dev *hr_dev) { -struct hns_roce_pf_timer_res_a *req_a;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;int ret; hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_QUERY_PF_TIMER_RES,@@ -1703,16 +1677,8 @@ static int hns_roce_query_pf_timer_resource(struct hns_roce_dev *hr_dev)if (ret)return ret; - req_a = (struct hns_roce_pf_timer_res_a *)desc.data; - - hr_dev->caps.qpc_timer_bt_num = -roce_get_field (req_a->qpc_timer_bt_idx_num, -PF_RES_DATA_1_PF_QPC_TIMER_BT_NUM_M , -PF_RES_DATA_1_PF_QPC_TIMER_BT_NUM_S ); - hr_dev->caps.cqc_timer_bt_num = -roce_get_field (req_a->cqc_timer_bt_idx_num, -PF_RES_DATA_2_PF_CQC_TIMER_BT_NUM_M , -PF_RES_DATA_2_PF_CQC_TIMER_BT_NUM_S ); + caps->qpc_timer_bt_num =hr_reg_read (req,PF_TIMER_RES_QPC_ITEM_NUM ); + caps->cqc_timer_bt_num =hr_reg_read (req,PF_TIMER_RES_CQC_ITEM_NUM );return 0 ; }@@ -1745,73 +1711,32 @@ static int hns_roce_set_vf_switch_param(struct hns_roce_dev *hr_dev, int vf_id)static int hns_roce_alloc_vf_resource (struct hns_roce_dev *hr_dev) {struct hns_roce_cmq_desc desc[2 ]; -struct hns_roce_vf_res_a *req_a; -struct hns_roce_vf_res_b *req_b; - - req_a = (struct hns_roce_vf_res_a *)desc[0 ].data; - req_b = (struct hns_roce_vf_res_b *)desc[1 ].data; +struct hns_roce_cmq_req *r_a = (struct hns_roce_cmq_req *)desc[0 ].data; +struct hns_roce_cmq_req *r_b = (struct hns_roce_cmq_req *)desc[1 ].data; +enum hns_roce_opcode_type opcode =HNS_ROCE_OPC_ALLOC_VF_RES ; -hns_roce_cmq_setup_basic_desc (&desc[0 ],HNS_ROCE_OPC_ALLOC_VF_RES , - false); +hns_roce_cmq_setup_basic_desc (&desc[0 ], opcode, false); desc[0 ].flag |=cpu_to_le16 (HNS_ROCE_CMD_FLAG_NEXT ); +hns_roce_cmq_setup_basic_desc (&desc[1 ], opcode, false); -hns_roce_cmq_setup_basic_desc (&desc[1 ],HNS_ROCE_OPC_ALLOC_VF_RES , - false); - -roce_set_field (req_a->vf_qpc_bt_idx_num, -VF_RES_A_DATA_1_VF_QPC_BT_IDX_M , -VF_RES_A_DATA_1_VF_QPC_BT_IDX_S ,0 ); -roce_set_field (req_a->vf_qpc_bt_idx_num, -VF_RES_A_DATA_1_VF_QPC_BT_NUM_M , -VF_RES_A_DATA_1_VF_QPC_BT_NUM_S ,HNS_ROCE_VF_QPC_BT_NUM ); - -roce_set_field (req_a->vf_srqc_bt_idx_num, -VF_RES_A_DATA_2_VF_SRQC_BT_IDX_M , -VF_RES_A_DATA_2_VF_SRQC_BT_IDX_S ,0 ); -roce_set_field (req_a->vf_srqc_bt_idx_num, -VF_RES_A_DATA_2_VF_SRQC_BT_NUM_M , -VF_RES_A_DATA_2_VF_SRQC_BT_NUM_S , -HNS_ROCE_VF_SRQC_BT_NUM ); - -roce_set_field (req_a->vf_cqc_bt_idx_num, -VF_RES_A_DATA_3_VF_CQC_BT_IDX_M , -VF_RES_A_DATA_3_VF_CQC_BT_IDX_S ,0 ); -roce_set_field (req_a->vf_cqc_bt_idx_num, -VF_RES_A_DATA_3_VF_CQC_BT_NUM_M , -VF_RES_A_DATA_3_VF_CQC_BT_NUM_S ,HNS_ROCE_VF_CQC_BT_NUM ); - -roce_set_field (req_a->vf_mpt_bt_idx_num, -VF_RES_A_DATA_4_VF_MPT_BT_IDX_M , -VF_RES_A_DATA_4_VF_MPT_BT_IDX_S ,0 ); -roce_set_field (req_a->vf_mpt_bt_idx_num, -VF_RES_A_DATA_4_VF_MPT_BT_NUM_M , -VF_RES_A_DATA_4_VF_MPT_BT_NUM_S ,HNS_ROCE_VF_MPT_BT_NUM ); - -roce_set_field (req_a->vf_eqc_bt_idx_num,VF_RES_A_DATA_5_VF_EQC_IDX_M , -VF_RES_A_DATA_5_VF_EQC_IDX_S ,0 ); -roce_set_field (req_a->vf_eqc_bt_idx_num,VF_RES_A_DATA_5_VF_EQC_NUM_M , -VF_RES_A_DATA_5_VF_EQC_NUM_S ,HNS_ROCE_VF_EQC_NUM ); - -roce_set_field (req_b->vf_smac_idx_num,VF_RES_B_DATA_1_VF_SMAC_IDX_M , -VF_RES_B_DATA_1_VF_SMAC_IDX_S ,0 ); -roce_set_field (req_b->vf_smac_idx_num,VF_RES_B_DATA_1_VF_SMAC_NUM_M , -VF_RES_B_DATA_1_VF_SMAC_NUM_S ,HNS_ROCE_VF_SMAC_NUM ); - -roce_set_field (req_b->vf_sgid_idx_num,VF_RES_B_DATA_2_VF_SGID_IDX_M , -VF_RES_B_DATA_2_VF_SGID_IDX_S ,0 ); -roce_set_field (req_b->vf_sgid_idx_num,VF_RES_B_DATA_2_VF_SGID_NUM_M , -VF_RES_B_DATA_2_VF_SGID_NUM_S ,HNS_ROCE_VF_SGID_NUM ); - -roce_set_field (req_b->vf_qid_idx_sl_num,VF_RES_B_DATA_3_VF_QID_IDX_M , -VF_RES_B_DATA_3_VF_QID_IDX_S ,0 ); -roce_set_field (req_b->vf_qid_idx_sl_num,VF_RES_B_DATA_3_VF_SL_NUM_M , -VF_RES_B_DATA_3_VF_SL_NUM_S ,HNS_ROCE_VF_SL_NUM ); - -roce_set_field (req_b->vf_sccc_idx_num,VF_RES_B_DATA_4_VF_SCCC_BT_IDX_M , -VF_RES_B_DATA_4_VF_SCCC_BT_IDX_S ,0 ); -roce_set_field (req_b->vf_sccc_idx_num,VF_RES_B_DATA_4_VF_SCCC_BT_NUM_M , -VF_RES_B_DATA_4_VF_SCCC_BT_NUM_S , -HNS_ROCE_VF_SCCC_BT_NUM ); +hr_reg_write (r_a,FUNC_RES_A_QPC_BT_NUM ,HNS_ROCE_VF_QPC_BT_NUM ); +hr_reg_write (r_a,FUNC_RES_A_QPC_BT_IDX ,0 ); +hr_reg_write (r_a,FUNC_RES_A_SRQC_BT_NUM ,HNS_ROCE_VF_SRQC_BT_NUM ); +hr_reg_write (r_a,FUNC_RES_A_SRQC_BT_IDX ,0 ); +hr_reg_write (r_a,FUNC_RES_A_CQC_BT_NUM ,HNS_ROCE_VF_CQC_BT_NUM ); +hr_reg_write (r_a,FUNC_RES_A_CQC_BT_IDX ,0 ); +hr_reg_write (r_a,FUNC_RES_A_MPT_BT_NUM ,HNS_ROCE_VF_MPT_BT_NUM ); +hr_reg_write (r_a,FUNC_RES_A_MPT_BT_IDX ,0 ); +hr_reg_write (r_a,FUNC_RES_A_EQC_BT_NUM ,HNS_ROCE_VF_EQC_NUM ); +hr_reg_write (r_a,FUNC_RES_A_EQC_BT_IDX ,0 ); +hr_reg_write (r_b,FUNC_RES_B_SMAC_NUM ,HNS_ROCE_VF_SMAC_NUM ); +hr_reg_write (r_b,FUNC_RES_B_SMAC_IDX ,0 ); +hr_reg_write (r_b,FUNC_RES_B_SGID_NUM ,HNS_ROCE_VF_SGID_NUM ); +hr_reg_write (r_b,FUNC_RES_B_SGID_IDX ,0 ); +hr_reg_write (r_b,FUNC_RES_V_QID_NUM ,HNS_ROCE_VF_SL_NUM ); +hr_reg_write (r_b,FUNC_RES_B_QID_IDX ,0 ); +hr_reg_write (r_b,FUNC_RES_B_SCCC_BT_NUM ,HNS_ROCE_VF_SCCC_BT_NUM ); +hr_reg_write (r_b,FUNC_RES_B_SCCC_BT_IDX ,0 );return hns_roce_cmq_send (hr_dev, desc,2 ); }drivers/infiniband/hw/hns/hns_roce_hw_v2.h +29
-187@@ -1363,194 +1363,43 @@ struct hns_roce_cfg_llm_b {#define CFG_LLM_TAIL_PTR_S 0#define CFG_LLM_TAIL_PTR_M GENMASK(11, 0) -struct hns_roce_cfg_global_param { -__le32 time_cfg_udp_port; -__le32 rsv[5 ]; -}; - -#define CFG_GLOBAL_PARAM_DATA_0_ROCEE_TIME_1US_CFG_S 0 -#define CFG_GLOBAL_PARAM_DATA_0_ROCEE_TIME_1US_CFG_M GENMASK(9, 0) - -#define CFG_GLOBAL_PARAM_DATA_0_ROCEE_UDP_PORT_S 16 -#define CFG_GLOBAL_PARAM_DATA_0_ROCEE_UDP_PORT_M GENMASK(31, 16) - -struct hns_roce_pf_res_a { -__le32 rsv; -__le32 qpc_bt_idx_num; -__le32 srqc_bt_idx_num; -__le32 cqc_bt_idx_num; -__le32 mpt_bt_idx_num; -__le32 eqc_bt_idx_num; -}; - -#define PF_RES_DATA_1_PF_QPC_BT_IDX_S 0 -#define PF_RES_DATA_1_PF_QPC_BT_IDX_M GENMASK(10, 0) - -#define PF_RES_DATA_1_PF_QPC_BT_NUM_S 16 -#define PF_RES_DATA_1_PF_QPC_BT_NUM_M GENMASK(27, 16) - -#define PF_RES_DATA_2_PF_SRQC_BT_IDX_S 0 -#define PF_RES_DATA_2_PF_SRQC_BT_IDX_M GENMASK(8, 0) - -#define PF_RES_DATA_2_PF_SRQC_BT_NUM_S 16 -#define PF_RES_DATA_2_PF_SRQC_BT_NUM_M GENMASK(25, 16) - -#define PF_RES_DATA_3_PF_CQC_BT_IDX_S 0 -#define PF_RES_DATA_3_PF_CQC_BT_IDX_M GENMASK(8, 0) - -#define PF_RES_DATA_3_PF_CQC_BT_NUM_S 16 -#define PF_RES_DATA_3_PF_CQC_BT_NUM_M GENMASK(25, 16) - -#define PF_RES_DATA_4_PF_MPT_BT_IDX_S 0 -#define PF_RES_DATA_4_PF_MPT_BT_IDX_M GENMASK(8, 0) - -#define PF_RES_DATA_4_PF_MPT_BT_NUM_S 16 -#define PF_RES_DATA_4_PF_MPT_BT_NUM_M GENMASK(25, 16) - -#define PF_RES_DATA_5_PF_EQC_BT_IDX_S 0 -#define PF_RES_DATA_5_PF_EQC_BT_IDX_M GENMASK(8, 0) - -#define PF_RES_DATA_5_PF_EQC_BT_NUM_S 16 -#define PF_RES_DATA_5_PF_EQC_BT_NUM_M GENMASK(25, 16) - -struct hns_roce_pf_res_b { -__le32 rsv0; -__le32 smac_idx_num; -__le32 sgid_idx_num; -__le32 qid_idx_sl_num; -__le32 sccc_bt_idx_num; -__le32 gmv_idx_num; -}; - -#define PF_RES_DATA_1_PF_SMAC_IDX_S 0 -#define PF_RES_DATA_1_PF_SMAC_IDX_M GENMASK(7, 0) - -#define PF_RES_DATA_1_PF_SMAC_NUM_S 8 -#define PF_RES_DATA_1_PF_SMAC_NUM_M GENMASK(16, 8) - -#define PF_RES_DATA_2_PF_SGID_IDX_S 0 -#define PF_RES_DATA_2_PF_SGID_IDX_M GENMASK(7, 0) - -#define PF_RES_DATA_2_PF_SGID_NUM_S 8 -#define PF_RES_DATA_2_PF_SGID_NUM_M GENMASK(16, 8) - -#define PF_RES_DATA_3_PF_QID_IDX_S 0 -#define PF_RES_DATA_3_PF_QID_IDX_M GENMASK(9, 0) - -#define PF_RES_DATA_3_PF_SL_NUM_S 16 -#define PF_RES_DATA_3_PF_SL_NUM_M GENMASK(26, 16) - -#define PF_RES_DATA_4_PF_SCCC_BT_IDX_S 0 -#define PF_RES_DATA_4_PF_SCCC_BT_IDX_M GENMASK(8, 0) - -#define PF_RES_DATA_4_PF_SCCC_BT_NUM_S 9 -#define PF_RES_DATA_4_PF_SCCC_BT_NUM_M GENMASK(17, 9) - -#define PF_RES_DATA_5_PF_GMV_BT_IDX_S 0 -#define PF_RES_DATA_5_PF_GMV_BT_IDX_M GENMASK(7, 0) - -#define PF_RES_DATA_5_PF_GMV_BT_NUM_S 8 -#define PF_RES_DATA_5_PF_GMV_BT_NUM_M GENMASK(16, 8) - -struct hns_roce_pf_timer_res_a { -__le32 rsv0; -__le32 qpc_timer_bt_idx_num; -__le32 cqc_timer_bt_idx_num; -__le32 rsv[3 ]; -}; +/* Fields of HNS_ROCE_OPC_CFG_GLOBAL_PARAM */ +#define CFG_GLOBAL_PARAM_1US_CYCLES CMQ_REQ_FIELD_LOC(9, 0) +#define CFG_GLOBAL_PARAM_UDP_PORT CMQ_REQ_FIELD_LOC(31, 16) -#define PF_RES_DATA_1_PF_QPC_TIMER_BT_IDX_S 0 -#define PF_RES_DATA_1_PF_QPC_TIMER_BT_IDX_M GENMASK(11, 0) - -#define PF_RES_DATA_1_PF_QPC_TIMER_BT_NUM_S 16 -#define PF_RES_DATA_1_PF_QPC_TIMER_BT_NUM_M GENMASK(28, 16) - -#define PF_RES_DATA_2_PF_CQC_TIMER_BT_IDX_S 0 -#define PF_RES_DATA_2_PF_CQC_TIMER_BT_IDX_M GENMASK(10, 0) - -#define PF_RES_DATA_2_PF_CQC_TIMER_BT_NUM_S 16 -#define PF_RES_DATA_2_PF_CQC_TIMER_BT_NUM_M GENMASK(27, 16) - -struct hns_roce_vf_res_a { -__le32 vf_id; -__le32 vf_qpc_bt_idx_num; -__le32 vf_srqc_bt_idx_num; -__le32 vf_cqc_bt_idx_num; -__le32 vf_mpt_bt_idx_num; -__le32 vf_eqc_bt_idx_num; -}; - -#define VF_RES_A_DATA_1_VF_QPC_BT_IDX_S 0 -#define VF_RES_A_DATA_1_VF_QPC_BT_IDX_M GENMASK(10, 0) - -#define VF_RES_A_DATA_1_VF_QPC_BT_NUM_S 16 -#define VF_RES_A_DATA_1_VF_QPC_BT_NUM_M GENMASK(27, 16) - -#define VF_RES_A_DATA_2_VF_SRQC_BT_IDX_S 0 -#define VF_RES_A_DATA_2_VF_SRQC_BT_IDX_M GENMASK(8, 0) - -#define VF_RES_A_DATA_2_VF_SRQC_BT_NUM_S 16 -#define VF_RES_A_DATA_2_VF_SRQC_BT_NUM_M GENMASK(25, 16) - -#define VF_RES_A_DATA_3_VF_CQC_BT_IDX_S 0 -#define VF_RES_A_DATA_3_VF_CQC_BT_IDX_M GENMASK(8, 0) - -#define VF_RES_A_DATA_3_VF_CQC_BT_NUM_S 16 -#define VF_RES_A_DATA_3_VF_CQC_BT_NUM_M GENMASK(25, 16) - -#define VF_RES_A_DATA_4_VF_MPT_BT_IDX_S 0 -#define VF_RES_A_DATA_4_VF_MPT_BT_IDX_M GENMASK(8, 0) - -#define VF_RES_A_DATA_4_VF_MPT_BT_NUM_S 16 -#define VF_RES_A_DATA_4_VF_MPT_BT_NUM_M GENMASK(25, 16) - -#define VF_RES_A_DATA_5_VF_EQC_IDX_S 0 -#define VF_RES_A_DATA_5_VF_EQC_IDX_M GENMASK(8, 0) - -#define VF_RES_A_DATA_5_VF_EQC_NUM_S 16 -#define VF_RES_A_DATA_5_VF_EQC_NUM_M GENMASK(25, 16) - -struct hns_roce_vf_res_b { -__le32 rsv0; -__le32 vf_smac_idx_num; -__le32 vf_sgid_idx_num; -__le32 vf_qid_idx_sl_num; -__le32 vf_sccc_idx_num; -__le32 vf_gmv_idx_num; -}; - -#define VF_RES_B_DATA_0_VF_ID_S 0 -#define VF_RES_B_DATA_0_VF_ID_M GENMASK(7, 0) - -#define VF_RES_B_DATA_1_VF_SMAC_IDX_S 0 -#define VF_RES_B_DATA_1_VF_SMAC_IDX_M GENMASK(7, 0) - -#define VF_RES_B_DATA_1_VF_SMAC_NUM_S 8 -#define VF_RES_B_DATA_1_VF_SMAC_NUM_M GENMASK(16, 8) - -#define VF_RES_B_DATA_2_VF_SGID_IDX_S 0 -#define VF_RES_B_DATA_2_VF_SGID_IDX_M GENMASK(7, 0) - -#define VF_RES_B_DATA_2_VF_SGID_NUM_S 8 -#define VF_RES_B_DATA_2_VF_SGID_NUM_M GENMASK(16, 8) - -#define VF_RES_B_DATA_3_VF_QID_IDX_S 0 -#define VF_RES_B_DATA_3_VF_QID_IDX_M GENMASK(9, 0) - -#define VF_RES_B_DATA_3_VF_SL_NUM_S 16 -#define VF_RES_B_DATA_3_VF_SL_NUM_M GENMASK(19, 16) - -#define VF_RES_B_DATA_4_VF_SCCC_BT_IDX_S 0 -#define VF_RES_B_DATA_4_VF_SCCC_BT_IDX_M GENMASK(8, 0) - -#define VF_RES_B_DATA_4_VF_SCCC_BT_NUM_S 9 -#define VF_RES_B_DATA_4_VF_SCCC_BT_NUM_M GENMASK(17, 9) - -#define VF_RES_B_DATA_5_VF_GMV_BT_IDX_S 0 -#define VF_RES_B_DATA_5_VF_GMV_BT_IDX_M GENMASK(7, 0) - -#define VF_RES_B_DATA_5_VF_GMV_BT_NUM_S 16 -#define VF_RES_B_DATA_5_VF_GMV_BT_NUM_M GENMASK(24, 16) +/* +* Fields of HNS_ROCE_OPC_QUERY_PF_RES and HNS_ROCE_OPC_ALLOC_VF_RES +*/ +#define FUNC_RES_A_VF_ID CMQ_REQ_FIELD_LOC(7, 0) +#define FUNC_RES_A_QPC_BT_IDX CMQ_REQ_FIELD_LOC(42, 32) +#define FUNC_RES_A_QPC_BT_NUM CMQ_REQ_FIELD_LOC(59, 48) +#define FUNC_RES_A_SRQC_BT_IDX CMQ_REQ_FIELD_LOC(72, 64) +#define FUNC_RES_A_SRQC_BT_NUM CMQ_REQ_FIELD_LOC(89, 80) +#define FUNC_RES_A_CQC_BT_IDX CMQ_REQ_FIELD_LOC(104, 96) +#define FUNC_RES_A_CQC_BT_NUM CMQ_REQ_FIELD_LOC(121, 112) +#define FUNC_RES_A_MPT_BT_IDX CMQ_REQ_FIELD_LOC(136, 128) +#define FUNC_RES_A_MPT_BT_NUM CMQ_REQ_FIELD_LOC(153, 144) +#define FUNC_RES_A_EQC_BT_IDX CMQ_REQ_FIELD_LOC(168, 160) +#define FUNC_RES_A_EQC_BT_NUM CMQ_REQ_FIELD_LOC(185, 176) +#define FUNC_RES_B_SMAC_IDX CMQ_REQ_FIELD_LOC(39, 32) +#define FUNC_RES_B_SMAC_NUM CMQ_REQ_FIELD_LOC(48, 40) +#define FUNC_RES_B_SGID_IDX CMQ_REQ_FIELD_LOC(71, 64) +#define FUNC_RES_B_SGID_NUM CMQ_REQ_FIELD_LOC(80, 72) +#define FUNC_RES_B_QID_IDX CMQ_REQ_FIELD_LOC(105, 96) +#define FUNC_RES_B_QID_NUM CMQ_REQ_FIELD_LOC(122, 112) +#define FUNC_RES_V_QID_NUM CMQ_REQ_FIELD_LOC(115, 112) + +#define FUNC_RES_B_SCCC_BT_IDX CMQ_REQ_FIELD_LOC(136, 128) +#define FUNC_RES_B_SCCC_BT_NUM CMQ_REQ_FIELD_LOC(145, 137) +#define FUNC_RES_B_GMV_BT_IDX CMQ_REQ_FIELD_LOC(167, 160) +#define FUNC_RES_B_GMV_BT_NUM CMQ_REQ_FIELD_LOC(176, 168)
drivers/infiniband/hw/hns/hns_roce_hw_v2.h struct hns_roce_cfg_llm_b { · line 1405
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +7
-0+#define FUNC_RES_V_GMV_BT_NUM CMQ_REQ_FIELD_LOC(184, 176) + +/* Fields of HNS_ROCE_OPC_QUERY_PF_TIMER_RES */ +#define PF_TIMER_RES_QPC_ITEM_IDX CMQ_REQ_FIELD_LOC(43, 32) +#define PF_TIMER_RES_QPC_ITEM_NUM CMQ_REQ_FIELD_LOC(60, 48) +#define PF_TIMER_RES_CQC_ITEM_IDX CMQ_REQ_FIELD_LOC(74, 64) +#define PF_TIMER_RES_CQC_ITEM_NUM CMQ_REQ_FIELD_LOC(91, 80)struct hns_roce_vf_switch {__le32 rocee_sel;
null
Re: [PATCH for-next 1/6] RDMA/hns: Simplify function's resource related command
Quoted 28 lines · chenglang
Quoted 6 lines
drivers/infiniband/hw/hns/hns_roce_common.h +0
-0@@ -87,6 +87,17 @@drivers/infiniband/hw/hns/hns_roce_common.h line 97
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_common.h +8
-0#define hr_reg_write (ptr, field, val) _hr_reg_write(ptr, field, val) +#define _hr_reg_read (ptr, field_type, field_h, field_l) \ + ({ \ + const field_type *_ptr = ptr; \ + BUILD_BUG_ON(((field_h) / 32) != ((field_l) / 32)); \ + ((le32_to_cpu(*((__le32 *)_ptr + (field_h) / 32)) & \ + GENMASK((field_h) % 32, (field_l) % 32)) >> \ + ((field_l) % 32)); \ + })I will try this:
#define
_hr_reg_read(ptr, field_type, field_h, field_l)({ const field_type *_ptr = ptr; FIELD_GET(GENMASK((field_h) % 32, (field_l) % 32), le32_to_cpu(*((__le32 *)_ptr +(field_h)/32))) + BUILD_BUG_ON_ZERO(((field_h) / 32) != ((field_l) / 32)); })
Quoted 2 lines
Thanks.
OK, I will send v2 instead.
Thanks
Weihang
PATCH 2/6 RDMA/hns: Query the number of functions supported by the PF
In reply to Weihang LiFrom: Wei Xu <[email protected]>
Query how many functions are supported by the PF from the FW and store it in the hns_roce_dev structure which will be used to support the configuration of virtual functions.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +++++++-- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +1 -0
@@ -1006,6 +1006,7 @@ struct hns_roce_dev {void *priv;struct workqueue_struct *irq_workq;const struct hns_roce_dfx_hw *dfx; +u32 func_num;u32 cong_algo_tmpl_id; };
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +7 -2
@@ -1607,15 +1607,20 @@ static int hns_roce_query_func_info(struct hns_roce_dev *hr_dev)struct hns_roce_cmq_desc desc;int ret; -if (hr_dev->pci_dev->revision <PCI_REVISION_ID_HIP09 ) +if (hr_dev->pci_dev->revision <PCI_REVISION_ID_HIP09 ) { + hr_dev->func_num =1 ;return 0 ; + }hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_QUERY_FUNC_INFO , true); ret =hns_roce_cmq_send (hr_dev, &desc,1 ); -if (ret) +if (ret) { + hr_dev->func_num =1 ;return ret; + } + hr_dev->func_num =le32_to_cpu (desc.func_info.own_func_num); hr_dev->cong_algo_tmpl_id =le32_to_cpu (desc.func_info.own_mac_id);return 0 ;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +2 -2
@@ -1697,9 +1697,9 @@ struct hns_roce_cmq_desc {union {__le32 data[6 ];struct { -__le32 rsv1; +__le32 own_func_num;__le32 own_mac_id; -__le32 rsv2[4 ]; +__le32 rsv[4 ]; } func_info; };
Signature · 1 line
2.8.1
PATCH 3/6 RDMA/hns: Reserve the resource for the VFs
In reply to Weihang LiFrom: Wei Xu <[email protected]>
Query the resource including EQC/SMAC/SGID from the firmware in the PF and distribute fairly among all the functions belong to the PF.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 3 ++ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 83 ++++++++++++++++++++--------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 - 3 files changed, 60 insertions(+), 28 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +3 -0
@@ -809,6 +809,9 @@ struct hns_roce_caps {u32 cqc_bt_num;u32 cqc_timer_bt_num;u32 mpt_bt_num; +u32 eqc_bt_num; +u32 smac_bt_num; +u32 sgid_bt_num;u32 sccc_bt_num;u32 gmv_bt_num;u32 qpc_ba_pg_sz;
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +57 -26
117 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +0 -2
@@ -40,9 +40,7 @@#define HNS_ROCE_VF_SRQC_BT_NUM 64#define HNS_ROCE_VF_CQC_BT_NUM 64#define HNS_ROCE_VF_MPT_BT_NUM 64 -#define HNS_ROCE_VF_EQC_NUM 64#define HNS_ROCE_VF_SMAC_NUM 32 -#define HNS_ROCE_VF_SGID_NUM 32#define HNS_ROCE_VF_SL_NUM 8#define HNS_ROCE_VF_GMV_BT_NUM 256
Signature · 1 line
2.8.1
PATCH 4/6 RDMA/hns: Set parameters of all the functions belong to a PF
In reply to Weihang LiFrom: Wei Xu <[email protected]>
Switch parameters of all functions belong to a PF should be set including VFs.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +16 -2
@@ -1693,7 +1693,8 @@ static int hns_roce_query_pf_timer_resource(struct hns_roce_dev *hr_dev)return 0 ; } -static int hns_roce_set_vf_switch_param (struct hns_roce_dev *hr_dev,int vf_id) +static int __hns_roce_set_vf_switch_param (struct hns_roce_dev *hr_dev, +u32 vf_id) {struct hns_roce_cmq_desc desc;struct hns_roce_vf_switch *swt;
@@ -1718,6 +1719,19 @@ static int hns_roce_set_vf_switch_param(struct hns_roce_dev *hr_dev, int vf_id)return hns_roce_cmq_send (hr_dev, &desc,1 ); } +static int hns_roce_set_vf_switch_param (struct hns_roce_dev *hr_dev) +{ +u32 vf_id; +int ret; + +for (vf_id =0 ; vf_id < hr_dev->func_num; vf_id++) { + ret =__hns_roce_set_vf_switch_param (hr_dev, vf_id); +if (ret) +return ret; + } +return 0 ; +} +static int __hns_roce_alloc_vf_resource (struct hns_roce_dev *hr_dev,int vf_id) {struct hns_roce_cmq_desc desc[2 ];
@@ -2319,7 +2333,7 @@ static int hns_roce_v2_profile(struct hns_roce_dev *hr_dev)return ret; } - ret =hns_roce_set_vf_switch_param (hr_dev,0 ); + ret =hns_roce_set_vf_switch_param (hr_dev);if (ret) { dev_err(hr_dev->dev, "failed to set function switch param, ret = %d.\n",
Signature · 1 line
2.8.1
PATCH 5/6 RDMA/hns: Enable RoCE on virtual functions
In reply to Weihang LiFrom: Wei Xu <[email protected]>
Introduce the VF support by adding code changes to allow VF PCI device initialization, assgining the reserved resource of the PF to the active VFs, setting the default abilities, applying the interruptions, resetting and reducing the default QP/GID number to aovid exceeding the hardware limitation.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 232 +++++++++++++++++++++++----- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 8 +- 3 files changed, 202 insertions(+), 39 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +1 -0
@@ -1010,6 +1010,7 @@ struct hns_roce_dev {struct workqueue_struct *irq_workq;const struct hns_roce_dfx_hw *dfx;u32 func_num; +u32 is_vf;u32 cong_algo_tmpl_id; };
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +196 -36
427 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +5 -3
@@ -44,7 +44,7 @@#define HNS_ROCE_VF_SL_NUM 8#define HNS_ROCE_VF_GMV_BT_NUM 256 -#define HNS_ROCE_V2_MAX_QP_NUM 0x100000 +#define HNS_ROCE_V2_MAX_QP_NUM 0x1000#define HNS_ROCE_V2_MAX_QPC_TIMER_NUM 0x200#define HNS_ROCE_V2_MAX_WQE_NUM 0x8000#define HNS_ROCE_V2_MAX_SRQ 0x100000
@@ -121,7 +121,7 @@#define HNS_ROCE_BA_PG_SZ_SUPPORTED_256K 6#define HNS_ROCE_BA_PG_SZ_SUPPORTED_16K 2 -#define HNS_ROCE_V2_GID_INDEX_NUM 256 +#define HNS_ROCE_V2_GID_INDEX_NUM 16#define HNS_ROCE_V2_TABLE_CHUNK_SIZE (1 << 18)
@@ -247,6 +247,7 @@ enum hns_roce_opcode_type {HNS_ROCE_OPC_CLR_SCCC =0x8509 ,HNS_ROCE_OPC_QUERY_SCCC =0x850a ,HNS_ROCE_OPC_RESET_SCCC =0x850b , +HNS_ROCE_OPC_QUERY_VF_RES =0x850e ,HNS_ROCE_OPC_CFG_GMV_TBL =0x850f ,HNS_ROCE_OPC_CFG_GMV_BT =0x8510 , HNS_SWITCH_PARAMETER_CFG = 0x1033,
@@ -1366,7 +1367,8 @@ struct hns_roce_cfg_llm_b {#define CFG_GLOBAL_PARAM_UDP_PORT CMQ_REQ_FIELD_LOC(31, 16)/* -* Fields of HNS_ROCE_OPC_QUERY_PF_RES and HNS_ROCE_OPC_ALLOC_VF_RES +* Fields of HNS_ROCE_OPC_QUERY_PF_RES, HNS_ROCE_OPC_QUERY_VF_RES +* and HNS_ROCE_OPC_ALLOC_VF_RES */ #define FUNC_RES_A_VF_ID CMQ_REQ_FIELD_LOC(7, 0)#define FUNC_RES_A_QPC_BT_IDX CMQ_REQ_FIELD_LOC(42, 32)
Signature · 1 line
2.8.1
PATCH 6/6 RDMA/hns: Remove duplicated hem page size config code
In reply to Weihang LiFrom: Xi Wang <[email protected]>
Remove duplicated code for setting hem page size in PF and VF.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 1 - drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 184 ++++++++++++---------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 + 3 files changed, 76 insertions(+), 110 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +0 -1
@@ -772,7 +772,6 @@ struct hns_roce_caps {int num_other_vectors;u32 num_mtpts;u32 num_mtt_segs; -u32 num_cqe_segs;u32 num_srqwqe_segs;u32 num_idx_segs;int reserved_mrws;
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +75 -109
305 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -0
@@ -59,6 +59,7 @@#define HNS_ROCE_V2_MAX_SQ_SGE_NUM 64#define HNS_ROCE_V2_MAX_EXTEND_SGE_NUM 0x200000#define HNS_ROCE_V2_MAX_SQ_INLINE 0x20 +#define HNS_ROCE_V2_MAX_SQ_INL_EXT 0x400#define HNS_ROCE_V2_MAX_RC_INL_INN_SZ 32#define HNS_ROCE_V2_UAR_NUM 256#define HNS_ROCE_V2_PHY_UAR_NUM 1
Signature · 1 line
2.8.1