From 5c1fd3b4843bb672c73962883a84e67eb3295f0b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 29 Mar 2022 10:08:06 -0400 Subject: [PATCH] Drop arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch Signed-off-by: Sasha Levin --- ...om-c630-disable-crypto-due-to-serror.patch | 38 ------------------- queue-5.10/series | 1 - ...om-c630-disable-crypto-due-to-serror.patch | 38 ------------------- queue-5.15/series | 1 - ...om-c630-disable-crypto-due-to-serror.patch | 38 ------------------- queue-5.16/series | 1 - 6 files changed, 117 deletions(-) delete mode 100644 queue-5.10/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch delete mode 100644 queue-5.15/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch delete mode 100644 queue-5.16/arm64-dts-qcom-c630-disable-crypto-due-to-serror.patch 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 index c276219011b..00000000000 --- 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 -Date: Thu, 4 Nov 2021 22:52:32 -0500 -Subject: arm64: dts: qcom: c630: disable crypto due to serror - -From: Steev Klimaszewski - -[ 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 -[bjorn: Reworked commit message] -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org -Signed-off-by: Sasha Levin ---- - 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 1ee7c16b212..7e61cc18f9a 100644 --- 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 index 04058b17d1c..00000000000 --- 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 -Date: Thu, 4 Nov 2021 22:52:32 -0500 -Subject: arm64: dts: qcom: c630: disable crypto due to serror - -From: Steev Klimaszewski - -[ 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 -[bjorn: Reworked commit message] -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org -Signed-off-by: Sasha Levin ---- - 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 bb14a2251db..7774ba0d7c8 100644 --- 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 index 612cc2bb4d1..00000000000 --- 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 -Date: Thu, 4 Nov 2021 22:52:32 -0500 -Subject: arm64: dts: qcom: c630: disable crypto due to serror - -From: Steev Klimaszewski - -[ 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 -[bjorn: Reworked commit message] -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20211105035235.2392-1-steev@kali.org -Signed-off-by: Sasha Levin ---- - 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 3afcc1a1c0d..a209d6ce29c 100644 --- 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 -- 2.47.3