samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BACKPORT: FROMGIT: coresight: core: Disable helpers for devices that fail to enable

Browse Source 
When enabling a SINK or LINK type coresight device fails, the
associated helpers should be disabled.

Bug: 393467632
(cherry picked from commit f6028eeeb5e4cf86f93f805098c84974a79bba8a
 https: //git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
 next)
Fixes: 6148652807 ("coresight: Enable and disable helper devices adjacent to the path")
Change-Id: I4ee1883f38d55da5df87058f016c5eb82e99100a
Signed-off-by: Yabin Cui <yabinc@google.com>
Suggested-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20250429231301.1952246-3-yabinc@google.com
This commit is contained in:
Yabin Cui
2025-04-29 16:13:00 -07:00
parent 2956315ed5
commit 272d4285dd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/hwtracing/coresight/coresight-core.c
View File

@@ -574,7 +574,7 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
/* Enable all helpers adjacent to the path first */ /* Enable all helpers adjacent to the path first */
ret = coresight_enable_helpers(csdev, mode, sink_data); ret = coresight_enable_helpers(csdev, mode, sink_data);
if (ret) if (ret)
goto err; goto err_disable_path;
/* /*
* ETF devices are tricky... They can be a link or a sink, * ETF devices are tricky... They can be a link or a sink,
* depending on how they are configured. If an ETF has been * depending on how they are configured. If an ETF has been
@@ -595,8 +595,10 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
* that need disabling. Disabling the path here * that need disabling. Disabling the path here
* would mean we could disrupt an existing session. * would mean we could disrupt an existing session.
*/ */
if (ret) if (ret) {
coresight_disable_helpers(csdev);
goto out; goto out;
}
break; break;
case CORESIGHT_DEV_TYPE_SOURCE: case CORESIGHT_DEV_TYPE_SOURCE:
/* sources are enabled from either sysFS or Perf */ /* sources are enabled from either sysFS or Perf */
@@ -606,16 +608,19 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
child = list_next_entry(nd, link)->csdev; child = list_next_entry(nd, link)->csdev;
ret = coresight_enable_link(csdev, parent, child); ret = coresight_enable_link(csdev, parent, child);
if (ret) if (ret)
goto err; goto err_disable_helpers;
break; break;
default: default:
goto err; ret = -EINVAL;
goto err_disable_helpers;
} }
} }
out: out:
return ret; return ret;
err: err_disable_helpers:
coresight_disable_helpers(csdev);
err_disable_path:
coresight_disable_path_from(path, nd); coresight_disable_path_from(path, nd);
goto out; goto out;
} }