Skip to contentSkip to conversation

FAILED: patch "[PATCH] arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 2 messages Nov 4, 2019

Subsystems (2)
Stable branch arm64
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d4af3c4b81f4cd5662baa6f1492f998d89783318 Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Tue, 29 Oct 2019 10:15:39 -0700
Subject: [PATCH] arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003

With the introduction of 'cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")' the Qualcomm Falkor/Kryo errata 1003 is no long applied.

The result of not applying errata 1003 is that MSM8996 runs into various RCU stalls and fails to boot most of the times.

Give 1003 a "type" to ensure they are not filtered out in update_cpu_capabilities().

Fixes cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")
Cc [email protected]
Reported-by Mark Brown <[email protected]>
Suggested-by Will Deacon <[email protected]>
Signed-off-by Bjorn Andersson <[email protected]>
Signed-off-by Will Deacon <[email protected]>
arch/arm64/kernel/cpu_errata.c +1 -0
index 6c3b10a41bd8..7f9b699969c7 100644
@@ -816,6 +816,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
 	{
 		.desc = "Qualcomm Technologies Falkor/Kryo erratum 1003",
 		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
+		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
 		.matches = cpucap_multi_entry_cap_matches,
 		.match_list = qcom_erratum_1003_list,
 	},
maintainer
#1 lore raw

Hi Greg,

[+Suzuki]

Quoted 20 lines · On Mon, Nov 04, 2019 at 10:21:07AM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d4af3c4b81f4cd5662baa6f1492f998d89783318 Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Tue, 29 Oct 2019 10:15:39 -0700
Subject: [PATCH] arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003

With the introduction of 'cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")' the Qualcomm Falkor/Kryo errata 1003 is no long applied.

Quoted 7 lines

The result of not applying errata 1003 is that MSM8996 runs into various RCU stalls and fails to boot most of the times.

Give 1003 a "type" to ensure they are not filtered out in update_cpu_capabilities().

Fixes cce360b54ce6 ("arm64: capabilities: Filter the entries based on a given mask")

I think this Fixes tag is actually wrong, and so this patch isn't required for the 4.19-stable tree or earlier.

The bug appears to have been introduced by a3dcea2c8512 ("arm64: capabilities:
Merge duplicate entries for Qualcomm erratum 1003") in v5.0.

Thanks,

Will

Quoted 13 lines
arch/arm64/kernel/cpu_errata.c +1 -0
index 6c3b10a41bd8..7f9b699969c7 100644
@@ -816,6 +816,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
 	{
 		.desc = "Qualcomm Technologies Falkor/Kryo erratum 1003",
 		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
+		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
 		.matches = cpucap_multi_entry_cap_matches,
 		.match_list = qcom_erratum_1003_list,
 	},