aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-03-13 13:25:00 +0100
committerFelix Fietkau <nbd@nbd.name>2017-03-13 13:40:56 +0100
commit2029167b565071f6fb19ee3d928779308e1a7ca3 (patch)
treeb768f408c122a3252f6744d81afda03ad50f4d62
parent2a4baf3e79ad58db44097198ce32ecc8e8d69d06 (diff)
downloadupstream-2029167b565071f6fb19ee3d928779308e1a7ca3.tar.gz
upstream-2029167b565071f6fb19ee3d928779308e1a7ca3.tar.bz2
upstream-2029167b565071f6fb19ee3d928779308e1a7ca3.zip
ipq806x: fix crash on 4.9 if the rpm clock probe happens before cpuidle init
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/ipq806x/patches-4.9/0070-qcom-spm-fix-probe-order.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches-4.9/0070-qcom-spm-fix-probe-order.patch b/target/linux/ipq806x/patches-4.9/0070-qcom-spm-fix-probe-order.patch
new file mode 100644
index 0000000000..b7e375dfb2
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.9/0070-qcom-spm-fix-probe-order.patch
@@ -0,0 +1,16 @@
+Check for SCM availability before attempting to use SPM
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+
+--- a/drivers/soc/qcom/spm.c
++++ b/drivers/soc/qcom/spm.c
+@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(stru
+ cpumask_t mask;
+ bool use_scm_power_down = false;
+
++ if (!qcom_scm_is_available())
++ return -EPROBE_DEFER;
++
+ for (i = 0; ; i++) {
+ state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
+ if (!state_node)