Commit c56cdd7a authored by Leo Yan's avatar Leo Yan Committed by Greg Kroah-Hartman

coresight: refactor with function of_coresight_get_cpu

This is refactor to add function of_coresight_get_cpu(), so it's used to
retrieve CPU id for coresight component. Finally can use it as a common
function for multiple places.
Suggested-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 04c94900
...@@ -101,16 +101,40 @@ static int of_coresight_alloc_memory(struct device *dev, ...@@ -101,16 +101,40 @@ static int of_coresight_alloc_memory(struct device *dev,
return 0; return 0;
} }
int of_coresight_get_cpu(const struct device_node *node)
{
int cpu;
bool found;
struct device_node *dn, *np;
dn = of_parse_phandle(node, "cpu", 0);
/* Affinity defaults to CPU0 */
if (!dn)
return 0;
for_each_possible_cpu(cpu) {
np = of_cpu_device_node_get(cpu);
found = (dn == np);
of_node_put(np);
if (found)
break;
}
of_node_put(dn);
/* Affinity to CPU0 if no cpu nodes are found */
return found ? cpu : 0;
}
EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
struct coresight_platform_data * struct coresight_platform_data *
of_get_coresight_platform_data(struct device *dev, of_get_coresight_platform_data(struct device *dev,
const struct device_node *node) const struct device_node *node)
{ {
int i = 0, ret = 0, cpu; int i = 0, ret = 0;
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;
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;
...@@ -177,18 +201,7 @@ of_get_coresight_platform_data(struct device *dev, ...@@ -177,18 +201,7 @@ of_get_coresight_platform_data(struct device *dev,
} while (ep); } while (ep);
} }
dn = of_parse_phandle(node, "cpu", 0); pdata->cpu = of_coresight_get_cpu(node);
for_each_possible_cpu(cpu) {
np = of_cpu_device_node_get(cpu);
found = (dn == np);
of_node_put(np);
if (found)
break;
}
of_node_put(dn);
/* Affinity to CPU0 if no cpu nodes are found */
pdata->cpu = found ? cpu : 0;
return pdata; return pdata;
} }
......
...@@ -263,10 +263,13 @@ static inline int coresight_timeout(void __iomem *addr, u32 offset, ...@@ -263,10 +263,13 @@ static inline int coresight_timeout(void __iomem *addr, u32 offset,
#endif #endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
extern int of_coresight_get_cpu(const struct device_node *node);
extern struct coresight_platform_data * extern struct coresight_platform_data *
of_get_coresight_platform_data(struct device *dev, of_get_coresight_platform_data(struct device *dev,
const struct device_node *node); const struct device_node *node);
#else #else
static inline int of_coresight_get_cpu(const struct device_node *node)
{ return 0; }
static inline struct coresight_platform_data *of_get_coresight_platform_data( static inline struct coresight_platform_data *of_get_coresight_platform_data(
struct device *dev, const struct device_node *node) { return NULL; } struct device *dev, const struct device_node *node) { return NULL; }
#endif #endif
......
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