Unverified Commit 5a73abe0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2777 RDMA/hns: Revert the private patch on the openEuler and Re-upload the... 

!2777 RDMA/hns: Revert the private patch on the openEuler and Re-upload the patch from Linux mainline.

Merge Pull Request from: @stinft 
 
To ensure that the patches on the Linux mainline and openEuler are consistent, delete the private patches and re-upload the patches from the mainline.

Chengchang Tang (4):
   RDMA/hns: Fix AH attr queried by query_qp
   RDMA/hns: Fix CQ and QP cache affinity
   RDMA/hns: Fix printing level of asynchronous events
   RDMA/hns: Fix signed-unsigned mixed comparisons
 
Junxian Huang (2):
   RDMA/hns: Remove VF extend configuration
   RDMA/hns: Fix inaccurate error label name in init instance

 Juan Zhou (6):
   Revert "RDMA/hns: Fix signed-unsigned mix with relational"
   Revert "RDMA/hns: Fix printing level of asynchronous events"
   Revert "RDMA/hns: Fix CQ and QP cache affinity"
   Revert "RDMA/hns: Fix inaccurate error label name in init instance"
   Revert "RDMA/hns: Remove VF extend configuration"
   Revert "RDMA/hns: Fix AH attr queried by query_qp"

bugzilla: https://gitee.com/openeuler/kernel/issues/I8E9OJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/2777

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents df23a8e9 56214b31

drivers/infiniband/hw/hns/hns_roce_device.h

+1 −1
Original line number Diff line number Diff line
@@ -104,11 +104,11 @@ 
#define HNS_ROCE_CQ_BANK_NUM 4



#define CQ_BANKID_SHIFT 2

#define CQ_BANKID_MASK GENMASK(1, 0)



#define MAX_NOTIFY_MEM_SIZE BIT(24)



#define HNS_ROCE_MEM_BAR 2

#define CQ_BANKID_MASK GENMASK(1, 0)



enum {

	SERV_TYPE_RC,

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -6371,7 +6371,7 @@ static void hns_roce_irq_work_handle(struct work_struct *work) 
	case HNS_ROCE_EVENT_TYPE_COMM_EST:

		break;

	case HNS_ROCE_EVENT_TYPE_SQ_DRAINED:

		ibdev_dbg(ibdev, "Send queue drained.\n");

		ibdev_dbg(ibdev, "send queue drained.\n");

		break;

	case HNS_ROCE_EVENT_TYPE_WQ_CATAS_ERROR:

		ibdev_err(ibdev, "Local work queue 0x%x catast error, sub_event type is: %d\n",

drivers/infiniband/hw/hns/hns_roce_qp.c

+1 −2
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ static int alloc_qpn_with_bankid(struct hns_roce_bank *bank, u8 bankid, 


	return 0;

}



static int alloc_qpn(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,

		     struct ib_qp_init_attr *init_attr)

{