| Message ID | 1347490900-8409-1-git-send-email-davidb@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 12 September 2012, David Brown wrote: > > From: Marc Zyngier <marc.zyngier@arm.com> > > Convert MSM SMP platforms to use the SoC descriptor to provide > their SMP and CPU hotplug operations. > > Cc: David Brown <davidb@codeaurora.org> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > This is an adaptation of this change on top of the msm-for-3.7 tree I > recently sent out a pull request for. The only real change is to > resolve the conflicts with the simplified board files. Not sure what I'm supposed to do with this patch, it doesn't apply unless I rebase all of the SMP patches on top of your msm-for-3.7 branch, which would be rather odd. I'll make sure the branches merge fine and then apply your patch 2/2 on top of the merge, ok? Arnd
On Thu, Sep 13, 2012 at 08:47:19AM +0000, Arnd Bergmann wrote: > On Wednesday 12 September 2012, David Brown wrote: > > > > From: Marc Zyngier <marc.zyngier@arm.com> > > > > Convert MSM SMP platforms to use the SoC descriptor to provide > > their SMP and CPU hotplug operations. > > > > Cc: David Brown <davidb@codeaurora.org> > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > This is an adaptation of this change on top of the msm-for-3.7 tree I > > recently sent out a pull request for. The only real change is to > > resolve the conflicts with the simplified board files. > > Not sure what I'm supposed to do with this patch, it doesn't apply > unless I rebase all of the SMP patches on top of your msm-for-3.7 branch, > which would be rather odd. > > I'll make sure the branches merge fine and then apply your patch 2/2 > on top of the merge, ok? Yeah, it shouldn't hurt anything to just wait until both get merged in. The patch was mostly a heads up that your series was going to conflict with msm changes coming in. Olof wanted me to try and split the msm-for-3.7 into a few branches, so I'm going to work on that this morning. I'm not quite sure how well it will work, since, for example, most of the cleanups are preparing the tree for the devicetree changes. David
On Thursday 13 September 2012, David Brown wrote: > Olof wanted me to try and split the msm-for-3.7 into a few branches, > so I'm going to work on that this morning. I'm not quite sure how > well it will work, since, for example, most of the cleanups are > preparing the tree for the devicetree changes. That is the common scenario. What you should do there is to have one cleanup branch that collects all the cleanups from the other branches, and then base each of the other branches on top of that. Arnd
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index f77f57f..e5643f6 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -20,6 +20,7 @@ #include <mach/board.h> #include "common.h" +#include "core.h" static const struct of_device_id msm_dt_gic_match[] __initconst = { { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init }, @@ -53,6 +54,7 @@ static const char *msm8x60_fluid_match[] __initdata = { }; DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") + .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8x60_io, .init_irq = msm8x60_init_irq, .handle_irq = gic_handle_irq, diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c index 8df99b8..139d61b 100644 --- a/arch/arm/mach-msm/board-dt-8960.c +++ b/arch/arm/mach-msm/board-dt-8960.c @@ -18,6 +18,7 @@ #include <asm/mach/arch.h> #include "common.h" +#include "core.h" static const struct of_device_id msm_dt_gic_match[] __initconst = { { .compatible = "qcom,msm-qgic2", .data = gic_of_init }, @@ -40,6 +41,7 @@ static const char * const msm8960_dt_match[] __initconst = { }; DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") + .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8960_io, .init_irq = msm_dt_init_irq, .timer = &msm_dt_timer, diff --git a/arch/arm/mach-msm/core.h b/arch/arm/mach-msm/core.h new file mode 100644 index 0000000..a9bab53 --- /dev/null +++ b/arch/arm/mach-msm/core.h @@ -0,0 +1,2 @@ +extern struct smp_operations msm_smp_ops; +extern void msm_cpu_die(unsigned int cpu); diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c index a446fc1..d0f79e8 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c @@ -13,6 +13,8 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> +#include "core.h" + extern volatile int pen_release; static inline void cpu_enter_lowpower(void) @@ -57,17 +59,12 @@ static inline void platform_do_lowpower(unsigned int cpu) } } -int platform_cpu_kill(unsigned int cpu) -{ - return 1; -} - /* * platform-specific code to shutdown a CPU * * Called with IRQs disabled */ -void platform_cpu_die(unsigned int cpu) +void msm_cpu_die(unsigned int cpu) { /* * we're ready for shutdown now, so do it @@ -81,12 +78,3 @@ void platform_cpu_die(unsigned int cpu) */ cpu_leave_lowpower(); } - -int platform_cpu_disable(unsigned int cpu) -{ - /* - * we don't allow CPU 0 to be shutdown (it is still too special - * e.g. clock tick interrupts) - */ - return cpu == 0 ? -EPERM : 0; -} diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index b119f99..313bd7d 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -23,6 +23,7 @@ #include <asm/smp_plat.h> #include "scm-boot.h" +#include "core.h" #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0 #define SCSS_CPU1CORE_RESET 0xD80 @@ -43,7 +44,7 @@ static inline int get_core_count(void) return ((read_cpuid_id() >> 4) & 3) + 1; } -void __cpuinit platform_secondary_init(unsigned int cpu) +static void __cpuinit msm_secondary_init(unsigned int cpu) { /* * if any interrupts are already enabled for the primary @@ -85,7 +86,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu) "address\n"); } -int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) +static int __cpuinit msm_boot_secondary(unsigned int cpu, struct task_struct *idle) { unsigned long timeout; static int cold_boot_done; @@ -145,7 +146,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * does not support the ARM SCU, so just set the possible cpu mask to * NR_CPUS. */ -void __init smp_init_cpus(void) +static void __init msm_smp_init_cpus(void) { unsigned int i, ncores = get_core_count(); @@ -161,6 +162,16 @@ void __init smp_init_cpus(void) set_smp_cross_call(gic_raise_softirq); } -void __init platform_smp_prepare_cpus(unsigned int max_cpus) +static void __init msm_smp_prepare_cpus(unsigned int max_cpus) { } + +struct smp_operations msm_smp_ops __initdata = { + .smp_init_cpus = msm_smp_init_cpus, + .smp_prepare_cpus = msm_smp_prepare_cpus, + .smp_secondary_init = msm_secondary_init, + .smp_boot_secondary = msm_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = msm_cpu_die, +#endif +};