Commit 2e4c30da authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

pkgdep/git: Remove QAT's patch targeted for ubuntu 



Unfortunately, the 7bd3c9e5 got off sync with 82c8059a. The
version of the QAT driver that we bumped to doesn't need this patch
since it already includes a similar check inside, hence our patch
doesn't apply cleanly anymore.

Just get rid of it.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent cfa0a248

test/common/config/pkgdep/git

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ function install_qat() { 
	patch --dir="$GIT_REPOS/QAT" -p1 \

		< "$rootdir/test/common/config/pkgdep/patches/qat/0001-empty-body.patch"



	if [[ $ID == ubuntu ]] && ge "$kernel_ver" 5.15.0-118 && lt "$kernel_ver" 6.3; then

		patch --dir="$GIT_REPOS/QAT" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-ubuntu-algapi.patch"



	(cd "$GIT_REPOS/QAT" && sudo ./configure --enable-icp-sriov=host && sudo make install)



	if ! sudo service qat_service start; then

test/common/config/pkgdep/patches/qat/0001-ubuntu-algapi.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Ubuntu provides a diff for 5.15.x kernels which adds crypto_request_complete()

to algapi.h. Originally this functionality was merged into >= 6.3 kernels.

---

 quickassist/qat/compat/qat_compat.h | 8 --------

 1 file changed, 8 deletions(-)



diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h

index 2c3d9cb..c94345a 100644

--- a/quickassist/qat/compat/qat_compat.h

+++ b/quickassist/qat/compat/qat_compat.h

@@ -510,14 +510,6 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev)

 void kfree_sensitive(const void *p);

 #endif

 

-#if (KERNEL_VERSION(6, 3, 0) > LINUX_VERSION_CODE)

-static inline void crypto_request_complete(struct crypto_async_request *req,

-					   int err)

-{

-	req->complete(req, err);

-}

-#endif

-

 #if (KERNEL_VERSION(6, 6, 0) <= LINUX_VERSION_CODE)

 

 #define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE | \

--