add wifi6 8852be driver

hc

2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da

 kernel/tools/perf/ui/hist.c
..
..
@@ -1,13 +1,17 @@
1
1
 // SPDX-License-Identifier: GPL-2.0
2
2
 #include <inttypes.h>
3
3
 #include <math.h>
4
+#include <stdlib.h>
5
+#include <string.h>
4
6
 #include <linux/compiler.h>
5
7
 
8
+#include "../util/callchain.h"
9
+#include "../util/debug.h"
6
10
 #include "../util/hist.h"
7
-#include "../util/util.h"
8
11
 #include "../util/sort.h"
9
12
 #include "../util/evsel.h"
10
13
 #include "../util/evlist.h"
14
+#include "../perf.h"
11
15
 
12
16
 /* hist period print (hpp) functions */
13
17
 
..
..
@@ -24,7 +28,7 @@
24
28
 {
25
29
 	int ret;
26
30
 	struct hists *hists = he->hists;
27
-	struct perf_evsel *evsel = hists_to_evsel(hists);
31
+	struct evsel *evsel = hists_to_evsel(hists);
28
32
 	char *buf = hpp->buf;
29
33
 	size_t size = hpp->size;
30
34
 
..
..
@@ -39,12 +43,12 @@
39
43
 	} else
40
44
 		ret = hpp__call_print_fn(hpp, print_fn, fmt, len, get_field(he));
41
45
 
42
-	if (perf_evsel__is_group_event(evsel)) {
46
+	if (evsel__is_group_event(evsel)) {
43
47
 		int prev_idx, idx_delta;
44
48
 		struct hist_entry *pair;
45
-		int nr_members = evsel->nr_members;
49
+		int nr_members = evsel->core.nr_members;
46
50
 
47
-		prev_idx = perf_evsel__group_idx(evsel);
51
+		prev_idx = evsel__group_idx(evsel);
48
52
 
49
53
 		list_for_each_entry(pair, &he->pairs.head, pairs.node) {
50
54
 			u64 period = get_field(pair);
..
..
@@ -54,7 +58,7 @@
54
58
 				continue;
55
59
 
56
60
 			evsel = hists_to_evsel(pair->hists);
57
-			idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
61
+			idx_delta = evsel__group_idx(evsel) - prev_idx - 1;
58
62
 
59
63
 			while (idx_delta--) {
60
64
 				/*
..
..
@@ -78,7 +82,7 @@
78
82
 							  len, period);
79
83
 			}
80
84
 
81
-			prev_idx = perf_evsel__group_idx(evsel);
85
+			prev_idx = evsel__group_idx(evsel);
82
86
 		}
83
87
 
84
88
 		idx_delta = nr_members - prev_idx - 1;
..
..
@@ -147,39 +151,102 @@
147
151
 	return 0;
148
152
 }
149
153
 
154
+static int hist_entry__new_pair(struct hist_entry *a, struct hist_entry *b,
155
+				hpp_field_fn get_field, int nr_members,
156
+				u64 **fields_a, u64 **fields_b)
157
+{
158
+	u64 *fa = calloc(nr_members, sizeof(*fa)),
159
+	    *fb = calloc(nr_members, sizeof(*fb));
160
+	struct hist_entry *pair;
161
+
162
+	if (!fa || !fb)
163
+		goto out_free;
164
+
165
+	list_for_each_entry(pair, &a->pairs.head, pairs.node) {
166
+		struct evsel *evsel = hists_to_evsel(pair->hists);
167
+		fa[evsel__group_idx(evsel)] = get_field(pair);
168
+	}
169
+
170
+	list_for_each_entry(pair, &b->pairs.head, pairs.node) {
171
+		struct evsel *evsel = hists_to_evsel(pair->hists);
172
+		fb[evsel__group_idx(evsel)] = get_field(pair);
173
+	}
174
+
175
+	*fields_a = fa;
176
+	*fields_b = fb;
177
+	return 0;
178
+out_free:
179
+	free(fa);
180
+	free(fb);
181
+	*fields_a = *fields_b = NULL;
182
+	return -1;
183
+}
184
+
185
+static int __hpp__group_sort_idx(struct hist_entry *a, struct hist_entry *b,
186
+				 hpp_field_fn get_field, int idx)
187
+{
188
+	struct evsel *evsel = hists_to_evsel(a->hists);
189
+	u64 *fields_a, *fields_b;
190
+	int cmp, nr_members, ret, i;
191
+
192
+	cmp = field_cmp(get_field(a), get_field(b));
193
+	if (!evsel__is_group_event(evsel))
194
+		return cmp;
195
+
196
+	nr_members = evsel->core.nr_members;
197
+	if (idx < 1 || idx >= nr_members)
198
+		return cmp;
199
+
200
+	ret = hist_entry__new_pair(a, b, get_field, nr_members, &fields_a, &fields_b);
201
+	if (ret) {
202
+		ret = cmp;
203
+		goto out;
204
+	}
205
+
206
+	ret = field_cmp(fields_a[idx], fields_b[idx]);
207
+	if (ret)
208
+		goto out;
209
+
210
+	for (i = 1; i < nr_members; i++) {
211
+		if (i != idx) {
212
+			ret = field_cmp(fields_a[i], fields_b[i]);
213
+			if (ret)
214
+				goto out;
215
+		}
216
+	}
217
+
218
+out:
219
+	free(fields_a);
220
+	free(fields_b);
221
+
222
+	return ret;
223
+}
224
+
150
225
 static int __hpp__sort(struct hist_entry *a, struct hist_entry *b,
151
226
 		       hpp_field_fn get_field)
152
227
 {
153
228
 	s64 ret;
154
229
 	int i, nr_members;
155
-	struct perf_evsel *evsel;
156
-	struct hist_entry *pair;
230
+	struct evsel *evsel;
157
231
 	u64 *fields_a, *fields_b;
232
+
233
+	if (symbol_conf.group_sort_idx && symbol_conf.event_group) {
234
+		return __hpp__group_sort_idx(a, b, get_field,
235
+					     symbol_conf.group_sort_idx);
236
+	}
158
237
 
159
238
 	ret = field_cmp(get_field(a), get_field(b));
160
239
 	if (ret || !symbol_conf.event_group)
161
240
 		return ret;
162
241
 
163
242
 	evsel = hists_to_evsel(a->hists);
164
-	if (!perf_evsel__is_group_event(evsel))
243
+	if (!evsel__is_group_event(evsel))
165
244
 		return ret;
166
245
 
167
-	nr_members = evsel->nr_members;
168
-	fields_a = calloc(nr_members, sizeof(*fields_a));
169
-	fields_b = calloc(nr_members, sizeof(*fields_b));
170
-
171
-	if (!fields_a || !fields_b)
246
+	nr_members = evsel->core.nr_members;
247
+	i = hist_entry__new_pair(a, b, get_field, nr_members, &fields_a, &fields_b);
248
+	if (i)
172
249
 		goto out;
173
-
174
-	list_for_each_entry(pair, &a->pairs.head, pairs.node) {
175
-		evsel = hists_to_evsel(pair->hists);
176
-		fields_a[perf_evsel__group_idx(evsel)] = get_field(pair);
177
-	}
178
-
179
-	list_for_each_entry(pair, &b->pairs.head, pairs.node) {
180
-		evsel = hists_to_evsel(pair->hists);
181
-		fields_b[perf_evsel__group_idx(evsel)] = get_field(pair);
182
-	}
183
250
 
184
251
 	for (i = 1; i < nr_members; i++) {
185
252
 		ret = field_cmp(fields_a[i], fields_b[i]);
..
..
@@ -222,10 +289,10 @@
222
289
 			 struct hists *hists)
223
290
 {
224
291
 	int len = fmt->user_len ?: fmt->len;
225
-	struct perf_evsel *evsel = hists_to_evsel(hists);
292
+	struct evsel *evsel = hists_to_evsel(hists);
226
293
 
227
294
 	if (symbol_conf.event_group)
228
-		len = max(len, evsel->nr_members * fmt->len);
295
+		len = max(len, evsel->core.nr_members * fmt->len);
229
296
 
230
297
 	if (len < (int)strlen(fmt->name))
231
298
 		len = strlen(fmt->name);
..
..
@@ -794,9 +861,9 @@
794
861
 }
795
862
 
796
863
 int perf_hpp__setup_hists_formats(struct perf_hpp_list *list,
797
-				  struct perf_evlist *evlist)
864
+				  struct evlist *evlist)
798
865
 {
799
-	struct perf_evsel *evsel;
866
+	struct evsel *evsel;
800
867
 	struct perf_hpp_fmt *fmt;
801
868
 	struct hists *hists;
802
869
 	int ret;