linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 2/2] arm: prefer PSCI for SMP bringup
@ 2013-03-29 16:42 Stefano Stabellini
  2013-03-29 17:31 ` Nicolas Pitre
  0 siblings, 1 reply; 14+ messages in thread
From: Stefano Stabellini @ 2013-03-29 16:42 UTC (permalink / raw)
  To: linux-arm-kernel

If PSCI initializes correctly and PSCI SMP operations are available, use them.
This is required for SMP support in Dom0 on Xen.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: will.deacon at arm.com
CC: arnd at arndb.de
CC: marc.zyngier at arm.com
CC: linux at arm.linux.org.uk
CC: nico at linaro.org
---
 arch/arm/kernel/setup.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 341efaa..c7e50dd 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -770,10 +770,10 @@ void __init setup_arch(char **cmdline_p)
 	psci_init();
 #ifdef CONFIG_SMP
 	if (is_smp()) {
-		if (mdesc->smp)
-			smp_set_ops(mdesc->smp);
-		else if (psci_smp_available())
+		if (psci_smp_available())
 			smp_set_ops(&psci_smp_ops);
+		else
+			smp_set_ops(mdesc->smp);
 		smp_init_cpus();
 	}
 #endif
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2013-04-09 18:34 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-29 16:42 [PATCH v4 2/2] arm: prefer PSCI for SMP bringup Stefano Stabellini
2013-03-29 17:31 ` Nicolas Pitre
2013-03-29 17:38   ` Stefano Stabellini
2013-03-29 17:53     ` Nicolas Pitre
2013-03-29 18:07       ` Stefano Stabellini
2013-03-29 19:31       ` Rob Herring
2013-04-01 14:42         ` Stefano Stabellini
2013-04-01 18:20           ` Nicolas Pitre
2013-04-02 14:28             ` Stefano Stabellini
2013-04-02 16:11               ` Nicolas Pitre
2013-04-09 12:21                 ` Dave Martin
2013-04-09 18:34                   ` Nicolas Pitre
2013-03-29 18:04     ` Nicolas Pitre
2013-03-29 18:10       ` Stefano Stabellini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).