[RFC PATCH 4/5] hwtracing: rvtrace: Move to fwnode_* APIs
Sunil V L
sunilvl at oss.qualcomm.com
Tue Sep 29 01:55:23 PDT 2026
From: Sunil V L <sunilvl at oss.qualcomm.com>
so that it works for ACPI as well in future.
Signed-off-by: Sunil V L <sunilvl at oss.qualcomm.com>
---
drivers/hwtracing/gtrace/Kconfig | 4 +-
drivers/hwtracing/gtrace/rvtrace-platform.c | 131 +++++++++++++-------
2 files changed, 90 insertions(+), 45 deletions(-)
diff --git a/drivers/hwtracing/gtrace/Kconfig b/drivers/hwtracing/gtrace/Kconfig
index e5b62d65e2fd..86322250a6a3 100644
--- a/drivers/hwtracing/gtrace/Kconfig
+++ b/drivers/hwtracing/gtrace/Kconfig
@@ -2,7 +2,7 @@
menuconfig GTRACE
tristate "Generic Hardware Trace Support"
- depends on OF
+ depends on OF || ACPI
select PERF_EVENTS
help
This framework provides an architecture-neutral kernel interface
@@ -18,7 +18,7 @@ menuconfig GTRACE
config RVTRACE
tristate "RISC-V Trace Support"
depends on RISCV
- depends on OF
+ depends on OF || ACPI
depends on GTRACE
default RISCV
help
diff --git a/drivers/hwtracing/gtrace/rvtrace-platform.c b/drivers/hwtracing/gtrace/rvtrace-platform.c
index f34de9183d9a..12330d9dcddd 100644
--- a/drivers/hwtracing/gtrace/rvtrace-platform.c
+++ b/drivers/hwtracing/gtrace/rvtrace-platform.c
@@ -7,7 +7,6 @@
#include <linux/gtrace.h>
#include <linux/io.h>
#include <linux/of.h>
-#include <linux/of_graph.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/types.h>
@@ -61,52 +60,61 @@ const struct gtrace_hw_ops rvtrace_hw_ops = {
.reset = rvtrace_hw_reset,
};
-static int rvtrace_of_parse_outconns(struct gtrace_platform_data *pdata)
+static int rvtrace_parse_outconns(struct gtrace_platform_data *pdata)
{
- struct device_node *parent, *ep_node, *rep_node, *rdev_node;
+ struct fwnode_handle *parent, *ep_node, *rep_node, *rdev_node;
+ struct fwnode_endpoint ep = { 0 };
+ struct fwnode_endpoint rep = { 0 };
struct gtrace_connection *conn;
- struct of_endpoint ep, rep;
+ unsigned int nr_outconns;
int ret = 0, i = 0;
- parent = of_get_child_by_name(dev_of_node(pdata->dev), "out-ports");
+ parent = fwnode_get_named_child_node(dev_fwnode(pdata->dev), "out-ports");
if (!parent)
return 0;
- pdata->nr_outconns = of_graph_get_endpoint_count(parent);
- pdata->outconns = devm_kcalloc(pdata->dev, pdata->nr_outconns,
+ nr_outconns = fwnode_graph_get_endpoint_count(parent, 0);
+ pdata->nr_outconns = nr_outconns;
+ pdata->outconns = devm_kcalloc(pdata->dev, nr_outconns,
sizeof(*pdata->outconns), GFP_KERNEL);
if (!pdata->outconns) {
ret = -ENOMEM;
goto done;
}
- for_each_endpoint_of_node(parent, ep_node) {
+ fwnode_graph_for_each_endpoint(parent, ep_node) {
conn = devm_kzalloc(pdata->dev, sizeof(*conn), GFP_KERNEL);
if (!conn) {
- of_node_put(ep_node);
+ fwnode_handle_put(ep_node);
ret = -ENOMEM;
break;
}
- ret = of_graph_parse_endpoint(ep_node, &ep);
+ ret = fwnode_graph_parse_endpoint(ep_node, &ep);
if (ret) {
- of_node_put(ep_node);
+ fwnode_handle_put(ep_node);
break;
}
- rep_node = of_graph_get_remote_endpoint(ep_node);
+ rep_node = fwnode_graph_get_remote_endpoint(ep_node);
if (!rep_node) {
ret = -ENODEV;
- of_node_put(ep_node);
+ fwnode_handle_put(ep_node);
+ break;
+ }
+ rdev_node = fwnode_graph_get_port_parent(rep_node);
+ if (!rdev_node) {
+ ret = -ENODEV;
+ fwnode_handle_put(ep_node);
+ fwnode_handle_put(rep_node);
break;
}
- rdev_node = of_graph_get_port_parent(rep_node);
- ret = of_graph_parse_endpoint(rep_node, &rep);
+ ret = fwnode_graph_parse_endpoint(rep_node, &rep);
if (ret) {
- of_node_put(ep_node);
- of_node_put(rep_node);
- of_node_put(rdev_node);
+ fwnode_handle_put(ep_node);
+ fwnode_handle_put(rep_node);
+ fwnode_handle_put(rdev_node);
break;
}
@@ -115,21 +123,25 @@ static int rvtrace_of_parse_outconns(struct gtrace_platform_data *pdata)
/* The 'src_comp' is set by gtrace_register_component() */
conn->src_comp = NULL;
conn->dest_port = rep.port;
- conn->dest_fwnode = of_fwnode_handle(rdev_node);
+ conn->dest_fwnode = rdev_node;
fwnode_handle_get(conn->dest_fwnode);
conn->dest_comp = gtrace_find_by_fwnode(conn->dest_fwnode);
if (!conn->dest_comp) {
ret = -EPROBE_DEFER;
- of_node_put(ep_node);
- of_node_put(rep_node);
- of_node_put(rdev_node);
+ fwnode_handle_put(ep_node);
+ fwnode_handle_put(rep_node);
+ fwnode_handle_put(rdev_node);
break;
}
- pdata->outconns[i] = conn;
- i++;
+ pdata->outconns[i++] = conn;
+ fwnode_handle_put(rep_node);
+ fwnode_handle_put(rdev_node);
}
+ if (!ret)
+ pdata->nr_outconns = i;
+
done:
if (ret) {
for (i = 0; i < pdata->nr_outconns && pdata->outconns; i++) {
@@ -138,29 +150,69 @@ static int rvtrace_of_parse_outconns(struct gtrace_platform_data *pdata)
fwnode_handle_put(conn->dest_fwnode);
}
}
- of_node_put(parent);
+ fwnode_handle_put(parent);
return ret;
}
-static int rvtrace_of_parse_inconns(struct gtrace_platform_data *pdata)
+static int rvtrace_parse_inconns(struct gtrace_platform_data *pdata)
{
- struct device_node *parent;
+ struct fwnode_handle *parent;
int ret = 0;
- parent = of_get_child_by_name(dev_of_node(pdata->dev), "in-ports");
+ parent = fwnode_get_named_child_node(dev_fwnode(pdata->dev), "in-ports");
if (!parent)
return 0;
- pdata->nr_inconns = of_graph_get_endpoint_count(parent);
+ pdata->nr_inconns = fwnode_graph_get_endpoint_count(parent,
+ FWNODE_GRAPH_DEVICE_DISABLED);
pdata->inconns = devm_kcalloc(pdata->dev, pdata->nr_inconns,
sizeof(*pdata->inconns), GFP_KERNEL);
if (!pdata->inconns)
ret = -ENOMEM;
- of_node_put(parent);
+ fwnode_handle_put(parent);
return ret;
}
+#ifdef CONFIG_OF
+static int of_rvtrace_get_cpu(struct device *dev)
+{
+ struct device_node *dn;
+ int cpu;
+
+ if (!dev->of_node)
+ return -1;
+
+ dn = of_parse_phandle(dev->of_node, "cpus", 0);
+ if (!dn)
+ return -1;
+
+ cpu = of_cpu_node_to_id(dn);
+ of_node_put(dn);
+
+ return cpu;
+}
+#else
+static int of_rvtrace_get_cpu(struct device *dev)
+{
+ return -1;
+}
+#endif
+
+/*
+ * rvtrace_get_cpu - Find the logical CPU id of the CPU associated
+ * with this rvtrace device.
+ *
+ * Returns the logical CPU id when found.
+ */
+static int rvtrace_get_cpu(struct device *dev)
+{
+ if (is_of_node(dev_fwnode(dev)))
+ return of_rvtrace_get_cpu(dev);
+
+ return -1;
+}
+
static int rvtrace_platform_probe(struct platform_device *pdev)
{
struct gtrace_platform_data *pdata;
@@ -168,7 +220,6 @@ static int rvtrace_platform_probe(struct platform_device *pdev)
struct gtrace_component_id id;
struct gtrace_component *comp;
u32 impl, type, major, minor;
- struct device_node *node;
struct resource *res;
int gtype;
int ret;
@@ -189,24 +240,18 @@ static int rvtrace_platform_probe(struct platform_device *pdev)
if (!pdata->base)
return dev_err_probe(dev, -ENOMEM, "failed to ioremap %pR\n", res);
- pdata->bound_cpu = -1;
- node = of_parse_phandle(dev_of_node(dev), "cpus", 0);
- if (node) {
- ret = of_cpu_node_to_id(node);
- of_node_put(node);
- if (ret < 0)
- return dev_err_probe(dev, ret, "failed to get CPU id for %pOF\n", node);
- pdata->bound_cpu = ret;
- }
-
+ pdata->bound_cpu = rvtrace_get_cpu(dev);
+ if (pdata->bound_cpu < 0)
+ return dev_err_probe(dev, pdata->bound_cpu,
+ "failed to get bound CPU\n");
/* Default control poll timeout */
pdata->control_poll_timeout_usecs = 10;
- ret = rvtrace_of_parse_outconns(pdata);
+ ret = rvtrace_parse_outconns(pdata);
if (ret)
return dev_err_probe(dev, ret, "failed to parse output connections\n");
- ret = rvtrace_of_parse_inconns(pdata);
+ ret = rvtrace_parse_inconns(pdata);
if (ret)
return dev_err_probe(dev, ret, "failed to parse input connections\n");
--
2.43.0
More information about the linux-riscv
mailing list