forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb 
 kernel/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h
....@@ -1,7 +1,7 @@
11 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33  *
4
- * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved.
4
+ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved.
55  *
66  * This program is free software and is provided to you under the terms of the
77  * GNU General Public License version 2 as published by the Free Software
....@@ -42,60 +42,75 @@
4242 	/*
4343 	 * Generic CSF events
4444 	 */
45
-	KBASE_KTRACE_CODE_MAKE_CODE(EVICT_CTX_SLOTS),
45
+	/* info_val = 0 */
46
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EVICT_CTX_SLOTS_START),
47
+	/* info_val == number of CSGs supported */
48
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EVICT_CTX_SLOTS_END),
4649 	/* info_val[0:7]   == fw version_minor
4750 	 * info_val[15:8]  == fw version_major
4851 	 * info_val[63:32] == fw version_hash
4952 	 */
50
-	KBASE_KTRACE_CODE_MAKE_CODE(FIRMWARE_BOOT),
51
-	KBASE_KTRACE_CODE_MAKE_CODE(FIRMWARE_REBOOT),
52
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK),
53
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_BOOT),
54
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_REBOOT),
55
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_INVOKE),
56
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_INVOKE),
57
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_START),
5358 	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TOCK_END),
5459 	/* info_val == total number of runnable groups across all kctxs */
55
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK),
60
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_START),
5661 	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_END),
57
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET),
62
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET_START),
63
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RESET_END),
5864 	/* info_val = timeout in ms */
59
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_WAIT_PROTM_QUIT),
65
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_WAIT_QUIT_START),
6066 	/* info_val = remaining ms timeout, or 0 if timedout */
61
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_WAIT_PROTM_QUIT_DONE),
62
-	KBASE_KTRACE_CODE_MAKE_CODE(SYNC_UPDATE_EVENT),
63
-	KBASE_KTRACE_CODE_MAKE_CODE(SYNC_UPDATE_EVENT_NOTIFY_GPU),
67
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_WAIT_QUIT_END),
68
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_EVENT),
69
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_SYNC_UPDATE_NOTIFY_GPU_EVENT),
6470 
6571 	/* info_val = JOB_IRQ_STATUS */
66
-	KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT),
72
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_START),
6773 	/* info_val = JOB_IRQ_STATUS */
6874 	KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_END),
6975 	/* info_val = JOB_IRQ_STATUS */
70
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROCESS),
76
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROCESS_START),
7177 	/* info_val = GLB_REQ ^ GLB_ACQ */
72
-	KBASE_KTRACE_CODE_MAKE_CODE(GLB_REQ_ACQ),
78
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_INTERRUPT_GLB_REQ_ACK),
7379 	/* info_val[31:0] = num non idle offslot groups
7480 	 * info_val[32] = scheduler can suspend on idle
7581 	 */
76
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_CAN_IDLE),
77
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_ADVANCE_TICK),
78
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NOADVANCE_TICK),
82
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_EVENT_CAN_SUSPEND),
83
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_ADVANCE),
84
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_TICK_NOADVANCE),
7985 	/* kctx is added to the back of the list */
80
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_INSERT_RUNNABLE),
81
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_REMOVE_RUNNABLE),
86
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_INSERT),
87
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_REMOVE),
8288 	/* kctx is moved to the back of the list */
83
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_ROTATE_RUNNABLE),
84
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_HEAD_RUNNABLE),
89
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_ROTATE),
90
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_RUNNABLE_KCTX_HEAD),
8591 
86
-	KBASE_KTRACE_CODE_MAKE_CODE(IDLE_WORKER_BEGIN),
92
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_START),
8793 	/* 4-bit encoding of boolean values (ease of reading as hex values)
8894 	 *
8995 	 * info_val[3:0] = was reset active/failed to be prevented
9096 	 * info_val[7:4] = whether scheduler was both idle and suspendable
9197 	 * info_val[11:8] = whether all groups were suspended
9298 	 */
93
-	KBASE_KTRACE_CODE_MAKE_CODE(IDLE_WORKER_END),
94
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_SYNC_UPDATE_WORKER_BEGIN),
95
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_SYNC_UPDATE_WORKER_END),
99
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_END),
100
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_START),
101
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GROUP_SYNC_UPDATE_WORKER_END),
96102 
97103 	/* info_val = bitmask of slots that gave an ACK for STATUS_UPDATE */
98
-	KBASE_KTRACE_CODE_MAKE_CODE(SLOTS_STATUS_UPDATE_ACK),
104
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_UPDATE_IDLE_SLOTS_ACK),
105
+
106
+	/* info_val[63:0] = GPU cycle counter, used mainly for benchmarking
107
+	 * purpose.
108
+	 */
109
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_HANDLING_START),
110
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_GPU_IDLE_WORKER_HANDLING_END),
111
+
112
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_MCU_HALTED),
113
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_FIRMWARE_MCU_SLEEP),
99114 
100115 	/*
101116 	 * Group events
....@@ -104,21 +119,23 @@
104119 	 * info_val[19:16] == as_nr
105120 	 * info_val[63:32] == endpoint config (max number of endpoints allowed)
106121 	 */
107
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_START),
122
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_START_REQ),
108123 	/* info_val == CSG_REQ state issued */
109
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOP),
124
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOP_REQ),
110125 	/* info_val == CSG_ACK state */
111
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STARTED),
126
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_RUNNING),
112127 	/* info_val == CSG_ACK state */
113128 	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STOPPED),
114129 	/* info_val == slot cleaned */
115130 	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_CLEANED),
116131 	/* info_val = slot requesting STATUS_UPDATE */
117
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_STATUS_UPDATE),
132
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_UPDATE_IDLE_SLOT_REQ),
118133 	/* info_val = scheduler's new csg_slots_idle_mask[0]
119134 	 * group->csg_nr indicates which bit was set
120135 	 */
121136 	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_IDLE_SET),
137
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_NO_NON_IDLE_GROUPS),
138
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_NON_IDLE_GROUPS),
122139 	/* info_val = scheduler's new csg_slots_idle_mask[0]
123140 	 * group->csg_nr indicates which bit was cleared
124141 	 *
....@@ -126,13 +143,13 @@
126143 	 */
127144 	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_IDLE_CLEAR),
128145 	/* info_val == previous priority */
129
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_PRIO_UPDATE),
146
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SLOT_PRIO_UPDATE),
130147 	/* info_val == CSG_REQ ^ CSG_ACK */
131
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_SYNC_UPDATE_INTERRUPT),
148
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_SYNC_UPDATE),
132149 	/* info_val == CSG_REQ ^ CSG_ACK */
133
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_IDLE_INTERRUPT),
150
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_IDLE),
134151 	/* info_val == CSG_REQ ^ CSG_ACK */
135
-	KBASE_KTRACE_CODE_MAKE_CODE(CSG_PROGRESS_TIMER_INTERRUPT),
152
+	KBASE_KTRACE_CODE_MAKE_CODE(CSG_INTERRUPT_PROGRESS_TIMER_EVENT),
136153 	/* info_val[31:0] == CSG_REQ ^ CSG_ACQ
137154 	 * info_val[63:32] == CSG_IRQ_REQ ^ CSG_IRQ_ACK
138155 	 */
....@@ -145,34 +162,34 @@
145162 	/* info_val[31:0] == new run state of the evicted group
146163 	 * info_val[63:32] == number of runnable groups
147164 	 */
148
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_EVICT_SCHED),
165
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_EVICT),
149166 
150167 	/* info_val == new num_runnable_grps
151168 	 * group is added to the back of the list for its priority level
152169 	 */
153
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_INSERT_RUNNABLE),
170
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_INSERT),
154171 	/* info_val == new num_runnable_grps
155172 	 */
156
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_REMOVE_RUNNABLE),
173
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_REMOVE),
157174 	/* info_val == num_runnable_grps
158175 	 * group is moved to the back of the list for its priority level
159176 	 */
160
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_ROTATE_RUNNABLE),
161
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_HEAD_RUNNABLE),
177
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_ROTATE),
178
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_RUNNABLE_HEAD),
162179 	/* info_val == new num_idle_wait_grps
163180 	 * group is added to the back of the list
164181 	 */
165
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_INSERT_IDLE_WAIT),
182
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_INSERT),
166183 	/* info_val == new num_idle_wait_grps
167184 	 * group is added to the back of the list
168185 	 */
169
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_REMOVE_IDLE_WAIT),
170
-	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_HEAD_IDLE_WAIT),
186
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_REMOVE),
187
+	KBASE_KTRACE_CODE_MAKE_CODE(GROUP_IDLE_WAIT_HEAD),
171188 
172189 	/* info_val == is scheduler running with protected mode tasks */
173
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_CHECK_PROTM_ENTER),
174
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_ENTER_PROTM),
175
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_EXIT_PROTM),
190
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_ENTER_CHECK),
191
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_ENTER),
192
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_PROTM_EXIT),
176193 	/* info_val[31:0] == number of GPU address space slots in use
177194 	 * info_val[63:32] == number of runnable groups
178195 	 */
....@@ -180,12 +197,39 @@
180197 	/* info_val == new count of off-slot non-idle groups
181198 	 * no group indicates it was set rather than incremented
182199 	 */
183
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_INC),
200
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_GRP_INC),
184201 	/* info_val == new count of off-slot non-idle groups */
185
-	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_DEC),
202
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_NONIDLE_OFFSLOT_GRP_DEC),
203
+	/* info_val = scheduler's new csg_slots_idle_mask[0]
204
+	 * group->csg_nr indicates which bit was set
205
+	 */
206
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHEDULER_HANDLE_IDLE_SLOTS),
186207 
187
-	KBASE_KTRACE_CODE_MAKE_CODE(PROTM_EVENT_WORKER_BEGIN),
208
+	KBASE_KTRACE_CODE_MAKE_CODE(PROTM_EVENT_WORKER_START),
188209 	KBASE_KTRACE_CODE_MAKE_CODE(PROTM_EVENT_WORKER_END),
210
+
211
+	/* info_val = scheduler state */
212
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHED_BUSY),
213
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHED_INACTIVE),
214
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHED_SUSPENDED),
215
+	KBASE_KTRACE_CODE_MAKE_CODE(SCHED_SLEEPING),
216
+
217
+	/* info_val = mcu state */
218
+#define KBASEP_MCU_STATE(n) KBASE_KTRACE_CODE_MAKE_CODE(PM_MCU_ ## n),
219
+#include "backend/gpu/mali_kbase_pm_mcu_states.h"
220
+#undef KBASEP_MCU_STATE
221
+
222
+	/* info_val = number of runnable groups */
223
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_INACTIVE),
224
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_RUNNABLE),
225
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_IDLE),
226
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED),
227
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED_ON_IDLE),
228
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_SUSPENDED_ON_WAIT_SYNC),
229
+	/* info_val = new run state of the evicted group */
230
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_FAULT_EVICTED),
231
+	/* info_val = get the number of active CSGs */
232
+	KBASE_KTRACE_CODE_MAKE_CODE(CSF_GROUP_TERMINATED),
189233 
190234 	/*
191235 	 * Group + Queue events
....@@ -194,42 +238,42 @@
194238 	KBASE_KTRACE_CODE_MAKE_CODE(CSI_START),
195239 	/* info_val == queue->enabled before stop */
196240 	KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP),
197
-	KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP_REQUESTED),
241
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_STOP_REQ),
198242 	/* info_val == CS_REQ ^ CS_ACK that were not processed due to the group
199243 	 * being suspended
200244 	 */
201
-	KBASE_KTRACE_CODE_MAKE_CODE(CSI_IGNORED_INTERRUPTS_GROUP_SUSPEND),
245
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_GROUP_SUSPENDS_IGNORED),
202246 	/* info_val == CS_REQ ^ CS_ACK */
203
-	KBASE_KTRACE_CODE_MAKE_CODE(CSI_FAULT_INTERRUPT),
247
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_FAULT),
204248 	/* info_val == CS_REQ ^ CS_ACK */
205
-	KBASE_KTRACE_CODE_MAKE_CODE(CSI_TILER_OOM_INTERRUPT),
249
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_TILER_OOM),
206250 	/* info_val == CS_REQ ^ CS_ACK */
207
-	KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_PEND_INTERRUPT),
251
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_INTERRUPT_PROTM_PEND),
208252 	/* info_val == CS_ACK_PROTM_PEND ^ CS_REQ_PROTM_PEND */
209253 	KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_ACK),
210254 	/* info_val == group->run_State (for group the queue is bound to) */
211255 	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_START),
212256 	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_STOP),
213257 	/* info_val == contents of CS_STATUS_WAIT_SYNC_POINTER */
214
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE),
258
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_EVAL_START),
215259 	/* info_val == bool for result of the evaluation */
216
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_EVALUATED),
260
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_EVAL_END),
217261 	/* info_val == contents of CS_STATUS_WAIT */
218
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_STATUS_WAIT),
262
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_WAIT_STATUS),
219263 	/* info_val == current sync value pointed to by queue->sync_ptr */
220
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_CURRENT_VAL),
264
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_CUR_VAL),
221265 	/* info_val == current value of CS_STATUS_WAIT_SYNC_VALUE */
222
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_TEST_VAL),
266
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_TEST_VAL),
223267 	/* info_val == current value of CS_STATUS_BLOCKED_REASON */
224
-	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_BLOCKED_REASON),
268
+	KBASE_KTRACE_CODE_MAKE_CODE(QUEUE_SYNC_UPDATE_BLOCKED_REASON),
225269 	/* info_val = group's new protm_pending_bitmap[0]
226270 	 * queue->csi_index indicates which bit was set
227271 	 */
228
-	KBASE_KTRACE_CODE_MAKE_CODE(PROTM_PENDING_SET),
272
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_PEND_SET),
229273 	/* info_val = group's new protm_pending_bitmap[0]
230274 	 * queue->csi_index indicates which bit was cleared
231275 	 */
232
-	KBASE_KTRACE_CODE_MAKE_CODE(PROTM_PENDING_CLEAR),
276
+	KBASE_KTRACE_CODE_MAKE_CODE(CSI_PROTM_PEND_CLEAR),
233277 
234278 	/*
235279 	 * KCPU queue events
....@@ -237,42 +281,42 @@
237281 	/* KTrace info_val == KCPU queue fence context
238282 	 * KCPU extra_info_val == N/A.
239283 	 */
240
-	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_NEW),
284
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_CREATE),
241285 	/* KTrace info_val == Number of pending commands in KCPU queue when
242286 	 * it is destroyed.
243287 	 * KCPU extra_info_val == Number of CQS wait operations present in
244288 	 * the KCPU queue when it is destroyed.
245289 	 */
246
-	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_DESTROY),
290
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_QUEUE_DELETE),
247291 	/* KTrace info_val == CQS event memory address
248292 	 * KCPU extra_info_val == Upper 32 bits of event memory, i.e. contents
249293 	 * of error field.
250294 	 */
251
-	KBASE_KTRACE_CODE_MAKE_CODE(CQS_SET),
295
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_SET),
252296 	/* KTrace info_val == Number of CQS objects to be waited upon
253297 	 * KCPU extra_info_val == N/A.
254298 	 */
255
-	KBASE_KTRACE_CODE_MAKE_CODE(CQS_WAIT_START),
299
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_WAIT_START),
256300 	/* KTrace info_val == CQS event memory address
257301 	 * KCPU extra_info_val == 1 if CQS was signaled with an error and queue
258302 	 * inherited the error, otherwise 0.
259303 	 */
260
-	KBASE_KTRACE_CODE_MAKE_CODE(CQS_WAIT_END),
304
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_CQS_WAIT_END),
261305 	/* KTrace info_val == Fence context
262306 	 * KCPU extra_info_val == Fence seqno.
263307 	 */
264
-	KBASE_KTRACE_CODE_MAKE_CODE(FENCE_SIGNAL),
308
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_SIGNAL),
265309 	/* KTrace info_val == Fence context
266310 	 * KCPU extra_info_val == Fence seqno.
267311 	 */
268
-	KBASE_KTRACE_CODE_MAKE_CODE(FENCE_WAIT_START),
312
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_WAIT_START),
269313 	/* KTrace info_val == Fence context
270314 	 * KCPU extra_info_val == Fence seqno.
271315 	 */
272
-	KBASE_KTRACE_CODE_MAKE_CODE(FENCE_WAIT_END),
316
+	KBASE_KTRACE_CODE_MAKE_CODE(KCPU_FENCE_WAIT_END),
273317 
274318 #if 0 /* Dummy section to avoid breaking formatting */
275319 };
276320 #endif
277321 
278
-/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */
322
+	/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */