summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-30 08:17:31 +0000
committerChristian Poessinger <christian@poessinger.com>2021-05-30 10:19:26 +0200
commit43d7bca9a6969c07c9291d7c8250e58c5566c137 (patch)
tree19a2aa33abcef88a302d2d5b79bad1e0838586d6
parent1c44d4042488fe060a90db4d9a2fea07ed96018e (diff)
downloadvyos-build-43d7bca9a6969c07c9291d7c8250e58c5566c137.tar.gz
vyos-build-43d7bca9a6969c07c9291d7c8250e58c5566c137.zip
Kernel: T3587: replace Out-Of-Tree QAT drivers with In-Tree drivers
The latest Intel QAT drivers make the 5.10 series Kernel crash and there was no real and good response from Intel so far. Today the build failed one more time by a source file moving around in the Intel webservers. It's time to try to move the QAT functionality to the Kernel buildin drivers.
-rw-r--r--data/package-lists/vyos-x86.list.chroot1
-rw-r--r--packages/linux-kernel/Jenkinsfile3
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig15
3 files changed, 8 insertions, 11 deletions
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index b8e6e7fa..c769c8fd 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -5,5 +5,4 @@ hyperv-daemons
vyos-xe-guest-utilities
vyos-1x-vmware
vyos-linux-firmware
-vyos-intel-qat
telegraf
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 1cd73c40..081c447b 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -52,9 +52,6 @@ def pkgList = [
['name': 'accel-ppp', 'scmCommit': '277ad4c3c7af01b26',
'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git',
'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'],
-
- // Intel-QAT
- ['name': 'qat', 'buildCmd': 'cd ..; ./build-intel-qat.sh'],
]
// Start package build using library function from https://github.com/vyos/vyos-build
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index cb00a468..8c695858 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.38 Kernel Configuration
+# Linux/x86 5.10.41 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@@ -5279,12 +5279,13 @@ CONFIG_CRYPTO_DEV_SP_CCP=y
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
CONFIG_CRYPTO_DEV_SP_PSP=y
# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
# CONFIG_CRYPTO_DEV_CHELSIO is not set
CONFIG_CRYPTO_DEV_VIRTIO=m