ARM64: kernel: make cpu_ops hooks DT agnostic

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>

diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h
index 5a31d671691439b1a329f49d878bbc479f4b253c..7d8b999d1a2b65a6484f43606e2c2ed33f3638ac 100644 (file)
--- a/arch/arm64/include/asm/cpu_ops.h
+++ b/arch/arm64/include/asm/cpu_ops.h
@@ -19,15 +19,15 @@
 #include <linux/init.h>
 #include <linux/threads.h>
 
-struct device_node;
-
 /**
  * struct cpu_operations - Callback operations for hotplugging CPUs.
  *
  * @name:      Name of the property as appears in a devicetree cpu node's
- *             enable-method property.
- * @cpu_init:  Reads any data necessary for a specific enable-method from the
- *             devicetree, for a given cpu node and proposed logical id.
+ *             enable-method property. On systems booting with ACPI, @name
+ *             identifies the struct cpu_operations entry corresponding to
+ *             the boot protocol specified in the ACPI MADT table.
+ * @cpu_init:  Reads any data necessary for a specific enable-method for a
+ *             proposed logical id.
  * @cpu_prepare: Early one-time preparation step for a cpu. If there is a
  *             mechanism for doing so, tests whether it is possible to boot
  *             the given CPU.
@@ -40,15 +40,15 @@ struct device_node;
  * @cpu_die:   Makes a cpu leave the kernel. Must not fail. Called from the
  *             cpu being killed.
  * @cpu_kill:  Ensures a cpu has left the kernel. Called from another cpu.
- * @cpu_init_idle: Reads any data necessary to initialize CPU idle states from
- *             devicetree, for a given cpu node and proposed logical id.
+ * @cpu_init_idle: Reads any data necessary to initialize CPU idle states for
+ *                a proposed logical id.
  * @cpu_suspend: Suspends a cpu and saves the required context. May fail owing
  *               to wrong parameters or error conditions. Called from the
  *               CPU being suspended. Must be called with IRQs disabled.
  */
 struct cpu_operations {
        const char      *name;
-       int             (*cpu_init)(struct device_node *, unsigned int);
+       int             (*cpu_init)(unsigned int);
        int             (*cpu_prepare)(unsigned int);
        int             (*cpu_boot)(unsigned int);
        void            (*cpu_postboot)(void);
@@ -58,14 +58,18 @@ struct cpu_operations {
        int             (*cpu_kill)(unsigned int cpu);
 #endif
 #ifdef CONFIG_CPU_IDLE
-       int             (*cpu_init_idle)(struct device_node *, unsigned int);
+       int             (*cpu_init_idle)(unsigned int);
        int             (*cpu_suspend)(unsigned long);
 #endif
 };
 
 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);
+int __init cpu_read_ops(int cpu);
 const struct cpu_operations *cpu_get_ops(const char *name);
 
+static inline void __init cpu_read_bootcpu_ops(void)
+{
+       cpu_read_ops(0);
+}
+
 #endif /* ifndef __ASM_CPU_OPS_H */

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 8b839558838e5a87e391d691d70492799f122d04..945cc1fb3c78c83c05145c8a48f304f021e35f82 100644 (file)
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -154,7 +154,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
                if (!cpu_ops[enabled_cpus])
                        return;
 
-               if (cpu_ops[enabled_cpus]->cpu_init(NULL, enabled_cpus))
+               if (cpu_ops[enabled_cpus]->cpu_init(enabled_cpus))
                        return;
 
                /* map the logical cpu id to cpu MPIDR */

diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
index fb8ff9ba467a9701cc870a451c7172f534c37f58..bbda2d267ea66a8a6f73e4b7b853ef26216ee0d2 100644 (file)
--- a/arch/arm64/kernel/cpu_ops.c
+++ b/arch/arm64/kernel/cpu_ops.c
@@ -52,9 +52,18 @@ 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_read_ops(int cpu)
 {
-       const char *enable_method = of_get_property(dn, "enable-method", NULL);
+       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
@@ -75,13 +84,3 @@ int __init cpu_read_ops(struct device_node *dn, int cpu)
 
        return 0;
 }
-
-void __init cpu_read_bootcpu_ops(void)
-{
-       struct device_node *dn = of_get_cpu_node(0, NULL);
-       if (!dn) {
-               pr_err("Failed to find device node for boot cpu\n");
-               return;
-       }
-       cpu_read_ops(dn, 0);
-}

diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index a78143a5c99ffb2c9a7ae69267ef3c7f3256c024..f8aa16973318f5339b54e761e22f9db5ca81033b 100644 (file)
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -18,15 +18,10 @@
 int arm_cpuidle_init(unsigned int cpu)
 {
        int ret = -EOPNOTSUPP;
-       struct device_node *cpu_node = of_cpu_device_node_get(cpu);
-
-       if (!cpu_node)
-               return -ENODEV;
 
        if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_init_idle)
