From: Stephen Boyd <sboyd@codeaurora.org> To: linux-arm-kernel@lists.infradead.org Cc: David Brown <davidb@codeaurora.org>, Rohit Vaswani <rvaswani@codeaurora.org>, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 11/11] ARM: msm: Remove nr_cpus detection logic Date: Fri, 1 Nov 2013 15:08:59 -0700 [thread overview] Message-ID: <1383343739-23080-12-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1383343739-23080-1-git-send-email-sboyd@codeaurora.org> All the SMP supported MSM devices are using devicetree and they have a cpus node in DT. Given this we know that arm generic code detects the number of cpus from the cpus node so we can drop support for detecting the number of CPUs from the mpidr register here. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/mach-msm/platsmp.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 87e4fdc..36b2294 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -41,12 +41,6 @@ extern void secondary_startup(void); static DEFINE_SPINLOCK(boot_lock); -static inline int get_core_count(void) -{ - /* 1 + the PART[1:0] field of MIDR */ - return ((read_cpuid_id() >> 4) & 3) + 1; -} - static void msm_secondary_init(unsigned int cpu) { /* @@ -268,26 +262,6 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle) return 0; } -/* - * Initialise the CPU possible map early - this describes the CPUs - * which may be present or become present in the system. The msm8x60 - * does not support the ARM SCU, so just set the possible cpu mask to - * NR_CPUS. - */ -static void __init msm_smp_init_cpus(void) -{ - unsigned int i, ncores = get_core_count(); - - if (ncores > nr_cpu_ids) { - pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", - ncores, nr_cpu_ids); - ncores = nr_cpu_ids; - } - - for (i = 0; i < ncores; i++) - set_cpu_possible(i, true); -} - static void __init msm_smp_prepare_cpus(unsigned int max_cpus) { int cpu, map; @@ -319,7 +293,6 @@ 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, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/11] ARM: msm: Remove nr_cpus detection logic Date: Fri, 1 Nov 2013 15:08:59 -0700 [thread overview] Message-ID: <1383343739-23080-12-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1383343739-23080-1-git-send-email-sboyd@codeaurora.org> All the SMP supported MSM devices are using devicetree and they have a cpus node in DT. Given this we know that arm generic code detects the number of cpus from the cpus node so we can drop support for detecting the number of CPUs from the mpidr register here. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/mach-msm/platsmp.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 87e4fdc..36b2294 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -41,12 +41,6 @@ extern void secondary_startup(void); static DEFINE_SPINLOCK(boot_lock); -static inline int get_core_count(void) -{ - /* 1 + the PART[1:0] field of MIDR */ - return ((read_cpuid_id() >> 4) & 3) + 1; -} - static void msm_secondary_init(unsigned int cpu) { /* @@ -268,26 +262,6 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle) return 0; } -/* - * Initialise the CPU possible map early - this describes the CPUs - * which may be present or become present in the system. The msm8x60 - * does not support the ARM SCU, so just set the possible cpu mask to - * NR_CPUS. - */ -static void __init msm_smp_init_cpus(void) -{ - unsigned int i, ncores = get_core_count(); - - if (ncores > nr_cpu_ids) { - pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", - ncores, nr_cpu_ids); - ncores = nr_cpu_ids; - } - - for (i = 0; i < ncores; i++) - set_cpu_possible(i, true); -} - static void __init msm_smp_prepare_cpus(unsigned int max_cpus) { int cpu, map; @@ -319,7 +293,6 @@ 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, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2013-11-01 22:08 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-11-01 22:08 [PATCH 00/11] CPU enable method based SMP/hotplug + MSM conversion Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` [PATCH 01/11] devicetree: bindings: Document cpu enable-method for ARM CPUs Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-02 1:00 ` Rob Herring 2013-11-02 1:00 ` Rob Herring 2013-11-02 1:00 ` Rob Herring 2013-11-08 9:12 ` Tomasz Figa 2013-11-08 9:12 ` Tomasz Figa 2013-11-01 22:08 ` [PATCH 02/11] devicetree: bindings: Document Qualcomm cpus and enable-method Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-02 1:04 ` Rob Herring 2013-11-02 1:04 ` Rob Herring 2013-11-02 1:04 ` Rob Herring 2013-11-04 17:36 ` Stephen Boyd 2013-11-04 17:36 ` Stephen Boyd 2013-11-04 17:36 ` Stephen Boyd 2013-11-05 17:12 ` Kumar Gala 2013-11-05 17:12 ` Kumar Gala 2013-11-05 17:12 ` Kumar Gala 2013-11-05 17:35 ` Stephen Boyd 2013-11-05 17:35 ` Stephen Boyd 2013-11-05 17:35 ` Stephen Boyd 2013-11-05 17:43 ` Kumar Gala 2013-11-05 17:43 ` Kumar Gala 2013-11-05 17:43 ` Kumar Gala 2013-11-05 17:46 ` Stephen Boyd 2013-11-05 17:46 ` Stephen Boyd 2013-11-05 17:46 ` Stephen Boyd 2013-11-05 18:12 ` Kumar Gala 2013-11-05 18:12 ` Kumar Gala 2013-11-05 18:12 ` Kumar Gala 2013-11-01 22:08 ` [PATCH 03/11] devicetree: bindings: Document qcom,kpss-acc Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-05 17:13 ` Kumar Gala 2013-11-05 17:13 ` Kumar Gala 2013-11-05 17:13 ` Kumar Gala 2013-11-05 17:44 ` Stephen Boyd 2013-11-05 17:44 ` Stephen Boyd 2013-11-05 17:51 ` Kumar Gala 2013-11-05 17:51 ` Kumar Gala 2013-11-08 9:10 ` Tomasz Figa 2013-11-08 9:10 ` Tomasz Figa 2013-11-08 14:30 ` Kumar Gala 2013-11-08 14:30 ` Kumar Gala 2013-11-01 22:08 ` [PATCH 04/11] devicetree: bindings: Document qcom,saw2 node Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-05 17:16 ` Kumar Gala 2013-11-05 17:16 ` Kumar Gala 2013-11-05 17:16 ` Kumar Gala 2013-11-01 22:08 ` [PATCH 05/11] ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-05 17:24 ` Kumar Gala 2013-11-05 17:24 ` Kumar Gala 2013-11-05 17:24 ` Kumar Gala 2013-11-05 17:27 ` Stephen Boyd 2013-11-05 17:27 ` Stephen Boyd [not found] ` <1383343739-23080-6-git-send-email-sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2013-11-07 1:50 ` Josh Cartwright 2013-11-07 1:50 ` Josh Cartwright 2013-11-07 1:50 ` Josh Cartwright 2013-11-07 22:34 ` Stephen Boyd 2013-11-07 22:34 ` Stephen Boyd 2013-11-01 22:08 ` [PATCH 06/11] ARM: msm: Remove pen_release usage Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` [PATCH 07/11] ARM: msm: Re-organize platsmp to make it extensible Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-05 17:32 ` Kumar Gala 2013-11-05 17:32 ` Kumar Gala 2013-11-01 22:08 ` [PATCH 08/11] ARM: msm: Add SMP support for KPSSv1 Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` [PATCH 09/11] ARM: msm: Add SMP support for KPSSv2 Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd [not found] ` <CACqS6krDt=zDWNXKTu2PvCkMXQbbf-4G2RZtuCt1deU6H2SUxQ@mail.gmail.com> 2013-11-04 18:03 ` Stephen Boyd 2013-11-04 18:03 ` Stephen Boyd 2013-11-01 22:08 ` [PATCH 10/11] ARM: dts: msm: Add nodes necessary for SMP boot Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd 2013-11-01 22:08 ` Stephen Boyd [this message] 2013-11-01 22:08 ` [PATCH 11/11] ARM: msm: Remove nr_cpus detection logic Stephen Boyd
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=1383343739-23080-12-git-send-email-sboyd@codeaurora.org \ --to=sboyd@codeaurora.org \ --cc=davidb@codeaurora.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rvaswani@codeaurora.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.