libhns: Remove support for HIP06

HIP06 is no longer supported. So, backport these patches from
rdma-core v41 to remove support for HIP06.

Signed-off-by: zhengfeng luo <luozhengfeng@h-partners.com>
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>

0046-libhns-Fix-the-shift-size-of-SQ-WQE.patch

@@ -0,0 +1,34 @@
+From 847336b7634b51548996b879f42c786a108885f1 Mon Sep 17 00:00:00 2001
+From: Chengchang Tang <tangchengchang@huawei.com>
+Date: Fri, 8 Apr 2022 11:31:07 +0800
+Subject: [PATCH 46/47] libhns: Fix the shift size of SQ WQE
+
+Currently, the shift size of SQ WQE is based on the size of the SQ WQE
+structure of HIP06. Although the size of SQ WQE of HIP08 is the same as
+the size of SQ WQE of HIP06, it is not a correct way for HIP08 to use the
+structure of HIP06 to define the size of SQ WQE.
+
+Fixes: b6cd213b276f ("libhns: Refactor for creating qp")
+Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
+Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
+---
+ providers/hns/hns_roce_u_verbs.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c
+index 1457a1a2..215d82ec 100644
+--- a/providers/hns/hns_roce_u_verbs.c
++++ b/providers/hns/hns_roce_u_verbs.c
+@@ -1068,8 +1068,7 @@ static void hns_roce_set_qp_params(struct ibv_qp_init_attr_ex *attr,
+ 	}
+ 
+ 	if (attr->cap.max_send_wr) {
+-		qp->sq.wqe_shift =
+-			hr_ilog32(sizeof(struct hns_roce_rc_send_wqe));
++		qp->sq.wqe_shift = HNS_ROCE_SQWQE_SHIFT;
+ 		cnt = roundup_pow_of_two(attr->cap.max_send_wr);
+ 		qp->sq.wqe_cnt = cnt;
+ 		qp->sq.shift = hr_ilog32(cnt);
+-- 
+2.30.0
+

rdma-core.spec

@@ -1,6 +1,6 @@
 Name:           rdma-core
 Version:        35.1
-Release:        6
+Release:        7
 Summary:        RDMA core userspace libraries and daemons
 License:        GPLv2 or BSD
 Url:            https://github.com/linux-rdma/rdma-core
@@ -52,6 +52,8 @@ Patch42:        0042-libhns-Optimize-the-error-handling-of-CQE.patch
 Patch43:        0043-libhns-Refactor-hns-roce-v2-poll-one-and-wc-poll-cqe.patch
 Patch44:        0044-libhns-Extended-QP-supports-the-new-post-send-mechan.patch
 Patch45:        0045-libhns-Add-general-error-type-for-CQE.patch
+Patch46:        0046-libhns-Fix-the-shift-size-of-SQ-WQE.patch
+Patch47:        0047-libhns-Remove-support-for-HIP06.patch
 
 BuildRequires:  binutils cmake >= 2.8.11 gcc libudev-devel pkgconfig pkgconfig(libnl-3.0)
 BuildRequires:  pkgconfig(libnl-route-3.0) valgrind-devel systemd systemd-devel
@@ -296,6 +298,12 @@ fi
 %{_mandir}/*
 
 %changelog
+* Tue Sep 06 2022 luozhengfeng <luozhengfeng@h-partners.com> - 35.1-7
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: Remove support for HIP06
+
 * Wed Aug 24 2022 luozhengfeng <luozhengfeng@h-partners.com> - 35.1-6
 - Type: requirement
 - ID: NA