mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-03 15:55:38 +00:00
819a88263d
ARM64 CPU operations such as cpu_init and cpu_init_idle take a struct device_node pointer as a parameter, which corresponds to the device tree node of the logical cpu on which the operation has to be applied. With the advent of ACPI on arm64, where MADT static table entries are used to initialize cpus, the device tree node parameter in cpu_ops hooks become useless when booting with ACPI, since in that case cpu device tree nodes are not present and can not be used for cpu initialization. The current cpu_init hook requires a struct device_node pointer parameter because it is called while parsing the device tree to initialize CPUs, when the cpu_logical_map (that is used to match a cpu node reg property to a device tree node) for a given logical cpu id is not set up yet. This means that the cpu_init hook cannot rely on the of_get_cpu_node function to retrieve the device tree node corresponding to the logical cpu id passed in as parameter, so the cpu device tree node must be passed in as a parameter to fix this catch-22 dependency cycle. This patch reshuffles the cpu_logical_map initialization code so that the cpu_init cpu_ops hook can safely use the of_get_cpu_node function to retrieve the cpu device tree node, removing the need for the device tree node pointer parameter. In the process, the patch removes device tree node parameters from all cpu_ops hooks, in preparation for SMP DT/ACPI cpus initialization consolidation. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Tested-by: Mark Rutland <mark.rutland@arm.com> [DT] Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
86 lines
2.1 KiB
C
86 lines
2.1 KiB
C
/*
|
|
* CPU kernel entry/exit control
|
|
*
|
|
* Copyright (C) 2013 ARM Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* 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>
|
|
|
|
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,
|
|
};
|
|
|
|
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;
|
|
|
|
ops++;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Read a cpu's enable method from the device tree and record it in cpu_ops.
|
|
*/
|
|
int __init cpu_read_ops(int cpu)
|
|
{
|
|
const char *enable_method;
|
|
struct device_node *dn = of_get_cpu_node(cpu, NULL);
|
|
|
|
if (!dn) {
|
|
if (!cpu)
|
|
pr_err("Failed to find device node for boot cpu\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
enable_method = of_get_property(dn, "enable-method", NULL);
|
|
if (!enable_method) {
|
|
/*
|
|
* The boot CPU may not have an enable method (e.g. when
|
|
* spin-table is used for secondaries). Don't warn spuriously.
|
|
*/
|
|
if (cpu != 0)
|
|
pr_err("%s: missing enable-method property\n",
|
|
dn->full_name);
|
|
return -ENOENT;
|
|
}
|
|
|
|
cpu_ops[cpu] = cpu_get_ops(enable_method);
|
|
if (!cpu_ops[cpu]) {
|
|
pr_warn("%s: unsupported enable-method property: %s\n",
|
|
dn->full_name, enable_method);
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
return 0;
|
|
}
|