Unverified Commit 9af9a479 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10061 Backport bugfixes for RDMA/hns from mainline linux 

Merge Pull Request from: @huwentao0417 
 
https://gitee.com/openeuler/kernel/issues/I9SONH 
 
Link:https://gitee.com/openeuler/kernel/pulls/10061

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 410f2933 be3625e5

drivers/infiniband/hw/hns/hns_roce_cq.c

+0 −7
Original line number Diff line number Diff line
@@ -609,13 +609,6 @@ void hns_roce_cq_event(struct hns_roce_dev *hr_dev, u32 cqn, int event_type) 
	struct ib_event event;

	struct ib_cq *ibcq;



	hr_cq = xa_load(&hr_dev->cq_table.array,

			cqn & (hr_dev->caps.num_cqs - 1));

	if (!hr_cq) {

		dev_warn(dev, "Async event for bogus CQ 0x%06x\n", cqn);

		return;

	}



	if (event_type != HNS_ROCE_EVENT_TYPE_CQ_ID_INVALID &&

	    event_type != HNS_ROCE_EVENT_TYPE_CQ_ACCESS_ERROR &&

	    event_type != HNS_ROCE_EVENT_TYPE_CQ_OVERFLOW) {

drivers/infiniband/hw/hns/hns_roce_qp.c

+1 −1
Original line number Diff line number Diff line
@@ -1409,8 +1409,8 @@ void hns_roce_qp_destroy(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, 
	free_kernel_wrid(hr_qp);

	free_qp_db(hr_dev, hr_qp, udata);



	kfree(hr_qp);

	mutex_destroy(&hr_qp->mutex);

	kfree(hr_qp);

}



static int check_qp_type(struct hns_roce_dev *hr_dev, enum ib_qp_type type,