Commit c08f6dd3 authored by Yangyang Li's avatar Yangyang Li Committed by ZhouJuan
Browse files

RDMA/hns: Remove redundant 'num_mtt_segs' and 'max_extend_sg' 

mainline inclusion
from mainline-v6.1-rc1
commit 5436272c
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I7A4LC
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5436272c8cf4eb420fdb3926ec07560051c8fd11

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

The num_mtt_segs and max_extend_sg used to be used for HIP06,
remove them since the HIP06 code has been removed.

Link: https://lore.kernel.org/r/20220922123315.3732205-9-xuhaoyue1@hisilicon.com


Signed-off-by: default avatarYangyang Li <liyangyang20@huawei.com>
Signed-off-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarZhou Juan <nnuzj07170227@163.com>
parent b8b5cbd4

drivers/infiniband/hw/hns/hns_roce_device.h

+2 −2
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ struct hns_roce_caps { 
	u32		max_sq_sg;

	u32		max_sq_inline;

	u32		max_rq_sg;

	u32		max_extend_sg;

	u32		rsv0;

	u32		num_qps;

	u32		reserved_qps;

	int		num_qpc_timer;
@@ -817,7 +817,7 @@ struct hns_roce_caps { 
	int		num_comp_vectors;

	int		num_other_vectors;

	u32		num_mtpts;

	u32		num_mtt_segs;

	u32		rsv1;

	u32		num_srqwqe_segs;

	u32		num_idx_segs;

	int		reserved_mrws;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −2
Original line number Diff line number Diff line
@@ -2257,7 +2257,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_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;
@@ -2347,7 +2346,6 @@ static int hns_roce_query_caps(struct hns_roce_dev *hr_dev) 
	caps->max_sq_inline = le16_to_cpu(resp_a->max_sq_inline);

	caps->max_rq_sg = le16_to_cpu(resp_a->max_rq_sg);

	caps->max_rq_sg = roundup_pow_of_two(caps->max_rq_sg);

	caps->max_extend_sg = le32_to_cpu(resp_a->max_extend_sg);

	caps->num_qpc_timer = le16_to_cpu(resp_a->num_qpc_timer);

	caps->max_srq_sges = le16_to_cpu(resp_a->max_srq_sges);

	caps->max_srq_sges = roundup_pow_of_two(caps->max_srq_sges);

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#define HNS_ROCE_V2_MTT_ENTRY_SZ		64

#define HNS_ROCE_V2_AEQE_VEC_NUM		1

#define HNS_ROCE_V2_ABNORMAL_VEC_NUM		1

#define HNS_ROCE_V2_MAX_MTT_SEGS		0x1000000

#define HNS_ROCE_V2_MAX_SRQWQE_SEGS		0x1000000

#define HNS_ROCE_V2_MAX_IDX_SEGS		0x1000000
@@ -1153,7 +1152,7 @@ struct hns_roce_query_pf_caps_a { 
	__le16 max_sq_sg;

	__le16 max_sq_inline;

	__le16 max_rq_sg;

	__le32 max_extend_sg;

	__le32 rsv0;

	__le16 num_qpc_timer;

	__le16 num_cqc_timer;

	__le16 max_srq_sges;