Get CPU ID from phandle. Some drivers such as coresight, cti-coresight, or arm-dsu use this API for finding CPU node in DT. In particular, drivers do this by getting the CPU device_node through a phandle and then find the CPU ID using of_cpu_node_to_id(). This commit encapsulates CPU node finding and improves readability.
The interface takes three parameters, 1) node, 2) pointer to pointer of CPU node, 3) CPU node index. API sets the pointer to the CPU node and allows the driver to work with the CPU node, for logging purposes for instance.
Reviewed-by: Rob Herring (Arm) robh@kernel.org Reviewed-by: Jonathan Cameron jonathan.cameron@huawei.com Signed-off-by: Alireza Sanaee alireza.sanaee@huawei.com --- drivers/of/cpu.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of.h | 9 +++++++++ 2 files changed, 57 insertions(+)
diff --git a/drivers/of/cpu.c b/drivers/of/cpu.c index 5214dc3d05ae..9e0d3ec10bc2 100644 --- a/drivers/of/cpu.c +++ b/drivers/of/cpu.c @@ -173,6 +173,54 @@ int of_cpu_node_to_id(struct device_node *cpu_node) } EXPORT_SYMBOL(of_cpu_node_to_id);
+/** + * of_cpu_phandle_to_id: Get the logical CPU number for a given device_node + * + * @node: Pointer to the device_node containing CPU phandle. + * @cpu_np: Pointer to the device_node for CPU. + * @cpu_idx: The index of the CPU in the list of CPUs. + * + * *cpu_np is only set when cpu_np is not NULL. Use of_node_put() to release + * the node reference if cpu_np != NULL and this function succeeds. + * + * Return: This function has three different possible return situations: + * 1) returns -EINVAL if the node is NULL. + * 2) returns -ENODEV if the CPU node is not found or of_cpu_node_to_id is + * not successful. + * 3) returns the logical CPU number if the CPU node is found. + */ +int of_cpu_phandle_to_id(const struct device_node *node, + struct device_node **cpu_np, + uint8_t cpu_idx) +{ + struct device_node *local_cpu_node = NULL; + int cpu; + + if (!node) + return -EINVAL; + + if (cpu_idx == 0) + local_cpu_node = of_parse_phandle(node, "cpu", 0); + if (!local_cpu_node) + local_cpu_node = of_parse_phandle(node, "cpus", cpu_idx); + if (!local_cpu_node) + return -ENODEV; + + cpu = of_cpu_node_to_id(local_cpu_node); + if (cpu < 0) { + of_node_put(local_cpu_node); + return cpu; + } + + if (cpu_np) + *cpu_np = local_cpu_node; + else + of_node_put(local_cpu_node); + + return cpu; +} +EXPORT_SYMBOL(of_cpu_phandle_to_id); + /** * of_get_cpu_state_node - Get CPU's idle state node at the given index * diff --git a/include/linux/of.h b/include/linux/of.h index a62154aeda1b..717e55065d99 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -365,6 +365,8 @@ extern const void *of_get_property(const struct device_node *node, extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); extern struct device_node *of_cpu_device_node_get(int cpu); extern int of_cpu_node_to_id(struct device_node *np); +extern int of_cpu_phandle_to_id(const struct device_node *np, + struct device_node **cpu_np, uint8_t cpu_idx); extern struct device_node *of_get_next_cpu_node(struct device_node *prev); extern struct device_node *of_get_cpu_state_node(const struct device_node *cpu_node, int index); @@ -680,6 +682,13 @@ static inline int of_cpu_node_to_id(struct device_node *np) return -ENODEV; }
+static inline int of_cpu_phandle_to_id(const struct device_node *np, + struct device_node **cpu_np, + uint8_t cpu_idx) +{ + return -ENODEV; +} + static inline struct device_node *of_get_next_cpu_node(struct device_node *prev) { return NULL;