From: Greg Kroah-Hartman Date: Thu, 5 Dec 2024 09:06:48 +0000 (+0100) Subject: drop powerpc crypto kconfig patch X-Git-Tag: v4.19.325~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e50d06b1e61afc2a396cc94a9ee776732b0f3b5;p=thirdparty%2Fkernel%2Fstable-queue.git drop powerpc crypto kconfig patch --- diff --git a/queue-6.11/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch b/queue-6.11/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch deleted file mode 100644 index 5fa576b9eae..00000000000 --- a/queue-6.11/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f2dc661e232bbc8e7a102d141b5f450ef6908620 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 23 Sep 2024 09:30:40 -0400 -Subject: crypto: powerpc/p10-aes-gcm - Add dependency on CRYPTO_SIMDand - re-enable CRYPTO_AES_GCM_P10 - -From: Danny Tsen - -[ Upstream commit 8b6c1e466eecab70c2ed686f636d56eda19f4cd6 ] - -Added CRYPTO_SIMD for CRYPTO_AES_GCM_P10. - -Fixes: 45a4672b9a6e ("crypto: p10-aes-gcm - Update Kconfig and Makefile") - -Signed-off-by: Danny Tsen -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - arch/powerpc/crypto/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig -index 46a4c85e85e24..951a437264611 100644 ---- a/arch/powerpc/crypto/Kconfig -+++ b/arch/powerpc/crypto/Kconfig -@@ -107,12 +107,12 @@ config CRYPTO_AES_PPC_SPE - - config CRYPTO_AES_GCM_P10 - tristate "Stitched AES/GCM acceleration support on P10 or later CPU (PPC)" -- depends on BROKEN - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_LIB_AES - select CRYPTO_ALGAPI - select CRYPTO_AEAD - select CRYPTO_SKCIPHER -+ select CRYPTO_SIMD - help - AEAD cipher: AES cipher algorithms (FIPS-197) - GCM (Galois/Counter Mode) authenticated encryption mode (NIST SP800-38D) --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 5ecfac167d7..9670c369fba 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -88,7 +88,6 @@ virtio_blk-reverse-request-order-in-virtio_queue_rqs.patch crypto-mxs-dcp-fix-aes-cbc-with-hardware-bound-keys.patch crypto-caam-fix-the-pointer-passed-to-caam_qi_shutdo.patch crypto-qat-remove-check-after-debugfs_create_dir.patch -crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch crypto-qat-qat_420xx-fix-off-by-one-in-uof_get_name.patch crypto-qat-qat_4xxx-fix-off-by-one-in-uof_get_name.patch firmware-google-unregister-driver_info-on-failure.patch diff --git a/queue-6.12/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch b/queue-6.12/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch deleted file mode 100644 index 16f9b29a6f2..00000000000 --- a/queue-6.12/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ee259ed184c5e5d53e9077b1a7f7e71d4082fe7f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 23 Sep 2024 09:30:40 -0400 -Subject: crypto: powerpc/p10-aes-gcm - Add dependency on CRYPTO_SIMDand - re-enable CRYPTO_AES_GCM_P10 - -From: Danny Tsen - -[ Upstream commit 8b6c1e466eecab70c2ed686f636d56eda19f4cd6 ] - -Added CRYPTO_SIMD for CRYPTO_AES_GCM_P10. - -Fixes: 45a4672b9a6e ("crypto: p10-aes-gcm - Update Kconfig and Makefile") - -Signed-off-by: Danny Tsen -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - arch/powerpc/crypto/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig -index 46a4c85e85e24..951a437264611 100644 ---- a/arch/powerpc/crypto/Kconfig -+++ b/arch/powerpc/crypto/Kconfig -@@ -107,12 +107,12 @@ config CRYPTO_AES_PPC_SPE - - config CRYPTO_AES_GCM_P10 - tristate "Stitched AES/GCM acceleration support on P10 or later CPU (PPC)" -- depends on BROKEN - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_LIB_AES - select CRYPTO_ALGAPI - select CRYPTO_AEAD - select CRYPTO_SKCIPHER -+ select CRYPTO_SIMD - help - AEAD cipher: AES cipher algorithms (FIPS-197) - GCM (Galois/Counter Mode) authenticated encryption mode (NIST SP800-38D) --- -2.43.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 4c159445cf4..21357158968 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -40,7 +40,6 @@ virtio_blk-reverse-request-order-in-virtio_queue_rqs.patch crypto-mxs-dcp-fix-aes-cbc-with-hardware-bound-keys.patch crypto-caam-fix-the-pointer-passed-to-caam_qi_shutdo.patch crypto-qat-remove-check-after-debugfs_create_dir.patch -crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch crypto-qat-qat_420xx-fix-off-by-one-in-uof_get_name.patch crypto-qat-qat_4xxx-fix-off-by-one-in-uof_get_name.patch firmware-google-unregister-driver_info-on-failure.patch diff --git a/queue-6.6/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch b/queue-6.6/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch deleted file mode 100644 index 8d908281d3d..00000000000 --- a/queue-6.6/crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 63636ce1b8548293319657bb728d092dc6132f51 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 23 Sep 2024 09:30:40 -0400 -Subject: crypto: powerpc/p10-aes-gcm - Add dependency on CRYPTO_SIMDand - re-enable CRYPTO_AES_GCM_P10 - -From: Danny Tsen - -[ Upstream commit 8b6c1e466eecab70c2ed686f636d56eda19f4cd6 ] - -Added CRYPTO_SIMD for CRYPTO_AES_GCM_P10. - -Fixes: 45a4672b9a6e ("crypto: p10-aes-gcm - Update Kconfig and Makefile") - -Signed-off-by: Danny Tsen -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - arch/powerpc/crypto/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig -index fccf742c55c2c..46059bca8721c 100644 ---- a/arch/powerpc/crypto/Kconfig -+++ b/arch/powerpc/crypto/Kconfig -@@ -96,12 +96,12 @@ config CRYPTO_AES_PPC_SPE - - config CRYPTO_AES_GCM_P10 - tristate "Stitched AES/GCM acceleration support on P10 or later CPU (PPC)" -- depends on BROKEN - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_LIB_AES - select CRYPTO_ALGAPI - select CRYPTO_AEAD - select CRYPTO_SKCIPHER -+ select CRYPTO_SIMD - help - AEAD cipher: AES cipher algorithms (FIPS-197) - GCM (Galois/Counter Mode) authenticated encryption mode (NIST SP800-38D) --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 976dbda45d4..a9460cc47ce 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -76,7 +76,6 @@ nvme-pci-reverse-request-order-in-nvme_queue_rqs.patch virtio_blk-reverse-request-order-in-virtio_queue_rqs.patch crypto-caam-fix-the-pointer-passed-to-caam_qi_shutdo.patch crypto-qat-remove-check-after-debugfs_create_dir.patch -crypto-powerpc-p10-aes-gcm-add-dependency-on-crypto_.patch crypto-qat-qat_4xxx-fix-off-by-one-in-uof_get_name.patch firmware-google-unregister-driver_info-on-failure.patch edac-bluefield-fix-potential-integer-overflow.patch