Commit 2dcb0569 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: [QAT] Replace linux/cryptohash.h with crypto/sha.h 



The former was dropped and merged with crypto/sha.h in kernel 5.8.

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


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d2cbb15c

test/common/config/pkgdep/git

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ function install_qat() { 
		[[ ${DRIVER_LOCATION_QAT##*/} == qat1.7.l.4.9.0-00008.tar.gz ]] && patch --dir="$GIT_REPOS/QAT" -p1

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



	# Patch use of cryptohash.h which was removed in favor of crypto/sha.h in kernels >= 5.8. See .patch for details

	if ((kernel_ver >= 0x050800)); then

		# Patch only the driver version that was tested

		[[ ${DRIVER_LOCATION_QAT##*/} == qat1.7.l.4.9.0-00008.tar.gz ]] && patch --dir="$GIT_REPOS/QAT" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-cryptohash.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-cryptohash.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
cryptohash.h was dropped and merged with crypto/sha.sh in 5.8 kernel. Details in:

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=228c4f265c6eb60eaa4ed0edb3bf7c113173576c



---

diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

index 4c389da..e602377 100644

--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

@@ -66,7 +66,7 @@

 

 #include "Osal.h"

 #include <linux/crypto.h>

-#include <linux/cryptohash.h>

+#include <crypto/sha.h>

 #include <linux/version.h>

 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))

 #include <crypto/internal/hash.h>