-               ret = cpu_ops[cpu]->cpu_init_idle(cpu_node, cpu);
+               ret = cpu_ops[cpu]->cpu_init_idle(cpu);
 
-       of_node_put(cpu_node);
        return ret;
 }
 

diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index ea18cb53921e8f8ed8197c6cc7090473a5ba56af..efe3480a97a9652ae814b597cb992bd255652815 100644 (file)
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -186,12 +186,15 @@ static int psci_migrate_info_type(void)
        return err;
 }
 
-static int __maybe_unused cpu_psci_cpu_init_idle(struct device_node *cpu_node,
-                                                unsigned int cpu)
+static int __maybe_unused cpu_psci_cpu_init_idle(unsigned int cpu)
 {
        int i, ret, count = 0;
        struct psci_power_state *psci_states;
-       struct device_node *state_node;
+       struct device_node *state_node, *cpu_node;
+
+       cpu_node = of_get_cpu_node(cpu, NULL);
+       if (!cpu_node)
+               return -ENODEV;
 
        /*
         * If the PSCI cpu_suspend function hook has not been initialized
@@ -444,7 +447,7 @@ int __init psci_acpi_init(void)
 
 #ifdef CONFIG_SMP
 
-static int __init cpu_psci_cpu_init(struct device_node *dn, unsigned int cpu)
+static int __init cpu_psci_cpu_init(unsigned int cpu)
 {
        return 0;
 }

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 2cb008177252f08d876875e08e4448b5b3260dde..98eb68b5660fa9cc57eee587f2c169cf2dcc1d8c 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -318,6 +318,23 @@ void __init smp_prepare_boot_cpu(void)
        set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
 }
 
+/*
+ * Initialize cpu operations for a logical cpu and
+ * set it in the possible mask on success
+ */
+static int __init smp_cpu_setup(int cpu)
+{
+       if (cpu_read_ops(cpu))
+               return -ENODEV;
+
+       if (cpu_ops[cpu]->cpu_init(cpu))
+               return -ENODEV;
+
+       set_cpu_possible(cpu, true);
+
+       return 0;
+}
+
 /*
  * Enumerate the possible CPU set from the device tree and build the
  * cpu logical map array containing MPIDR values related to logical
@@ -395,12 +412,6 @@ void __init of_smp_init_cpus(void)
                if (cpu >= NR_CPUS)
                        goto next;
 
-               if (cpu_read_ops(dn, cpu) != 0)
-                       goto next;
-
-               if (cpu_ops[cpu]->cpu_init(dn, cpu))
-                       goto next;
-
                pr_debug("cpu logical map 0x%llx\n", hwid);
                cpu_logical_map(cpu) = hwid;
 next:
@@ -418,12 +429,18 @@ next:
        }
 
        /*
-        * All the cpus that made it to the cpu_logical_map have been
-        * validated so set them as possible cpus.
+        * We need to set the cpu_logical_map entries before enabling
+        * the cpus so that cpu processor description entries (DT cpu nodes
+        * and ACPI MADT entries) can be retrieved by matching the cpu hwid
+        * with entries in cpu_logical_map while initializing the cpus.
+        * If the cpu set-up fails, invalidate the cpu_logical_map entry.
         */
-       for (i = 0; i < NR_CPUS; i++)
-               if (cpu_logical_map(i) != INVALID_HWID)
-                       set_cpu_possible(i, true);
+       for (i = 1; i < NR_CPUS; i++) {
+               if (cpu_logical_map(i) != INVALID_HWID) {
+                       if (smp_cpu_setup(i))
+                               cpu_logical_map(i) = INVALID_HWID;
+               }
+       }
 }
 
 void __init smp_prepare_cpus(unsigned int max_cpus)

diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c
index 14944e5b28dace9ea083e74f4849d4f40eadef95..aef3605a8c47845ce2ce2d32f75e0fd59a8e4405 100644 (file)
--- a/arch/arm64/kernel/smp_spin_table.c
+++ b/arch/arm64/kernel/smp_spin_table.c
@@ -49,8 +49,14 @@ static void write_pen_release(u64 val)
 }
 
 
-static int smp_spin_table_cpu_init(struct device_node *dn, unsigned int cpu)
+static int smp_spin_table_cpu_init(unsigned int cpu)
 {
+       struct device_node *dn;
+
+       dn = of_get_cpu_node(cpu, NULL);
+       if (!dn)
+               return -ENODEV;
+
        /*
         * Determine the address from which the CPU is polling.
         */