Commit bbfeb5d8 authored by Luoyouming's avatar Luoyouming Committed by ZhouJuan
Browse files

RDMA/hns: Support getting xrcd num from firmware 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6WAZI



---------------------------------------------------------------

Support driver gets the num_xrcds and reserved_xrcds from firmware.

Signed-off-by: default avatarLuoyouming <luoyouming@huawei.com>
Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
parent be633dee

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −3
Original line number Diff line number Diff line
@@ -2310,9 +2310,6 @@ static void apply_func_caps(struct hns_roce_dev *hr_dev) 
	caps->qpc_timer_hop_num = HNS_ROCE_HOP_NUM_0;

	caps->cqc_timer_hop_num = HNS_ROCE_HOP_NUM_0;



	caps->num_xrcds = HNS_ROCE_V2_MAX_XRCD_NUM;

	caps->reserved_xrcds = HNS_ROCE_V2_RSV_XRCD_NUM;



	caps->num_mtt_segs = HNS_ROCE_V2_MAX_MTT_SEGS;

	caps->num_srqwqe_segs = HNS_ROCE_V2_MAX_SRQWQE_SEGS;

	caps->num_idx_segs = HNS_ROCE_V2_MAX_IDX_SEGS;
@@ -2440,6 +2437,7 @@ static int hns_roce_query_caps(struct hns_roce_dev *hr_dev) 
	caps->num_cqs = 1 << hr_reg_read(resp_c, PF_CAPS_C_NUM_CQS);

	caps->gid_table_len[0] = hr_reg_read(resp_c, PF_CAPS_C_MAX_GID);

	caps->max_cqes = 1 << hr_reg_read(resp_c, PF_CAPS_C_CQ_DEPTH);

	caps->num_xrcds = 1 << hr_reg_read(resp_c, PF_CAPS_C_NUM_XRCDS);

	caps->num_mtpts = 1 << hr_reg_read(resp_c, PF_CAPS_C_NUM_MRWS);

	caps->num_qps = 1 << hr_reg_read(resp_c, PF_CAPS_C_NUM_QPS);

	caps->max_qp_init_rdma = hr_reg_read(resp_c, PF_CAPS_C_MAX_ORD);
@@ -2461,6 +2459,7 @@ static int hns_roce_query_caps(struct hns_roce_dev *hr_dev) 
	caps->reserved_mrws = hr_reg_read(resp_e, PF_CAPS_E_RSV_MRWS);

	caps->chunk_sz = 1 << hr_reg_read(resp_e, PF_CAPS_E_CHUNK_SIZE_SHIFT);

	caps->reserved_cqs = hr_reg_read(resp_e, PF_CAPS_E_RSV_CQS);

	caps->reserved_xrcds = hr_reg_read(resp_e, PF_CAPS_E_RSV_XRCDS);

	caps->reserved_srqs = hr_reg_read(resp_e, PF_CAPS_E_RSV_SRQS);

	caps->reserved_lkey = hr_reg_read(resp_e, PF_CAPS_E_RSV_LKEYS);

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#define HNS_ROCE_V2_MAX_MTT_SEGS		0x1000000

#define HNS_ROCE_V2_MAX_SRQWQE_SEGS		0x1000000

#define HNS_ROCE_V2_MAX_IDX_SEGS		0x1000000

#define HNS_ROCE_V2_MAX_XRCD_NUM		0x1000000

#define HNS_ROCE_V2_RSV_XRCD_NUM		0



#define HNS_ROCE_V3_SCCC_SZ			64

#define HNS_ROCE_V3_GMV_ENTRY_SZ		32
@@ -1214,6 +1212,7 @@ struct hns_roce_query_pf_caps_c { 
#define PF_CAPS_C_NUM_CQS PF_CAPS_C_FIELD_LOC(51, 32)

#define PF_CAPS_C_MAX_GID PF_CAPS_C_FIELD_LOC(60, 52)

#define PF_CAPS_C_CQ_DEPTH PF_CAPS_C_FIELD_LOC(86, 64)

#define PF_CAPS_C_NUM_XRCDS PF_CAPS_C_FIELD_LOC(91, 87)

#define PF_CAPS_C_NUM_MRWS PF_CAPS_C_FIELD_LOC(115, 96)

#define PF_CAPS_C_NUM_QPS PF_CAPS_C_FIELD_LOC(147, 128)

#define PF_CAPS_C_MAX_ORD PF_CAPS_C_FIELD_LOC(155, 148)
@@ -1273,6 +1272,7 @@ struct hns_roce_query_pf_caps_e { 
#define PF_CAPS_E_RSV_MRWS PF_CAPS_E_FIELD_LOC(19, 0)

#define PF_CAPS_E_CHUNK_SIZE_SHIFT PF_CAPS_E_FIELD_LOC(31, 20)

#define PF_CAPS_E_RSV_CQS PF_CAPS_E_FIELD_LOC(51, 32)

#define PF_CAPS_E_RSV_XRCDS PF_CAPS_E_FIELD_LOC(63, 52)

#define PF_CAPS_E_RSV_SRQS PF_CAPS_E_FIELD_LOC(83, 64)

#define PF_CAPS_E_RSV_LKEYS PF_CAPS_E_FIELD_LOC(115, 96)