summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTan, Raymond <raymond.tan@intel.com>2018-06-06 10:17:06 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2018-06-07 14:38:09 +0800
commitd7beb161e3e99fe4cf60ac1b5c09d32737aa9dde (patch)
tree5a86b2a3bd4e3257acff30cb07edd713097612ed
parentd7503390f2a6d481807248f9231338de853e6250 (diff)
downloadmeta-intel-qat-d7beb161e3e99fe4cf60ac1b5c09d32737aa9dde.tar.gz
qat: update to qat17_4.1.0-00022
- update qat17 version to 4.1.0-00022 - update previous patch to redefine yocto specific kernel path - merge and clean up qat17.inc into bb file - patch cpa_sample_code to use static lib for linking - generate qat17-src package which contains full source Signed-off-by: Tan, Raymond <raymond.tan@intel.com>
-rw-r--r--recipes-extended/qat/files/qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch (renamed from recipes-extended/qat/files/qat17_0.6.0-1-qat-fix-kernel-patch.patch)25
-rw-r--r--recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch55
-rw-r--r--recipes-extended/qat/files/qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch30
-rw-r--r--recipes-extended/qat/qat17.inc148
-rw-r--r--recipes-extended/qat/qat17_1.0.3-42.bb29
-rw-r--r--recipes-extended/qat/qat17_4.1.0-00022.bb152
6 files changed, 225 insertions, 214 deletions
diff --git a/recipes-extended/qat/files/qat17_0.6.0-1-qat-fix-kernel-patch.patch b/recipes-extended/qat/files/qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch
index 8b59c0a..78fc44b 100644
--- a/recipes-extended/qat/files/qat17_0.6.0-1-qat-fix-kernel-patch.patch
+++ b/recipes-extended/qat/files/qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch
@@ -1,19 +1,24 @@
1From 7950a07afaa44eef17b1cab9c036953036878d73 Mon Sep 17 00:00:00 2001 1From ae306d58c1bfc3d1c01d0e54ecfbfbbce39a0d4e Mon Sep 17 00:00:00 2001
2From: Wu Chia Chuan <chia.chuan.wu@intel.com> 2From: "Tan, Raymond" <raymond.tan@intel.com>
3Date: Wed, 28 Oct 2015 16:43:47 +0800 3Date: Wed, 30 May 2018 22:17:58 +0800
4Subject: [PATCH] fix kernel patch 4Subject: [PATCH] update KDIR for cross-compilation
5 5
6Signed-off-by: Wu Chia Chuan <chia.chuan.wu@intel.com> 6Upstream-Status: Inappropriate [Configuration]
7
8This patch updates the kernel path for cross-compilation, avoid using the host
9machine path.
10
11Signed-off-by: Tan, Raymond <raymond.tan@intel.com>
7--- 12---
8 quickassist/qat/Makefile | 6 +++--- 13 quickassist/qat/Makefile | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
10 15
11diff --git a/quickassist/qat/Makefile b/quickassist/qat/Makefile 16diff --git a/quickassist/qat/Makefile b/quickassist/qat/Makefile
12index 319665d..36db6e6 100755 17index ab9a381..8608378 100644
13--- a/quickassist/qat/Makefile 18--- a/quickassist/qat/Makefile
14+++ b/quickassist/qat/Makefile 19+++ b/quickassist/qat/Makefile
15@@ -6,13 +6,13 @@ export CONFIG_CRYPTO_DEV_QAT_C62X=m 20@@ -61,13 +61,13 @@ $(info Compiling with Heartbeat Failure Simulation feature)
16 export QAT_UIO?=y 21 endif
17 22
18 ifeq ($(KERNELRELEASE),) 23 ifeq ($(KERNELRELEASE),)
19-KDIR ?= $(INSTALL_MOD_PATH)/lib/modules/$(shell uname -r)/build 24-KDIR ?= $(INSTALL_MOD_PATH)/lib/modules/$(shell uname -r)/build
@@ -30,4 +35,4 @@ index 319665d..36db6e6 100755
30 35
31 default: modules 36 default: modules
32-- 37--
331.7.9.5 381.9.1
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 7b21dc8..6b6dfa9 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,14 +1,19 @@
1From 9f190755ea165cd2391cfa5b5a54dfe00961f72c Mon Sep 17 00:00:00 2001 1From 22963fed4e9017ca05855bd2373e2467f45ebe30 Mon Sep 17 00:00:00 2001
2From: "Goh, Wen Sen" <wen.sen.goh@intel.com> 2From: "Tan, Raymond" <raymond.tan@intel.com>
3Date: Fri, 18 Nov 2016 10:52:37 +0800 3Date: Mon, 4 Jun 2018 09:26:33 +0800
4Subject: [PATCH] qat-add-install-target-and-add-folder 4Subject: [PATCH] qat-add-install-target-and-add-folder
5 5
6Upstream-Status: Inappropriate [Configuration]
7
8Modify Makefile to add install target and add folder
9
10Signed-off-by: Tan, Raymond <raymond.tan@intel.com>
6--- 11---
7 quickassist/Makefile | 30 +++++++++++++++++++++++++++--- 12 quickassist/Makefile | 25 ++++++++++++++++++++++---
8 1 file changed, 27 insertions(+), 3 deletions(-) 13 1 file changed, 22 insertions(+), 3 deletions(-)
9 14
10diff --git a/quickassist/Makefile b/quickassist/Makefile 15diff --git a/quickassist/Makefile b/quickassist/Makefile
11index 4cbff53..b57779b 100644 16index 3e08241..1647d9e 100644
12--- a/quickassist/Makefile 17--- a/quickassist/Makefile
13+++ b/quickassist/Makefile 18+++ b/quickassist/Makefile
14@@ -64,6 +64,7 @@ ICP_BUILD_OUTPUT?=build_$(DATE) 19@@ -64,6 +64,7 @@ ICP_BUILD_OUTPUT?=build_$(DATE)
@@ -16,43 +21,36 @@ index 4cbff53..b57779b 100644
16 export ICP_ACCEL_INC=YES 21 export ICP_ACCEL_INC=YES
17 LAC_LIB_DIR=$(LAC_PATH)/build/libs 22 LAC_LIB_DIR=$(LAC_PATH)/build/libs
18+MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat 23+MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat
19 24
20 #Release Package build steps 25 #Release Package build steps
21 ALL_TARGETS = clean lac_lib_dir qat_direct libosal_user lac_user 26 ALL_TARGETS = clean lac_lib_dir qat_direct libosal_user lac_user
22@@ -80,10 +81,21 @@ all: $(ALL_TARGETS) 27@@ -80,10 +81,14 @@ all: $(ALL_TARGETS)
23 28
24 user: lac_lib_dir libosal_user lac_user 29 user: lac_lib_dir libosal_user lac_user
25 30
26+install: output_dir install_scripts 31+install: output_dir install_scripts
27+ @cp $(KO_INTEL_QAT)/intel_qat.ko $(MODULE_INSTALLPATH)/qat_common;
28+ @cp $(KO_QAT_C3XXX)/qat_c3xxx.ko $(MODULE_INSTALLPATH)/qat_c3xxx;
29+ @cp $(KO_QAT_C3XXXVF)/qat_c3xxxvf.ko $(MODULE_INSTALLPATH)/qat_c3xxxvf;
30+ @cp $(KO_QAT_C62X)/qat_c62x.ko $(MODULE_INSTALLPATH)/qat_c62x;
31+ @cp $(KO_QAT_C62XVF)/qat_c62xvf.ko $(MODULE_INSTALLPATH)/qat_c62xvf;
32+ @cp $(KO_QAT_DH895XCC)/qat_dh895xcc.ko $(MODULE_INSTALLPATH)/qat_dh895xcc;
33+ @cp $(KO_QAT_DH895XCCVF)/qat_dh895xccvf.ko $(MODULE_INSTALLPATH)/qat_dh895xccvf;
34+ @cp $(ICP_ROOT)/quickassist/utilities/libusdm_drv/usdm_drv.ko $(MODULE_INSTALLPATH); 32+ @cp $(ICP_ROOT)/quickassist/utilities/libusdm_drv/usdm_drv.ko $(MODULE_INSTALLPATH);
35+ @cp $(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/build/linux_2.6/user_space/cpa_sample_code $(ICP_BUILD_OUTPUT)$(DEST_BINDIR); 33+ @cp $(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/build/linux_2.6/user_space/cpa_sample_code $(ICP_BUILD_OUTPUT)$(DEST_BINDIR);
36+ 34+
37 install_scripts: 35 install_scripts:
38 @echo ; echo 'Copying Install Scripts'; 36 @echo ; echo 'Copying Install Scripts';
39- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/; 37- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/;
40- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service; 38- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service;
41+ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d; 39+ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d;
42+ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service; 40+ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service;
43 41
44 # 42 #
45 # Common memory driver 43 # Common memory driver
46@@ -143,8 +155,20 @@ ifeq ($(ICP_NO_CLEAN),) 44@@ -143,8 +148,22 @@ ifeq ($(ICP_NO_CLEAN),)
47 endif 45 endif
48 46
49 47
50-output_dir: clean 48-output_dir: clean
51+output_dir: 49+output_dir:
52 test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); 50 test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT);
53+ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); 51+ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR);
54+ test -d $(ICP_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_BINDIR); 52+ test -d $(ICP_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_BINDIR);
55+ test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR); 53+ test -d $(ICP_BUILD_OUTPUT)/lib/firmware || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware;
56+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat; 54+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat;
57+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common; 55+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common;
58+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx; 56+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx;
@@ -61,9 +59,12 @@ index 4cbff53..b57779b 100644
61+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf; 59+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf;
62+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc; 60+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc;
63+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf; 61+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf;
62+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xx || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xx;
63+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xxvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xxvf;
64+ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; 64+ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d;
65 65
66 lac_lib_dir: clean 66 lac_lib_dir: clean
67 test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); 67 test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR);
68-- 68--
691.9.1 691.9.1
70
diff --git a/recipes-extended/qat/files/qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch b/recipes-extended/qat/files/qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch
new file mode 100644
index 0000000..f786a10
--- /dev/null
+++ b/recipes-extended/qat/files/qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch
@@ -0,0 +1,30 @@
1From 026fd275834ac4e345464c8ce2b0163d052d0262 Mon Sep 17 00:00:00 2001
2From: "Tan, Raymond" <raymond.tan@intel.com>
3Date: Wed, 30 May 2018 13:27:03 +0800
4Subject: [PATCH] qat-use-static-lib-for-linking-under-cpa-sample-code
5
6Upstream-Status: Inappropriate [Configuration]
7
8Update linking target to use stalib library instead, to mitigate error on
9hidden symbol "__ctzdi2" being referenced by shared lib (SO) during intel-core2-32 build.
10
11Signed-off-by: Tan, Raymond <raymond.tan@intel.com>
12---
13 quickassist/lookaside/access_layer/src/sample_code/performance/Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile
17index 3a0fb37..5b7b3fa 100644
18--- a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile
19+++ b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile
20@@ -209,7 +209,7 @@ ifeq ($(WITH_CMDRV),1)
21 ifeq ($(WITH_ICP_TARGET),1)
22 ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqae_mem.a
23 else
24- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libusdm_drv_s.so
25+ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libusdm_drv.a
26 endif
27 endif
28 #endif
29--
301.9.1
diff --git a/recipes-extended/qat/qat17.inc b/recipes-extended/qat/qat17.inc
deleted file mode 100644
index 76e5487..0000000
--- a/recipes-extended/qat/qat17.inc
+++ /dev/null
@@ -1,148 +0,0 @@
1DESCRIPTION = "Intel(r) QuickAssist Technology API"
2HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches"
3
4#Dual BSD and GPLv2 License
5LICENSE = "BSD & GPLv2"
6LIC_FILES_CHKSUM = "\
7 file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
8 file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \
9 "
10DEPENDS += "boost"
11DEPENDS += "udev"
12DEPENDS += "zlib openssl"
13PROVIDES += "virtual/qat"
14
15SRC_URI="file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \
16 file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
17 file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \
18 "
19#https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat
20COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64|intel-core2-32"
21COMPATIBLE_HOST_x86-x32 = 'null'
22COMPATIBLE_HOST_libc-musl_class-target = 'null'
23
24S = "${WORKDIR}"
25ICP_TOOLS = "accelcomp"
26SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code"
27export INSTALL_MOD_PATH = "${D}"
28export ICP_DRIVER_TYPE = "QAT1.7"
29export ICP_FIRMWARE_DIR="c3xxx"
30export ICP_ROOT = "${S}"
31export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files"
32export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system"
33export ICP_TOOLS_TARGET = "${ICP_TOOLS}"
34export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional"
35export INSTALL_FW_PATH = "${D}${base_libdir}/firmware"
36export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}"
37export ICP_BUILD_OUTPUT = "${D}"
38export DEST_LIBDIR = "${libdir}"
39export DEST_BINDIR = "${bindir}"
40export QAT_KERNEL_VER = "${KERNEL_VERSION}"
41export SAMPLE_BUILD_OUTPUT = "${D}"
42export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers"
43export INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}"
44export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}"
45export SC_EPOLL_DISABLED = "1"
46export WITH_UPSTREAM = "1"
47export WITH_CMDRV = "1"
48export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/"
49
50export BIN_LIST="qat_c3xxx.bin qat_c3xxx_a0.bin qat_c3xxx_mmp.bin qat_c62x.bin qat_c62x_mmp.bin"
51export BIN_DH895XCC="qat_895xcc.bin qat_mmp.bin"
52export BIN_C62X="qat_c62x.bin qat_c62x_mmp.bin"
53export BIN_C3XXX="qat_c3xxx.bin qat_c3xxx_mmp.bin"
54
55export KO_INTEL_QAT="${S}/quickassist/qat/drivers/crypto/qat/qat_common"
56export KO_QAT_DH895XCC="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xcc"
57export KO_QAT_DH895XCCVF="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf"
58export KO_QAT_C62X="${S}/quickassist/qat/drivers/crypto/qat/qat_c62x"
59export KO_QAT_C62XVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c62xvf"
60export KO_QAT_C3XXX="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxx"
61export KO_QAT_C3XXXVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf"
62
63inherit module
64inherit update-rc.d
65INITSCRIPT_NAME = "qat_service"
66
67PARALLEL_MAKE = ""
68
69#To get around the double slashes in paths in QAT makefiles
70PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
71
72EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'"
73EXTRA_OEMAKE = "-e MAKEFLAGS="
74
75do_compile () {
76 export LD="${LD} --hash-style=gnu"
77 export MACHINE="${TARGET_ARCH}"
78
79 cd ${S}/quickassist
80 oe_runmake
81
82 cd ${S}/quickassist/qat
83 oe_runmake 'clean'
84 oe_runmake 'modules_install'
85
86 cd ${S}/quickassist/utilities/adf_ctl
87 oe_runmake
88
89 cd ${S}/quickassist/utilities/libusdm_drv
90 oe_runmake
91
92 #build the whole sample code: per_user only
93 cd ${SAMPLE_CODE_DIR}
94 oe_runmake 'perf_user'
95}
96
97do_install() {
98 cp ${TOPDIR}/downloads/qat1.7.upstream.l.${PV}.tar.gz ${S}
99 export MACHINE="${TARGET_ARCH}"
100
101 cd ${S}/quickassist
102 oe_runmake install
103
104 install -d ${D}/etc/udev/rules.d
105 install -d ${D}${sbindir}
106 install -d ${D}${sysconfdir}/conf_files
107 install -d ${D}${prefix}/qat
108
109 echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
110 echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
111 echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
112
113 install -m 0755 ${S}/qat1.7.upstream.l.${PV}.tar.gz ${D}${prefix}/qat
114
115 install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/*.so ${D}${base_libdir}
116 install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir}
117 install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir}
118 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}
119 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}/conf_files
120 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxxvf_dev0.conf.vm ${D}${sysconfdir}/conf_files
121 install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx.bin ${D}${base_libdir}/firmware
122 install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_a0.bin ${D}${base_libdir}/firmware
123 install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_mmp.bin ${D}${base_libdir}/firmware
124 install -m 0755 ${S}/quickassist/qat/fw/qat_c62x.bin ${D}${base_libdir}/firmware
125 install -m 0755 ${S}/quickassist/qat/fw/qat_c62x_mmp.bin ${D}${base_libdir}/firmware
126 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${base_libdir}/firmware
127 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${base_libdir}/firmware
128 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${base_libdir}/firmware
129}
130
131PACKAGES += "${PN}-app"
132
133FILES_${PN}-dev = "${includedir}/ \
134 "
135FILES_${PN} += "\
136 ${libdir}/ \
137 ${base_libdir}/firmware \
138 ${sysconfdir}/ \
139 ${sbindir}/ \
140 ${base_libdir}/*.so \
141 "
142
143FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \
144 "
145
146FILES_${PN}-app += "${bindir}/* \
147 ${prefix}/qat \
148 "
diff --git a/recipes-extended/qat/qat17_1.0.3-42.bb b/recipes-extended/qat/qat17_1.0.3-42.bb
deleted file mode 100644
index 4f6d35c..0000000
--- a/recipes-extended/qat/qat17_1.0.3-42.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1include qat17.inc
2
3DESCRIPTION = "Intel(r) QuickAssist Technology API"
4HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches"
5
6#Dual BSD and GPLv2 License
7LICENSE = "BSD & GPLv2"
8
9TARGET_CC_ARCH += "${LDFLAGS}"
10
11SRC_URI="https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.upstream.l.1.0.3-42.tar.gz \
12 file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
13 file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \
14 file://qat17_0.6.0-1-qat-fix-kernel-patch.patch \
15 file://qat17_0.8.0-37-qat-added-include-dir-path.patch \
16 file://qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch \
17 "
18
19SRC_URI[md5sum] = "ee059cf134486f5684466555e8636ee0"
20SRC_URI[sha256sum] = "84d2c4a242987548135274da7c3def31461af6f1b4beb74f519a993e854abf5b"
21
22# Support for 4.14 not yet available
23python () {
24 if d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel" and \
25 d.getVar("PREFERRED_VERSION_linux-intel") == "4.14%" or \
26 d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel-rt" and \
27 d.getVar("PREFERRED_VERSION_linux-intel-rt") == "4.14%":
28 raise bb.parse.SkipPackage("This version of QAT has not been tested with Linux Kernel 4.14 or newer")
29}
diff --git a/recipes-extended/qat/qat17_4.1.0-00022.bb b/recipes-extended/qat/qat17_4.1.0-00022.bb
new file mode 100644
index 0000000..d68007b
--- /dev/null
+++ b/recipes-extended/qat/qat17_4.1.0-00022.bb
@@ -0,0 +1,152 @@
1DESCRIPTION = "Intel(r) QuickAssist Technology API"
2HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches"
3
4#Dual BSD and GPLv2 License
5LICENSE = "BSD & GPLv2"
6LIC_FILES_CHKSUM = "\
7 file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
8 file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \
9 "
10DEPENDS += "boost udev zlib openssl"
11PROVIDES += "virtual/qat"
12
13TARGET_CC_ARCH += "${LDFLAGS}"
14
15SRC_URI="https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.l.${PV}.tar.gz;subdir=qat17 \
16 file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
17 file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \
18 file://qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch \
19 file://qat17_0.8.0-37-qat-added-include-dir-path.patch \
20 file://qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch \
21 file://qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch \
22 "
23
24SRC_URI[md5sum] = "29ab942f9c151d3c0e025accfd971ee6"
25SRC_URI[sha256sum] = "6caa72c65b9350f1708b2ed341e40ae3c6881953c501d0fbb7e2f8affaa5e025"
26
27COMPATIBLE_MACHINE = "null"
28COMPATIBLE_HOST_x86-x32 = 'null'
29COMPATIBLE_HOST_libc-musl_class-target = 'null'
30
31S = "${WORKDIR}/qat17"
32ICP_TOOLS = "accelcomp"
33SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code"
34export INSTALL_MOD_PATH = "${D}"
35export ICP_ROOT = "${S}"
36export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files"
37export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system"
38export ICP_TOOLS_TARGET = "${ICP_TOOLS}"
39export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional"
40export INSTALL_FW_PATH = "${D}${base_libdir}/firmware"
41export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}"
42export ICP_BUILD_OUTPUT = "${D}"
43export DEST_LIBDIR = "${libdir}"
44export DEST_BINDIR = "${bindir}"
45export QAT_KERNEL_VER = "${KERNEL_VERSION}"
46export SAMPLE_BUILD_OUTPUT = "${D}"
47export INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}"
48export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}"
49export SC_EPOLL_DISABLED = "1"
50export WITH_UPSTREAM = "1"
51export WITH_CMDRV = "1"
52export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/"
53export ICP_NO_CLEAN = "1"
54
55inherit module
56inherit update-rc.d
57INITSCRIPT_NAME = "qat_service"
58
59PARALLEL_MAKE = ""
60
61EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'"
62EXTRA_OEMAKE = "-e MAKEFLAGS="
63
64do_compile () {
65 export LD="${LD} --hash-style=gnu"
66 export MACHINE="${TARGET_ARCH}"
67
68 cd ${S}/quickassist
69 oe_runmake
70
71 cd ${S}/quickassist/qat
72 oe_runmake 'clean'
73 oe_runmake 'modules_install'
74
75 cd ${S}/quickassist/utilities/adf_ctl
76 oe_runmake
77
78 cd ${S}/quickassist/utilities/libusdm_drv
79 oe_runmake
80
81 #build the whole sample code: per_user only
82 cd ${SAMPLE_CODE_DIR}
83 oe_runmake 'perf_user'
84}
85
86do_install() {
87 export MACHINE="${TARGET_ARCH}"
88
89 cd ${S}/quickassist
90 oe_runmake install
91
92 cd ${S}/quickassist/qat
93 oe_runmake modules_install
94
95 install -d ${D}${sysconfdir}/udev/rules.d
96 install -d ${D}${sbindir}
97 install -d ${D}${sysconfdir}/conf_files
98 install -d ${D}${prefix}/src/qat
99
100 echo 'KERNEL=="qat_adf_ctl" MODE="0660" GROUP="qat"' > ${D}/etc/udev/rules.d/00-qat.rules
101 echo 'KERNEL=="qat_dev_processes" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules
102 echo 'KERNEL=="usdm_drv" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules
103 echo 'KERNEL=="uio*" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules
104 echo 'KERNEL=="hugepages" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules
105
106 install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat_s.so ${D}${base_libdir}
107 install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir}
108 install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir}
109
110 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}
111 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf ${D}${sysconfdir}/conf_files
112 install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf.vm ${D}${sysconfdir}/conf_files
113
114 install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx.bin ${D}${base_libdir}/firmware
115 install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_mmp.bin ${D}${base_libdir}/firmware
116 install -m 0755 ${S}/quickassist/qat/fw/qat_c62x.bin ${D}${base_libdir}/firmware
117 install -m 0755 ${S}/quickassist/qat/fw/qat_c62x_mmp.bin ${D}${base_libdir}/firmware
118 install -m 0755 ${S}/quickassist/qat/fw/qat_895xcc.bin ${D}${base_libdir}/firmware
119 install -m 0755 ${S}/quickassist/qat/fw/qat_895xcc_mmp.bin ${D}${base_libdir}/firmware
120 install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx.bin ${D}${base_libdir}/firmware
121 install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx_mmp.bin ${D}${base_libdir}/firmware
122
123 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${base_libdir}/firmware
124 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${base_libdir}/firmware
125 install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${base_libdir}/firmware
126
127 #install qat source
128 cp ${DL_DIR}/qat1.7.l.${PV}.tar.gz ${D}${prefix}/src/qat/
129}
130
131PACKAGES += "${PN}-app ${PN}-src"
132
133FILES_${PN}-dev = "${includedir}/ \
134 "
135
136FILES_${PN} += "\
137 ${libdir}/ \
138 ${base_libdir}/firmware \
139 ${sysconfdir}/ \
140 ${sbindir}/ \
141 ${base_libdir}/*.so \
142 "
143
144FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \
145 "
146
147FILES_${PN}-app += "${bindir}/* \
148 ${prefix}/qat \
149 "
150
151FILES_${PN}-src += "${prefix}/src/* \
152 "