Commit 7939c642 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Bump IRDMA driver to the latest release 



Change-Id: I8ffd853d988f24110cbc508984d1f3dcd25a8fce
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23471


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent f0dbfd08

test/common/config/pkgdep/git

+4 −7
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ function install_igb_uio() { 
}



function install_irdma() {

	local RDMA_CORE_VERSION=46.0

	local RDMA_CORE_VERSION=51.0

	local RDMA_CORE=https://github.com/linux-rdma/rdma-core/releases/download/v$RDMA_CORE_VERSION/rdma-core-$RDMA_CORE_VERSION.tar.gz



	if [[ $ID != fedora ]]; then
@@ -335,9 +335,6 @@ function install_irdma() { 
	curl -L -o- "$IRDMA_DRIVER" | tar -C "$GIT_REPOS" -xzf -

	[[ -e $GIT_REPOS/irdma-$IRDMA_VERSION/build.sh ]]



	if ge "$kernel_ver" 6.5.1; then

		patch --dir="$GIT_REPOS/irdma-$IRDMA_VERSION" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/irdma/0001-irdma-avoid-fortify-string-warning.patch"

	(

		cd "$GIT_REPOS/irdma-$IRDMA_VERSION"

		sed -i "s/IRDMA_FLUSH_DELAY_MS 1500/IRDMA_FLUSH_DELAY_MS 50/" \
@@ -358,7 +355,7 @@ function install_irdma() { 
	cp "$GIT_REPOS/rdma-core-$RDMA_CORE_VERSION/redhat/rdma-core.spec" "$HOME/rpmbuild/SPECS"



	# Re-package the source

	tar -czf "$HOME/rpmbuild/SOURCES/rdma-core-$RDMA_CORE_VERSION.tgz" -C "$GIT_REPOS" "rdma-core-$RDMA_CORE_VERSION"

	tar -czf "$HOME/rpmbuild/SOURCES/rdma-core-$RDMA_CORE_VERSION.tar.gz" -C "$GIT_REPOS" "rdma-core-$RDMA_CORE_VERSION"



	# Build the rpms

	(
@@ -524,7 +521,7 @@ function install_sources() { 
}



GIT_VERSION=2.25.1

IRDMA_VERSION=1.13.43

IRDMA_VERSION=1.14.31

ICE_VERSION=1.13.7



BPFTRACE_VERSION=${BPFTRACE_VERSION:-db63ddb}
@@ -549,7 +546,7 @@ export DRIVER_LOCATION_QAT 
export GIT_REPO_GIT

: ${GIT_REPO_DPDK_KMODS=http://dpdk.org/git/dpdk-kmods}

export GIT_REPO_DPDK_KMODS

: ${IRDMA_DRIVER=https://downloadmirror.intel.com/812530/irdma-$IRDMA_VERSION.tgz}

: ${IRDMA_DRIVER=https://downloadmirror.intel.com/823677/irdma-$IRDMA_VERSION.tgz}

export IRDMA_DRIVER

: ${ICE_DRIVER="https://sourceforge.net/projects/e1000/files/ice%20stable/$ICE_VERSION/ice-$ICE_VERSION.tar.gz"}

export ICE_DRIVER

test/common/config/pkgdep/patches/irdma/0001-irdma-avoid-fortify-string-warning.patch

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
This patch is a port of the upstream commit missing from latest oot irdma

release (1.12.55):



https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b002760f877c0d91ecd3c78565b52f4bbac379dd



---

 src/irdma/uk.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/src/irdma/uk.c b/src/irdma/uk.c

index 13b9006..dcd98db 100644

--- a/src/irdma/uk.c

+++ b/src/irdma/uk.c

@@ -99,16 +99,16 @@ static int irdma_nop_1(struct irdma_qp_uk *qp)

  */

 void irdma_clr_wqes(struct irdma_qp_uk *qp, u32 qp_wqe_idx)

 {

-	__le64 *wqe;

+	struct irdma_qp_quanta *sq;

 	u32 wqe_idx;

 

 	if (!(qp_wqe_idx & 0x7F)) {

 		wqe_idx = (qp_wqe_idx + 128) % qp->sq_ring.size;

-		wqe = qp->sq_base[wqe_idx].elem;

+		sq = qp->sq_base + wqe_idx;

 		if (wqe_idx)

-			memset(wqe, qp->swqe_polarity ? 0 : 0xFF, 0x1000);

+			memset(sq, qp->swqe_polarity ? 0 : 0xFF, 128 * sizeof(*sq));

 		else

-			memset(wqe, qp->swqe_polarity ? 0xFF : 0, 0x1000);

+			memset(sq, qp->swqe_polarity ? 0xFF : 0, 128 * sizeof(*sq));

 	}

 }

 

--