From: Olof Johansson <olof@lixom•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Greg KH <greg@kroah•com>, Greg KH <gregkh@suse•de>,
linux-kernel@vger•kernel.org,
Chris Wedgwood <reviews@ml•cw.f00f.org>,
linuxppc-dev@ozlabs•org, paulus@samba•org, tgall.foo@gmail•com,
Thomas Gleixner <tglx@linutronix•de>,
Linus Torvalds <torvalds@linux-foundation•org>,
stable@kernel•org
Subject: [PATCH v2] powerpc: don't enable cpu hotplug on mpic-based pseries
Date: Tue, 9 Oct 2007 19:38:24 -0500 [thread overview]
Message-ID: <20071010003824.GA8477@lixom.net> (raw)
In-Reply-To: <20071010101826.186f1f24.sfr@canb.auug.org.au>
Don't allow cpu hotplug on systems lacking XICS interrupt controller,
since current code is hardcoded for it.
Signed-off-by: Olof Johansson <olof@lixom•net>
---
On Wed, Oct 10, 2007 at 10:18:26AM +1000, Stephen Rothwell wrote:
> > + struct device_node *np;
> > + const char *typep;
> > +
> > + for (np = NULL; (np = of_find_node_by_name(np,
> > + "interrupt-controller"));) {
> > + typep = of_get_property(np, "compatible", NULL);
> > + if (strstr(typep, "open-pic")) {
> > + printk(KERN_INFO "CPU Hotplug not supported on "
> > + "systems using MPIC\n");
>
> You need an of_node_put(np) here.
Grmbl, you're right.
pseries_discover_pic() doesn't have one, that's where I took the above
logic from. So we're obviously already leaking device node references.
Still, no reason to make it worse.
-Olof
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 9711eb0..ae85fc0 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -252,6 +252,21 @@ static struct notifier_block pseries_smp_nb = {
static int __init pseries_cpu_hotplug_init(void)
{
+ struct device_node *np;
+ const char *typep;
+
+ for (np = NULL; (np = of_find_node_by_name(np,
+ "interrupt-controller"));) {
+ typep = of_get_property(np, "compatible", NULL);
+ if (strstr(typep, "open-pic")) {
+ of_node_put(np);
+
+ printk(KERN_INFO "CPU Hotplug not supported on "
+ "systems using MPIC\n");
+ return 0;
+ }
+ }
+
rtas_stop_self_args.token = rtas_token("stop-self");
qcss_tok = rtas_token("query-cpu-stopped-state");
next prev parent reply other threads:[~2007-10-10 0:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071008180406.052382073@mini.kroah.org>
[not found] ` <20071008180633.GJ7627@kroah.com>
[not found] ` <20071009151702.GA19209@lixom.net>
[not found] ` <20071009222003.GA21228@kroah.com>
[not found] ` <alpine.LFD.0.9999.0710100120340.7766@localhost.localdomain>
[not found] ` <alpine.LFD.0.999.0710091625520.3838@woody.linux-foundation.org>
2007-10-10 0:03 ` [stable] [patch 09/12] Fix SMP poweroff hangs Olof Johansson
2007-10-10 0:08 ` [PATCH] powerpc: don't enable cpu hotplug on mpic-based pseries Olof Johansson
2007-10-10 0:18 ` Stephen Rothwell
2007-10-10 0:38 ` Olof Johansson [this message]
2007-10-10 10:08 ` [PATCH v2] " Milton Miller
2007-10-10 16:43 ` Olof Johansson
2007-10-11 15:25 ` Milton Miller
2007-10-11 5:52 ` Paul Mackerras
2007-10-11 5:59 ` Olof Johansson
2007-10-11 21:42 ` Milton Miller
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=20071010003824.GA8477@lixom.net \
--to=olof@lixom$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
--cc=reviews@ml$(echo .)cw.f00f.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stable@kernel$(echo .)org \
--cc=tgall.foo@gmail$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=torvalds@linux-foundation$(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