From: Arnd Bergmann <arnd@arndb•de>
To: linuxppc-dev@ozlabs•org
Cc: Olof Johansson <olof@lixom•net>,
Christian Krafft <krafft@de•ibm.com>,
Paul Mackerras <paulus@samba•org>
Subject: [PATCH] cell: cbe_cpufreq cleanup and crash fix
Date: Sat, 28 Apr 2007 04:49:03 +0200 [thread overview]
Message-ID: <200704280449.04126.arnd@arndb.de> (raw)
In-Reply-To: <17969.56735.644629.328360@cargo.ozlabs.ibm.com>
From: Olof Johansson <olof@lixom•net>
cbe_cpufreq cleanups:
* comment format
* whitespace
* don't init on non-cell platforms
Signed-off-by: Olof Johansson <olof@lixom•net>
Acked-by: Christian Krafft <krafft@de•ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
---
Index: linux-2.6/arch/powerpc/platforms/cell/cbe_cpufreq.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ linux-2.6/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -25,6 +25,7 @@
#include <asm/hw_irq.h>
#include <asm/io.h>
+#include <asm/machdep.h>
#include <asm/processor.h>
#include <asm/prom.h>
#include <asm/time.h>
@@ -155,7 +156,7 @@ static int set_pmode_reg(int cpu, unsign
}
static int set_pmode(int cpu, unsigned int slow_mode) {
- if(pmi_dev)
+ if (pmi_dev)
return set_pmode_pmi(cpu, slow_mode);
else
return set_pmode_reg(cpu, slow_mode);
@@ -167,7 +168,7 @@ static void cbe_cpufreq_handle_pmi(struc
u8 cpu;
u8 cbe_pmode_new;
- BUG_ON (pmi_msg.type != PMI_TYPE_FREQ_CHANGE);
+ BUG_ON(pmi_msg.type != PMI_TYPE_FREQ_CHANGE);
cpu = cbe_node_to_cpu(pmi_msg.data1);
cbe_pmode_new = pmi_msg.data2;
@@ -191,7 +192,7 @@ static struct pmi_handler cbe_pmi_handle
* cpufreq functions
*/
-static int cbe_cpufreq_cpu_init (struct cpufreq_policy *policy)
+static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
const u32 *max_freqp;
u32 max_freq;
@@ -200,7 +201,7 @@ static int cbe_cpufreq_cpu_init (struct
cpu = of_get_cpu_node(policy->cpu, NULL);
- if(!cpu)
+ if (!cpu)
return -ENODEV;
pr_debug("init cpufreq on CPU %d\n", policy->cpu);
@@ -210,13 +211,13 @@ static int cbe_cpufreq_cpu_init (struct
if (!max_freqp)
return -EINVAL;
- // we need the freq in kHz
+ /* we need the freq in kHz */
max_freq = *max_freqp / 1000;
pr_debug("max clock-frequency is at %u kHz\n", max_freq);
pr_debug("initializing frequency table\n");
- // initialize frequency table
+ /* initialize frequency table */
for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
cbe_freqs[i].frequency = max_freq / cbe_freqs[i].index;
pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
@@ -235,10 +236,10 @@ static int cbe_cpufreq_cpu_init (struct
policy->cpus = cpu_sibling_map[policy->cpu];
#endif
- cpufreq_frequency_table_get_attr (cbe_freqs, policy->cpu);
+ cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);
/* this ensures that policy->cpuinfo_min and policy->cpuinfo_max are set correctly */
- return cpufreq_frequency_table_cpuinfo (policy, cbe_freqs);
+ return cpufreq_frequency_table_cpuinfo(policy, cbe_freqs);
}
static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)
@@ -270,7 +271,7 @@ static int cbe_cpufreq_target(struct cpu
freqs.new = cbe_freqs[cbe_pmode_new].frequency;
freqs.cpu = policy->cpu;
- mutex_lock (&cbe_switch_mutex);
+ mutex_lock(&cbe_switch_mutex);
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n",
@@ -303,6 +304,9 @@ static int __init cbe_cpufreq_init(void)
{
struct device_node *np;
+ if (!machine_is(cell))
+ return -ENODEV;
+
np = of_find_node_by_type(NULL, "ibm,pmi");
pmi_dev = of_find_device_by_node(np);
@@ -315,7 +319,7 @@ static int __init cbe_cpufreq_init(void)
static void __exit cbe_cpufreq_exit(void)
{
- if(pmi_dev)
+ if (pmi_dev)
pmi_unregister_handler(pmi_dev, &cbe_pmi_handler);
cpufreq_unregister_driver(&cbe_cpufreq_driver);
next prev parent reply other threads:[~2007-04-28 2:49 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-27 11:25 patches for 2.6.22 Paul Mackerras
2007-04-27 12:00 ` Johannes Berg
2007-04-27 21:41 ` [PATCH] powerpc: fix suspend states again Johannes Berg
2007-04-27 21:53 ` Olof Johansson
2007-04-27 21:54 ` Johannes Berg
2007-04-27 21:57 ` Olof Johansson
2007-04-27 22:00 ` [PATCH] powerpc: put enable_kernel_spe into a header Johannes Berg
2007-04-27 22:02 ` [PATCH v2] powerpc: fix suspend states again Johannes Berg
2007-04-27 23:13 ` Olof Johansson
2007-04-30 0:14 ` Paul Mackerras
2007-04-30 11:35 ` Johannes Berg
2007-04-30 11:37 ` [PATCH v3] " Johannes Berg
2007-05-01 14:16 ` Johannes Berg
2007-04-27 23:42 ` patches for 2.6.22 Arnd Bergmann
2007-04-28 2:49 ` Arnd Bergmann [this message]
2007-04-28 7:49 ` [PATCH] powermac: proper sleep management Johannes Berg
2007-04-28 8:08 ` Paul Mackerras
2007-04-28 12:52 ` Johannes Berg
2007-04-28 8:38 ` Benjamin Herrenschmidt
2007-04-28 12:51 ` Johannes Berg
2007-04-28 12:01 ` Paul Mackerras
2007-04-28 13:46 ` Johannes Berg
2007-04-30 5:31 ` Paul Mackerras
2007-04-30 12:08 ` Johannes Berg
2007-05-01 12:14 ` Paul Mackerras
2007-05-01 12:24 ` Johannes Berg
2007-04-30 11:44 ` [PATCH v3] " Johannes Berg
2007-05-01 8:55 ` Johannes Berg
2007-04-30 19:51 ` patches for 2.6.22 Kim Phillips
2007-05-01 3:38 ` Paul Mackerras
2007-05-02 14:12 ` Kumar Gala
2007-05-02 14:19 ` Kim Phillips
2007-05-01 9:06 ` Johannes Berg
2007-05-02 5:33 ` [PATCH] adb: replace sleep notifier with platform driver suspend/resume hooks Johannes Berg
2007-05-02 5:34 ` [PATCH] apm_emu: use generic apm-emulation Johannes Berg
2007-05-02 5:36 ` [PATCH] via-pmu: remove LED sleep notifier Johannes Berg
2007-05-02 10:57 ` Stephen Rothwell
2007-05-02 14:32 ` [PATCH v2] " Johannes Berg
2007-05-07 8:47 ` Paul Mackerras
2007-05-07 8:58 ` Johannes Berg
2007-05-07 15:08 ` [PATCH v3] " Johannes Berg
2007-05-02 5:39 ` [PATCH] remove awacs dmasound Johannes Berg
2007-05-02 6:18 ` [PATCH] via-pmu: kill sleep notifiers completely Johannes Berg
2007-05-02 6:21 ` [PATCH] powermac: support G5 CPU hotplug Johannes Berg
2007-05-02 10:55 ` Paul Mackerras
2007-05-02 14:33 ` Johannes Berg
2007-05-02 17:57 ` Segher Boessenkool
2007-05-02 22:03 ` Benjamin Herrenschmidt
2007-05-02 23:47 ` Segher Boessenkool
2007-05-02 23:59 ` Benjamin Herrenschmidt
2007-05-03 0:05 ` Segher Boessenkool
2007-05-03 0:18 ` Benjamin Herrenschmidt
2007-05-03 0:01 ` Paul Mackerras
2007-05-03 0:08 ` Benjamin Herrenschmidt
2007-05-03 0:10 ` Benjamin Herrenschmidt
2007-05-03 0:19 ` Segher Boessenkool
2007-05-03 0:17 ` Segher Boessenkool
2007-05-03 0:21 ` Benjamin Herrenschmidt
2007-05-03 0:24 ` Benjamin Herrenschmidt
2007-05-03 1:01 ` Segher Boessenkool
2007-05-03 2:11 ` Benjamin Herrenschmidt
2007-05-03 16:49 ` Segher Boessenkool
2007-05-02 20:33 ` [PATCH v2] " Johannes Berg
2007-05-02 6:33 ` [PATCH] powerpc: MPIC sys_device & suspend/resume Johannes Berg
2007-05-02 6:35 ` [PATCH] powermac: fix G5-cpufreq for cpu on/offline Johannes Berg
2007-05-03 12:25 ` patches for 2.6.22 Johannes Berg
2007-05-03 12:28 ` [PATCH] powerpc: dart iommu suspend Johannes Berg
2007-05-03 12:30 ` Benjamin Herrenschmidt
2007-05-03 12:34 ` Johannes Berg
2007-05-03 12:34 ` Benjamin Herrenschmidt
2007-05-03 12:48 ` Johannes Berg
2007-05-03 14:24 ` Olof Johansson
2007-05-04 10:51 ` Johannes Berg
2007-05-03 12:29 ` [PATCH] powerpc: mark pages that don't exist as nosave Johannes Berg
2007-05-03 12:31 ` [PATCH] powermac: suspend to disk on G5 Johannes Berg
2007-07-17 13:28 ` [PATCH] remove awacs dmasound Johannes Berg
2007-07-17 13:37 ` Adrian Bunk
2007-07-17 13:43 ` Johannes Berg
-- strict thread matches above, loose matches on Subject: below --
2007-04-25 20:46 [PATCH] [2.6.22] pasemi: cpufreq driver Olof Johansson
2007-04-25 23:47 ` Arnd Bergmann
2007-04-26 6:56 ` cbe_cpufreq crashes my machine Olof Johansson
2007-04-26 23:07 ` [PATCH] cell: cbe_cpufreq cleanup and crash fix Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200704280449.04126.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=krafft@de$(echo .)ibm.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=olof@lixom$(echo .)net \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox