Merge remote-tracking branch 'grant/devicetree/next' into for-next

1 files changed, 39 insertions, 21 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index ced4c06d79b3..f2431091f4c1 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -272,9 +272,9 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
 
         ac = of_n_addr_cells(cpun);
         cell = of_get_property(cpun, prop_name, &prop_len);
-        if (!cell)
+        if (!cell || !ac)
                 return false;
-        prop_len /= sizeof(*cell);
+        prop_len /= sizeof(*cell) * ac;
         for (tid = 0; tid < prop_len; tid++) {
                 hwid = of_read_number(cell, ac);
                 if (arch_match_cpu_phys_id(cpu, hwid)) {
@@ -287,6 +287,31 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
         return false;
 }
 
+/*
+ * arch_find_n_match_cpu_physical_id - See if the given device node is
+ * for the cpu corresponding to logical cpu 'cpu'.  Return true if so,
+ * else false.  If 'thread' is non-NULL, the local thread number within the
+ * core is returned in it.
+ */
+bool __weak arch_find_n_match_cpu_physical_id(struct device_node *cpun,
+                                              int cpu, unsigned int *thread)
+{
+        /* Check for non-standard "ibm,ppc-interrupt-server#s" property
+         * for thread ids on PowerPC. If it doesn't exist fallback to
+         * standard "reg" property.
+         */
+        if (IS_ENABLED(CONFIG_PPC) &&
+            __of_find_n_match_cpu_property(cpun,
+                                           "ibm,ppc-interrupt-server#s",
+                                           cpu, thread))
+                return true;
+
+        if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread))
+                return true;
+
+        return false;
+}
+
 /**
  * of_get_cpu_node - Get device node associated with the given logical CPU
  *
@@ -307,26 +332,10 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
  */
 struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
-        struct device_node *cpun, *cpus;
+        struct device_node *cpun;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (!cpus) {
-                pr_warn("Missing cpus node, bailing out\n");
-                return NULL;
-        }
-
-        for_each_child_of_node(cpus, cpun) {
-                if (of_node_cmp(cpun->type, "cpu"))
-                        continue;
-                /* Check for non-standard "ibm,ppc-interrupt-server#s" property
-                 * for thread ids on PowerPC. If it doesn't exist fallback to
-                 * standard "reg" property.
-                 */
-                if (IS_ENABLED(CONFIG_PPC) &&
-                        __of_find_n_match_cpu_property(cpun,
-                                "ibm,ppc-interrupt-server#s", cpu, thread))
-                        return cpun;
-                if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread))
+        for_each_node_by_type(cpun, "cpu") {
+                if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                         return cpun;
         }
         return NULL;
@@ -1183,6 +1192,15 @@ int of_property_count_strings(struct device_node *np, const char *propname)
 }
 EXPORT_SYMBOL_GPL(of_property_count_strings);
 
+void of_print_phandle_args(const char *msg, const struct of_phandle_args *args)
+{
+        int i;
+        printk("%s %s", msg, of_node_full_name(args->np));
+        for (i = 0; i < args->args_count; i++)
+                printk(i ? ",%08x" : ":%08x", args->args[i]);
+        printk("\n");
+}
+
 static int __of_parse_phandle_with_args(const struct device_node *np,
                                         const char *list_name,
                                         const char *cells_name,