[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1364919374-7836-2-git-send-email-stefano.stabellini@eu.citrix.com>
Date: Tue, 2 Apr 2013 17:16:13 +0100
From: Stefano Stabellini <stefano.stabellini@...citrix.com>
To: <xen-devel@...ts.xensource.com>
CC: <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <will.deacon@....com>,
<arnd@...db.de>, <nicolas.pitre@...aro.org>,
<Stefano.Stabellini@...citrix.com>, <rob.herring@...xeda.com>,
Jon Medhurst <tixy@...aro.org>
Subject: [PATCH v5 2/3] ARM: Enable selection of SMP operations at boot time
From: Jon Medhurst <tixy@...aro.org>
Add a new 'smp_init' hook to machine_desc so platforms can specify a
function to be used to setup smp ops instead of having a statically
defined value.
Signed-off-by: Jon Medhurst <tixy@...aro.org>
Signed-off-by: Nicolas Pitre <nicolas.pitre@...aro.org>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@...com>
---
arch/arm/include/asm/mach/arch.h | 3 +++
arch/arm/kernel/setup.c | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..c01bf53 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -16,8 +16,10 @@ struct pt_regs;
struct smp_operations;
#ifdef CONFIG_SMP
#define smp_ops(ops) (&(ops))
+#define smp_init_ops(ops) (&(ops))
#else
#define smp_ops(ops) (struct smp_operations *)NULL
+#define smp_init_ops(ops) (void (*)(void))NULL
#endif
struct machine_desc {
@@ -41,6 +43,7 @@ struct machine_desc {
unsigned char reserve_lp2 :1; /* never has lp2 */
char restart_mode; /* default restart mode */
struct smp_operations *smp; /* SMP operations */
+ void (*smp_init)(void);
void (*fixup)(struct tag *, char **,
struct meminfo *);
void (*reserve)(void);/* reserve mem blocks */
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 341efaa..7e193df 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -770,7 +770,9 @@ void __init setup_arch(char **cmdline_p)
psci_init();
#ifdef CONFIG_SMP
if (is_smp()) {
- if (mdesc->smp)
+ if (mdesc->smp_init)
+ (*mdesc->smp_init)();
+ else if (mdesc->smp)
smp_set_ops(mdesc->smp);
else if (psci_smp_available())
smp_set_ops(&psci_smp_ops);
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists