From 04b458653ccadd766352d9a658ea718063886225 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Jan 2024 22:59:06 -0500 Subject: [PATCH] QAT fixes --- debian/changelog | 6 ++++ .../pve/0025-drop-x86-dependency-qat.patch | 36 +++++-------------- debian/rules | 2 +- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89df74a..984fab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-kernel (5.15.131-1) generic; urgency=medium + + * Update to Linux 5.15.131 + + -- Jiangcuo Sun, 24 Dec 2023 18:39:05 +0100 + pve-kernel (5.15.146-1) generic; urgency=medium * Update to Linux 5.15.146 diff --git a/debian/patches/pve/0025-drop-x86-dependency-qat.patch b/debian/patches/pve/0025-drop-x86-dependency-qat.patch index c13885f..91979f0 100644 --- a/debian/patches/pve/0025-drop-x86-dependency-qat.patch +++ b/debian/patches/pve/0025-drop-x86-dependency-qat.patch @@ -1,25 +1,8 @@ -From 9c846c5d2d4e63d75b2cb172625087cadadbe065 Mon Sep 17 00:00:00 2001 -From: Yoan Picchi -Date: Fri, 17 Jun 2022 09:59:45 +0000 -Subject: crypto: qat - Removes the x86 dependency on the QAT drivers - -This dependency looks outdated. After the previous patch, we have been able -to use this driver to encrypt some data and to create working VF on arm64. -We have not tested it yet on any big endian machine, hence the new dependency - -Signed-off-by: Yoan Picchi -Signed-off-by: Herbert Xu ---- - drivers/crypto/qat/Kconfig | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -(limited to 'drivers/crypto/qat') - diff --git a/drivers/crypto/qat/Kconfig b/drivers/crypto/qat/Kconfig -index 4b90c0f22b03f..1220cc86f9100 100644 +index 77783feb62b2..ccddd87fc055 100644 --- a/drivers/crypto/qat/Kconfig +++ b/drivers/crypto/qat/Kconfig -@@ -17,7 +17,7 @@ config CRYPTO_DEV_QAT +@@ -16,7 +16,7 @@ config CRYPTO_DEV_QAT config CRYPTO_DEV_QAT_DH895xCC tristate "Support for Intel(R) DH895xCC" @@ -28,7 +11,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select CRYPTO_DEV_QAT help Support for Intel(R) DH895xcc with Intel(R) QuickAssist Technology -@@ -28,7 +28,7 @@ config CRYPTO_DEV_QAT_DH895xCC +@@ -27,7 +27,7 @@ config CRYPTO_DEV_QAT_DH895xCC config CRYPTO_DEV_QAT_C3XXX tristate "Support for Intel(R) C3XXX" @@ -37,7 +20,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select CRYPTO_DEV_QAT help Support for Intel(R) C3xxx with Intel(R) QuickAssist Technology -@@ -39,7 +39,7 @@ config CRYPTO_DEV_QAT_C3XXX +@@ -38,7 +38,7 @@ config CRYPTO_DEV_QAT_C3XXX config CRYPTO_DEV_QAT_C62X tristate "Support for Intel(R) C62X" @@ -46,7 +29,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select CRYPTO_DEV_QAT help Support for Intel(R) C62x with Intel(R) QuickAssist Technology -@@ -50,7 +50,7 @@ config CRYPTO_DEV_QAT_C62X +@@ -49,7 +49,7 @@ config CRYPTO_DEV_QAT_C62X config CRYPTO_DEV_QAT_4XXX tristate "Support for Intel(R) QAT_4XXX" @@ -55,7 +38,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select CRYPTO_DEV_QAT help Support for Intel(R) QuickAssist Technology QAT_4xxx -@@ -61,7 +61,7 @@ config CRYPTO_DEV_QAT_4XXX +@@ -60,7 +60,7 @@ config CRYPTO_DEV_QAT_4XXX config CRYPTO_DEV_QAT_DH895xCCVF tristate "Support for Intel(R) DH895xCC Virtual Function" @@ -64,7 +47,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select PCI_IOV select CRYPTO_DEV_QAT -@@ -74,7 +74,7 @@ config CRYPTO_DEV_QAT_DH895xCCVF +@@ -73,7 +73,7 @@ config CRYPTO_DEV_QAT_DH895xCCVF config CRYPTO_DEV_QAT_C3XXXVF tristate "Support for Intel(R) C3XXX Virtual Function" @@ -73,7 +56,7 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select PCI_IOV select CRYPTO_DEV_QAT help -@@ -86,7 +86,7 @@ config CRYPTO_DEV_QAT_C3XXXVF +@@ -85,7 +85,7 @@ config CRYPTO_DEV_QAT_C3XXXVF config CRYPTO_DEV_QAT_C62XVF tristate "Support for Intel(R) C62X Virtual Function" @@ -82,6 +65,3 @@ index 4b90c0f22b03f..1220cc86f9100 100644 select PCI_IOV select CRYPTO_DEV_QAT help --- -cgit 1.2.3-korg - diff --git a/debian/rules b/debian/rules index f740eea..f64b03d 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ override_dh_quilt_unpatch: cd ${KERNEL_SRC}; \ QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.linux \ - quilt --quiltrc /dev/null pop -a || test $$? = 2 + quilt --quiltrc /dev/null pop -af || test $$? = 2 cd ${ZFS_SRC}; \ QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.zfs \