Re: [PATCH v2] powerpc: don't enable cpu hotplug on mpic-based pseries

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Olof Johansson <olof@...>, Paul Mackerras <paulus@...>, Greg Kroah-Hartman <gregkh@...>
Cc: <linuxppc-dev@...>, <linux-kernel@...>, Stephen Rothwell <sfr@...>, Linus Torvalds <torvalds@...>
Date: Wednesday, October 10, 2007 - 6:08 am

Don't allow cpu hotplug on pSeries systems lacking XICS interrupt controller,
since current code is hardcoded to call xics routines.

Signed-off-by: Milton Miller <miltonm@bga.com>
--

Olof's patch searched the device-tree again, looking for an mpic.   This
code instead checks that we found an xics the first time by checking the
init function.

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 9711eb0..20f010a 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -262,6 +262,12 @@ static int __init pseries_cpu_hotplug_init(void)
 		return 0;
 	}
 
+	if (ppc_md.init_IRQ != xics_init_IRQ) {
+		printk(KERN_INFO "pSeries CPU Hotplug only supported on xics "
+				"interrupt controllers - disabling");
+		return 0;
+	}
+
 	ppc_md.cpu_die = pseries_mach_cpu_die;
 	smp_ops->cpu_disable = pseries_cpu_disable;
 	smp_ops->cpu_die = pseries_cpu_die;
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch 00/12] 2.6.22.10 -stable review, Greg KH, (Mon Oct 8, 2:05 pm)
Re: [patch 00/12] 2.6.22.10 -stable review, Greg KH, (Mon Oct 8, 2:09 pm)
[patch 09/12] Fix SMP poweroff hangs, Greg KH, (Mon Oct 8, 2:06 pm)
Re: [patch 09/12] Fix SMP poweroff hangs, Olof Johansson, (Tue Oct 9, 11:17 am)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Thomas Gleixner, (Tue Oct 9, 7:21 pm)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Linus Torvalds, (Tue Oct 9, 7:27 pm)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Paul Mackerras, (Wed Oct 10, 8:24 pm)
Re: [PATCH v2] powerpc: don't enable cpu hotplug on mpic-bas..., Milton Miller, (Wed Oct 10, 6:08 am)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Olof Johansson, (Tue Oct 9, 8:03 pm)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Thomas Gleixner, (Tue Oct 9, 7:35 pm)
Re: [stable] [patch 09/12] Fix SMP poweroff hangs, Linus Torvalds, (Wed Oct 10, 1:29 am)
[patch 06/12] Fix ppp_mppe kernel stack usage., Greg KH, (Mon Oct 8, 2:06 pm)
[patch 05/12] libata: update drive blacklists, Greg KH, (Mon Oct 8, 2:06 pm)