The patch titled
cell: fix cbe_cpufreq for legacy SLOF tree.
has been removed from the -mm tree. Its filename was
cell-fix-cbe_cpufreq-for-legacy-slof-tree.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: cell: fix cbe_cpufreq for legacy SLOF tree.
From: Jean-Christophe DUBOIS <jcd@xxxxxxxxxxxxxxx>
Previous patch changed based on Christian Krafft's comment.
On some legacy SLOF tree the generic code is unable to ioremap some Cell BE
registers. Therefore the "generic" functions are returning a NULL pointer,
triggering a crash on such platforms.
Let's handle this more gracefully.
Signed-off-by: Jean-Christophe DUBOIS <jcd@xxxxxxxxxxxxxxx>
Acked-by: Christian Kraff <krafft@xxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd.bergmann@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/platforms/cell/cbe_cpufreq.c | 10 ++++++++++
1 files changed, 10 insertions(+)
diff -puN arch/powerpc/platforms/cell/cbe_cpufreq.c~cell-fix-cbe_cpufreq-for-legacy-slof-tree arch/powerpc/platforms/cell/cbe_cpufreq.c
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c~cell-fix-cbe_cpufreq-for-legacy-slof-tree
+++ a/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -24,6 +24,7 @@
#include <asm/machdep.h>
#include <asm/of_platform.h>
#include <asm/prom.h>
+#include "cbe_regs.h"
#include "cbe_cpufreq.h"
static DEFINE_MUTEX(cbe_switch_mutex);
@@ -78,6 +79,15 @@ static int cbe_cpufreq_cpu_init(struct c
pr_debug("init cpufreq on CPU %d\n", policy->cpu);
+ /*
+ * Let's check we can actually get to the CELL regs
+ */
+ if (!cbe_get_cpu_pmd_regs(policy->cpu) ||
+ !cbe_get_cpu_mic_tm_regs(policy->cpu)) {
+ pr_info("invalid CBE regs pointers for cpufreq\n");
+ return -EINVAL;
+ }
+
max_freqp = of_get_property(cpu, "clock-frequency", NULL);
of_node_put(cpu);
_
Patches currently in -mm which might be from jcd@xxxxxxxxxxxxxxx are
cell-fix-cbe_cpufreq-for-legacy-slof-tree.patch
cell-fix-cbe_regc-for-legacy-slof-tree.patch
cell-fix-cbe_thermal-for-legacy-slof-tree.patch
cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
