1) Rebased patches:
qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
2) Added patch:
qat17_4.7.0-00006-Link-driver-with-object-files.patch
3) Remove duplicate firmware installation, since linux-firmware.bb
in OE-Core will do it.
4) Remove qat17-src from PACKAGES due to duplicate packaging.
5) Use ${nonarch_base_libdir} to install firmware instead of
using ${base_libdir}.
Signed-off-by: Yongxin Liu <[email protected]>
---
....0-34-qat-remove-local-path-from-makefile.patch | 15 ++--
...0-4-qat-add-install-target-and-add-folder.patch | 16 ++--
...4.7.0-00006-Link-driver-with-object-files.patch | 91 ++++++++++++++++++++++
.../{qat17_4.2.0-00012.bb => qat17_4.7.0-00006.bb} | 45 +++++------
4 files changed, 126 insertions(+), 41 deletions(-)
create mode 100644
recipes-extended/qat/files/qat17_4.7.0-00006-Link-driver-with-object-files.patch
rename recipes-extended/qat/{qat17_4.2.0-00012.bb => qat17_4.7.0-00006.bb}
(80%)
diff --git
a/recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
b/recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
index da40e9f..96791cb 100644
---
a/recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
+++
b/recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
@@ -1,4 +1,4 @@
-From 5044a14a6b4192b771f16aa834f688c1fd1287dd Mon Sep 17 00:00:00 2001
+From 1e29afc0e69fb9118cb0dcb924cdffa9db730572 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <[email protected]>
Date: Wed, 8 Jul 2015 11:11:32 +0800
Subject: [PATCH] qat: remove local path from makefile
@@ -9,22 +9,23 @@ Remove the host machine /usr/include path from makefile.
Signed-off-by: Anuj Mittal <[email protected]>
---
- .../build_files/env_files/linux_2.6_user_space.mk | 3 +--
+ quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
-index 1451f4a..719d1bb 100755
+index f7f18a5..e8c9f18 100644
--- a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
+++ b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
-@@ -72,8 +72,7 @@
+@@ -46,8 +46,7 @@
#
#-------------------------------------------------------------
-
+
-INCLUDES+=-I/usr/include \
- -I$(API_DIR) \
+INCLUDES+=-I$(API_DIR) \
+ -I$(ADF_CMN_DIR) \
-I$(OSAL_DIR)/include \
-I$(OSAL_DIR)/src/linux/user_space/include
+--
+2.14.4
---
-1.7.9.5
diff --git
a/recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
b/recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
index 6b6dfa9..a810cfc 100644
---
a/recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
+++
b/recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
@@ -1,4 +1,4 @@
-From 22963fed4e9017ca05855bd2373e2467f45ebe30 Mon Sep 17 00:00:00 2001
+From a94af9df0fa6f2c41efaf7ef6c17d0e5bb8aa80d Mon Sep 17 00:00:00 2001
From: "Tan, Raymond" <[email protected]>
Date: Mon, 4 Jun 2018 09:26:33 +0800
Subject: [PATCH] qat-add-install-target-and-add-folder
@@ -8,23 +8,24 @@ Upstream-Status: Inappropriate [Configuration]
Modify Makefile to add install target and add folder
Signed-off-by: Tan, Raymond <[email protected]>
+
---
quickassist/Makefile | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/quickassist/Makefile b/quickassist/Makefile
-index 3e08241..1647d9e 100644
+index 93990f2..70a4353 100644
--- a/quickassist/Makefile
+++ b/quickassist/Makefile
-@@ -64,6 +64,7 @@ ICP_BUILD_OUTPUT?=build_$(DATE)
+@@ -97,6 +97,7 @@ ICP_BUILD_OUTPUT?=build_$(DATE)
ICP_TOP_ENV=$(ICP_BUILDSYSTEM_PATH)/build_files/env_files/
export ICP_ACCEL_INC=YES
LAC_LIB_DIR=$(LAC_PATH)/build/libs
+MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat
#Release Package build steps
- ALL_TARGETS = clean lac_lib_dir qat_direct libosal_user lac_user
-@@ -80,10 +81,14 @@ all: $(ALL_TARGETS)
+ ALL_TARGETS = lac_user lac_kernel
+@@ -114,10 +115,14 @@ all: $(ALL_TARGETS)
user: lac_lib_dir libosal_user lac_user
@@ -41,7 +42,7 @@ index 3e08241..1647d9e 100644
#
# Common memory driver
-@@ -143,8 +148,22 @@ ifeq ($(ICP_NO_CLEAN),)
+@@ -200,8 +205,22 @@ ifeq ($(ICP_NO_CLEAN),)
endif
@@ -65,6 +66,3 @@ index 3e08241..1647d9e 100644
lac_lib_dir: clean
test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR);
---
-1.9.1
-
diff --git
a/recipes-extended/qat/files/qat17_4.7.0-00006-Link-driver-with-object-files.patch
b/recipes-extended/qat/files/qat17_4.7.0-00006-Link-driver-with-object-files.patch
new file mode 100644
index 0000000..3ba62f5
--- /dev/null
+++
b/recipes-extended/qat/files/qat17_4.7.0-00006-Link-driver-with-object-files.patch
@@ -0,0 +1,91 @@
+From 555a4b3605e983e492f8c67e38a094933bc7efcd Mon Sep 17 00:00:00 2001
+From: Yongxin Liu <[email protected]>
+Date: Mon, 6 Jan 2020 09:26:39 +0800
+Subject: [PATCH] qat: Link driver with object files instead of archived files
+
+Upstream-Status: Inappropriate [Temporary workaround for kernel later than
+v4.19-rc3]
+
+Due to mainline kernel commit 69ea912fda7 ("kbuild: remove unneeded
+link_multi_deps"), modules cannot link *.a archives. So change .a to
+.o files.
+
+Signed-off-by: Yongxin Liu <[email protected]>
+
+---
+ quickassist/Makefile | 2 ++
+ .../lookaside/access_layer/src/Makefile | 21 +++++++++----------
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/quickassist/Makefile b/quickassist/Makefile
+index 70a4353..5f6ee46 100644
+--- a/quickassist/Makefile
++++ b/quickassist/Makefile
+@@ -154,6 +154,7 @@ libosal_kernel: clean output_dir lac_lib_dir
+ echo ; echo 'Copying OSAL library';
+ cp
$(OSAL_PATH)/src/linux/kernel_space/build/linux_2.6/kernel_space/libosal.a
$(ICP_BUILD_OUTPUT)/libosal_kernel.a;
+ cp
$(OSAL_PATH)/src/linux/kernel_space/build/linux_2.6/kernel_space/libosal.a
$(LAC_LIB_DIR)/;
++ cp $(OSAL_PATH)/src/linux/kernel_space/build/linux_2.6/kernel_space/*.o
$(LAC_LIB_DIR)/;
+
+
+ #build linux qat_direct layer
+@@ -169,6 +170,7 @@ qat_kernel: clean output_dir lac_lib_dir libosal_kernel
cmn_ko
+ echo ; echo 'Copying qat_kernel library';
+ cp $(KERNEL_PATH)/src/build/linux_2.6/kernel_space/libadf_kernel.a
$(ICP_BUILD_OUTPUT)/;
+ cp $(KERNEL_PATH)/src/build/linux_2.6/kernel_space/libadf_kernel.a
$(LAC_LIB_DIR)/;
++ cp $(KERNEL_PATH)/src/build/linux_2.6/kernel_space/*.o $(LAC_LIB_DIR)/;
+
+
+ lac_user: clean output_dir qat_direct libosal_user cmn_user cmn_ko
+diff --git a/quickassist/lookaside/access_layer/src/Makefile
b/quickassist/lookaside/access_layer/src/Makefile
+index cc8cf2f..b8ec93c 100644
+--- a/quickassist/lookaside/access_layer/src/Makefile
++++ b/quickassist/lookaside/access_layer/src/Makefile
+@@ -112,13 +112,13 @@ LIB_STATIC=$(OUTPUT_NAME).a
+ LIB_SHARED=$(OUTPUT_NAME).so
+
+ # add the path and list of source libraries,
+-ADDITIONAL_KERNEL_LIBS= common/utils/$(ICP_BUILD_OUTPUT_DIR)/utils.a \
+- common/ctrl/$(ICP_BUILD_OUTPUT_DIR)/init.a \
+-
common/compression/$(ICP_BUILD_OUTPUT_DIR)/compression.a
++ADDITIONAL_KERNEL_LIBS= common/utils/$(ICP_BUILD_OUTPUT_DIR)/*.o \
++ common/ctrl/$(ICP_BUILD_OUTPUT_DIR)/*.o \
++ common/compression/$(ICP_BUILD_OUTPUT_DIR)/*.o
+ ifndef ICP_DC_ONLY
+-ADDITIONAL_KERNEL_LIBS += common/crypto/sym/$(ICP_BUILD_OUTPUT_DIR)/sym.a \
+-
common/crypto/sym/qat/$(ICP_BUILD_OUTPUT_DIR)/sym_qat.a \
+-
common/crypto/sym/key/$(ICP_BUILD_OUTPUT_DIR)/sym_key.a
++ADDITIONAL_KERNEL_LIBS += common/crypto/sym/$(ICP_BUILD_OUTPUT_DIR)/*.o \
++ common/crypto/sym/qat/$(ICP_BUILD_OUTPUT_DIR)/*.o \
++ common/crypto/sym/key/$(ICP_BUILD_OUTPUT_DIR)/*.o
+ ifeq ($(ICP_OS_LEVEL), user_space)
+ ADDITIONAL_KERNEL_LIBS +=
common/crypto/asym/pke_common/$(ICP_BUILD_OUTPUT_DIR)/pke_common.a \
+
common/crypto/asym/diffie_hellman/$(ICP_BUILD_OUTPUT_DIR)/diffie_hellman.a \
+@@ -128,14 +128,14 @@ ADDITIONAL_KERNEL_LIBS +=
common/crypto/asym/pke_common/$(ICP_BUILD_OUTPUT_DIR)/
+
common/crypto/asym/large_number/$(ICP_BUILD_OUTPUT_DIR)/ln.a \
+
common/crypto/asym/ecc/$(ICP_BUILD_OUTPUT_DIR)/elliptic_curve.a
+ else
+-ADDITIONAL_KERNEL_LIBS += common/stubs/$(ICP_BUILD_OUTPUT_DIR)/lib_lac_stubs.a
++ADDITIONAL_KERNEL_LIBS += common/stubs/$(ICP_BUILD_OUTPUT_DIR)/*.o
+ endif
+ else
+ ifeq ($(ICP_OS_LEVEL), kernel_space)
+-ADDITIONAL_KERNEL_LIBS += common/stubs/$(ICP_BUILD_OUTPUT_DIR)/lib_lac_stubs.a
++ADDITIONAL_KERNEL_LIBS += common/stubs/$(ICP_BUILD_OUTPUT_DIR)/*.o
+ endif
+ endif
+-ADDITIONAL_KERNEL_LIBS += common/qat_comms/$(ICP_BUILD_OUTPUT_DIR)/qat_comms.a
++ADDITIONAL_KERNEL_LIBS += common/qat_comms/$(ICP_BUILD_OUTPUT_DIR)/*.o
+
+ ifeq ($(ICP_OS_LEVEL), user_space)
+ ifdef KPT
+@@ -145,8 +145,7 @@ endif
+ endif
+
+ ifeq ($(ICP_OS_LEVEL), kernel_space)
+- ADDITIONAL_OBJECTS = ../build/libs/libadf_kernel.a
+- ADDITIONAL_OBJECTS += ../build/libs/libosal.a
++ ADDITIONAL_OBJECTS += ../build/libs/*.o
+ endif
+
+ ifeq ($(ICP_OS_LEVEL), user_space)
diff --git a/recipes-extended/qat/qat17_4.2.0-00012.bb
b/recipes-extended/qat/qat17_4.7.0-00006.bb
similarity index 80%
rename from recipes-extended/qat/qat17_4.2.0-00012.bb
rename to recipes-extended/qat/qat17_4.7.0-00006.bb
index a5902dc..a13b5a7 100644
--- a/recipes-extended/qat/qat17_4.2.0-00012.bb
+++ b/recipes-extended/qat/qat17_4.7.0-00006.bb
@@ -12,17 +12,18 @@ PROVIDES += "virtual/qat"
TARGET_CC_ARCH += "${LDFLAGS}"
-SRC_URI="https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.l.${PV}.tar.gz;subdir=qat17
\
+SRC_URI="https://01.org/sites/default/files/downloads/qat1.7.l.4.7.0-00006.tar.gz;subdir=qat17
\
file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \
file://qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch \
file://qat17_0.8.0-37-qat-added-include-dir-path.patch \
file://qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch \
file://qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch \
+ file://qat17_4.7.0-00006-Link-driver-with-object-files.patch \
"
-SRC_URI[md5sum] = "2fe81587e8b85747d5461b031241beb2"
-SRC_URI[sha256sum] =
"47990b3283ded748799dba42d4b0e1bdc0be3cf3978bd587533cd12788b03856"
+SRC_URI[md5sum] = "ac939b51cc8836c182e31e309c065002"
+SRC_URI[sha256sum] =
"5c8bdc35fd7a42f212f1f87eb9e3d8584df7af56dae366debc487981e531fa5c"
COMPATIBLE_MACHINE = "null"
COMPATIBLE_HOST_x86-x32 = 'null'
@@ -65,13 +66,13 @@ do_compile () {
export LD="${LD} --hash-style=gnu"
export MACHINE="${TARGET_ARCH}"
- cd ${S}/quickassist
- oe_runmake
-
cd ${S}/quickassist/qat
- oe_runmake 'clean'
+ oe_runmake
oe_runmake 'modules_install'
+ cd ${S}/quickassist
+ oe_runmake
+
cd ${S}/quickassist/utilities/adf_ctl
oe_runmake
@@ -109,27 +110,22 @@ do_install() {
echo 'KERNEL=="uio*" MODE="0660" GROUP="qat"' >>
${D}/etc/udev/rules.d/00-qat.rules
echo 'KERNEL=="hugepages" MODE="0660" GROUP="qat"' >>
${D}/etc/udev/rules.d/00-qat.rules
+ mkdir ${D}${base_libdir}
+
install -D -m 0755
${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat_s.so
${D}${base_libdir}
install -D -m 0755
${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat.a
${D}${base_libdir}
install -D -m 0755
${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal_s.so
${D}${base_libdir}
install -D -m 0755
${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal.a
${D}${base_libdir}
- install -D -m 0755
${S}/quickassist/lookaside/access_layer/src/qat_direct/src/build/linux_2.6/user_space/libadf.a
${D}${base_libdir}
+ install -D -m 0755
${S}/quickassist/lookaside/access_layer/src/qat_direct/src/build/linux_2.6/user_space/libadf_user.a
${D}${base_libdir}/libadf.a
install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so
${D}${base_libdir}
install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv.a
${D}${base_libdir}
install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir}
- install -D -m 640
${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}
install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf
${D}${sysconfdir}/conf_files
install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf.vm
${D}${sysconfdir}/conf_files
- install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_mmp.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_c62x.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_c62x_mmp.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_895xcc.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_895xcc_mmp.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx.bin
${D}${base_libdir}/firmware
- install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx_mmp.bin
${D}${base_libdir}/firmware
+ install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx.bin
${D}${nonarch_base_libdir}/firmware
+ install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx_mmp.bin
${D}${nonarch_base_libdir}/firmware
install -m 640 ${S}/quickassist/include/*.h ${D}${includedir}
install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/
@@ -137,25 +133,27 @@ do_install() {
install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h
${D}${includedir}
install -m 640 ${S}/quickassist/utilities/libusdm_drv/*.h ${D}${includedir}
- install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary
${D}${base_libdir}/firmware
- install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32
${D}${base_libdir}/firmware
- install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury
${D}${base_libdir}/firmware
+ install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary
${D}${nonarch_base_libdir}/firmware
+ install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32
${D}${nonarch_base_libdir}/firmware
+ install -m 0755
${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury
${D}${nonarch_base_libdir}/firmware
#install qat source
cp ${DL_DIR}/qat1.7.l.${PV}.tar.gz ${D}${prefix}/src/qat/
}
-PACKAGES += "${PN}-app ${PN}-src"
+PACKAGES += "${PN}-app"
FILES_${PN}-dev = "${includedir}/ \
+ ${nonarch_base_libdir}/*.a \
"
FILES_${PN} += "\
${libdir}/ \
- ${base_libdir}/firmware \
+ ${nonarch_base_libdir}/firmware \
${sysconfdir}/ \
${sbindir}/ \
${base_libdir}/*.so \
+ ${prefix}/src/qat \
"
FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \
@@ -164,6 +162,3 @@ FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \
FILES_${PN}-app += "${bindir}/* \
${prefix}/qat \
"
-
-FILES_${PN}-src += "${prefix}/src/* \
- "
--
2.14.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6323):
https://lists.yoctoproject.org/g/meta-intel/message/6323
Mute This Topic: https://lists.yoctoproject.org/mt/69660554/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
