Unverified Commit 951a8789 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1928 RDMA/hns Bugfix from mainline linux 

Merge Pull Request from: @stinft 
 
https://gitee.com/openeuler/kernel/issues/I7WVK1 
 
Link:https://gitee.com/openeuler/kernel/pulls/1928

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 9d808811 997aa9b3

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −1
Original line number Diff line number Diff line
@@ -797,7 +797,6 @@ struct hns_roce_caps { 
	u32		rsv0;

	u32		num_qps;

	u32		reserved_qps;

	int		num_qpc_timer;

	u32		num_srqs;

	u32		max_wqes;

	u32		max_srq_wrs;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −1
Original line number Diff line number Diff line
@@ -2331,7 +2331,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->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);

	caps->num_aeq_vectors = resp_a->num_aeq_vectors;

drivers/infiniband/hw/hns/hns_roce_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev) 
		ret = hns_roce_init_hem_table(hr_dev, &hr_dev->qpc_timer_table,

					      HEM_TYPE_QPC_TIMER,

					      hr_dev->caps.qpc_timer_entry_sz,

					      hr_dev->caps.num_qpc_timer);

					      hr_dev->caps.qpc_timer_bt_num);

		if (ret) {

			dev_err(dev,

				"Failed to init QPC timer memory, aborting.\n");