From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/19] ARM64 / ACPI: Get the enable method for SMP initialization in ACPI way
Date: Fri, 25 Jul 2014 13:24:24 +0100 [thread overview]
Message-ID: <20140725122424.GD19632@leverpostej> (raw)
In-Reply-To: <53D236B9.7000302@linaro.org>
On Fri, Jul 25, 2014 at 11:51:37AM +0100, Hanjun Guo wrote:
> On 2014-7-24 23:47, Mark Rutland wrote:
> > On Thu, Jul 24, 2014 at 02:00:16PM +0100, Hanjun Guo wrote:
> >> ACPI 5.1 only has two explicit methods to boot up SMP,
> >> PSCI and Parking protocol, but the Parking protocol is
> >> only suitable for ARMv7 now, so make PSCI as the only way
> >> for the SMP boot protocol before some updates for the
> >> ACPI spec or the Parking protocol spec.
> >>
> >> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> >> Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
> >> ---
> >> arch/arm64/include/asm/acpi.h | 21 +++++++++++++++
> >> arch/arm64/include/asm/cpu_ops.h | 9 ++++++-
> >> arch/arm64/include/asm/smp.h | 2 +-
> >> arch/arm64/kernel/acpi.c | 9 +++++++
> >> arch/arm64/kernel/cpu_ops.c | 52 ++++++++++++++++++++++++++++++++++----
> >> arch/arm64/kernel/smp.c | 29 +++++++++++++++++++--
> >> 6 files changed, 113 insertions(+), 9 deletions(-)
> [...]
> >> /*
> >> - * Setup the set of possible CPUs (via set_cpu_possible)
> >> + * Platform specific SMP operations
> >> */
> >> extern void smp_init_cpus(void);
> >
> > While the originial comment is out of date, the new form is plain wrong.
> >
> > Something like "Discover the set of possible CPUs and determine their
> > SMP operations" would be a better description of what's going on here.
>
> Agreed.
Ok.
> >
> >>
> >> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> >> index ff0f6a0..2af6662 100644
> >> --- a/arch/arm64/kernel/acpi.c
> >> +++ b/arch/arm64/kernel/acpi.c
> >> @@ -184,6 +184,15 @@ static int __init acpi_parse_madt_gic_cpu_interface_entries(void)
> >> return 0;
> >> }
> >>
> >> +/* Protocol to bring up secondary CPUs */
> >> +enum acpi_smp_boot_protocol smp_boot_protocol(void)
> >> +{
> >> + if (acpi_psci_present)
> >> + return ACPI_SMP_BOOT_PSCI;
> >> + else
> >> + return ACPI_SMP_BOOT_PARKING_PROTOCOL;
> >> +}
> >> +
> >> static int __init acpi_parse_fadt(struct acpi_table_header *table)
> >> {
> >> struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table;
> >> diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
> >> index d62d12f..4d9b3cf 100644
> >> --- a/arch/arm64/kernel/cpu_ops.c
> >> +++ b/arch/arm64/kernel/cpu_ops.c
> >> @@ -16,11 +16,13 @@
> >> * along with this program. If not, see <http://www.gnu.org/licenses/>.
> >> */
> >>
> >> -#include <asm/cpu_ops.h>
> >> -#include <asm/smp_plat.h>
> >> #include <linux/errno.h>
> >> #include <linux/of.h>
> >> #include <linux/string.h>
> >> +#include <linux/acpi.h>
> >> +
> >> +#include <asm/cpu_ops.h>
> >> +#include <asm/smp_plat.h>
> >
> > Was the header move just for consistency with other files, or is there
> > some ordering requirement here?
>
> Ordering requirement, it will meet compile error for "return -ENODEV;"
> in the head file which I introduced, I know I can include the right
> head file in asm/cpu_ops.h, but I think move the asm/xx.h after the
> include of linux/xx.h would be fine.
If a file uses something defined in a header, it should include that
header. So if you need ENODEV in cpu_ops.h, make cpu_ops.h include
<linux/errno.h>. It is not fine to deliberately rely on implicit
includes.
Moving the headers around is a separate issue. I have no problem with
doing that for consistency with other files.
>
> >
> >>
> >> extern const struct cpu_operations smp_spin_table_ops;
> >> extern const struct cpu_operations cpu_psci_ops;
> >> @@ -52,7 +54,7 @@ static const struct cpu_operations * __init cpu_get_ops(const char *name)
> >> /*
> >> * Read a cpu's enable method from the device tree and record it in cpu_ops.
> >> */
> >> -int __init cpu_read_ops(struct device_node *dn, int cpu)
> >> +int __init cpu_of_read_ops(struct device_node *dn, int cpu)
> >> {
> >> const char *enable_method = of_get_property(dn, "enable-method", NULL);
> >> if (!enable_method) {
> >> @@ -76,12 +78,52 @@ int __init cpu_read_ops(struct device_node *dn, int cpu)
> >> return 0;
> >> }
> >>
> >> +#ifdef CONFIG_ACPI
> >> +/*
> >> + * Read a cpu's enable method in the ACPI way and record it in cpu_ops.
> >> + */
> >> +int __init cpu_acpi_read_ops(int cpu)
> >> +{
> >> + /*
> >> + * For ACPI 5.1, only two kind of methods are provided,
> >> + * Parking protocol and PSCI, but Parking protocol is
> >> + * used on ARMv7 only, so make PSCI as the only method
> >> + * for SMP initialization before the ACPI spec or Parking
> >> + * protocol spec is updated.
> >> + */
> >
> > That comment is a little misleading. The parking protocol is _specified_
> > for ARMv7 only.
>
> Agreed. But I'm just wondering if the Parking protocol is modified and
> then support ARMv8, how to describe it in the comments?
We update the comments if and when that happens.
> >
> >> + switch (smp_boot_protocol()) {
> >> + case ACPI_SMP_BOOT_PSCI:
> >> + cpu_ops[cpu] = cpu_get_ops("psci");
> >> + break;
> >> + case ACPI_SMP_BOOT_PARKING_PROTOCOL:
> >> + default:
> >> + cpu_ops[cpu] = NULL;
> >> + break;
> >> + }
> >> +
> >> + if (!cpu_ops[cpu]) {
> >> + pr_warn("CPU %d: unsupported enable-method, only PSCI is supported\n",
> >> + cpu);
> >> + return -EOPNOTSUPP;
> >> + }
> >
> > That's going to require changes as things get updated, and
> > "enable-method" is a term from DT rather than ACPI.
> >
> > How about:
> >
> > "CPU%d: boot protocol unsupported or unknown\n".
>
> Pretty fine to me :)
Ok.
Cheers,
Mark.
next prev parent reply other threads:[~2014-07-25 12:24 UTC|newest]
Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 13:00 [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-07-24 13:00 ` [PATCH 01/19] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-07-28 18:29 ` Sudeep Holla
2014-07-28 22:49 ` Graeme Gregory
2014-07-29 8:49 ` Sudeep Holla
2014-07-29 13:08 ` Hanjun Guo
2014-07-29 13:50 ` Sudeep Holla
2014-07-29 14:07 ` Hanjun Guo
2014-07-28 18:30 ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 02/19] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-07-28 18:35 ` Sudeep Holla
2014-07-29 13:10 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 03/19] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo
2014-07-24 15:34 ` Mark Rutland
2014-07-25 10:42 ` Hanjun Guo
2014-07-28 18:28 ` Sudeep Holla
2014-07-29 13:00 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 04/19] ARM64 / ACPI: Introduce arch_fix_phys_package_id() for cpu topology Hanjun Guo
2014-07-24 14:43 ` Mark Brown
2014-07-25 10:32 ` Hanjun Guo
2014-07-28 18:51 ` Sudeep Holla
2014-08-01 6:35 ` Hanjun Guo
2014-08-01 10:48 ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-07-24 21:57 ` Naresh Bhat
2014-07-29 16:40 ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-07-29 16:40 ` Sudeep Holla
2014-07-31 3:53 ` Hanjun Guo
2014-07-31 4:22 ` Olof Johansson
2014-07-31 10:23 ` Hanjun Guo
2014-08-20 15:02 ` Grant Likely
2014-08-20 15:00 ` Grant Likely
2014-08-20 15:29 ` Catalin Marinas
2014-08-20 15:43 ` graeme.gregory at linaro.org
2014-07-24 13:00 ` [PATCH 07/19] ARM64 / ACPI: Parse MADT to map logical cpu to MPIDR and get cpu_possible/present_map Hanjun Guo
2014-07-24 23:06 ` Naresh Bhat
2014-07-25 11:11 ` Hanjun Guo
2014-07-30 18:20 ` Sudeep Holla
2014-07-31 8:14 ` Hanjun Guo
2014-08-20 15:14 ` Grant Likely
2014-07-24 13:00 ` [PATCH 08/19] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-07-30 18:21 ` Sudeep Holla
2014-07-31 8:15 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 09/19] ARM64 / ACPI: Move the initialization of cpu_logical_map(0) before acpi_boot_init() Hanjun Guo
2014-07-24 15:21 ` Mark Rutland
2014-07-25 10:39 ` Hanjun Guo
2014-07-25 12:18 ` Mark Rutland
2014-07-24 13:00 ` [PATCH 10/19] ARM64 / ACPI: Get the enable method for SMP initialization in ACPI way Hanjun Guo
2014-07-24 15:47 ` Mark Rutland
2014-07-25 10:51 ` Hanjun Guo
2014-07-25 12:24 ` Mark Rutland [this message]
2014-07-29 8:12 ` Hanjun Guo
2014-07-31 6:54 ` Olof Johansson
2014-07-31 10:57 ` Hanjun Guo
2014-08-04 9:56 ` Hanjun Guo
2014-07-31 18:52 ` Geoff Levand
2014-08-01 6:49 ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 11/19] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-07-24 13:00 ` [PATCH 12/19] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2014-07-24 13:00 ` [PATCH 13/19] ACPI / table: Add new function to get table entries Hanjun Guo
2014-07-24 13:00 ` [PATCH 14/19] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-07-24 13:00 ` [PATCH 15/19] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-07-24 13:00 ` [PATCH 16/19] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-07-24 13:00 ` [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-07-24 13:00 ` [PATCH 18/19] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-07-24 13:00 ` [PATCH 19/19] Documentation: ACPI for ARM64 Hanjun Guo
2014-07-24 20:42 ` Randy Dunlap
2014-07-25 10:55 ` Hanjun Guo
[not found] ` <CAFoFrHaWWxRPRYM5+bWj0tGnz05SokqwVGejUCUi+U-KChFBdQ@mail.gmail.com>
2014-07-24 21:19 ` Randy Dunlap
2014-07-29 10:07 ` Christoffer Dall
2014-07-27 2:34 ` Olof Johansson
2014-07-28 8:42 ` Graeme Gregory
2014-07-28 16:23 ` Olof Johansson
2014-07-28 17:44 ` Mark Brown
2014-07-28 9:07 ` Arnd Bergmann
2014-07-28 9:23 ` Graeme Gregory
2014-07-28 10:46 ` Arnd Bergmann
2014-07-28 14:20 ` Andre Przywara
2014-07-28 15:23 ` Arnd Bergmann
2014-07-28 16:14 ` Andre Przywara
2014-07-29 9:17 ` Graeme Gregory
2014-07-29 10:07 ` Arnd Bergmann
2014-07-28 10:12 ` Mark Rutland
2014-07-28 16:33 ` Olof Johansson
2014-07-28 18:37 ` Mark Rutland
2014-07-28 18:44 ` Olof Johansson
2014-07-28 16:27 ` Olof Johansson
2014-07-28 17:00 ` Mark Rutland
2014-07-28 18:27 ` Olof Johansson
2014-08-12 18:23 ` Catalin Marinas
2014-08-13 23:41 ` Rafael J. Wysocki
2014-08-14 3:21 ` Hanjun Guo
2014-08-14 10:27 ` Catalin Marinas
2014-08-14 20:53 ` Arnd Bergmann
2014-08-15 1:02 ` Olof Johansson
2014-08-15 19:49 ` Arnd Bergmann
2014-08-15 23:19 ` Mark Brown
2014-08-16 12:51 ` graeme.gregory at linaro.org
2014-08-15 9:09 ` Hanjun Guo
2014-08-15 10:01 ` Catalin Marinas
2014-08-18 9:29 ` Hanjun Guo
2014-08-18 12:49 ` Mark Rutland
2014-08-20 22:17 ` Olof Johansson
2014-08-21 4:00 ` Hanjun Guo
2014-07-29 9:01 ` Hanjun Guo
2014-07-28 10:06 ` Mark Rutland
2014-07-28 16:44 ` Olof Johansson
2014-07-28 17:36 ` Mark Rutland
2014-07-28 18:34 ` Olof Johansson
2014-07-29 10:29 ` Christoffer Dall
2014-07-29 10:41 ` Arnd Bergmann
2014-07-29 10:55 ` Mark Rutland
2014-07-29 11:28 ` Mark Rutland
2014-07-29 12:37 ` Christoffer Dall
2014-07-29 12:52 ` Arnd Bergmann
2014-07-29 13:08 ` Mark Rutland
2014-07-29 13:31 ` Christoffer Dall
2014-07-29 14:04 ` Mark Rutland
2014-07-29 14:41 ` Arnd Bergmann
2014-07-29 15:01 ` Christoffer Dall
2014-07-30 6:47 ` Hanjun Guo
2014-07-30 7:14 ` Christoffer Dall
2014-07-30 9:36 ` Hanjun Guo
2014-07-29 13:33 ` Christoffer Dall
2014-07-29 7:58 ` Hanjun Guo
2014-07-29 10:30 ` Christoffer Dall
2014-08-15 22:43 ` Len Brown
2014-08-16 12:45 ` Graeme Gregory
2014-08-20 16:42 ` Grant Likely
2014-07-25 0:46 ` [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
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=20140725122424.GD19632@leverpostej \
--to=mark.rutland@arm.com \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).