|
@@ -109,7 +109,8 @@ of_get_coresight_platform_data(struct device *dev,
|
|
struct coresight_platform_data *pdata;
|
|
struct coresight_platform_data *pdata;
|
|
struct of_endpoint endpoint, rendpoint;
|
|
struct of_endpoint endpoint, rendpoint;
|
|
struct device *rdev;
|
|
struct device *rdev;
|
|
- struct device_node *dn;
|
|
|
|
|
|
+ bool found;
|
|
|
|
+ struct device_node *dn, *np;
|
|
struct device_node *ep = NULL;
|
|
struct device_node *ep = NULL;
|
|
struct device_node *rparent = NULL;
|
|
struct device_node *rparent = NULL;
|
|
struct device_node *rport = NULL;
|
|
struct device_node *rport = NULL;
|
|
@@ -176,17 +177,19 @@ of_get_coresight_platform_data(struct device *dev,
|
|
} while (ep);
|
|
} while (ep);
|
|
}
|
|
}
|
|
|
|
|
|
- /* Affinity defaults to CPU0 */
|
|
|
|
- pdata->cpu = 0;
|
|
|
|
dn = of_parse_phandle(node, "cpu", 0);
|
|
dn = of_parse_phandle(node, "cpu", 0);
|
|
- for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {
|
|
|
|
- if (dn == of_get_cpu_node(cpu, NULL)) {
|
|
|
|
- pdata->cpu = cpu;
|
|
|
|
|
|
+ for_each_possible_cpu(cpu) {
|
|
|
|
+ np = of_cpu_device_node_get(cpu);
|
|
|
|
+ found = (dn == np);
|
|
|
|
+ of_node_put(np);
|
|
|
|
+ if (found)
|
|
break;
|
|
break;
|
|
- }
|
|
|
|
}
|
|
}
|
|
of_node_put(dn);
|
|
of_node_put(dn);
|
|
|
|
|
|
|
|
+ /* Affinity to CPU0 if no cpu nodes are found */
|
|
|
|
+ pdata->cpu = found ? cpu : 0;
|
|
|
|
+
|
|
return pdata;
|
|
return pdata;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);
|
|
EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);
|