From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> To: Kumar Gala <galak@codeaurora.org> Cc: "linux-arm-msm@vger.kernel.org" <linux-arm-msm@vger.kernel.org>, Abhimanyu Kapur <abhimany@codeaurora.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "arm@kernel.org" <arm@kernel.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, Catalin Marinas <Catalin.Marinas@arm.com>, Will Deacon <Will.Deacon@arm.com> Subject: Re: [RFC PATCH 3/5] arm64: introduce CPU_OF_TABLES for cpu ops selection Date: Fri, 10 Apr 2015 11:28:43 +0100 [thread overview] Message-ID: <20150410102843.GA25921@red-moon> (raw) In-Reply-To: <1428601031-5366-4-git-send-email-galak@codeaurora.org> On Thu, Apr 09, 2015 at 06:37:09PM +0100, Kumar Gala wrote: > From: Abhimanyu Kapur <abhimany@codeaurora.org> > > Add support to arm64 to provide a dt-based method to allow soc-vendors to > supply cpu_ops. Also move psci and smp_spin_table ops to use CPU_OF_TABLES. On arm64 there are two enable methods: PSCI and spin-table. Update your firmware accordingly and drop this patch, thanks. Lorenzo > Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org> > Signed-off-by: Kumar Gala <galak@codeaurora.org> > --- > arch/arm64/include/asm/cpu_ops.h | 5 +++++ > arch/arm64/kernel/cpu_ops.c | 27 +++++++++------------------ > arch/arm64/kernel/psci.c | 1 + > arch/arm64/kernel/smp_spin_table.c | 3 ++- > 4 files changed, 17 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h > index da301ee..a7efab8 100644 > --- a/arch/arm64/include/asm/cpu_ops.h > +++ b/arch/arm64/include/asm/cpu_ops.h > @@ -67,4 +67,9 @@ extern const struct cpu_operations *cpu_ops[NR_CPUS]; > int __init cpu_read_ops(struct device_node *dn, int cpu); > void __init cpu_read_bootcpu_ops(void); > > +#define CPU_METHOD_OF_DECLARE(name, __ops) \ > + static const struct cpu_operations *__cpu_method_table_##name \ > + __used __section(__cpu_method_of_table) \ > + = __ops; > + > #endif /* ifndef __ASM_CPU_OPS_H */ > diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c > index cce9524..ad33f98 100644 > --- a/arch/arm64/kernel/cpu_ops.c > +++ b/arch/arm64/kernel/cpu_ops.c > @@ -22,29 +22,20 @@ > #include <linux/of.h> > #include <linux/string.h> > > -extern const struct cpu_operations smp_spin_table_ops; > -extern const struct cpu_operations cpu_psci_ops; > - > const struct cpu_operations *cpu_ops[NR_CPUS]; > > -static const struct cpu_operations *supported_cpu_ops[] __initconst = { > -#ifdef CONFIG_SMP > - &smp_spin_table_ops, > -#endif > - &cpu_psci_ops, > - NULL, > -}; > +extern struct cpu_operations __cpu_method_of_table[]; > +static const struct cpu_operations *__cpu_method_of_table_sentinel > + __used __section(__cpu_method_of_table_end); > > -static const struct cpu_operations * __init cpu_get_ops(const char *name) > +const struct cpu_operations * __init cpu_get_ops(const char *name) > { > - const struct cpu_operations **ops = supported_cpu_ops; > - > - while (*ops) { > - if (!strcmp(name, (*ops)->name)) > - return *ops; > + const struct cpu_operations **start = (void *)__cpu_method_of_table; > > - ops++; > - } > + for (; *start; start++) { > + if (!strcmp((*start)->name, name)) > + return *start; > + }; > > return NULL; > } > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index 9b8a70a..2f255c7 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -523,3 +523,4 @@ const struct cpu_operations cpu_psci_ops = { > #endif > }; > > +CPU_METHOD_OF_DECLARE(psci, &cpu_psci_ops); > diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c > index 14944e5..b41a8b4 100644 > --- a/arch/arm64/kernel/smp_spin_table.c > +++ b/arch/arm64/kernel/smp_spin_table.c > @@ -119,9 +119,10 @@ static int smp_spin_table_cpu_boot(unsigned int cpu) > return 0; > } > > -const struct cpu_operations smp_spin_table_ops = { > +static const struct cpu_operations smp_spin_table_ops = { > .name = "spin-table", > .cpu_init = smp_spin_table_cpu_init, > .cpu_prepare = smp_spin_table_cpu_prepare, > .cpu_boot = smp_spin_table_cpu_boot, > }; > +CPU_METHOD_OF_DECLARE(spin_table, &smp_spin_table_ops); > -- > Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >
WARNING: multiple messages have this Message-ID (diff)
From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 3/5] arm64: introduce CPU_OF_TABLES for cpu ops selection Date: Fri, 10 Apr 2015 11:28:43 +0100 [thread overview] Message-ID: <20150410102843.GA25921@red-moon> (raw) In-Reply-To: <1428601031-5366-4-git-send-email-galak@codeaurora.org> On Thu, Apr 09, 2015 at 06:37:09PM +0100, Kumar Gala wrote: > From: Abhimanyu Kapur <abhimany@codeaurora.org> > > Add support to arm64 to provide a dt-based method to allow soc-vendors to > supply cpu_ops. Also move psci and smp_spin_table ops to use CPU_OF_TABLES. On arm64 there are two enable methods: PSCI and spin-table. Update your firmware accordingly and drop this patch, thanks. Lorenzo > Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org> > Signed-off-by: Kumar Gala <galak@codeaurora.org> > --- > arch/arm64/include/asm/cpu_ops.h | 5 +++++ > arch/arm64/kernel/cpu_ops.c | 27 +++++++++------------------ > arch/arm64/kernel/psci.c | 1 + > arch/arm64/kernel/smp_spin_table.c | 3 ++- > 4 files changed, 17 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h > index da301ee..a7efab8 100644 > --- a/arch/arm64/include/asm/cpu_ops.h > +++ b/arch/arm64/include/asm/cpu_ops.h > @@ -67,4 +67,9 @@ extern const struct cpu_operations *cpu_ops[NR_CPUS]; > int __init cpu_read_ops(struct device_node *dn, int cpu); > void __init cpu_read_bootcpu_ops(void); > > +#define CPU_METHOD_OF_DECLARE(name, __ops) \ > + static const struct cpu_operations *__cpu_method_table_##name \ > + __used __section(__cpu_method_of_table) \ > + = __ops; > + > #endif /* ifndef __ASM_CPU_OPS_H */ > diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c > index cce9524..ad33f98 100644 > --- a/arch/arm64/kernel/cpu_ops.c > +++ b/arch/arm64/kernel/cpu_ops.c > @@ -22,29 +22,20 @@ > #include <linux/of.h> > #include <linux/string.h> > > -extern const struct cpu_operations smp_spin_table_ops; > -extern const struct cpu_operations cpu_psci_ops; > - > const struct cpu_operations *cpu_ops[NR_CPUS]; > > -static const struct cpu_operations *supported_cpu_ops[] __initconst = { > -#ifdef CONFIG_SMP > - &smp_spin_table_ops, > -#endif > - &cpu_psci_ops, > - NULL, > -}; > +extern struct cpu_operations __cpu_method_of_table[]; > +static const struct cpu_operations *__cpu_method_of_table_sentinel > + __used __section(__cpu_method_of_table_end); > > -static const struct cpu_operations * __init cpu_get_ops(const char *name) > +const struct cpu_operations * __init cpu_get_ops(const char *name) > { > - const struct cpu_operations **ops = supported_cpu_ops; > - > - while (*ops) { > - if (!strcmp(name, (*ops)->name)) > - return *ops; > + const struct cpu_operations **start = (void *)__cpu_method_of_table; > > - ops++; > - } > + for (; *start; start++) { > + if (!strcmp((*start)->name, name)) > + return *start; > + }; > > return NULL; > } > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index 9b8a70a..2f255c7 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -523,3 +523,4 @@ const struct cpu_operations cpu_psci_ops = { > #endif > }; > > +CPU_METHOD_OF_DECLARE(psci, &cpu_psci_ops); > diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c > index 14944e5..b41a8b4 100644 > --- a/arch/arm64/kernel/smp_spin_table.c > +++ b/arch/arm64/kernel/smp_spin_table.c > @@ -119,9 +119,10 @@ static int smp_spin_table_cpu_boot(unsigned int cpu) > return 0; > } > > -const struct cpu_operations smp_spin_table_ops = { > +static const struct cpu_operations smp_spin_table_ops = { > .name = "spin-table", > .cpu_init = smp_spin_table_cpu_init, > .cpu_prepare = smp_spin_table_cpu_prepare, > .cpu_boot = smp_spin_table_cpu_boot, > }; > +CPU_METHOD_OF_DECLARE(spin_table, &smp_spin_table_ops); > -- > Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >
next prev parent reply other threads:[~2015-04-10 10:28 UTC|newest] Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-09 17:37 [RFC PATCH 0/5] Add smp booting support for Qualcomm ARMv8 SoCs Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 17:37 ` [RFC PATCH 1/5] firmware: qcom: scm: Split out 32-bit specific SCM code Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 17:37 ` [RFC PATCH 2/5] firmware: qcom: scm: Add support for ARM64 SoCs Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 17:37 ` [RFC PATCH 3/5] arm64: introduce CPU_OF_TABLES for cpu ops selection Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 21:17 ` Arnd Bergmann 2015-04-09 21:17 ` Arnd Bergmann 2015-04-14 15:52 ` Mark Rutland 2015-04-14 15:52 ` Mark Rutland 2015-04-14 15:52 ` Mark Rutland 2015-04-10 10:28 ` Lorenzo Pieralisi [this message] 2015-04-10 10:28 ` Lorenzo Pieralisi 2015-04-10 10:28 ` Lorenzo Pieralisi 2015-04-09 17:37 ` [RFC PATCH 4/5] arm64: smp: move the pen to a header file Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 21:17 ` Arnd Bergmann 2015-04-09 21:17 ` Arnd Bergmann 2015-04-14 19:41 ` Kumar Gala 2015-04-14 19:41 ` Kumar Gala 2015-04-14 15:59 ` Mark Rutland 2015-04-14 15:59 ` Mark Rutland 2015-04-14 15:59 ` Mark Rutland 2015-04-14 19:40 ` Kumar Gala 2015-04-14 19:40 ` Kumar Gala 2015-04-14 19:40 ` Kumar Gala [not found] ` <1428601031-5366-1-git-send-email-galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2015-04-09 17:37 ` [RFC PATCH 5/5] arm64: qcom: add cpu operations Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 17:37 ` Kumar Gala 2015-04-09 21:19 ` Arnd Bergmann 2015-04-09 21:19 ` Arnd Bergmann 2015-04-10 10:08 ` Catalin Marinas 2015-04-10 10:08 ` Catalin Marinas 2015-04-10 10:08 ` Catalin Marinas 2015-04-10 10:39 ` Lorenzo Pieralisi 2015-04-10 10:39 ` Lorenzo Pieralisi 2015-04-10 10:39 ` Lorenzo Pieralisi 2015-04-14 16:29 ` Mark Rutland 2015-04-14 16:29 ` Mark Rutland 2015-04-14 16:29 ` Mark Rutland 2015-04-14 20:51 ` Arnd Bergmann 2015-04-14 20:51 ` Arnd Bergmann 2015-04-15 14:46 ` Catalin Marinas 2015-04-15 14:46 ` Catalin Marinas 2015-04-15 14:46 ` Catalin Marinas 2015-04-14 22:52 ` Al Stone 2015-04-14 22:52 ` Al Stone 2015-04-14 22:52 ` Al Stone 2015-04-15 9:04 ` Mark Rutland 2015-04-15 9:04 ` Mark Rutland 2015-04-15 9:04 ` Mark Rutland 2015-04-15 14:53 ` Catalin Marinas 2015-04-15 14:53 ` Catalin Marinas 2015-04-15 14:53 ` Catalin Marinas 2015-04-15 16:29 ` Al Stone 2015-04-15 16:29 ` Al Stone 2015-04-15 16:29 ` Al Stone 2015-04-10 10:05 ` [RFC PATCH 0/5] Add smp booting support for Qualcomm ARMv8 SoCs Catalin Marinas 2015-04-10 10:05 ` Catalin Marinas [not found] ` <20150410100529.GA6854-M2fw3Uu6cmfZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org> 2015-04-10 15:24 ` Kumar Gala 2015-04-10 15:24 ` Kumar Gala 2015-04-10 15:24 ` Kumar Gala [not found] ` <493B15F8-0EBE-4633-9604-671EF403F36E-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2015-04-10 16:10 ` Catalin Marinas 2015-04-10 16:10 ` Catalin Marinas 2015-04-10 16:10 ` Catalin Marinas 2015-04-10 19:06 ` Kumar Gala 2015-04-10 19:06 ` Kumar Gala 2015-04-13 9:41 ` Catalin Marinas 2015-04-13 9:41 ` Catalin Marinas 2015-04-14 14:21 ` Kumar Gala 2015-04-14 14:21 ` Kumar Gala 2015-04-14 14:21 ` Kumar Gala 2015-04-14 14:44 ` Kumar Gala 2015-04-14 14:44 ` Kumar Gala 2015-04-14 15:45 ` Mark Rutland 2015-04-14 15:45 ` Mark Rutland 2015-04-14 15:45 ` Mark Rutland 2015-04-14 22:32 ` Lorenzo Pieralisi 2015-04-14 22:32 ` Lorenzo Pieralisi 2015-04-14 22:32 ` Lorenzo Pieralisi 2015-04-15 16:17 ` Lina Iyer 2015-04-15 16:17 ` Lina Iyer 2015-04-15 16:17 ` Lina Iyer 2015-04-15 17:35 ` Lorenzo Pieralisi 2015-04-15 17:35 ` Lorenzo Pieralisi 2015-04-15 17:35 ` Lorenzo Pieralisi 2015-04-15 14:27 ` Catalin Marinas 2015-04-15 14:27 ` Catalin Marinas 2015-04-14 16:36 ` Mark Rutland 2015-04-14 16:36 ` Mark Rutland 2015-04-14 16:36 ` Mark Rutland 2015-04-14 19:49 ` Kumar Gala 2015-04-14 19:49 ` Kumar Gala 2015-04-14 19:49 ` Kumar Gala 2015-04-14 21:17 ` Catalin Marinas 2015-04-14 21:17 ` Catalin Marinas 2015-04-14 21:17 ` Catalin Marinas 2015-04-14 21:48 ` Rob Clark 2015-04-14 21:48 ` Rob Clark 2015-04-14 21:48 ` Rob Clark [not found] ` <CAF6AEGtoxNrCoxT5n0CXmKMnL-YprJ3DkAuM4Myi87WMxPqBGw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-04-15 13:34 ` Catalin Marinas 2015-04-15 13:34 ` Catalin Marinas 2015-04-15 13:34 ` Catalin Marinas 2015-04-15 15:01 ` Rob Clark 2015-04-15 15:01 ` Rob Clark 2015-04-15 15:01 ` Rob Clark 2015-04-16 15:21 ` Catalin Marinas 2015-04-16 15:21 ` Catalin Marinas 2015-04-16 15:21 ` Catalin Marinas [not found] ` <20150416152121.GE819-M2fw3Uu6cmfZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org> 2015-04-16 17:17 ` Rob Clark 2015-04-16 17:17 ` Rob Clark 2015-04-16 17:17 ` Rob Clark [not found] ` <CAF6AEGt3bf70MUWFU_kqtc8KDR09tMUCkXbqOq0SpOXU44moTg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-04-16 21:39 ` Catalin Marinas 2015-04-16 21:39 ` Catalin Marinas 2015-04-16 21:39 ` Catalin Marinas 2015-04-16 22:03 ` Matt Sealey 2015-04-16 22:03 ` Matt Sealey 2015-04-16 22:03 ` Matt Sealey 2015-04-10 11:03 ` Lorenzo Pieralisi 2015-04-10 11:03 ` Lorenzo Pieralisi 2015-04-10 11:03 ` Lorenzo Pieralisi 2015-04-10 15:25 ` Kumar Gala 2015-04-10 15:25 ` Kumar Gala 2015-04-10 15:25 ` Kumar Gala 2015-04-10 16:07 ` Lorenzo Pieralisi 2015-04-10 16:07 ` Lorenzo Pieralisi 2015-04-10 16:07 ` Lorenzo Pieralisi 2015-04-16 22:08 ` Rob Herring
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=20150410102843.GA25921@red-moon \ --to=lorenzo.pieralisi@arm.com \ --cc=Catalin.Marinas@arm.com \ --cc=Will.Deacon@arm.com \ --cc=abhimany@codeaurora.org \ --cc=arm@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=galak@codeaurora.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.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.