From: Olof Johansson <olof@lixom.net>
To: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Will Deacon <will.deacon@arm.com>,
Grant Likely <grant.likely@linaro.org>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Arnd Bergmann <arnd@arndb.de>,
Mark Rutland <mark.rutland@arm.com>,
Graeme Gregory <graeme.gregory@linaro.org>,
Sudeep Holla <Sudeep.Holla@arm.com>, Jon Masters <jcm@redhat.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Mark Brown <broonie@kernel.org>, Robert Richter <rric@kernel.org>,
Timur Tabi <timur@codeaurora.org>,
Ashwin Chaugule <ashwinc@codeaurora.org>,
suravee.suthikulpanit@amd.com, linux-acpi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org,
Tomasz Nowicki <tomasz.nowicki@linaro.org>
Subject: Re: [PATCH v9 13/21] ARM64 / ACPI: Parse MADT for SMP initialization
Date: Thu, 5 Mar 2015 10:49:25 -0800 [thread overview]
Message-ID: <20150305184925.GF4932@quad.lixom.net> (raw)
In-Reply-To: <1424853601-6675-14-git-send-email-hanjun.guo@linaro.org>
Hi,
On Wed, Feb 25, 2015 at 04:39:53PM +0800, Hanjun Guo wrote:
> MADT contains the information for MPIDR which is essential for
> SMP initialization, parse the GIC cpu interface structures to
> get the MPIDR value and map it to cpu_logical_map(), and add
> enabled cpu with valid MPIDR into cpu_possible_map.
>
> ACPI 5.1 only has two explicit methods to boot up SMP, PSCI and
> Parking protocol, but the Parking protocol is only specified 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.
>
> Parking protocol patches for SMP boot will be sent to upstream when
> the new version of Parking protocol is ready.
>
> CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> CC: Catalin Marinas <catalin.marinas@arm.com>
> CC: Will Deacon <will.deacon@arm.com>
> CC: Mark Rutland <mark.rutland@arm.com>
> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
> Tested-by: Yijing Wang <wangyijing@huawei.com>
> Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
> Tested-by: Jon Masters <jcm@redhat.com>
> Tested-by: Timur Tabi <timur@codeaurora.org>
> Tested-by: Robert Richter <rrichter@cavium.com>
> Acked-by: Robert Richter <rrichter@cavium.com>
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Some nits below. Up to you if you fix incrementally or respin, but I'd like to
see them fixed for consistency's sake.
Acked-by: Olof Johansson <olof@lixom.net>
> diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
> index 780f82c..bf22650 100644
> --- a/arch/arm64/include/asm/smp.h
> +++ b/arch/arm64/include/asm/smp.h
> @@ -39,9 +39,10 @@ extern void show_ipi_list(struct seq_file *p, int prec);
> extern void handle_IPI(int ipinr, struct pt_regs *regs);
>
> /*
> - * Setup the set of possible CPUs (via set_cpu_possible)
> + * Discover the set of possible CPUs and determine their
> + * SMP operations.
> */
> -extern void smp_init_cpus(void);
> +extern void of_smp_init_cpus(void);
This is inconsistent naming, we use dt some places, of elsewhere.
> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> index bdcc9fc..0f35d87 100644
> --- a/arch/arm64/kernel/acpi.c
> +++ b/arch/arm64/kernel/acpi.c
> @@ -25,6 +25,10 @@
> #include <linux/of_fdt.h>
> #include <linux/smp.h>
>
> +#include <asm/cputype.h>
> +#include <asm/cpu_ops.h>
> +#include <asm/smp_plat.h>
> +
> int acpi_noirq = 1; /* skip ACPI IRQ initialization */
> int acpi_disabled = 1;
> EXPORT_SYMBOL(acpi_disabled);
> @@ -32,6 +36,12 @@ EXPORT_SYMBOL(acpi_disabled);
> int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */
> EXPORT_SYMBOL(acpi_pci_disabled);
>
> +/* Processors with enabled flag and sane MPIDR */
> +static int enabled_cpus;
> +
> +/* Boot CPU is valid or not in MADT */
> +static bool __initdata bootcpu_valid;
> +
> static bool __initdata param_acpi_off;
> static bool __initdata param_acpi_force;
>
> @@ -85,6 +95,129 @@ void __init __acpi_unmap_table(char *map, unsigned long size)
> early_memunmap(map, size);
> }
>
> +/**
> + * acpi_map_gic_cpu_interface - generates a logical cpu number
> + * and map to MPIDR represented by GICC structure
> + * @mpidr: CPU's hardware id to register, MPIDR represented in MADT
> + * @enabled: this cpu is enabled or not
> + *
> + * Returns the logical cpu number which maps to MPIDR
> + */
> +static int __init acpi_map_gic_cpu_interface(u64 mpidr, u8 enabled)
> +{
> + int i;
> +
> + if (mpidr == INVALID_HWID) {
> + pr_info("Skip MADT cpu entry with invalid MPIDR\n");
> + return -EINVAL;
> + }
> +
> + total_cpus++;
> + if (!enabled)
> + return -EINVAL;
> +
> + if (enabled_cpus >= NR_CPUS) {
> + pr_warn("NR_CPUS limit of %d reached, Processor %d/0x%llx ignored.\n",
> + NR_CPUS, total_cpus, mpidr);
> + return -EINVAL;
> + }
> +
> + /* Check if GICC structure of boot CPU is available in the MADT */
> + if (cpu_logical_map(0) == mpidr) {
> + if (bootcpu_valid) {
> + pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
> + mpidr);
> + return -EINVAL;
> + }
> +
> + bootcpu_valid = true;
> + }
> +
> + /*
> + * Duplicate MPIDRs are a recipe for disaster. Scan
> + * all initialized entries and check for
> + * duplicates. If any is found just ignore the CPU.
> + */
> + for (i = 1; i < enabled_cpus; i++) {
> + if (cpu_logical_map(i) == mpidr) {
> + pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
> + mpidr);
> + return -EINVAL;
> + }
> + }
> +
> + if (!acpi_psci_present())
> + return -EOPNOTSUPP;
> +
> + cpu_ops[enabled_cpus] = cpu_get_ops("psci");
> + /* CPU 0 was already initialized */
> + if (enabled_cpus) {
> + if (!cpu_ops[enabled_cpus])
> + return -EINVAL;
> +
> + if (cpu_ops[enabled_cpus]->cpu_init(NULL, enabled_cpus))
> + return -EOPNOTSUPP;
> +
> + /* map the logical cpu id to cpu MPIDR */
> + cpu_logical_map(enabled_cpus) = mpidr;
> + }
> +
> + enabled_cpus++;
> + return enabled_cpus;
> +}
> +
> +static int __init
> +acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
> + const unsigned long end)
> +{
> + struct acpi_madt_generic_interrupt *processor;
> +
> + processor = (struct acpi_madt_generic_interrupt *)header;
> +
> + if (BAD_MADT_ENTRY(processor, end))
> + return -EINVAL;
> +
> + acpi_table_print_madt_entry(header);
> +
> + acpi_map_gic_cpu_interface(processor->arm_mpidr & MPIDR_HWID_BITMASK,
> + processor->flags & ACPI_MADT_ENABLED);
> +
> + return 0;
> +}
> +
> +/* Parse GIC cpu interface entries in MADT for SMP init */
> +void __init acpi_init_cpus(void)
> +{
> + int count, i;
> +
> + /*
> + * do a partial walk of MADT to determine how many CPUs
> + * we have including disabled CPUs, and get information
> + * we need for SMP init
> + */
> + count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
> + acpi_parse_gic_cpu_interface, 0);
> +
> + if (!count) {
> + pr_err("No GIC CPU interface entries present\n");
> + return;
> + } else if (count < 0) {
> + pr_err("Error parsing GIC CPU interface entry\n");
> + return;
> + }
> +
> + if (!bootcpu_valid) {
> + pr_err("MADT missing boot CPU MPIDR, not enabling secondaries\n");
> + return;
> + }
> +
> + for (i = 0; i < enabled_cpus; i++)
> + set_cpu_possible(i, true);
> +
> + /* Make boot-up look pretty */
> + pr_info("%d CPUs enabled, %d CPUs total\n", enabled_cpus, total_cpus);
> +}
> +
> static int __init acpi_parse_fadt(struct acpi_table_header *table)
> {
> struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table;
> @@ -96,8 +229,20 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
> * boot protocol configuration data, or we will disable ACPI.
> */
> if (table->revision > 5 ||
> - (table->revision == 5 && fadt->minor_revision >= 1))
> - return 0;
> + (table->revision == 5 && fadt->minor_revision >= 1)) {
> + /*
> + * ACPI 5.1 only has two explicit methods to boot up SMP,
> + * PSCI and Parking protocol, but the Parking protocol is
> + * only specified for ARMv7 now, so make PSCI as the only
> + * way for the SMP boot protocol before some updates for
> + * the Parking protocol spec.
> + */
> + if (acpi_psci_present())
> + return 0;
> +
> + pr_warn("No PSCI support, will not bring up secondary CPUs\n");
> + return -EOPNOTSUPP;
> + }
>
> pr_warn("Unsupported FADT revision %d.%d, should be 5.1+, will disable ACPI\n",
> table->revision, fadt->minor_revision);
> diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
> index cce9524..fb8ff9b 100644
> --- a/arch/arm64/kernel/cpu_ops.c
> +++ b/arch/arm64/kernel/cpu_ops.c
> @@ -35,7 +35,7 @@ static const struct cpu_operations *supported_cpu_ops[] __initconst = {
> NULL,
> };
>
> -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;
>
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index 97fa7f3..b278311 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -393,13 +393,16 @@ void __init setup_arch(char **cmdline_p)
> if (acpi_disabled) {
> unflatten_device_tree();
> psci_dt_init();
> + cpu_read_bootcpu_ops();
> +#ifdef CONFIG_SMP
> + of_smp_init_cpus();
> +#endif
> } else {
> psci_acpi_init();
> + acpi_init_cpus();
> }
>
> - cpu_read_bootcpu_ops();
> #ifdef CONFIG_SMP
> - smp_init_cpus();
> smp_build_mpidr_hash();
> #endif
I'd rather do without another ifdef above and provide a stub for that function,
but again it might make sense to just keep a small smp_init_cpus() just as with
the psci setup.
The cpu_read_bootcpu_ops() should be pushed down to the dt implementation to
keep the paths more common between acpi and dt.
-Olof
next prev parent reply other threads:[~2015-03-05 18:49 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 8:39 [PATCH v9 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 01/21] ACPI / table: Use pr_debug() instead of pr_info() for MADT table scanning Hanjun Guo
2015-03-04 22:33 ` Rafael J. Wysocki
2015-03-05 17:55 ` Olof Johansson
2015-03-06 20:17 ` Grant Likely
2015-03-06 20:31 ` Joe Perches
2015-03-10 2:35 ` Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 02/21] ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID Hanjun Guo
2015-03-04 22:29 ` Rafael J. Wysocki
2015-03-05 7:44 ` Hanjun Guo
2015-03-05 13:23 ` Rafael J. Wysocki
2015-03-06 6:48 ` Hanjun Guo
2015-03-06 20:19 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 03/21] ACPI: add arm64 to the platforms that use ioremap Hanjun Guo
2015-03-04 22:33 ` Rafael J. Wysocki
2015-03-06 20:20 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 04/21] ARM64: allow late use of early_ioremap Hanjun Guo
2015-03-06 20:24 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 05/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-03-05 18:10 ` Olof Johansson
2015-03-05 18:51 ` Lorenzo Pieralisi
2015-03-10 8:01 ` Hanjun Guo
2015-03-10 9:32 ` Lorenzo Pieralisi
2015-03-10 11:19 ` Leif Lindholm
2015-03-10 11:36 ` Hanjun Guo
2015-03-06 20:28 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 06/21] ACPI: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-03-04 22:36 ` Rafael J. Wysocki
2015-03-06 20:30 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 07/21] ACPI / sleep: Introduce arm64 specific acpi_sleep.c Hanjun Guo
2015-03-04 22:38 ` Rafael J. Wysocki
2015-03-04 22:49 ` G Gregory
2015-03-04 23:25 ` Rafael J. Wysocki
2015-03-05 0:16 ` Rafael J. Wysocki
2015-03-06 12:36 ` Lorenzo Pieralisi
2015-03-06 20:34 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 08/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-03-06 18:31 ` Lorenzo Pieralisi
2015-03-10 9:21 ` Hanjun Guo
2015-03-06 20:36 ` Grant Likely
2015-03-09 15:01 ` Liviu Dudau
2015-03-10 9:34 ` Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 09/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI Hanjun Guo
2015-03-05 18:11 ` Olof Johansson
2015-03-06 20:37 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-03-05 18:12 ` Olof Johansson
2015-03-06 20:38 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 11/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-03-05 18:19 ` Olof Johansson
2015-03-06 20:40 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 12/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-03-04 22:40 ` Rafael J. Wysocki
2015-03-06 18:06 ` Lorenzo Pieralisi
2015-03-06 20:40 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 13/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-03-05 18:49 ` Olof Johansson [this message]
2015-03-10 11:33 ` Hanjun Guo
2015-03-07 22:49 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-03-04 22:46 ` Rafael J. Wysocki
2015-03-05 8:03 ` Hanjun Guo
2015-03-05 11:27 ` Catalin Marinas
2015-03-05 13:13 ` Rafael J. Wysocki
2015-03-05 15:19 ` Catalin Marinas
2015-03-06 6:51 ` Hanjun Guo
2015-03-07 22:52 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2015-03-04 22:47 ` Rafael J. Wysocki
2015-03-07 23:05 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
2015-03-04 22:50 ` Rafael J. Wysocki
2015-03-05 9:06 ` Hanjun Guo
2015-03-05 11:53 ` Catalin Marinas
2015-03-06 0:42 ` Rafael J. Wysocki
2015-03-05 8:21 ` Hanjun Guo
2015-03-07 23:14 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-03-07 23:16 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-03-06 17:47 ` Lorenzo Pieralisi
2015-03-10 12:23 ` Hanjun Guo
2015-03-10 14:16 ` Lorenzo Pieralisi
2015-03-07 23:16 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-03-04 22:52 ` Rafael J. Wysocki
2015-03-07 23:17 ` Grant Likely
2015-02-25 8:40 ` [PATCH v9 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-02-27 10:53 ` Shannon Zhao
2015-02-27 11:13 ` Shannon Zhao
2015-02-27 11:20 ` Shannon Zhao
2015-02-25 8:40 ` [PATCH v9 21/21] ARM64 / ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-02-27 11:22 ` Shannon Zhao
2015-02-27 14:19 ` Hanjun Guo
2015-03-05 18:54 ` Olof Johansson
2015-02-27 3:20 ` [PATCH v9 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Timur Tabi
2015-02-27 8:37 ` Hanjun Guo
2015-02-27 10:51 ` Shannon Zhao
2015-02-27 8:50 ` Ard Biesheuvel
2015-02-27 10:36 ` Mark Rutland
2015-02-27 21:05 ` Timur Tabi
2015-03-04 23:18 ` Timur Tabi
2015-03-04 22:56 ` Rafael J. Wysocki
2015-03-05 7:03 ` Hanjun Guo
2015-03-05 18:57 ` Olof Johansson
2015-03-06 4:26 ` 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=20150305184925.GF4932@quad.lixom.net \
--to=olof@lixom.net \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=arnd@arndb.de \
--cc=ashwinc@codeaurora.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=graeme.gregory@linaro.org \
--cc=grant.likely@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=jcm@redhat.com \
--cc=linaro-acpi@lists.linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=rjw@rjwysocki.net \
--cc=rric@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=timur@codeaurora.org \
--cc=tomasz.nowicki@linaro.org \
--cc=will.deacon@arm.com \
/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).