Drop arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch b/queue-5.10/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
deleted file mode 100644 (file)
index c276219..0000000
--- a/queue-5.10/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 615d7ef2457e4eb3d58e677822c0dc9d61539d26 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 4 Nov 2021 22:52:32 -0500
-Subject: arm64: dts: qcom: c630: disable crypto due to serror
-
-From: Steev Klimaszewski <steev@kali.org>
-
-[ Upstream commit 382e3e0eb6a83f1cf73d4dfa3448ade1ed721f22 ]
-
-Disable the crypto block due to it causing an SError in qce_start() on
-the C630, which happens upon every boot when cryptomanager tests are
-enabled.
-
-Signed-off-by: Steev Klimaszewski <steev@kali.org>
-[bjorn: Reworked commit message]
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-index e080c317b5e3..08d0e67751ed 100644
---- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-@@ -618,3 +618,8 @@
- 
-       qcom,snoc-host-cap-8bit-quirk;
- };
-+
-+&crypto {
-+      /* FIXME: qce_start triggers an SError */
-+      status= "disable";
-+};
--- 
-2.34.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 1ee7c16b21287db4b633b42d6b4007fdd6885c27..7e61cc18f9abd9f12501da7754877f305125d955 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -3,7 +3,6 @@ usb-serial-pl2303-add-ibm-device-ids.patch
 usb-serial-simple-add-nokia-phone-driver.patch
 hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
 netdevice-add-the-case-if-dev-is-null.patch
-arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
 hid-logitech-dj-add-new-lightspeed-receiver-id.patch
 xfrm-fix-tunnel-model-fragmentation-behavior.patch
 arm-mstar-select-have_arm_arch_timer.patch

diff --git a/queue-5.15/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch b/queue-5.15/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
deleted file mode 100644 (file)
index 04058b1..0000000
--- a/queue-5.15/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e48e798c4ccba299c7314a5e4fb775fb11a84fb3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 4 Nov 2021 22:52:32 -0500
-Subject: arm64: dts: qcom: c630: disable crypto due to serror
-
-From: Steev Klimaszewski <steev@kali.org>
-
-[ Upstream commit 382e3e0eb6a83f1cf73d4dfa3448ade1ed721f22 ]
-
-Disable the crypto block due to it causing an SError in qce_start() on
-the C630, which happens upon every boot when cryptomanager tests are
-enabled.
-
-Signed-off-by: Steev Klimaszewski <steev@kali.org>
-[bjorn: Reworked commit message]
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-index 617a634ac905..d6a9dbe59a1d 100644
---- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-@@ -793,3 +793,8 @@
- 
-       qcom,snoc-host-cap-8bit-quirk;
- };
-+
-+&crypto {
-+      /* FIXME: qce_start triggers an SError */
-+      status= "disable";
-+};
--- 
-2.34.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index bb14a2251dbe745088bfa9f415b302acae044c86..7774ba0d7c8d26d026cdf4fcf440cc2e7d118d00 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -5,7 +5,6 @@ usb-serial-pl2303-fix-gs-type-detection.patch
 usb-serial-simple-add-nokia-phone-driver.patch
 mm-kfence-fix-missing-objcg-housekeeping-for-slab.patch
 hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
-arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
 hid-logitech-dj-add-new-lightspeed-receiver-id.patch
 hid-add-support-for-open-wheel-and-no-attachment-to-.patch
 xfrm-fix-tunnel-model-fragmentation-behavior.patch

diff --git a/queue-5.16/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch b/queue-5.16/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
deleted file mode 100644 (file)
index 612cc2b..0000000
--- a/queue-5.16/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3228a1c7f62d673aa29c48c9dda1f3df5bef1853 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 4 Nov 2021 22:52:32 -0500
-Subject: arm64: dts: qcom: c630: disable crypto due to serror
-
-From: Steev Klimaszewski <steev@kali.org>
-
-[ Upstream commit 382e3e0eb6a83f1cf73d4dfa3448ade1ed721f22 ]
-
-Disable the crypto block due to it causing an SError in qce_start() on
-the C630, which happens upon every boot when cryptomanager tests are
-enabled.
-
-Signed-off-by: Steev Klimaszewski <steev@kali.org>
-[bjorn: Reworked commit message]
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-index 2e882a977e2c..89c11c147846 100644
---- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-@@ -804,3 +804,8 @@
- 
-       qcom,snoc-host-cap-8bit-quirk;
- };
-+
-+&crypto {
-+      /* FIXME: qce_start triggers an SError */
-+      status= "disable";
-+};
--- 
-2.34.1
-

diff --git a/queue-5.16/series b/queue-5.16/series
index 3afcc1a1c0dbab7ed264c37511d79c7201b5c325..a209d6ce29cdd29ff2ade95232ce31d58fc1971a 100644 (file)
--- a/queue-5.16/series
+++ b/queue-5.16/series
@@ -4,7 +4,6 @@ dt-bindings-usb-hcd-correct-usb-device-path.patch
 usb-serial-pl2303-fix-gs-type-detection.patch
 usb-serial-simple-add-nokia-phone-driver.patch
 mm-kfence-fix-missing-objcg-housekeeping-for-slab.patch
-arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch
 hid-logitech-dj-add-new-lightspeed-receiver-id.patch
 hid-add-support-for-open-wheel-and-no-attachment-to-.patch
 xfrm-fix-tunnel-model-fragmentation-behavior.patch