Skip to content

Commit b5cb28f

Browse files
committed
revert upstream patch 41955b6c
1 parent 163f8d1 commit b5cb28f

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
commit 82ee4b45efa363e7f26b02bfe3a9b5416cbfccaf
2+
Author: nkraetzschmar <[email protected]>
3+
Date: Mon Feb 17 19:25:59 2025 +0100
4+
5+
Revert "rtla/timerlat_top: Set OSNOISE_WORKLOAD for kernel threads"
6+
7+
This reverts commit 41955b6c268154f81e34f9b61cf8156eec0730c0.
8+
9+
diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
10+
index 5a33789a375e..1cf3d2779320 100644
11+
--- a/tools/tracing/rtla/src/timerlat_top.c
12+
+++ b/tools/tracing/rtla/src/timerlat_top.c
13+
@@ -679,15 +679,12 @@ timerlat_top_apply_config(struct osnoise_tool *top, struct timerlat_top_params *
14+
auto_house_keeping(&params->monitored_cpus);
15+
}
16+
17+
- /*
18+
- * Set workload according to type of thread if the kernel supports it.
19+
- * On kernels without support, user threads will have already failed
20+
- * on missing timerlat_fd, and kernel threads do not need it.
21+
- */
22+
- retval = osnoise_set_workload(top->context, params->kernel_workload);
23+
- if (retval < -1) {
24+
- err_msg("Failed to set OSNOISE_WORKLOAD option\n");
25+
- goto out_err;
26+
+ if (params->user_top) {
27+
+ retval = osnoise_set_workload(top->context, 0);
28+
+ if (retval) {
29+
+ err_msg("Failed to set OSNOISE_WORKLOAD option\n");
30+
+ goto out_err;
31+
+ }
32+
}
33+
34+
return 0;

upstream_patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,4 @@ fpga-ofs-dev-6.6-lts-patches/0086-.github-workflows-build-kernel-packages.patch
8787
fpga-ofs-dev-6.6-lts-patches/0087-.github-workflows-scan-kernel-with-Coverity.patch
8888
fpga-ofs-dev-6.6-lts-patches/0088-fpga-dfl-cxl-cache-depend-on-DRM.patch
8989
intel-dfl-fixes/001-fix-config-dependency-intel-s10hssi.patch
90+
revert_41955b6c.patch

0 commit comments

Comments
 (0)