Skip to content

Optimize the Coresight Trace id allocation logic #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jie Gan (jiegan0107) wants to merge 2 commits into
base: qcom-6.18.y
Choose a base branch
from
Open

Optimize the Coresight Trace id allocation logic #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3923aec
BACKPORT: coresight: fix missing error code when trace ID is invalid
jiegan0107 May 12, 2026
f562475
FROMLIST: coresight: tnoc: fix trace ID path assignment failure on no…
jiegan0107 Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions drivers/hwtracing/coresight/coresight-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,8 @@ static int coresight_get_trace_id(struct coresight_device *csdev,
* Call this after creating the path and before enabling it. This leaves
* the trace ID set on the path, or it remains 0 if it couldn't be assigned.
*/
void coresight_path_assign_trace_id(struct coresight_path *path,
enum cs_mode mode)
int coresight_path_assign_trace_id(struct coresight_path *path,
enum cs_mode mode)
{
struct coresight_device *sink = coresight_get_sink(path);
struct coresight_node *nd;
Expand All @@ -803,15 +803,18 @@ void coresight_path_assign_trace_id(struct coresight_path *path,
/* Assign a trace ID to the path for the first device that wants to do it */
trace_id = coresight_get_trace_id(nd->csdev, mode, sink);

/*
* 0 in this context is that it didn't want to assign so keep searching.
* Non 0 is either success or fail.
*/
if (trace_id != 0) {
path->trace_id = trace_id;
return;
}
/* 0 means the device has no ID assignment, so keep searching */
if (trace_id == 0)
continue;

if (!IS_VALID_CS_TRACE_ID(trace_id))
return -EINVAL;

path->trace_id = trace_id;
return 0;
}

return -EINVAL;
}

/**
Expand Down
5 changes: 3 additions & 2 deletions drivers/hwtracing/coresight/coresight-etm-perf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
struct coresight_device *sink = NULL;
struct coresight_device *user_sink = NULL, *last_sink = NULL;
struct etm_event_data *event_data = NULL;
int ret;

event_data = alloc_event_data(cpu);
if (!event_data)
Expand Down Expand Up @@ -418,8 +419,8 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
}

/* ensure we can allocate a trace ID for this CPU */
coresight_path_assign_trace_id(path, CS_MODE_PERF);
if (!IS_VALID_CS_TRACE_ID(path->trace_id)) {
ret = coresight_path_assign_trace_id(path, CS_MODE_PERF);
if (ret) {
cpumask_clear_cpu(cpu, mask);
coresight_release_path(path);
continue;
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwtracing/coresight/coresight-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ int coresight_make_links(struct coresight_device *orig,
void coresight_remove_links(struct coresight_device *orig,
struct coresight_connection *conn);
u32 coresight_get_sink_id(struct coresight_device *csdev);
void coresight_path_assign_trace_id(struct coresight_path *path,
int coresight_path_assign_trace_id(struct coresight_path *path,
enum cs_mode mode);
int coresight_get_in_port_dest(struct coresight_device *src,
struct coresight_device *dest);
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwtracing/coresight/coresight-sysfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
goto out;
}

coresight_path_assign_trace_id(path, CS_MODE_SYSFS);
if (!IS_VALID_CS_TRACE_ID(path->trace_id))
ret = coresight_path_assign_trace_id(path, CS_MODE_SYSFS);
if (ret)
goto err_path;

ret = coresight_enable_path(path, CS_MODE_SYSFS, NULL);
Expand Down
10 changes: 4 additions & 6 deletions drivers/hwtracing/coresight/coresight-tnoc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ static void trace_noc_enable_hw(struct trace_noc_drvdata *drvdata)
{
u32 val;

/* No valid ATID, simply enable the unit */
if (drvdata->atid == -EOPNOTSUPP) {
/* 0 means no ID assignment, simply enable the unit */
if (drvdata->atid == 0) {
writel(TRACE_NOC_CTRL_PORTEN, drvdata->base + TRACE_NOC_CTRL);
return;
}
Expand Down Expand Up @@ -133,10 +133,8 @@ static int trace_noc_init_default_data(struct trace_noc_drvdata *drvdata)
{
int atid;

if (of_device_is_compatible(drvdata->dev->of_node, "qcom,coresight-itnoc")) {
drvdata->atid = -EOPNOTSUPP;
if (of_device_is_compatible(drvdata->dev->of_node, "qcom,coresight-itnoc"))
return 0;
}

atid = coresight_trace_id_get_system_id();
if (atid < 0)
Expand Down Expand Up @@ -169,7 +167,7 @@ static umode_t trace_id_is_visible(struct kobject *kobj,
struct device *dev = kobj_to_dev(kobj);
struct trace_noc_drvdata *drvdata = dev_get_drvdata(dev->parent);

if (attr == &dev_attr_traceid.attr && drvdata->atid < 0)
if (attr == &dev_attr_traceid.attr && drvdata->atid == 0)
return 0;

return attr->mode;
Expand Down
Loading