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

pkgdep/git: Make sure all object files are built for the QAT driver 



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


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

test/common/config/pkgdep/git

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ 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-cryptohash.patch"



	# Object files need to be passed via obj-m otherwise they won't be built with kernels >= 5.10

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

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

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Due to git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?id=6212804f2d78e86f15dba5b46a4065cbf1403cde

built-in objects are not being built for the external modules anymore. To mitigate, don't set obj-m to an empty

list to force the build.



---

diff --git a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk

index 71bbeb7..324fa96 100644

--- a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk

+++ b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk

@@ -72,7 +72,7 @@ endif

 

 $(LIB_STATIC): dirs

 	@echo 'Creating static library ${LIB_STATIC}'; \

-	$(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD) obj-m=""; \

+	$(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD); \

 	echo 'Copying outputs';\

 	test -f lib.a  &&  (ar -t lib.a | xargs ar -rcsD $(LIB_STATIC)); \

 	test -f $(LIB_STATIC)  &&  mv -f $(LIB_STATIC) $($(PROG_ACY)_FINAL_OUTPUT_DIR)/$(LIB_STATIC); \

-- 

2.26.2