Commit 8c02a5ba authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Greg Kroah-Hartman

coresight: making cpu index lookup arm64 compliant

Function "get_logical_index()" is not available on arm64.
Instead of adding the function simply using "of_get_cpu_node()" and
comparing the return value with cpu handles yields the same
result.
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d86fb45b
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/coresight.h> #include <linux/coresight.h>
#include <linux/cpumask.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
...@@ -113,7 +114,7 @@ static int of_coresight_alloc_memory(struct device *dev, ...@@ -113,7 +114,7 @@ static int of_coresight_alloc_memory(struct device *dev,
struct coresight_platform_data *of_get_coresight_platform_data( struct coresight_platform_data *of_get_coresight_platform_data(
struct device *dev, struct device_node *node) struct device *dev, struct device_node *node)
{ {
int i = 0, ret = 0; int i = 0, ret = 0, cpu;
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;
...@@ -187,17 +188,10 @@ struct coresight_platform_data *of_get_coresight_platform_data( ...@@ -187,17 +188,10 @@ struct coresight_platform_data *of_get_coresight_platform_data(
/* Affinity defaults to CPU0 */ /* Affinity defaults to CPU0 */
pdata->cpu = 0; pdata->cpu = 0;
dn = of_parse_phandle(node, "cpu", 0); dn = of_parse_phandle(node, "cpu", 0);
if (dn) { for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {
const u32 *cell; if (dn == of_get_cpu_node(cpu, NULL)) {
int len, index; pdata->cpu = cpu;
u64 hwid; break;
cell = of_get_property(dn, "reg", &len);
if (cell) {
hwid = of_read_number(cell, of_n_addr_cells(dn));
index = get_logical_index(hwid);
if (index != -EINVAL)
pdata->cpu = index;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment