forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 kernel/net/wireless/trace.h
....@@ -68,7 +68,8 @@
6868 		       __field(u16, ht_opmode)				   \
6969 		       __field(u32, dot11MeshHWMPactivePathToRootTimeout)  \
7070 		       __field(u16, dot11MeshHWMProotInterval)		   \
71
-		       __field(u16, dot11MeshHWMPconfirmationInterval)
71
+		       __field(u16, dot11MeshHWMPconfirmationInterval)	   \
72
+		       __field(bool, dot11MeshNolearn)
7273 #define MESH_CFG_ASSIGN							      \
7374 	do {								      \
7475 		__entry->dot11MeshRetryTimeout = conf->dot11MeshRetryTimeout; \
....@@ -109,27 +110,33 @@
109110 				conf->dot11MeshHWMProotInterval;	      \
110111 		__entry->dot11MeshHWMPconfirmationInterval =		      \
111112 				conf->dot11MeshHWMPconfirmationInterval;      \
113
+		__entry->dot11MeshNolearn = conf->dot11MeshNolearn;	      \
112114 	} while (0)
113115 
114116 #define CHAN_ENTRY __field(enum nl80211_band, band) \
115
-		   __field(u16, center_freq)
117
+		   __field(u32, center_freq)		\
118
+		   __field(u16, freq_offset)
116119 #define CHAN_ASSIGN(chan)					  \
117120 	do {							  \
118121 		if (chan) {					  \
119122 			__entry->band = chan->band;		  \
120123 			__entry->center_freq = chan->center_freq; \
124
+			__entry->freq_offset = chan->freq_offset; \
121125 		} else {					  \
122126 			__entry->band = 0;			  \
123127 			__entry->center_freq = 0;		  \
128
+			__entry->freq_offset = 0;		  \
124129 		}						  \
125130 	} while (0)
126
-#define CHAN_PR_FMT "band: %d, freq: %u"
127
-#define CHAN_PR_ARG __entry->band, __entry->center_freq
131
+#define CHAN_PR_FMT "band: %d, freq: %u.%03u"
132
+#define CHAN_PR_ARG __entry->band, __entry->center_freq, __entry->freq_offset
128133 
129134 #define CHAN_DEF_ENTRY __field(enum nl80211_band, band)		\
130135 		       __field(u32, control_freq)			\
136
+		       __field(u32, freq_offset)			\
131137 		       __field(u32, width)				\
132138 		       __field(u32, center_freq1)			\
139
+		       __field(u32, freq1_offset)			\
133140 		       __field(u32, center_freq2)
134141 #define CHAN_DEF_ASSIGN(chandef)					\
135142 	do {								\
....@@ -137,21 +144,27 @@
137144 			__entry->band = (chandef)->chan->band;		\
138145 			__entry->control_freq =				\
139146 				(chandef)->chan->center_freq;		\
147
+			__entry->freq_offset =				\
148
+				(chandef)->chan->freq_offset;		\
140149 			__entry->width = (chandef)->width;		\
141150 			__entry->center_freq1 = (chandef)->center_freq1;\
151
+			__entry->freq1_offset = (chandef)->freq1_offset;\
142152 			__entry->center_freq2 = (chandef)->center_freq2;\
143153 		} else {						\
144154 			__entry->band = 0;				\
145155 			__entry->control_freq = 0;			\
156
+			__entry->freq_offset = 0;			\
146157 			__entry->width = 0;				\
147158 			__entry->center_freq1 = 0;			\
159
+			__entry->freq1_offset = 0;			\
148160 			__entry->center_freq2 = 0;			\
149161 		}							\
150162 	} while (0)
151163 #define CHAN_DEF_PR_FMT							\
152
-	"band: %d, control freq: %u, width: %d, cf1: %u, cf2: %u"
164
+	"band: %d, control freq: %u.%03u, width: %d, cf1: %u.%03u, cf2: %u"
153165 #define CHAN_DEF_PR_ARG __entry->band, __entry->control_freq,		\
154
-			__entry->width, __entry->center_freq1,		\
166
+			__entry->freq_offset, __entry->width,		\
167
+			__entry->center_freq1, __entry->freq1_offset,	\
155168 			__entry->center_freq2
156169 
157170 #define SINFO_ENTRY __field(int, generation)	    \
....@@ -361,6 +374,24 @@
361374 	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT, WIPHY_PR_ARG, WDEV_PR_ARG)
362375 );
363376 
377
+DECLARE_EVENT_CLASS(wiphy_wdev_cookie_evt,
378
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, u64 cookie),
379
+	TP_ARGS(wiphy, wdev, cookie),
380
+	TP_STRUCT__entry(
381
+		WIPHY_ENTRY
382
+		WDEV_ENTRY
383
+		__field(u64, cookie)
384
+	),
385
+	TP_fast_assign(
386
+		WIPHY_ASSIGN;
387
+		WDEV_ASSIGN;
388
+		__entry->cookie = cookie;
389
+	),
390
+	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie: %lld",
391
+		  WIPHY_PR_ARG, WDEV_PR_ARG,
392
+		  (unsigned long long)__entry->cookie)
393
+);
394
+
364395 DEFINE_EVENT(wiphy_wdev_evt, rdev_return_wdev,
365396 	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
366397 	TP_ARGS(wiphy, wdev)
....@@ -412,12 +443,6 @@
412443 		  BOOL_TO_STR(__entry->pairwise), MAC_PR_ARG(mac_addr))
413444 );
414445 
415
-DEFINE_EVENT(key_handle, rdev_add_key,
416
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
417
-		 bool pairwise, const u8 *mac_addr),
418
-	TP_ARGS(wiphy, netdev, key_index, pairwise, mac_addr)
419
-);
420
-
421446 DEFINE_EVENT(key_handle, rdev_get_key,
422447 	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
423448 		 bool pairwise, const u8 *mac_addr),
....@@ -428,6 +453,33 @@
428453 	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
429454 		 bool pairwise, const u8 *mac_addr),
430455 	TP_ARGS(wiphy, netdev, key_index, pairwise, mac_addr)
456
+);
457
+
458
+TRACE_EVENT(rdev_add_key,
459
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
460
+		 bool pairwise, const u8 *mac_addr, u8 mode),
461
+	TP_ARGS(wiphy, netdev, key_index, pairwise, mac_addr, mode),
462
+	TP_STRUCT__entry(
463
+		WIPHY_ENTRY
464
+		NETDEV_ENTRY
465
+		MAC_ENTRY(mac_addr)
466
+		__field(u8, key_index)
467
+		__field(bool, pairwise)
468
+		__field(u8, mode)
469
+	),
470
+	TP_fast_assign(
471
+		WIPHY_ASSIGN;
472
+		NETDEV_ASSIGN;
473
+		MAC_ASSIGN(mac_addr, mac_addr);
474
+		__entry->key_index = key_index;
475
+		__entry->pairwise = pairwise;
476
+		__entry->mode = mode;
477
+	),
478
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", key_index: %u, "
479
+		  "mode: %u, pairwise: %s, mac addr: " MAC_PR_FMT,
480
+		  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->key_index,
481
+		  __entry->mode, BOOL_TO_STR(__entry->pairwise),
482
+		  MAC_PR_ARG(mac_addr))
431483 );
432484 
433485 TRACE_EVENT(rdev_set_default_key,
....@@ -792,9 +844,9 @@
792844 );
793845 
794846 TRACE_EVENT(rdev_dump_station,
795
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,
847
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,
796848 		 u8 *mac),
797
-	TP_ARGS(wiphy, netdev, idx, mac),
849
+	TP_ARGS(wiphy, netdev, _idx, mac),
798850 	TP_STRUCT__entry(
799851 		WIPHY_ENTRY
800852 		NETDEV_ENTRY
....@@ -805,7 +857,7 @@
805857 		WIPHY_ASSIGN;
806858 		NETDEV_ASSIGN;
807859 		MAC_ASSIGN(sta_mac, mac);
808
-		__entry->idx = idx;
860
+		__entry->idx = _idx;
809861 	),
810862 	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT ", idx: %d",
811863 		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac),
....@@ -869,9 +921,9 @@
869921 );
870922 
871923 TRACE_EVENT(rdev_dump_mpath,
872
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,
924
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,
873925 		 u8 *dst, u8 *next_hop),
874
-	TP_ARGS(wiphy, netdev, idx, dst, next_hop),
926
+	TP_ARGS(wiphy, netdev, _idx, dst, next_hop),
875927 	TP_STRUCT__entry(
876928 		WIPHY_ENTRY
877929 		NETDEV_ENTRY
....@@ -884,7 +936,7 @@
884936 		NETDEV_ASSIGN;
885937 		MAC_ASSIGN(dst, dst);
886938 		MAC_ASSIGN(next_hop, next_hop);
887
-		__entry->idx = idx;
939
+		__entry->idx = _idx;
888940 	),
889941 	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d, destination: "
890942 		  MAC_PR_FMT ", next hop: " MAC_PR_FMT,
....@@ -914,9 +966,9 @@
914966 );
915967 
916968 TRACE_EVENT(rdev_dump_mpp,
917
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,
969
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,
918970 		 u8 *dst, u8 *mpp),
919
-	TP_ARGS(wiphy, netdev, idx, mpp, dst),
971
+	TP_ARGS(wiphy, netdev, _idx, mpp, dst),
920972 	TP_STRUCT__entry(
921973 		WIPHY_ENTRY
922974 		NETDEV_ENTRY
....@@ -929,7 +981,7 @@
929981 		NETDEV_ASSIGN;
930982 		MAC_ASSIGN(dst, dst);
931983 		MAC_ASSIGN(mpp, mpp);
932
-		__entry->idx = idx;
984
+		__entry->idx = _idx;
933985 	),
934986 	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d, destination: "
935987 		  MAC_PR_FMT ", mpp: " MAC_PR_FMT,
....@@ -1543,25 +1595,25 @@
15431595 		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
15441596 );
15451597 
1546
-TRACE_EVENT(rdev_mgmt_frame_register,
1598
+TRACE_EVENT(rdev_update_mgmt_frame_registrations,
15471599 	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
1548
-		 u16 frame_type, bool reg),
1549
-	TP_ARGS(wiphy, wdev, frame_type, reg),
1600
+		 struct mgmt_frame_regs *upd),
1601
+	TP_ARGS(wiphy, wdev, upd),
15501602 	TP_STRUCT__entry(
15511603 		WIPHY_ENTRY
15521604 		WDEV_ENTRY
1553
-		__field(u16, frame_type)
1554
-		__field(bool, reg)
1605
+		__field(u16, global_stypes)
1606
+		__field(u16, interface_stypes)
15551607 	),
15561608 	TP_fast_assign(
15571609 		WIPHY_ASSIGN;
15581610 		WDEV_ASSIGN;
1559
-		__entry->frame_type = frame_type;
1560
-		__entry->reg = reg;
1611
+		__entry->global_stypes = upd->global_stypes;
1612
+		__entry->interface_stypes = upd->interface_stypes;
15611613 	),
1562
-	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", frame_type: 0x%.2x, reg: %s ",
1563
-		  WIPHY_PR_ARG, WDEV_PR_ARG, __entry->frame_type,
1564
-		  __entry->reg ? "true" : "false")
1614
+	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", global: 0x%.2x, intf: 0x%.2x",
1615
+		  WIPHY_PR_ARG, WDEV_PR_ARG,
1616
+		  __entry->global_stypes, __entry->interface_stypes)
15651617 );
15661618 
15671619 TRACE_EVENT(rdev_return_int_tx_rx,
....@@ -1695,8 +1747,8 @@
16951747 );
16961748 
16971749 TRACE_EVENT(rdev_dump_survey,
1698
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx),
1699
-	TP_ARGS(wiphy, netdev, idx),
1750
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx),
1751
+	TP_ARGS(wiphy, netdev, _idx),
17001752 	TP_STRUCT__entry(
17011753 		WIPHY_ENTRY
17021754 		NETDEV_ENTRY
....@@ -1705,7 +1757,7 @@
17051757 	TP_fast_assign(
17061758 		WIPHY_ASSIGN;
17071759 		NETDEV_ASSIGN;
1708
-		__entry->idx = idx;
1760
+		__entry->idx = _idx;
17091761 	),
17101762 	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d",
17111763 		  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->idx)
....@@ -1992,7 +2044,7 @@
19922044 		WIPHY_ENTRY
19932045 		WDEV_ENTRY
19942046 		__field(u8, master_pref)
1995
-		__field(u8, bands);
2047
+		__field(u8, bands)
19962048 	),
19972049 	TP_fast_assign(
19982050 		WIPHY_ASSIGN;
....@@ -2014,8 +2066,8 @@
20142066 		WIPHY_ENTRY
20152067 		WDEV_ENTRY
20162068 		__field(u8, master_pref)
2017
-		__field(u8, bands);
2018
-		__field(u32, changes);
2069
+		__field(u8, bands)
2070
+		__field(u32, changes)
20192071 	),
20202072 	TP_fast_assign(
20212073 		WIPHY_ASSIGN;
....@@ -2390,6 +2442,151 @@
23902442 		      __entry->bssid, __entry->ssid, __entry->status)
23912443 );
23922444 
2445
+TRACE_EVENT(rdev_start_radar_detection,
2446
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
2447
+		 struct cfg80211_chan_def *chandef,
2448
+		 u32 cac_time_ms),
2449
+	TP_ARGS(wiphy, netdev, chandef, cac_time_ms),
2450
+	TP_STRUCT__entry(
2451
+		WIPHY_ENTRY
2452
+		NETDEV_ENTRY
2453
+		CHAN_DEF_ENTRY
2454
+		__field(u32, cac_time_ms)
2455
+	),
2456
+	TP_fast_assign(
2457
+		WIPHY_ASSIGN;
2458
+		NETDEV_ASSIGN;
2459
+		CHAN_DEF_ASSIGN(chandef);
2460
+		__entry->cac_time_ms = cac_time_ms;
2461
+	),
2462
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_DEF_PR_FMT
2463
+		  ", cac_time_ms=%u",
2464
+		  WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_DEF_PR_ARG,
2465
+		  __entry->cac_time_ms)
2466
+);
2467
+
2468
+TRACE_EVENT(rdev_set_mcast_rate,
2469
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
2470
+		 int *mcast_rate),
2471
+	TP_ARGS(wiphy, netdev, mcast_rate),
2472
+	TP_STRUCT__entry(
2473
+		WIPHY_ENTRY
2474
+		NETDEV_ENTRY
2475
+		__array(int, mcast_rate, NUM_NL80211_BANDS)
2476
+	),
2477
+	TP_fast_assign(
2478
+		WIPHY_ASSIGN;
2479
+		NETDEV_ASSIGN;
2480
+		memcpy(__entry->mcast_rate, mcast_rate,
2481
+		       sizeof(int) * NUM_NL80211_BANDS);
2482
+	),
2483
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", "
2484
+		  "mcast_rates [2.4GHz=0x%x, 5.2GHz=0x%x, 6GHz=0x%x, 60GHz=0x%x]",
2485
+		  WIPHY_PR_ARG, NETDEV_PR_ARG,
2486
+		  __entry->mcast_rate[NL80211_BAND_2GHZ],
2487
+		  __entry->mcast_rate[NL80211_BAND_5GHZ],
2488
+		  __entry->mcast_rate[NL80211_BAND_6GHZ],
2489
+		  __entry->mcast_rate[NL80211_BAND_60GHZ])
2490
+);
2491
+
2492
+TRACE_EVENT(rdev_set_coalesce,
2493
+	TP_PROTO(struct wiphy *wiphy, struct cfg80211_coalesce *coalesce),
2494
+	TP_ARGS(wiphy, coalesce),
2495
+	TP_STRUCT__entry(
2496
+		WIPHY_ENTRY
2497
+		__field(int, n_rules)
2498
+	),
2499
+	TP_fast_assign(
2500
+		WIPHY_ASSIGN;
2501
+		__entry->n_rules = coalesce ? coalesce->n_rules : 0;
2502
+	),
2503
+	TP_printk(WIPHY_PR_FMT ", n_rules=%d",
2504
+		  WIPHY_PR_ARG, __entry->n_rules)
2505
+);
2506
+
2507
+DEFINE_EVENT(wiphy_wdev_evt, rdev_abort_scan,
2508
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
2509
+	TP_ARGS(wiphy, wdev)
2510
+);
2511
+
2512
+TRACE_EVENT(rdev_set_multicast_to_unicast,
2513
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
2514
+		 const bool enabled),
2515
+	TP_ARGS(wiphy, netdev, enabled),
2516
+	TP_STRUCT__entry(
2517
+		WIPHY_ENTRY
2518
+		NETDEV_ENTRY
2519
+		__field(bool, enabled)
2520
+	),
2521
+	TP_fast_assign(
2522
+		WIPHY_ASSIGN;
2523
+		NETDEV_ASSIGN;
2524
+		__entry->enabled = enabled;
2525
+	),
2526
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", unicast: %s",
2527
+		  WIPHY_PR_ARG, NETDEV_PR_ARG,
2528
+		  BOOL_TO_STR(__entry->enabled))
2529
+);
2530
+
2531
+DEFINE_EVENT(wiphy_wdev_evt, rdev_get_txq_stats,
2532
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
2533
+	TP_ARGS(wiphy, wdev)
2534
+);
2535
+
2536
+TRACE_EVENT(rdev_get_ftm_responder_stats,
2537
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
2538
+		 struct cfg80211_ftm_responder_stats *ftm_stats),
2539
+
2540
+	TP_ARGS(wiphy, netdev, ftm_stats),
2541
+
2542
+	TP_STRUCT__entry(
2543
+		WIPHY_ENTRY
2544
+		NETDEV_ENTRY
2545
+		__field(u64, timestamp)
2546
+		__field(u32, success_num)
2547
+		__field(u32, partial_num)
2548
+		__field(u32, failed_num)
2549
+		__field(u32, asap_num)
2550
+		__field(u32, non_asap_num)
2551
+		__field(u64, duration)
2552
+		__field(u32, unknown_triggers)
2553
+		__field(u32, reschedule)
2554
+		__field(u32, out_of_window)
2555
+	),
2556
+
2557
+	TP_fast_assign(
2558
+		WIPHY_ASSIGN;
2559
+		NETDEV_ASSIGN;
2560
+		__entry->success_num = ftm_stats->success_num;
2561
+		__entry->partial_num = ftm_stats->partial_num;
2562
+		__entry->failed_num = ftm_stats->failed_num;
2563
+		__entry->asap_num = ftm_stats->asap_num;
2564
+		__entry->non_asap_num = ftm_stats->non_asap_num;
2565
+		__entry->duration = ftm_stats->total_duration_ms;
2566
+		__entry->unknown_triggers = ftm_stats->unknown_triggers_num;
2567
+		__entry->reschedule = ftm_stats->reschedule_requests_num;
2568
+		__entry->out_of_window = ftm_stats->out_of_window_triggers_num;
2569
+	),
2570
+
2571
+	TP_printk(WIPHY_PR_FMT "Ftm responder stats: success %u, partial %u, "
2572
+		"failed %u, asap %u, non asap %u, total duration %llu, unknown "
2573
+		"triggers %u, rescheduled %u, out of window %u", WIPHY_PR_ARG,
2574
+		__entry->success_num, __entry->partial_num, __entry->failed_num,
2575
+		__entry->asap_num, __entry->non_asap_num, __entry->duration,
2576
+		__entry->unknown_triggers, __entry->reschedule,
2577
+		__entry->out_of_window)
2578
+);
2579
+
2580
+DEFINE_EVENT(wiphy_wdev_cookie_evt, rdev_start_pmsr,
2581
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, u64 cookie),
2582
+	TP_ARGS(wiphy, wdev, cookie)
2583
+);
2584
+
2585
+DEFINE_EVENT(wiphy_wdev_cookie_evt, rdev_abort_pmsr,
2586
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, u64 cookie),
2587
+	TP_ARGS(wiphy, wdev, cookie)
2588
+);
2589
+
23932590 /*************************************************************
23942591  *	     cfg80211 exported functions traces		     *
23952592  *************************************************************/
....@@ -2591,6 +2788,24 @@
25912788 		  WDEV_PR_ARG, __entry->cookie, CHAN_PR_ARG)
25922789 );
25932790 
2791
+TRACE_EVENT(cfg80211_tx_mgmt_expired,
2792
+	TP_PROTO(struct wireless_dev *wdev, u64 cookie,
2793
+		 struct ieee80211_channel *chan),
2794
+	TP_ARGS(wdev, cookie, chan),
2795
+	TP_STRUCT__entry(
2796
+		WDEV_ENTRY
2797
+		__field(u64, cookie)
2798
+		CHAN_ENTRY
2799
+	),
2800
+	TP_fast_assign(
2801
+		WDEV_ASSIGN;
2802
+		__entry->cookie = cookie;
2803
+		CHAN_ASSIGN(chan);
2804
+	),
2805
+	TP_printk(WDEV_PR_FMT ", cookie: %llu, " CHAN_PR_FMT,
2806
+		  WDEV_PR_ARG, __entry->cookie, CHAN_PR_ARG)
2807
+);
2808
+
25942809 TRACE_EVENT(cfg80211_new_sta,
25952810 	TP_PROTO(struct net_device *netdev, const u8 *mac_addr,
25962811 		 struct station_info *sinfo),
....@@ -2627,11 +2842,28 @@
26272842 		__entry->freq = freq;
26282843 		__entry->sig_dbm = sig_dbm;
26292844 	),
2630
-	TP_printk(WDEV_PR_FMT ", freq: %d, sig dbm: %d",
2631
-		  WDEV_PR_ARG, __entry->freq, __entry->sig_dbm)
2845
+	TP_printk(WDEV_PR_FMT ", freq: "KHZ_F", sig dbm: %d",
2846
+		  WDEV_PR_ARG, PR_KHZ(__entry->freq), __entry->sig_dbm)
26322847 );
26332848 
26342849 TRACE_EVENT(cfg80211_mgmt_tx_status,
2850
+	TP_PROTO(struct wireless_dev *wdev, u64 cookie, bool ack),
2851
+	TP_ARGS(wdev, cookie, ack),
2852
+	TP_STRUCT__entry(
2853
+		WDEV_ENTRY
2854
+		__field(u64, cookie)
2855
+		__field(bool, ack)
2856
+	),
2857
+	TP_fast_assign(
2858
+		WDEV_ASSIGN;
2859
+		__entry->cookie = cookie;
2860
+		__entry->ack = ack;
2861
+	),
2862
+	TP_printk(WDEV_PR_FMT", cookie: %llu, ack: %s",
2863
+		  WDEV_PR_ARG, __entry->cookie, BOOL_TO_STR(__entry->ack))
2864
+);
2865
+
2866
+TRACE_EVENT(cfg80211_control_port_tx_status,
26352867 	TP_PROTO(struct wireless_dev *wdev, u64 cookie, bool ack),
26362868 	TP_ARGS(wdev, cookie, ack),
26372869 	TP_STRUCT__entry(
....@@ -2908,8 +3140,8 @@
29083140 		__entry->freq = freq;
29093141 		__entry->sig_dbm = sig_dbm;
29103142 	),
2911
-	TP_printk(WIPHY_PR_FMT ", freq: %d, sig_dbm: %d",
2912
-		  WIPHY_PR_ARG, __entry->freq, __entry->sig_dbm)
3143
+	TP_printk(WIPHY_PR_FMT ", freq: "KHZ_F", sig_dbm: %d",
3144
+		  WIPHY_PR_ARG, PR_KHZ(__entry->freq), __entry->sig_dbm)
29133145 );
29143146 
29153147 TRACE_EVENT(cfg80211_tdls_oper_request,
....@@ -3183,103 +3415,44 @@
31833415 		  WIPHY_PR_ARG, WDEV_PR_ARG)
31843416 );
31853417 
3186
-TRACE_EVENT(rdev_start_radar_detection,
3187
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3188
-		 struct cfg80211_chan_def *chandef,
3189
-		 u32 cac_time_ms),
3190
-	TP_ARGS(wiphy, netdev, chandef, cac_time_ms),
3191
-	TP_STRUCT__entry(
3192
-		WIPHY_ENTRY
3193
-		NETDEV_ENTRY
3194
-		CHAN_DEF_ENTRY
3195
-		__field(u32, cac_time_ms)
3196
-	),
3197
-	TP_fast_assign(
3198
-		WIPHY_ASSIGN;
3199
-		NETDEV_ASSIGN;
3200
-		CHAN_DEF_ASSIGN(chandef);
3201
-		__entry->cac_time_ms = cac_time_ms;
3202
-	),
3203
-	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_DEF_PR_FMT
3204
-		  ", cac_time_ms=%u",
3205
-		  WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_DEF_PR_ARG,
3206
-		  __entry->cac_time_ms)
3207
-);
3208
-
3209
-TRACE_EVENT(rdev_set_mcast_rate,
3210
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3211
-		 int *mcast_rate),
3212
-	TP_ARGS(wiphy, netdev, mcast_rate),
3213
-	TP_STRUCT__entry(
3214
-		WIPHY_ENTRY
3215
-		NETDEV_ENTRY
3216
-		__array(int, mcast_rate, NUM_NL80211_BANDS)
3217
-	),
3218
-	TP_fast_assign(
3219
-		WIPHY_ASSIGN;
3220
-		NETDEV_ASSIGN;
3221
-		memcpy(__entry->mcast_rate, mcast_rate,
3222
-		       sizeof(int) * NUM_NL80211_BANDS);
3223
-	),
3224
-	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", "
3225
-		  "mcast_rates [2.4GHz=0x%x, 5.2GHz=0x%x, 60GHz=0x%x]",
3226
-		  WIPHY_PR_ARG, NETDEV_PR_ARG,
3227
-		  __entry->mcast_rate[NL80211_BAND_2GHZ],
3228
-		  __entry->mcast_rate[NL80211_BAND_5GHZ],
3229
-		  __entry->mcast_rate[NL80211_BAND_60GHZ])
3230
-);
3231
-
3232
-TRACE_EVENT(rdev_set_coalesce,
3233
-	TP_PROTO(struct wiphy *wiphy, struct cfg80211_coalesce *coalesce),
3234
-	TP_ARGS(wiphy, coalesce),
3235
-	TP_STRUCT__entry(
3236
-		WIPHY_ENTRY
3237
-		__field(int, n_rules)
3238
-	),
3239
-	TP_fast_assign(
3240
-		WIPHY_ASSIGN;
3241
-		__entry->n_rules = coalesce ? coalesce->n_rules : 0;
3242
-	),
3243
-	TP_printk(WIPHY_PR_FMT ", n_rules=%d",
3244
-		  WIPHY_PR_ARG, __entry->n_rules)
3245
-);
3246
-
3247
-DEFINE_EVENT(wiphy_wdev_evt, rdev_abort_scan,
3248
-	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
3249
-	TP_ARGS(wiphy, wdev)
3250
-);
3251
-
3252
-TRACE_EVENT(rdev_set_multicast_to_unicast,
3253
-	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3254
-		 const bool enabled),
3255
-	TP_ARGS(wiphy, netdev, enabled),
3256
-	TP_STRUCT__entry(
3257
-		WIPHY_ENTRY
3258
-		NETDEV_ENTRY
3259
-		__field(bool, enabled)
3260
-	),
3261
-	TP_fast_assign(
3262
-		WIPHY_ASSIGN;
3263
-		NETDEV_ASSIGN;
3264
-		__entry->enabled = enabled;
3265
-	),
3266
-	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", unicast: %s",
3267
-		  WIPHY_PR_ARG, NETDEV_PR_ARG,
3268
-		  BOOL_TO_STR(__entry->enabled))
3269
-);
3270
-
3271
-TRACE_EVENT(rdev_get_txq_stats,
3272
-	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
3273
-	TP_ARGS(wiphy, wdev),
3418
+TRACE_EVENT(cfg80211_pmsr_report,
3419
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
3420
+		 u64 cookie, const u8 *addr),
3421
+	TP_ARGS(wiphy, wdev, cookie, addr),
32743422 	TP_STRUCT__entry(
32753423 		WIPHY_ENTRY
32763424 		WDEV_ENTRY
3425
+		__field(u64, cookie)
3426
+		MAC_ENTRY(addr)
32773427 	),
32783428 	TP_fast_assign(
32793429 		WIPHY_ASSIGN;
32803430 		WDEV_ASSIGN;
3431
+		__entry->cookie = cookie;
3432
+		MAC_ASSIGN(addr, addr);
32813433 	),
3282
-	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT, WIPHY_PR_ARG, WDEV_PR_ARG)
3434
+	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie:%lld, " MAC_PR_FMT,
3435
+		  WIPHY_PR_ARG, WDEV_PR_ARG,
3436
+		  (unsigned long long)__entry->cookie,
3437
+		  MAC_PR_ARG(addr))
3438
+);
3439
+
3440
+TRACE_EVENT(cfg80211_pmsr_complete,
3441
+	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, u64 cookie),
3442
+	TP_ARGS(wiphy, wdev, cookie),
3443
+	TP_STRUCT__entry(
3444
+		WIPHY_ENTRY
3445
+		WDEV_ENTRY
3446
+		__field(u64, cookie)
3447
+	),
3448
+	TP_fast_assign(
3449
+		WIPHY_ASSIGN;
3450
+		WDEV_ASSIGN;
3451
+		__entry->cookie = cookie;
3452
+	),
3453
+	TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie:%lld",
3454
+		  WIPHY_PR_ARG, WDEV_PR_ARG,
3455
+		  (unsigned long long)__entry->cookie)
32833456 );
32843457 
32853458 TRACE_EVENT(rdev_update_owe_info,
....@@ -3319,6 +3492,61 @@
33193492 		      WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
33203493 );
33213494 
3495
+TRACE_EVENT(rdev_probe_mesh_link,
3496
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3497
+		 const u8 *dest, const u8 *buf, size_t len),
3498
+	TP_ARGS(wiphy, netdev, dest, buf, len),
3499
+	TP_STRUCT__entry(
3500
+		WIPHY_ENTRY
3501
+		NETDEV_ENTRY
3502
+		MAC_ENTRY(dest)
3503
+	),
3504
+	TP_fast_assign(
3505
+		WIPHY_ASSIGN;
3506
+		NETDEV_ASSIGN;
3507
+		MAC_ASSIGN(dest, dest);
3508
+	),
3509
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT,
3510
+		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest))
3511
+);
3512
+
3513
+TRACE_EVENT(rdev_set_tid_config,
3514
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3515
+		 struct cfg80211_tid_config *tid_conf),
3516
+	TP_ARGS(wiphy, netdev, tid_conf),
3517
+	TP_STRUCT__entry(
3518
+		WIPHY_ENTRY
3519
+		NETDEV_ENTRY
3520
+		MAC_ENTRY(peer)
3521
+	),
3522
+	TP_fast_assign(
3523
+		WIPHY_ASSIGN;
3524
+		NETDEV_ASSIGN;
3525
+		MAC_ASSIGN(peer, tid_conf->peer);
3526
+	),
3527
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT,
3528
+		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
3529
+);
3530
+
3531
+TRACE_EVENT(rdev_reset_tid_config,
3532
+	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
3533
+		 const u8 *peer, u8 tids),
3534
+	TP_ARGS(wiphy, netdev, peer, tids),
3535
+	TP_STRUCT__entry(
3536
+		WIPHY_ENTRY
3537
+		NETDEV_ENTRY
3538
+		MAC_ENTRY(peer)
3539
+		__field(u8, tids)
3540
+	),
3541
+	TP_fast_assign(
3542
+		WIPHY_ASSIGN;
3543
+		NETDEV_ASSIGN;
3544
+		MAC_ASSIGN(peer, peer);
3545
+		__entry->tids = tids;
3546
+	),
3547
+	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT ", tids: 0x%x",
3548
+		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), __entry->tids)
3549
+);
33223550 #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */
33233551 
33243552 #undef TRACE_INCLUDE_PATH