forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2010  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2010  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../base.h"
....@@ -115,124 +93,6 @@
11593 	0x3FE  /* 36, +6.0dB */
11694 };
11795 
118
-static const u32 ofdmswing_table[] = {
119
-	0x0b40002d, /* 0, -15.0dB */
120
-	0x0c000030, /* 1, -14.5dB */
121
-	0x0cc00033, /* 2, -14.0dB */
122
-	0x0d800036, /* 3, -13.5dB */
123
-	0x0e400039, /* 4, -13.0dB */
124
-	0x0f00003c, /* 5, -12.5dB */
125
-	0x10000040, /* 6, -12.0dB */
126
-	0x11000044, /* 7, -11.5dB */
127
-	0x12000048, /* 8, -11.0dB */
128
-	0x1300004c, /* 9, -10.5dB */
129
-	0x14400051, /* 10, -10.0dB */
130
-	0x15800056, /* 11, -9.5dB */
131
-	0x16c0005b, /* 12, -9.0dB */
132
-	0x18000060, /* 13, -8.5dB */
133
-	0x19800066, /* 14, -8.0dB */
134
-	0x1b00006c, /* 15, -7.5dB */
135
-	0x1c800072, /* 16, -7.0dB */
136
-	0x1e400079, /* 17, -6.5dB */
137
-	0x20000080, /* 18, -6.0dB */
138
-	0x22000088, /* 19, -5.5dB */
139
-	0x24000090, /* 20, -5.0dB */
140
-	0x26000098, /* 21, -4.5dB */
141
-	0x288000a2, /* 22, -4.0dB */
142
-	0x2ac000ab, /* 23, -3.5dB */
143
-	0x2d4000b5, /* 24, -3.0dB */
144
-	0x300000c0, /* 25, -2.5dB */
145
-	0x32c000cb, /* 26, -2.0dB */
146
-	0x35c000d7, /* 27, -1.5dB */
147
-	0x390000e4, /* 28, -1.0dB */
148
-	0x3c8000f2, /* 29, -0.5dB */
149
-	0x40000100, /* 30, +0dB */
150
-	0x43c0010f, /* 31, +0.5dB */
151
-	0x47c0011f, /* 32, +1.0dB */
152
-	0x4c000130, /* 33, +1.5dB */
153
-	0x50800142, /* 34, +2.0dB */
154
-	0x55400155, /* 35, +2.5dB */
155
-	0x5a400169, /* 36, +3.0dB */
156
-	0x5fc0017f, /* 37, +3.5dB */
157
-	0x65400195, /* 38, +4.0dB */
158
-	0x6b8001ae, /* 39, +4.5dB */
159
-	0x71c001c7, /* 40, +5.0dB */
160
-	0x788001e2, /* 41, +5.5dB */
161
-	0x7f8001fe  /* 42, +6.0dB */
162
-};
163
-
164
-static const u8 cckswing_table_ch1ch13[CCK_TABLE_SIZE][8] = {
165
-	{0x09, 0x08, 0x07, 0x06, 0x04, 0x03, 0x01, 0x01}, /* 0, -16.0dB */
166
-	{0x09, 0x09, 0x08, 0x06, 0x05, 0x03, 0x01, 0x01}, /* 1, -15.5dB */
167
-	{0x0a, 0x09, 0x08, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 2, -15.0dB */
168
-	{0x0a, 0x0a, 0x09, 0x07, 0x05, 0x03, 0x02, 0x01}, /* 3, -14.5dB */
169
-	{0x0b, 0x0a, 0x09, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 4, -14.0dB */
170
-	{0x0b, 0x0b, 0x0a, 0x08, 0x06, 0x04, 0x02, 0x01}, /* 5, -13.5dB */
171
-	{0x0c, 0x0c, 0x0a, 0x09, 0x06, 0x04, 0x02, 0x01}, /* 6, -13.0dB */
172
-	{0x0d, 0x0c, 0x0b, 0x09, 0x07, 0x04, 0x02, 0x01}, /* 7, -12.5dB */
173
-	{0x0d, 0x0d, 0x0c, 0x0a, 0x07, 0x05, 0x02, 0x01}, /* 8, -12.0dB */
174
-	{0x0e, 0x0e, 0x0c, 0x0a, 0x08, 0x05, 0x02, 0x01}, /* 9, -11.5dB */
175
-	{0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 10, -11.0dB */
176
-	{0x10, 0x10, 0x0e, 0x0b, 0x08, 0x05, 0x03, 0x01}, /* 11, -10.5dB */
177
-	{0x11, 0x11, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 12, -10.0dB */
178
-	{0x12, 0x12, 0x0f, 0x0c, 0x09, 0x06, 0x03, 0x01}, /* 13, -9.5dB */
179
-	{0x13, 0x13, 0x10, 0x0d, 0x0a, 0x06, 0x03, 0x01}, /* 14, -9.0dB */
180
-	{0x14, 0x14, 0x11, 0x0e, 0x0b, 0x07, 0x03, 0x02}, /* 15, -8.5dB */
181
-	{0x16, 0x15, 0x12, 0x0f, 0x0b, 0x07, 0x04, 0x01}, /* 16, -8.0dB */
182
-	{0x17, 0x16, 0x13, 0x10, 0x0c, 0x08, 0x04, 0x02}, /* 17, -7.5dB */
183
-	{0x18, 0x17, 0x15, 0x11, 0x0c, 0x08, 0x04, 0x02}, /* 18, -7.0dB */
184
-	{0x1a, 0x19, 0x16, 0x12, 0x0d, 0x09, 0x04, 0x02}, /* 19, -6.5dB */
185
-	{0x1b, 0x1a, 0x17, 0x13, 0x0e, 0x09, 0x04, 0x02}, /* 20, -6.0dB */
186
-	{0x1d, 0x1c, 0x18, 0x14, 0x0f, 0x0a, 0x05, 0x02}, /* 21, -5.5dB */
187
-	{0x1f, 0x1e, 0x1a, 0x15, 0x10, 0x0a, 0x05, 0x02}, /* 22, -5.0dB */
188
-	{0x20, 0x20, 0x1b, 0x16, 0x11, 0x08, 0x05, 0x02}, /* 23, -4.5dB */
189
-	{0x22, 0x21, 0x1d, 0x18, 0x11, 0x0b, 0x06, 0x02}, /* 24, -4.0dB */
190
-	{0x24, 0x23, 0x1f, 0x19, 0x13, 0x0c, 0x06, 0x03}, /* 25, -3.5dB */
191
-	{0x26, 0x25, 0x21, 0x1b, 0x14, 0x0d, 0x06, 0x03}, /* 26, -3.0dB */
192
-	{0x28, 0x28, 0x22, 0x1c, 0x15, 0x0d, 0x07, 0x03}, /* 27, -2.5dB */
193
-	{0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03}, /* 28, -2.0dB */
194
-	{0x2d, 0x2d, 0x27, 0x1f, 0x18, 0x0f, 0x08, 0x03}, /* 29, -1.5dB */
195
-	{0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, /* 30, -1.0dB */
196
-	{0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04}, /* 31, -0.5dB */
197
-	{0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04} /* 32, +0dB */
198
-};
199
-
200
-static const u8 cckswing_table_ch14[CCK_TABLE_SIZE][8] = {
201
-	{0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00}, /* 0, -16.0dB */
202
-	{0x09, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 1, -15.5dB */
203
-	{0x0a, 0x09, 0x08, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 2, -15.0dB */
204
-	{0x0a, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 3, -14.5dB */
205
-	{0x0b, 0x0a, 0x09, 0x05, 0x00, 0x00, 0x00, 0x00}, /* 4, -14.0dB */
206
-	{0x0b, 0x0b, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 5, -13.5dB */
207
-	{0x0c, 0x0c, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 6, -13.0dB */
208
-	{0x0d, 0x0c, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00}, /* 7, -12.5dB */
209
-	{0x0d, 0x0d, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 8, -12.0dB */
210
-	{0x0e, 0x0e, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00}, /* 9, -11.5dB */
211
-	{0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 10, -11.0dB */
212
-	{0x10, 0x10, 0x0e, 0x08, 0x00, 0x00, 0x00, 0x00}, /* 11, -10.5dB */
213
-	{0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 12, -10.0dB */
214
-	{0x12, 0x12, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, /* 13, -9.5dB */
215
-	{0x13, 0x13, 0x10, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 14, -9.0dB */
216
-	{0x14, 0x14, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x00}, /* 15, -8.5dB */
217
-	{0x16, 0x15, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 16, -8.0dB */
218
-	{0x17, 0x16, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00}, /* 17, -7.5dB */
219
-	{0x18, 0x17, 0x15, 0x0c, 0x00, 0x00, 0x00, 0x00}, /* 18, -7.0dB */
220
-	{0x1a, 0x19, 0x16, 0x0d, 0x00, 0x00, 0x00, 0x00}, /* 19, -6.5dB */
221
-	{0x1b, 0x1a, 0x17, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 20, -6.0dB */
222
-	{0x1d, 0x1c, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00}, /* 21, -5.5dB */
223
-	{0x1f, 0x1e, 0x1a, 0x0f, 0x00, 0x00, 0x00, 0x00}, /* 22, -5.0dB */
224
-	{0x20, 0x20, 0x1b, 0x10, 0x00, 0x00, 0x00, 0x00}, /* 23, -4.5dB */
225
-	{0x22, 0x21, 0x1d, 0x11, 0x00, 0x00, 0x00, 0x00}, /* 24, -4.0dB */
226
-	{0x24, 0x23, 0x1f, 0x12, 0x00, 0x00, 0x00, 0x00}, /* 25, -3.5dB */
227
-	{0x26, 0x25, 0x21, 0x13, 0x00, 0x00, 0x00, 0x00}, /* 26, -3.0dB */
228
-	{0x28, 0x28, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00}, /* 27, -2.5dB */
229
-	{0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00}, /* 28, -2.0dB */
230
-	{0x2d, 0x2d, 0x17, 0x17, 0x00, 0x00, 0x00, 0x00}, /* 29, -1.5dB */
231
-	{0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, /* 30, -1.0dB */
232
-	{0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00}, /* 31, -0.5dB */
233
-	{0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00} /* 32, +0dB */
234
-};
235
-
23696 static const u32 edca_setting_dl[PEER_MAX] = {
23797 	0xa44f,		/* 0 UNKNOWN */
23898 	0x5ea44f,	/* 1 REALTEK_90 */
....@@ -255,47 +115,47 @@
255115 	0x5ea44f,	/* 7 MARV */
256116 };
257117 
258
-static u8 rtl8818e_delta_swing_table_idx_24gb_p[] = {
118
+static const u8 rtl8818e_delta_swing_table_idx_24gb_p[] = {
259119 	0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4,
260120 	4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9};
261121 
262
-static u8 rtl8818e_delta_swing_table_idx_24gb_n[] = {
122
+static const u8 rtl8818e_delta_swing_table_idx_24gb_n[] = {
263123 	0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6,
264124 	7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11};
265125 
266
-static u8 rtl8812ae_delta_swing_table_idx_24gb_n[]  = {
126
+static const u8 rtl8812ae_delta_swing_table_idx_24gb_n[]  = {
267127 	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
268128 	6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
269129 
270
-static u8 rtl8812ae_delta_swing_table_idx_24gb_p[] = {
130
+static const u8 rtl8812ae_delta_swing_table_idx_24gb_p[] = {
271131 	0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
272132 	6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
273133 
274
-static u8 rtl8812ae_delta_swing_table_idx_24ga_n[] = {
134
+static const u8 rtl8812ae_delta_swing_table_idx_24ga_n[] = {
275135 	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
276136 	6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
277137 
278
-static u8 rtl8812ae_delta_swing_table_idx_24ga_p[] = {
138
+static const u8 rtl8812ae_delta_swing_table_idx_24ga_p[] = {
279139 	0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
280140 	6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
281141 
282
-static u8 rtl8812ae_delta_swing_table_idx_24gcckb_n[] = {
142
+static const u8 rtl8812ae_delta_swing_table_idx_24gcckb_n[] = {
283143 	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
284144 	6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
285145 
286
-static u8 rtl8812ae_delta_swing_table_idx_24gcckb_p[] = {
146
+static const u8 rtl8812ae_delta_swing_table_idx_24gcckb_p[] = {
287147 	0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
288148 	6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
289149 
290
-static u8 rtl8812ae_delta_swing_table_idx_24gccka_n[] = {
150
+static const u8 rtl8812ae_delta_swing_table_idx_24gccka_n[] = {
291151 	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
292152 	6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
293153 
294
-static u8 rtl8812ae_delta_swing_table_idx_24gccka_p[] = {
154
+static const u8 rtl8812ae_delta_swing_table_idx_24gccka_p[] = {
295155 	0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
296156 	6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
297157 
298
-static u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
158
+static const u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
299159 	{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7,
300160 	7, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13},
301161 	{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
....@@ -304,7 +164,7 @@
304164 	12, 12, 13, 14, 14, 14, 15, 16, 17, 17, 17, 18, 18, 18},
305165 };
306166 
307
-static u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
167
+static const u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
308168 	{0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8,
309169 	8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
310170 	{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
....@@ -313,7 +173,7 @@
313173 	9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
314174 };
315175 
316
-static u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
176
+static const u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
317177 	{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
318178 	8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, 13},
319179 	{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9,
....@@ -322,7 +182,7 @@
322182 	12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 18, 18},
323183 };
324184 
325
-static u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
185
+static const u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
326186 	{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, 7, 8,
327187 	8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
328188 	{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
....@@ -331,39 +191,23 @@
331191 	10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
332192 };
333193 
334
-static u8 rtl8821ae_delta_swing_table_idx_24gb_n[] = {
194
+static const u8 rtl8821ae_delta_swing_table_idx_24ga_n[]  = {
335195 	0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
336196 	6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
337197 
338
-static u8 rtl8821ae_delta_swing_table_idx_24gb_p[]  = {
198
+static const u8 rtl8821ae_delta_swing_table_idx_24ga_p[] = {
339199 	0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
340200 	8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
341201 
342
-static u8 rtl8821ae_delta_swing_table_idx_24ga_n[]  = {
202
+static const u8 rtl8821ae_delta_swing_table_idx_24gccka_n[] = {
343203 	0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
344204 	6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
345205 
346
-static u8 rtl8821ae_delta_swing_table_idx_24ga_p[] = {
206
+static const u8 rtl8821ae_delta_swing_table_idx_24gccka_p[] = {
347207 	0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
348208 	8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
349209 
350
-static u8 rtl8821ae_delta_swing_table_idx_24gcckb_n[] = {
351
-	0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
352
-	6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
353
-
354
-static u8 rtl8821ae_delta_swing_table_idx_24gcckb_p[] = {
355
-	0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
356
-	8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
357
-
358
-static u8 rtl8821ae_delta_swing_table_idx_24gccka_n[] = {
359
-	0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
360
-	6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
361
-
362
-static u8 rtl8821ae_delta_swing_table_idx_24gccka_p[] = {
363
-	0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
364
-	8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
365
-
366
-static u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
210
+static const u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
367211 	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
368212 	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
369213 	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
....@@ -372,25 +216,7 @@
372216 	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
373217 };
374218 
375
-static u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
376
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
377
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
378
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
379
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
380
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
381
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
382
-};
383
-
384
-static u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
385
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
386
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
387
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
388
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
389
-	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
390
-	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
391
-};
392
-
393
-static u8 rtl8821ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
219
+static const u8 rtl8821ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
394220 	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
395221 	12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
396222 	{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
....@@ -611,26 +437,26 @@
611437 		    mac->opmode == NL80211_IFTYPE_ADHOC) {
612438 			rtl_dm_dig->min_undec_pwdb_for_dm =
613439 			    rtlpriv->dm.entry_min_undec_sm_pwdb;
614
-			RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
615
-				 "AP Client PWDB = 0x%lx\n",
616
-				 rtlpriv->dm.entry_min_undec_sm_pwdb);
440
+			rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
441
+				"AP Client PWDB = 0x%lx\n",
442
+				rtlpriv->dm.entry_min_undec_sm_pwdb);
617443 		} else {
618444 			rtl_dm_dig->min_undec_pwdb_for_dm =
619445 			    rtlpriv->dm.undec_sm_pwdb;
620
-			RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
621
-				 "STA Default Port PWDB = 0x%x\n",
622
-				 rtl_dm_dig->min_undec_pwdb_for_dm);
446
+			rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
447
+				"STA Default Port PWDB = 0x%x\n",
448
+				rtl_dm_dig->min_undec_pwdb_for_dm);
623449 		}
624450 	} else {
625451 		rtl_dm_dig->min_undec_pwdb_for_dm =
626452 		    rtlpriv->dm.entry_min_undec_sm_pwdb;
627
-		RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
628
-			 "AP Ext Port or disconnect PWDB = 0x%x\n",
629
-			 rtl_dm_dig->min_undec_pwdb_for_dm);
453
+		rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
454
+			"AP Ext Port or disconnect PWDB = 0x%x\n",
455
+			rtl_dm_dig->min_undec_pwdb_for_dm);
630456 	}
631
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
632
-		 "MinUndecoratedPWDBForDM =%d\n",
633
-		 rtl_dm_dig->min_undec_pwdb_for_dm);
457
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
458
+		"MinUndecoratedPWDBForDM =%d\n",
459
+		rtl_dm_dig->min_undec_pwdb_for_dm);
634460 }
635461 
636462 static void  rtl8812ae_dm_rssi_dump_to_register(struct ieee80211_hw *hw)
....@@ -677,10 +503,9 @@
677503 	u8 h2c_parameter[4] = { 0 };
678504 	long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
679505 	u8 stbc_tx = 0;
680
-	u64 cur_txokcnt = 0, cur_rxokcnt = 0;
506
+	u64 cur_rxokcnt = 0;
681507 	static u64 last_txokcnt = 0, last_rxokcnt;
682508 
683
-	cur_txokcnt = rtlpriv->stats.txbytesunicast - last_txokcnt;
684509 	cur_rxokcnt = rtlpriv->stats.rxbytesunicast - last_rxokcnt;
685510 	last_txokcnt = rtlpriv->stats.txbytesunicast;
686511 	last_rxokcnt = rtlpriv->stats.rxbytesunicast;
....@@ -801,11 +626,11 @@
801626 	u8 dm_dig_max, dm_dig_min, offset;
802627 	u8 current_igi = dm_digtable->cur_igvalue;
803628 
804
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "\n");
629
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "\n");
805630 
806631 	if (mac->act_scanning) {
807
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
808
-			 "Return: In Scan Progress\n");
632
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
633
+			"Return: In Scan Progress\n");
809634 		return;
810635 	}
811636 
....@@ -841,10 +666,10 @@
841666 			dm_digtable->rx_gain_max =
842667 				dm_digtable->rssi_val_min + offset;
843668 
844
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
845
-			 "dm_digtable->rssi_val_min=0x%x,dm_digtable->rx_gain_max = 0x%x\n",
846
-			 dm_digtable->rssi_val_min,
847
-			 dm_digtable->rx_gain_max);
669
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
670
+			"dm_digtable->rssi_val_min=0x%x,dm_digtable->rx_gain_max = 0x%x\n",
671
+			dm_digtable->rssi_val_min,
672
+			dm_digtable->rx_gain_max);
848673 		if (rtlpriv->dm.one_entry_only) {
849674 			offset = 0;
850675 
....@@ -857,22 +682,21 @@
857682 				dig_min_0 =
858683 					dm_digtable->rssi_val_min - offset;
859684 
860
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
861
-				 "bOneEntryOnly=TRUE, dig_min_0=0x%x\n",
862
-				 dig_min_0);
685
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
686
+				"bOneEntryOnly=TRUE, dig_min_0=0x%x\n",
687
+				dig_min_0);
863688 		} else {
864689 			dig_min_0 = dm_dig_min;
865690 		}
866691 	} else {
867692 		dm_digtable->rx_gain_max = dm_dig_max;
868693 		dig_min_0 = dm_dig_min;
869
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
870
-			 "No Link\n");
694
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "No Link\n");
871695 	}
872696 
873697 	if (rtlpriv->falsealm_cnt.cnt_all > 10000) {
874
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
875
-			 "Abnormally false alarm case.\n");
698
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
699
+			"Abnormally false alarm case.\n");
876700 
877701 		if (dm_digtable->large_fa_hit != 3)
878702 			dm_digtable->large_fa_hit++;
....@@ -903,23 +727,23 @@
903727 						dig_min_0;
904728 					dm_digtable->rx_gain_min =
905729 						dig_min_0;
906
-					RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
907
-						 "Normal Case: At Lower Bound\n");
730
+					rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
731
+						"Normal Case: At Lower Bound\n");
908732 				} else {
909733 					dm_digtable->forbidden_igi--;
910734 					dm_digtable->rx_gain_min =
911735 					  (dm_digtable->forbidden_igi + 1);
912
-					RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
913
-						 "Normal Case: Approach Lower Bound\n");
736
+					rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
737
+						"Normal Case: Approach Lower Bound\n");
914738 				}
915739 			} else {
916740 				dm_digtable->large_fa_hit = 0;
917741 			}
918742 		}
919743 	}
920
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
921
-		 "pDM_DigTable->LargeFAHit=%d\n",
922
-		 dm_digtable->large_fa_hit);
744
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
745
+		"pDM_DigTable->LargeFAHit=%d\n",
746
+		dm_digtable->large_fa_hit);
923747 
924748 	if (rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 10)
925749 		dm_digtable->rx_gain_min = dm_dig_min;
....@@ -929,15 +753,15 @@
929753 
930754 	/*Adjust initial gain by false alarm*/
931755 	if (mac->link_state >= MAC80211_LINKED) {
932
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
933
-			 "DIG AfterLink\n");
756
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
757
+			"DIG AfterLink\n");
934758 		if (first_connect) {
935759 			if (dm_digtable->rssi_val_min <= dig_max_of_min)
936760 				current_igi = dm_digtable->rssi_val_min;
937761 			else
938762 				current_igi = dig_max_of_min;
939
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
940
-				 "First Connect\n");
763
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
764
+				"First Connect\n");
941765 		} else {
942766 			if (rtlpriv->falsealm_cnt.cnt_all > DM_DIG_FA_TH2)
943767 				current_igi = current_igi + 4;
....@@ -949,17 +773,17 @@
949773 			if ((rtlpriv->dm.dbginfo.num_qry_beacon_pkt < 10) &&
950774 			    (rtlpriv->falsealm_cnt.cnt_all < DM_DIG_FA_TH1)) {
951775 				current_igi = dm_digtable->rx_gain_min;
952
-				RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
953
-					 "Beacon is less than 10 and FA is less than 768, IGI GOES TO 0x1E!!!!!!!!!!!!\n");
776
+				rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
777
+					"Beacon is less than 10 and FA is less than 768, IGI GOES TO 0x1E!!!!!!!!!!!!\n");
954778 			}
955779 		}
956780 	} else {
957
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
958
-			 "DIG BeforeLink\n");
781
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
782
+			"DIG BeforeLink\n");
959783 		if (first_disconnect) {
960784 			current_igi = dm_digtable->rx_gain_min;
961
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
962
-				 "First DisConnect\n");
785
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
786
+				"First DisConnect\n");
963787 		} else {
964788 			/* 2012.03.30 LukeLee: enable DIG before
965789 			 * link but with very high thresholds
....@@ -974,11 +798,11 @@
974798 			if (current_igi >= 0x3e)
975799 				current_igi = 0x3e;
976800 
977
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "England DIG\n");
801
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "England DIG\n");
978802 		}
979803 	}
980
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
981
-		 "DIG End Adjust IGI\n");
804
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
805
+		"DIG End Adjust IGI\n");
982806 	/* Check initial gain by upper/lower bound*/
983807 
984808 	if (current_igi > dm_digtable->rx_gain_max)
....@@ -986,13 +810,13 @@
986810 	if (current_igi < dm_digtable->rx_gain_min)
987811 		current_igi = dm_digtable->rx_gain_min;
988812 
989
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
990
-		 "rx_gain_max=0x%x, rx_gain_min=0x%x\n",
813
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
814
+		"rx_gain_max=0x%x, rx_gain_min=0x%x\n",
991815 		dm_digtable->rx_gain_max, dm_digtable->rx_gain_min);
992
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
993
-		 "TotalFA=%d\n", rtlpriv->falsealm_cnt.cnt_all);
994
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
995
-		 "CurIGValue=0x%x\n", current_igi);
816
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
817
+		"TotalFA=%d\n", rtlpriv->falsealm_cnt.cnt_all);
818
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
819
+		"CurIGValue=0x%x\n", current_igi);
996820 
997821 	rtl8821ae_dm_write_dig(hw, current_igi);
998822 	dm_digtable->media_connect_0 =
....@@ -1055,12 +879,12 @@
1055879 	rtl_set_bbreg(hw, ODM_REG_CCK_FA_RST_11AC, BIT(15), 0);
1056880 	rtl_set_bbreg(hw, ODM_REG_CCK_FA_RST_11AC, BIT(15), 1);
1057881 
1058
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Cnt_Cck_fail=%d\n",
1059
-		 falsealm_cnt->cnt_cck_fail);
1060
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "cnt_ofdm_fail=%d\n",
1061
-		 falsealm_cnt->cnt_ofdm_fail);
1062
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Total False Alarm=%d\n",
1063
-		 falsealm_cnt->cnt_all);
882
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "Cnt_Cck_fail=%d\n",
883
+		falsealm_cnt->cnt_cck_fail);
884
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "cnt_ofdm_fail=%d\n",
885
+		falsealm_cnt->cnt_ofdm_fail);
886
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "Total False Alarm=%d\n",
887
+		falsealm_cnt->cnt_all);
1064888 }
1065889 
1066890 static void rtl8812ae_dm_check_txpower_tracking_thermalmeter(
....@@ -1071,13 +895,13 @@
1071895 	if (!rtlpriv->dm.tm_trigger) {
1072896 		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E,
1073897 			      BIT(17) | BIT(16), 0x03);
1074
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1075
-			 "Trigger 8812 Thermal Meter!!\n");
898
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
899
+			"Trigger 8812 Thermal Meter!!\n");
1076900 		rtlpriv->dm.tm_trigger = 1;
1077901 		return;
1078902 	}
1079
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1080
-		 "Schedule TxPowerTracking direct call!!\n");
903
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
904
+		"Schedule TxPowerTracking direct call!!\n");
1081905 	rtl8812ae_dm_txpower_tracking_callback_thermalmeter(hw);
1082906 }
1083907 
....@@ -1103,8 +927,10 @@
1103927 }
1104928 
1105929 static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw,
1106
-					    u8 **up_a, u8 **down_a,
1107
-					    u8 **up_b, u8 **down_b)
930
+					    const u8 **up_a,
931
+					    const u8 **down_a,
932
+					    const u8 **up_b,
933
+					    const u8 **down_b)
1108934 {
1109935 	struct rtl_priv *rtlpriv = rtl_priv(hw);
1110936 	struct rtl_phy *rtlphy = &rtlpriv->phy;
....@@ -1140,10 +966,10 @@
1140966 		*up_b = rtl8812ae_delta_swing_table_idx_5gb_p[2];
1141967 		*down_b = rtl8812ae_delta_swing_table_idx_5gb_n[2];
1142968 	} else {
1143
-	    *up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
1144
-	    *down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
1145
-	    *up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
1146
-	    *down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
969
+		*up_a = rtl8818e_delta_swing_table_idx_24gb_p;
970
+		*down_a = rtl8818e_delta_swing_table_idx_24gb_n;
971
+		*up_b = rtl8818e_delta_swing_table_idx_24gb_p;
972
+		*down_b = rtl8818e_delta_swing_table_idx_24gb_n;
1147973 	}
1148974 }
1149975 
....@@ -1154,8 +980,8 @@
1154980 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
1155981 	u8 p = 0;
1156982 
1157
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1158
-		 "Get C2H Command! Rate=0x%x\n", rate);
983
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
984
+		"Get C2H Command! Rate=0x%x\n", rate);
1159985 
1160986 	rtldm->tx_rate = rate;
1161987 
....@@ -1318,9 +1144,9 @@
13181144 		ret_rate = MGN_VHT2SS_MCS9;
13191145 		break;
13201146 	default:
1321
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1322
-			 "HwRateToMRate8812(): Non supported Rate [%x]!!!\n",
1323
-			 rate);
1147
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1148
+			"HwRateToMRate8812(): Non supported Rate [%x]!!!\n",
1149
+			rate);
13241150 		break;
13251151 	}
13261152 	return ret_rate;
....@@ -1360,8 +1186,8 @@
13601186 		tx_rate =
13611187 			rtl8821ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
13621188 
1363
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1364
-		 "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
1189
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1190
+		"===>%s\n", __func__);
13651191 	/*20130429 Mimic Modify High Rate BBSwing Limit.*/
13661192 	if (tx_rate != 0xFF) {
13671193 		/*CCK*/
....@@ -1432,13 +1258,13 @@
14321258 		else
14331259 			pwr_tracking_limit = 24;
14341260 	}
1435
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1436
-		 "TxRate=0x%x, PwrTrackingLimit=%d\n",
1437
-		 tx_rate, pwr_tracking_limit);
1261
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1262
+		"TxRate=0x%x, PwrTrackingLimit=%d\n",
1263
+		tx_rate, pwr_tracking_limit);
14381264 
14391265 	if (method == BBSWING) {
1440
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1441
-			 "===>rtl8812ae_dm_txpwr_track_set_pwr\n");
1266
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1267
+			"===>%s\n", __func__);
14421268 
14431269 		if (rf_path == RF90_PATH_A) {
14441270 			u32 tmp;
....@@ -1449,10 +1275,10 @@
14491275 				pwr_tracking_limit :
14501276 				rtldm->ofdm_index[RF90_PATH_A];
14511277 			tmp = final_swing_idx[RF90_PATH_A];
1452
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1453
-				 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
1454
-				 rtldm->ofdm_index[RF90_PATH_A],
1455
-				 final_swing_idx[RF90_PATH_A]);
1278
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1279
+				"pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
1280
+				rtldm->ofdm_index[RF90_PATH_A],
1281
+				final_swing_idx[RF90_PATH_A]);
14561282 
14571283 			rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
14581284 				      txscaling_tbl[tmp]);
....@@ -1465,20 +1291,20 @@
14651291 				pwr_tracking_limit :
14661292 				rtldm->ofdm_index[RF90_PATH_B];
14671293 			tmp = final_swing_idx[RF90_PATH_B];
1468
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1469
-				 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_B]=%d, pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_B]=%d\n",
1470
-				 rtldm->ofdm_index[RF90_PATH_B],
1471
-				 final_swing_idx[RF90_PATH_B]);
1294
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1295
+				"pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_B]=%d, pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_B]=%d\n",
1296
+				rtldm->ofdm_index[RF90_PATH_B],
1297
+				final_swing_idx[RF90_PATH_B]);
14721298 
14731299 			rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
14741300 				      txscaling_tbl[tmp]);
14751301 		}
14761302 	} else if (method == MIX_MODE) {
1477
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1478
-			 "pDM_Odm->DefaultOfdmIndex=%d, pDM_Odm->Absolute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
1479
-			 rtldm->default_ofdm_index,
1480
-			 rtldm->absolute_ofdm_swing_idx[rf_path],
1481
-			 rf_path);
1303
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1304
+			"pDM_Odm->DefaultOfdmIndex=%d, pDM_Odm->Absolute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
1305
+			rtldm->default_ofdm_index,
1306
+			rtldm->absolute_ofdm_swing_idx[rf_path],
1307
+			rf_path);
14821308 
14831309 		final_ofdm_swing_index = rtldm->default_ofdm_index +
14841310 				rtldm->absolute_ofdm_swing_idx[rf_path];
....@@ -1506,10 +1332,10 @@
15061332 					rtlphy->current_channel,
15071333 					RF90_PATH_A);
15081334 
1509
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1510
-					 "******Path_A Over BBSwing Limit ,PwrTrackingLimit = %d ,Remnant TxAGC Value = %d\n",
1511
-					 pwr_tracking_limit,
1512
-					 rtldm->remnant_ofdm_swing_idx[rf_path]);
1335
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1336
+					"******Path_A Over BBSwing Limit ,PwrTrackingLimit = %d ,Remnant TxAGC Value = %d\n",
1337
+					pwr_tracking_limit,
1338
+					rtldm->remnant_ofdm_swing_idx[rf_path]);
15131339 			} else if (final_ofdm_swing_index < 0) {
15141340 				rtldm->remnant_cck_idx = final_ofdm_swing_index;
15151341 				/* CCK Follow the same compensate value as Path A*/
....@@ -1525,15 +1351,15 @@
15251351 				rtl8821ae_phy_set_txpower_level_by_path(hw,
15261352 					rtlphy->current_channel, RF90_PATH_A);
15271353 
1528
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1529
-					 "******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
1530
-					 rtldm->remnant_ofdm_swing_idx[rf_path]);
1354
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1355
+					"******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
1356
+					rtldm->remnant_ofdm_swing_idx[rf_path]);
15311357 			} else {
15321358 				rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
15331359 					txscaling_tbl[(u8)final_ofdm_swing_index]);
15341360 
1535
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1536
-					 "******Path_A Compensate with BBSwing, Final_OFDM_Swing_Index = %d\n",
1361
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1362
+					"******Path_A Compensate with BBSwing, Final_OFDM_Swing_Index = %d\n",
15371363 					final_ofdm_swing_index);
15381364 				/*If TxAGC has changed, reset TxAGC again*/
15391365 				if (rtldm->modify_txagc_flag_path_a) {
....@@ -1545,9 +1371,9 @@
15451371 						rtlphy->current_channel, RF90_PATH_A);
15461372 					rtldm->modify_txagc_flag_path_a = false;
15471373 
1548
-					RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
1549
-						 DBG_LOUD,
1550
-						 "******Path_A pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
1374
+					rtl_dbg(rtlpriv, COMP_POWER_TRACKING,
1375
+						DBG_LOUD,
1376
+						"******Path_A pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
15511377 				}
15521378 			}
15531379 		}
....@@ -1568,9 +1394,9 @@
15681394 				rtl8821ae_phy_set_txpower_level_by_path(hw,
15691395 					rtlphy->current_channel, RF90_PATH_B);
15701396 
1571
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1572
-					 "******Path_B Over BBSwing Limit , PwrTrackingLimit = %d , Remnant TxAGC Value = %d\n",
1573
-					 pwr_tracking_limit,
1397
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1398
+					"******Path_B Over BBSwing Limit , PwrTrackingLimit = %d , Remnant TxAGC Value = %d\n",
1399
+					pwr_tracking_limit,
15741400 					 rtldm->remnant_ofdm_swing_idx[rf_path]);
15751401 			} else if (final_ofdm_swing_index < 0) {
15761402 				rtldm->remnant_ofdm_swing_idx[rf_path] =
....@@ -1585,15 +1411,15 @@
15851411 				rtl8821ae_phy_set_txpower_level_by_path(hw,
15861412 					rtlphy->current_channel, RF90_PATH_B);
15871413 
1588
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1589
-					 "******Path_B Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
1590
-					 rtldm->remnant_ofdm_swing_idx[rf_path]);
1414
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1415
+					"******Path_B Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
1416
+					rtldm->remnant_ofdm_swing_idx[rf_path]);
15911417 			} else {
15921418 				rtl_set_bbreg(hw, RB_TXSCALE, 0xFFE00000,
15931419 					txscaling_tbl[(u8)final_ofdm_swing_index]);
15941420 
1595
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1596
-					 "******Path_B Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
1421
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1422
+					"******Path_B Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
15971423 					final_ofdm_swing_index);
15981424 				 /*If TxAGC has changed, reset TxAGC again*/
15991425 				if (rtldm->modify_txagc_flag_path_b) {
....@@ -1606,8 +1432,8 @@
16061432 					rtldm->modify_txagc_flag_path_b =
16071433 						false;
16081434 
1609
-					RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1610
-						 "******Path_B pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
1435
+					rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1436
+						"******Path_B pDM_Odm->Modify_TxAGC_Flag = FALSE\n");
16111437 				}
16121438 			}
16131439 		}
....@@ -1633,32 +1459,32 @@
16331459 	/* 1. The following TWO tables decide
16341460 	 * the final index of OFDM/CCK swing table.
16351461 	 */
1636
-	u8 *delta_swing_table_idx_tup_a;
1637
-	u8 *delta_swing_table_idx_tdown_a;
1638
-	u8 *delta_swing_table_idx_tup_b;
1639
-	u8 *delta_swing_table_idx_tdown_b;
1462
+	const u8 *delta_swing_table_idx_tup_a;
1463
+	const u8 *delta_swing_table_idx_tdown_a;
1464
+	const u8 *delta_swing_table_idx_tup_b;
1465
+	const u8 *delta_swing_table_idx_tdown_b;
16401466 
16411467 	/*2. Initilization ( 7 steps in total )*/
16421468 	rtl8812ae_get_delta_swing_table(hw,
1643
-		(u8 **)&delta_swing_table_idx_tup_a,
1644
-		(u8 **)&delta_swing_table_idx_tdown_a,
1645
-		(u8 **)&delta_swing_table_idx_tup_b,
1646
-		(u8 **)&delta_swing_table_idx_tdown_b);
1469
+		&delta_swing_table_idx_tup_a,
1470
+		&delta_swing_table_idx_tdown_a,
1471
+		&delta_swing_table_idx_tup_b,
1472
+		&delta_swing_table_idx_tdown_b);
16471473 
16481474 	rtldm->txpower_trackinginit = true;
16491475 
1650
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1651
-		 "pDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
1652
-		 rtldm->swing_idx_cck_base,
1653
-		 rtldm->swing_idx_ofdm_base[RF90_PATH_A],
1654
-		 rtldm->default_ofdm_index);
1476
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1477
+		"pDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
1478
+		rtldm->swing_idx_cck_base,
1479
+		rtldm->swing_idx_ofdm_base[RF90_PATH_A],
1480
+		rtldm->default_ofdm_index);
16551481 
16561482 	thermal_value = (u8)rtl_get_rfreg(hw, RF90_PATH_A,
16571483 		/*0x42: RF Reg[15:10] 88E*/
16581484 		RF_T_METER_8812A, 0xfc00);
1659
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1660
-		 "Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
1661
-		 thermal_value, rtlefuse->eeprom_thermalmeter);
1485
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1486
+		"Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
1487
+		thermal_value, rtlefuse->eeprom_thermalmeter);
16621488 	if (!rtldm->txpower_track_control ||
16631489 	    rtlefuse->eeprom_thermalmeter == 0 ||
16641490 	    rtlefuse->eeprom_thermalmeter == 0xFF)
....@@ -1667,8 +1493,8 @@
16671493 	/* 3. Initialize ThermalValues of RFCalibrateInfo*/
16681494 
16691495 	if (rtlhal->reloadtxpowerindex)
1670
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1671
-			 "reload ofdm index for band switch\n");
1496
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1497
+			"reload ofdm index for band switch\n");
16721498 
16731499 	/*4. Calculate average thermal meter*/
16741500 	rtldm->thermalvalue_avg[rtldm->thermalvalue_avg_index] = thermal_value;
....@@ -1687,9 +1513,9 @@
16871513 	if (thermal_value_avg_count) {
16881514 		thermal_value = (u8)(thermal_value_avg /
16891515 				thermal_value_avg_count);
1690
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1691
-			 "AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
1692
-			 thermal_value, rtlefuse->eeprom_thermalmeter);
1516
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1517
+			"AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
1518
+			thermal_value, rtlefuse->eeprom_thermalmeter);
16931519 	}
16941520 
16951521 	/*5. Calculate delta, delta_LCK, delta_IQK.
....@@ -1706,17 +1532,17 @@
17061532 		(thermal_value - rtldm->thermalvalue_iqk) :
17071533 		(rtldm->thermalvalue_iqk - thermal_value);
17081534 
1709
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1710
-		 "(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
1711
-		 delta, delta_lck, delta_iqk);
1535
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1536
+		"(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
1537
+		delta, delta_lck, delta_iqk);
17121538 
17131539 	/* 6. If necessary, do LCK.
17141540 	 * Delta temperature is equal to or larger than 20 centigrade.
17151541 	 */
17161542 	if (delta_lck >= IQK_THRESHOLD) {
1717
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1718
-			 "delta_LCK(%d) >= Threshold_IQK(%d)\n",
1719
-			 delta_lck, IQK_THRESHOLD);
1543
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1544
+			"delta_LCK(%d) >= Threshold_IQK(%d)\n",
1545
+			delta_lck, IQK_THRESHOLD);
17201546 		rtldm->thermalvalue_lck = thermal_value;
17211547 		rtl8821ae_phy_lc_calibrate(hw);
17221548 	}
....@@ -1737,9 +1563,9 @@
17371563 		/*7.1 The Final Power Index = BaseIndex + PowerIndexOffset*/
17381564 
17391565 		if (thermal_value > rtlefuse->eeprom_thermalmeter) {
1740
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1741
-				 "delta_swing_table_idx_tup_a[%d] = %d\n",
1742
-				 delta, delta_swing_table_idx_tup_a[delta]);
1566
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1567
+				"delta_swing_table_idx_tup_a[%d] = %d\n",
1568
+				delta, delta_swing_table_idx_tup_a[delta]);
17431569 			rtldm->delta_power_index_last[RF90_PATH_A] =
17441570 				rtldm->delta_power_index[RF90_PATH_A];
17451571 			rtldm->delta_power_index[RF90_PATH_A] =
....@@ -1749,13 +1575,13 @@
17491575 				delta_swing_table_idx_tup_a[delta];
17501576 			/*Record delta swing for mix mode power tracking*/
17511577 
1752
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1753
-				 "******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
1578
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1579
+				"******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
17541580 			rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
17551581 
1756
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1757
-				 "delta_swing_table_idx_tup_b[%d] = %d\n",
1758
-				 delta, delta_swing_table_idx_tup_b[delta]);
1582
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1583
+				"delta_swing_table_idx_tup_b[%d] = %d\n",
1584
+				delta, delta_swing_table_idx_tup_b[delta]);
17591585 			rtldm->delta_power_index_last[RF90_PATH_B] =
17601586 				rtldm->delta_power_index[RF90_PATH_B];
17611587 			rtldm->delta_power_index[RF90_PATH_B] =
....@@ -1765,13 +1591,13 @@
17651591 				delta_swing_table_idx_tup_b[delta];
17661592 			/*Record delta swing for mix mode power tracking*/
17671593 
1768
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1769
-				 "******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
1770
-				 rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
1594
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1595
+				"******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
1596
+				rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
17711597 		} else {
1772
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1773
-				 "delta_swing_table_idx_tdown_a[%d] = %d\n",
1774
-				 delta, delta_swing_table_idx_tdown_a[delta]);
1598
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1599
+				"delta_swing_table_idx_tdown_a[%d] = %d\n",
1600
+				delta, delta_swing_table_idx_tdown_a[delta]);
17751601 
17761602 			rtldm->delta_power_index_last[RF90_PATH_A] =
17771603 				rtldm->delta_power_index[RF90_PATH_A];
....@@ -1781,13 +1607,13 @@
17811607 			rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
17821608 				-1 * delta_swing_table_idx_tdown_a[delta];
17831609 			/* Record delta swing for mix mode power tracking*/
1784
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1785
-				 "******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
1786
-				 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
1610
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1611
+				"******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
1612
+				rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
17871613 
1788
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1789
-				 "deltaSwingTableIdx_TDOWN_B[%d] = %d\n",
1790
-				 delta, delta_swing_table_idx_tdown_b[delta]);
1614
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1615
+				"deltaSwingTableIdx_TDOWN_B[%d] = %d\n",
1616
+				delta, delta_swing_table_idx_tdown_b[delta]);
17911617 
17921618 			rtldm->delta_power_index_last[RF90_PATH_B] =
17931619 				rtldm->delta_power_index[RF90_PATH_B];
....@@ -1798,15 +1624,15 @@
17981624 				-1 * delta_swing_table_idx_tdown_b[delta];
17991625 			/*Record delta swing for mix mode power tracking*/
18001626 
1801
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1802
-				 "******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
1803
-				 rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
1627
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1628
+				"******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",
1629
+				rtldm->absolute_ofdm_swing_idx[RF90_PATH_B]);
18041630 		}
18051631 
18061632 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++) {
1807
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1808
-				 "============================= [Path-%c]Calculating PowerIndexOffset =============================\n",
1809
-				 (p == RF90_PATH_A ? 'A' : 'B'));
1633
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1634
+				"============================= [Path-%c]Calculating PowerIndexOffset =============================\n",
1635
+				(p == RF90_PATH_A ? 'A' : 'B'));
18101636 
18111637 			if (rtldm->delta_power_index[p] ==
18121638 				rtldm->delta_power_index_last[p])
....@@ -1820,12 +1646,12 @@
18201646 				/* Power Index Diff between 2
18211647 				 * times Power Tracking
18221648 				 */
1823
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1824
-				 "[Path-%c] PowerIndexOffset(%d) =DeltaPowerIndex(%d) -DeltaPowerIndexLast(%d)\n",
1825
-				 (p == RF90_PATH_A ? 'A' : 'B'),
1826
-				 rtldm->power_index_offset[p],
1827
-				 rtldm->delta_power_index[p] ,
1828
-				 rtldm->delta_power_index_last[p]);
1649
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1650
+				"[Path-%c] PowerIndexOffset(%d) =DeltaPowerIndex(%d) -DeltaPowerIndexLast(%d)\n",
1651
+				(p == RF90_PATH_A ? 'A' : 'B'),
1652
+				rtldm->power_index_offset[p],
1653
+				rtldm->delta_power_index[p],
1654
+				rtldm->delta_power_index_last[p]);
18291655 
18301656 			rtldm->ofdm_index[p] =
18311657 					rtldm->swing_idx_ofdm_base[p] +
....@@ -1839,17 +1665,17 @@
18391665 
18401666 			/****Print BB Swing Base and Index Offset */
18411667 
1842
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1843
-				 "The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
1844
-				 rtldm->swing_idx_cck,
1668
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1669
+				"The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
1670
+				rtldm->swing_idx_cck,
18451671 				rtldm->swing_idx_cck_base,
18461672 				rtldm->power_index_offset[p]);
1847
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1848
-				 "The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
1849
-				 rtldm->swing_idx_ofdm[p],
1850
-				 (p == RF90_PATH_A ? 'A' : 'B'),
1851
-				 rtldm->swing_idx_ofdm_base[p],
1852
-				 rtldm->power_index_offset[p]);
1673
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1674
+				"The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
1675
+				rtldm->swing_idx_ofdm[p],
1676
+				(p == RF90_PATH_A ? 'A' : 'B'),
1677
+				rtldm->swing_idx_ofdm_base[p],
1678
+				rtldm->power_index_offset[p]);
18531679 
18541680 			/*7.1 Handle boundary conditions of index.*/
18551681 
....@@ -1858,32 +1684,32 @@
18581684 			else if (rtldm->ofdm_index[p] < ofdm_min_index)
18591685 				rtldm->ofdm_index[p] = ofdm_min_index;
18601686 		}
1861
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1862
-			 "\n\n====================================================================================\n");
1687
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1688
+			"\n\n====================================================================================\n");
18631689 		if (rtldm->cck_index > TXSCALE_TABLE_SIZE - 1)
18641690 			rtldm->cck_index = TXSCALE_TABLE_SIZE - 1;
18651691 		else if (rtldm->cck_index < 0)
18661692 			rtldm->cck_index = 0;
18671693 	} else {
1868
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1869
-			 "The thermal meter is unchanged or TxPowerTracking OFF(%d): ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
1870
-			 rtldm->txpower_track_control,
1871
-			 thermal_value,
1872
-			 rtldm->thermalvalue);
1694
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1695
+			"The thermal meter is unchanged or TxPowerTracking OFF(%d): ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
1696
+			rtldm->txpower_track_control,
1697
+			thermal_value,
1698
+			rtldm->thermalvalue);
18731699 
18741700 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
18751701 			rtldm->power_index_offset[p] = 0;
18761702 	}
18771703 	/*Print Swing base & current*/
1878
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1879
-		 "TxPowerTracking: [CCK] Swing Current Index: %d,Swing Base Index: %d\n",
1880
-		 rtldm->cck_index, rtldm->swing_idx_cck_base);
1704
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1705
+		"TxPowerTracking: [CCK] Swing Current Index: %d,Swing Base Index: %d\n",
1706
+		rtldm->cck_index, rtldm->swing_idx_cck_base);
18811707 	for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++) {
1882
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1883
-			 "TxPowerTracking: [OFDM] Swing Current Index: %d,Swing Base Index[%c]: %d\n",
1884
-			 rtldm->ofdm_index[p],
1885
-			 (p == RF90_PATH_A ? 'A' : 'B'),
1886
-			 rtldm->swing_idx_ofdm_base[p]);
1708
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1709
+			"TxPowerTracking: [OFDM] Swing Current Index: %d,Swing Base Index[%c]: %d\n",
1710
+			rtldm->ofdm_index[p],
1711
+			(p == RF90_PATH_A ? 'A' : 'B'),
1712
+			rtldm->swing_idx_ofdm_base[p]);
18871713 	}
18881714 
18891715 	if ((rtldm->power_index_offset[RF90_PATH_A] != 0 ||
....@@ -1900,52 +1726,52 @@
19001726 		 *tx power in tx agc for 88E.
19011727 		 */
19021728 		if (thermal_value > rtldm->thermalvalue) {
1903
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1904
-				 "Temperature Increasing(A): delta_pi: %d , delta_t: %d, Now_t: %d,EFUSE_t: %d, Last_t: %d\n",
1905
-				 rtldm->power_index_offset[RF90_PATH_A],
1906
-				 delta, thermal_value,
1907
-				 rtlefuse->eeprom_thermalmeter,
1908
-				 rtldm->thermalvalue);
1729
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1730
+				"Temperature Increasing(A): delta_pi: %d , delta_t: %d, Now_t: %d,EFUSE_t: %d, Last_t: %d\n",
1731
+				rtldm->power_index_offset[RF90_PATH_A],
1732
+				delta, thermal_value,
1733
+				rtlefuse->eeprom_thermalmeter,
1734
+				rtldm->thermalvalue);
19091735 
1910
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1911
-				 "Temperature Increasing(B): delta_pi: %d ,delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1912
-				 rtldm->power_index_offset[RF90_PATH_B],
1913
-				 delta, thermal_value,
1914
-				 rtlefuse->eeprom_thermalmeter,
1915
-				 rtldm->thermalvalue);
1736
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1737
+				"Temperature Increasing(B): delta_pi: %d ,delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1738
+				rtldm->power_index_offset[RF90_PATH_B],
1739
+				delta, thermal_value,
1740
+				rtlefuse->eeprom_thermalmeter,
1741
+				rtldm->thermalvalue);
19161742 		} else if (thermal_value < rtldm->thermalvalue) { /*Low temperature*/
1917
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1918
-				 "Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1919
-				 rtldm->power_index_offset[RF90_PATH_A],
1920
-				 delta, thermal_value,
1921
-				 rtlefuse->eeprom_thermalmeter,
1922
-				 rtldm->thermalvalue);
1743
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1744
+				"Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1745
+				rtldm->power_index_offset[RF90_PATH_A],
1746
+				delta, thermal_value,
1747
+				rtlefuse->eeprom_thermalmeter,
1748
+				rtldm->thermalvalue);
19231749 
1924
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1925
-				 "Temperature Decreasing(B): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1926
-				 rtldm->power_index_offset[RF90_PATH_B],
1927
-				 delta, thermal_value,
1928
-				 rtlefuse->eeprom_thermalmeter,
1929
-				 rtldm->thermalvalue);
1750
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1751
+				"Temperature Decreasing(B): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
1752
+				rtldm->power_index_offset[RF90_PATH_B],
1753
+				delta, thermal_value,
1754
+				rtlefuse->eeprom_thermalmeter,
1755
+				rtldm->thermalvalue);
19301756 		}
19311757 
19321758 		if (thermal_value > rtlefuse->eeprom_thermalmeter) {
1933
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1934
-				 "Temperature(%d) higher than PG value(%d)\n",
1935
-				 thermal_value, rtlefuse->eeprom_thermalmeter);
1759
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1760
+				"Temperature(%d) higher than PG value(%d)\n",
1761
+				thermal_value, rtlefuse->eeprom_thermalmeter);
19361762 
1937
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1938
-				 "**********Enter POWER Tracking MIX_MODE**********\n");
1763
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1764
+				"**********Enter POWER Tracking MIX_MODE**********\n");
19391765 			for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
19401766 				rtl8812ae_dm_txpwr_track_set_pwr(hw, MIX_MODE,
19411767 								 p, 0);
19421768 		} else {
1943
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1944
-				 "Temperature(%d) lower than PG value(%d)\n",
1945
-				 thermal_value, rtlefuse->eeprom_thermalmeter);
1769
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1770
+				"Temperature(%d) lower than PG value(%d)\n",
1771
+				thermal_value, rtlefuse->eeprom_thermalmeter);
19461772 
1947
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1948
-				 "**********Enter POWER Tracking MIX_MODE**********\n");
1773
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1774
+				"**********Enter POWER Tracking MIX_MODE**********\n");
19491775 			for (p = RF90_PATH_A; p < MAX_PATH_NUM_8812A; p++)
19501776 				rtl8812ae_dm_txpwr_track_set_pwr(hw, MIX_MODE,
19511777 								 p, index_for_channel);
....@@ -1956,9 +1782,9 @@
19561782 				rtldm->swing_idx_ofdm_base[p] =
19571783 					rtldm->swing_idx_ofdm[p];
19581784 
1959
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1960
-			 "pDM_Odm->RFCalibrateInfo.ThermalValue =%d ThermalValue= %d\n",
1961
-			 rtldm->thermalvalue, thermal_value);
1785
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1786
+			"pDM_Odm->RFCalibrateInfo.ThermalValue =%d ThermalValue= %d\n",
1787
+			rtldm->thermalvalue, thermal_value);
19621788 		/*Record last Power Tracking Thermal Value*/
19631789 		rtldm->thermalvalue = thermal_value;
19641790 	}
....@@ -1967,12 +1793,13 @@
19671793 	if (delta_iqk >= IQK_THRESHOLD)
19681794 		rtl8812ae_do_iqk(hw, delta_iqk, thermal_value, 8);
19691795 
1970
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1971
-		 "<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n");
1796
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1797
+		"<===%s\n", __func__);
19721798 }
19731799 
1974
-static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw, u8 **up_a,
1975
-					    u8 **down_a, u8 **up_b, u8 **down_b)
1800
+static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw,
1801
+					    const u8 **up_a,
1802
+					    const u8 **down_a)
19761803 {
19771804 	struct rtl_priv *rtlpriv = rtl_priv(hw);
19781805 	struct rtl_phy *rtlphy = &rtlpriv->phy;
....@@ -1984,34 +1811,22 @@
19841811 		if (RTL8821AE_RX_HAL_IS_CCK_RATE(rate)) {
19851812 			*up_a = rtl8821ae_delta_swing_table_idx_24gccka_p;
19861813 			*down_a = rtl8821ae_delta_swing_table_idx_24gccka_n;
1987
-			*up_b = rtl8821ae_delta_swing_table_idx_24gcckb_p;
1988
-			*down_b = rtl8821ae_delta_swing_table_idx_24gcckb_n;
19891814 		} else {
19901815 			*up_a = rtl8821ae_delta_swing_table_idx_24ga_p;
19911816 			*down_a = rtl8821ae_delta_swing_table_idx_24ga_n;
1992
-			*up_b = rtl8821ae_delta_swing_table_idx_24gb_p;
1993
-			*down_b = rtl8821ae_delta_swing_table_idx_24gb_n;
19941817 		}
19951818 	} else if (36 <= channel && channel <= 64) {
19961819 		*up_a = rtl8821ae_delta_swing_table_idx_5ga_p[0];
19971820 		*down_a = rtl8821ae_delta_swing_table_idx_5ga_n[0];
1998
-		*up_b = rtl8821ae_delta_swing_table_idx_5gb_p[0];
1999
-		*down_b = rtl8821ae_delta_swing_table_idx_5gb_n[0];
20001821 	} else if (100 <= channel && channel <= 140) {
20011822 		*up_a = rtl8821ae_delta_swing_table_idx_5ga_p[1];
20021823 		*down_a = rtl8821ae_delta_swing_table_idx_5ga_n[1];
2003
-		*up_b = rtl8821ae_delta_swing_table_idx_5gb_p[1];
2004
-		*down_b = rtl8821ae_delta_swing_table_idx_5gb_n[1];
20051824 	} else if (149 <= channel && channel <= 173) {
20061825 		*up_a = rtl8821ae_delta_swing_table_idx_5ga_p[2];
20071826 		*down_a = rtl8821ae_delta_swing_table_idx_5ga_n[2];
2008
-		*up_b = rtl8821ae_delta_swing_table_idx_5gb_p[2];
2009
-		*down_b = rtl8821ae_delta_swing_table_idx_5gb_n[2];
20101827 	} else {
2011
-	    *up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
2012
-	    *down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
2013
-	    *up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p;
2014
-	    *down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n;
1828
+		*up_a = rtl8818e_delta_swing_table_idx_24gb_p;
1829
+		*down_a = rtl8818e_delta_swing_table_idx_24gb_n;
20151830 	}
20161831 	return;
20171832 }
....@@ -2049,7 +1864,7 @@
20491864 	if (rtldm->tx_rate != 0xFF)
20501865 		tx_rate = rtl8821ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
20511866 
2052
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "===>%s\n", __func__);
1867
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "===>%s\n", __func__);
20531868 
20541869 	if (tx_rate != 0xFF) { /* Mimic Modify High Rate BBSwing Limit.*/
20551870 		/*CCK*/
....@@ -2092,33 +1907,33 @@
20921907 		else
20931908 			pwr_tracking_limit = 24;
20941909 	}
2095
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2096
-		 "TxRate=0x%x, PwrTrackingLimit=%d\n",
2097
-		 tx_rate, pwr_tracking_limit);
1910
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1911
+		"TxRate=0x%x, PwrTrackingLimit=%d\n",
1912
+		tx_rate, pwr_tracking_limit);
20981913 
20991914 	if (method == BBSWING) {
2100
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2101
-			 "===>%s\n", __func__);
1915
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1916
+			"===>%s\n", __func__);
21021917 		if (rf_path == RF90_PATH_A) {
21031918 			final_swing_idx[RF90_PATH_A] =
21041919 				(rtldm->ofdm_index[RF90_PATH_A] >
21051920 				pwr_tracking_limit) ?
21061921 				pwr_tracking_limit :
21071922 				rtldm->ofdm_index[RF90_PATH_A];
2108
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2109
-				 "pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
2110
-				 rtldm->ofdm_index[RF90_PATH_A],
2111
-				 final_swing_idx[RF90_PATH_A]);
1923
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1924
+				"pDM_Odm->RFCalibrateInfo.OFDM_index[ODM_RF_PATH_A]=%d,pDM_Odm->RealBbSwingIdx[ODM_RF_PATH_A]=%d\n",
1925
+				rtldm->ofdm_index[RF90_PATH_A],
1926
+				final_swing_idx[RF90_PATH_A]);
21121927 
21131928 			rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
21141929 				txscaling_tbl[final_swing_idx[RF90_PATH_A]]);
21151930 		}
21161931 	} else if (method == MIX_MODE) {
2117
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2118
-			 "pDM_Odm->DefaultOfdmIndex=%d,pDM_Odm->Absolute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
2119
-			 rtldm->default_ofdm_index,
2120
-			 rtldm->absolute_ofdm_swing_idx[rf_path],
2121
-			 rf_path);
1932
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1933
+			"pDM_Odm->DefaultOfdmIndex=%d,pDM_Odm->Absolute_OFDMSwingIdx[RFPath]=%d, RF_Path = %d\n",
1934
+			rtldm->default_ofdm_index,
1935
+			rtldm->absolute_ofdm_swing_idx[rf_path],
1936
+			rf_path);
21221937 
21231938 		final_ofdm_swing_index =
21241939 			rtldm->default_ofdm_index +
....@@ -2145,10 +1960,10 @@
21451960 					rtlphy->current_channel,
21461961 					RF90_PATH_A);
21471962 
2148
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1963
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
21491964 					" ******Path_A Over BBSwing Limit , PwrTrackingLimit = %d , Remnant TxAGC Value = %d\n",
2150
-					 pwr_tracking_limit,
2151
-					 rtldm->remnant_ofdm_swing_idx[rf_path]);
1965
+					pwr_tracking_limit,
1966
+					rtldm->remnant_ofdm_swing_idx[rf_path]);
21521967 			} else if (final_ofdm_swing_index < 0) {
21531968 				rtldm->remnant_cck_idx = final_ofdm_swing_index;
21541969 				/* CCK Follow the same compensate value as Path A*/
....@@ -2164,16 +1979,16 @@
21641979 				rtl8821ae_phy_set_txpower_level_by_path(hw,
21651980 					rtlphy->current_channel, RF90_PATH_A);
21661981 
2167
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2168
-					 "******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
2169
-					 rtldm->remnant_ofdm_swing_idx[rf_path]);
1982
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1983
+					"******Path_A Lower then BBSwing lower bound  0 , Remnant TxAGC Value = %d\n",
1984
+					rtldm->remnant_ofdm_swing_idx[rf_path]);
21701985 			} else {
21711986 				rtl_set_bbreg(hw, RA_TXSCALE, 0xFFE00000,
21721987 					txscaling_tbl[(u8)final_ofdm_swing_index]);
21731988 
2174
-				RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2175
-					 "******Path_A Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
2176
-					 final_ofdm_swing_index);
1989
+				rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
1990
+					"******Path_A Compensate with BBSwing ,Final_OFDM_Swing_Index = %d\n",
1991
+					final_ofdm_swing_index);
21771992 				/*If TxAGC has changed, reset TxAGC again*/
21781993 				if (rtldm->modify_txagc_flag_path_a) {
21791994 					rtldm->remnant_cck_idx = 0;
....@@ -2185,9 +2000,9 @@
21852000 
21862001 					rtldm->modify_txagc_flag_path_a = false;
21872002 
2188
-					RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
2189
-						 DBG_LOUD,
2190
-						 "******Path_A pDM_Odm->Modify_TxAGC_Flag= FALSE\n");
2003
+					rtl_dbg(rtlpriv, COMP_POWER_TRACKING,
2004
+						DBG_LOUD,
2005
+						"******Path_A pDM_Odm->Modify_TxAGC_Flag= FALSE\n");
21912006 				}
21922007 			}
21932008 		}
....@@ -2216,25 +2031,22 @@
22162031 	/* 1. The following TWO tables decide the final
22172032 	 * index of OFDM/CCK swing table.
22182033 	 */
2219
-	u8 *delta_swing_table_idx_tup_a;
2220
-	u8 *delta_swing_table_idx_tdown_a;
2221
-	u8 *delta_swing_table_idx_tup_b;
2222
-	u8 *delta_swing_table_idx_tdown_b;
2034
+	const u8 *delta_swing_table_idx_tup_a;
2035
+	const u8 *delta_swing_table_idx_tdown_a;
22232036 
22242037 	/*2. Initilization ( 7 steps in total )*/
2225
-	rtl8821ae_get_delta_swing_table(hw, (u8 **)&delta_swing_table_idx_tup_a,
2226
-					(u8 **)&delta_swing_table_idx_tdown_a,
2227
-					(u8 **)&delta_swing_table_idx_tup_b,
2228
-					(u8 **)&delta_swing_table_idx_tdown_b);
2038
+	rtl8821ae_get_delta_swing_table(hw,
2039
+					&delta_swing_table_idx_tup_a,
2040
+					&delta_swing_table_idx_tdown_a);
22292041 
22302042 	rtldm->txpower_trackinginit = true;
22312043 
2232
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2233
-		 "===>%s,\n pDM_Odm->BbSwingIdxCckBase: %d,pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
2234
-		 __func__,
2235
-		 rtldm->swing_idx_cck_base,
2236
-		 rtldm->swing_idx_ofdm_base[RF90_PATH_A],
2237
-		 rtldm->default_ofdm_index);
2044
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2045
+		"===>%s,\n pDM_Odm->BbSwingIdxCckBase: %d,pDM_Odm->BbSwingIdxOfdmBase[A]:%d, pDM_Odm->DefaultOfdmIndex: %d\n",
2046
+		__func__,
2047
+		rtldm->swing_idx_cck_base,
2048
+		rtldm->swing_idx_ofdm_base[RF90_PATH_A],
2049
+		rtldm->default_ofdm_index);
22382050 	/*0x42: RF Reg[15:10] 88E*/
22392051 	thermal_value = (u8)rtl_get_rfreg(hw,
22402052 		RF90_PATH_A, RF_T_METER_8812A, 0xfc00);
....@@ -2246,8 +2058,8 @@
22462058 	/* 3. Initialize ThermalValues of RFCalibrateInfo*/
22472059 
22482060 	if (rtlhal->reloadtxpowerindex) {
2249
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2250
-			 "reload ofdm index for band switch\n");
2061
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2062
+			"reload ofdm index for band switch\n");
22512063 	}
22522064 
22532065 	/*4. Calculate average thermal meter*/
....@@ -2267,9 +2079,9 @@
22672079 	if (thermal_value_avg_count) {
22682080 		thermal_value = (u8)(thermal_value_avg /
22692081 				thermal_value_avg_count);
2270
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2271
-			 "AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
2272
-			 thermal_value, rtlefuse->eeprom_thermalmeter);
2082
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2083
+			"AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",
2084
+			thermal_value, rtlefuse->eeprom_thermalmeter);
22732085 	}
22742086 
22752087 	/*5. Calculate delta, delta_LCK, delta_IQK.
....@@ -2286,16 +2098,16 @@
22862098 		(thermal_value - rtldm->thermalvalue_iqk) :
22872099 		(rtldm->thermalvalue_iqk - thermal_value);
22882100 
2289
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2290
-		 "(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
2291
-		 delta, delta_lck, delta_iqk);
2101
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2102
+		"(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",
2103
+		delta, delta_lck, delta_iqk);
22922104 
22932105 	/* 6. If necessary, do LCK.	*/
22942106 	/*Delta temperature is equal to or larger than 20 centigrade.*/
22952107 	if (delta_lck >= IQK_THRESHOLD) {
2296
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2297
-			 "delta_LCK(%d) >= Threshold_IQK(%d)\n",
2298
-			 delta_lck, IQK_THRESHOLD);
2108
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2109
+			"delta_LCK(%d) >= Threshold_IQK(%d)\n",
2110
+			delta_lck, IQK_THRESHOLD);
22992111 		rtldm->thermalvalue_lck = thermal_value;
23002112 		rtl8821ae_phy_lc_calibrate(hw);
23012113 	}
....@@ -2316,9 +2128,9 @@
23162128 		/*7.1 The Final Power Index = BaseIndex + PowerIndexOffset*/
23172129 
23182130 		if (thermal_value > rtlefuse->eeprom_thermalmeter) {
2319
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2320
-				 "delta_swing_table_idx_tup_a[%d] = %d\n",
2321
-				 delta, delta_swing_table_idx_tup_a[delta]);
2131
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2132
+				"delta_swing_table_idx_tup_a[%d] = %d\n",
2133
+				delta, delta_swing_table_idx_tup_a[delta]);
23222134 			rtldm->delta_power_index_last[RF90_PATH_A] =
23232135 				rtldm->delta_power_index[RF90_PATH_A];
23242136 			rtldm->delta_power_index[RF90_PATH_A] =
....@@ -2328,13 +2140,13 @@
23282140 				delta_swing_table_idx_tup_a[delta];
23292141 			/*Record delta swing for mix mode power tracking*/
23302142 
2331
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2332
-				 "******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
2333
-				 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
2143
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2144
+				"******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
2145
+				rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
23342146 		} else {
2335
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2336
-				 "delta_swing_table_idx_tdown_a[%d] = %d\n",
2337
-				 delta, delta_swing_table_idx_tdown_a[delta]);
2147
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2148
+				"delta_swing_table_idx_tdown_a[%d] = %d\n",
2149
+				delta, delta_swing_table_idx_tdown_a[delta]);
23382150 
23392151 			rtldm->delta_power_index_last[RF90_PATH_A] =
23402152 				rtldm->delta_power_index[RF90_PATH_A];
....@@ -2344,15 +2156,15 @@
23442156 			rtldm->absolute_ofdm_swing_idx[RF90_PATH_A] =
23452157 				-1 * delta_swing_table_idx_tdown_a[delta];
23462158 			/* Record delta swing for mix mode power tracking*/
2347
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2348
-				 "******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
2349
-				 rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
2159
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2160
+				"******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",
2161
+				rtldm->absolute_ofdm_swing_idx[RF90_PATH_A]);
23502162 		}
23512163 
23522164 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++) {
2353
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2354
-				 "\n\n================================ [Path-%c]Calculating PowerIndexOffset ================================\n",
2355
-				 (p == RF90_PATH_A ? 'A' : 'B'));
2165
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2166
+				"\n\n================================ [Path-%c]Calculating PowerIndexOffset ================================\n",
2167
+				(p == RF90_PATH_A ? 'A' : 'B'));
23562168 			/*If Thermal value changes but lookup table value
23572169 			 * still the same
23582170 			 */
....@@ -2366,9 +2178,9 @@
23662178 					rtldm->delta_power_index_last[p];
23672179 			/*Power Index Diff between 2 times Power Tracking*/
23682180 
2369
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2370
-				 "[Path-%c] PowerIndexOffset(%d) = DeltaPowerIndex(%d) - DeltaPowerIndexLast(%d)\n",
2371
-				 (p == RF90_PATH_A ? 'A' : 'B'),
2181
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2182
+				"[Path-%c] PowerIndexOffset(%d) = DeltaPowerIndex(%d) - DeltaPowerIndexLast(%d)\n",
2183
+				(p == RF90_PATH_A ? 'A' : 'B'),
23722184 				rtldm->power_index_offset[p],
23732185 				rtldm->delta_power_index[p] ,
23742186 				rtldm->delta_power_index_last[p]);
....@@ -2385,17 +2197,17 @@
23852197 
23862198 			/*********Print BB Swing Base and Index Offset********/
23872199 
2388
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2389
-				 "The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
2390
-				 rtldm->swing_idx_cck,
2391
-				 rtldm->swing_idx_cck_base,
2392
-				 rtldm->power_index_offset[p]);
2393
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2394
-				 "The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
2395
-				 rtldm->swing_idx_ofdm[p],
2396
-				 (p == RF90_PATH_A ? 'A' : 'B'),
2397
-				 rtldm->swing_idx_ofdm_base[p],
2398
-				 rtldm->power_index_offset[p]);
2200
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2201
+				"The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",
2202
+				rtldm->swing_idx_cck,
2203
+				rtldm->swing_idx_cck_base,
2204
+				rtldm->power_index_offset[p]);
2205
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2206
+				"The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",
2207
+				rtldm->swing_idx_ofdm[p],
2208
+				(p == RF90_PATH_A ? 'A' : 'B'),
2209
+				rtldm->swing_idx_ofdm_base[p],
2210
+				rtldm->power_index_offset[p]);
23992211 
24002212 			/*7.1 Handle boundary conditions of index.*/
24012213 
....@@ -2404,32 +2216,32 @@
24042216 			else if (rtldm->ofdm_index[p] < ofdm_min_index)
24052217 				rtldm->ofdm_index[p] = ofdm_min_index;
24062218 		}
2407
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2408
-			 "\n\n========================================================================================================\n");
2219
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2220
+			"\n\n========================================================================================================\n");
24092221 		if (rtldm->cck_index > TXSCALE_TABLE_SIZE - 1)
24102222 			rtldm->cck_index = TXSCALE_TABLE_SIZE - 1;
24112223 		else if (rtldm->cck_index < 0)
24122224 			rtldm->cck_index = 0;
24132225 	} else {
2414
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2415
-			 "The thermal meter is unchanged or TxPowerTracking OFF(%d):ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
2416
-			 rtldm->txpower_track_control,
2417
-			 thermal_value,
2418
-			 rtldm->thermalvalue);
2226
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2227
+			"The thermal meter is unchanged or TxPowerTracking OFF(%d):ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",
2228
+			rtldm->txpower_track_control,
2229
+			thermal_value,
2230
+			rtldm->thermalvalue);
24192231 
24202232 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
24212233 			rtldm->power_index_offset[p] = 0;
24222234 	}
2423
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2424
-		 "TxPowerTracking: [CCK] Swing Current Index: %d, Swing Base Index: %d\n",
2425
-		 /*Print Swing base & current*/
2235
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2236
+		"TxPowerTracking: [CCK] Swing Current Index: %d, Swing Base Index: %d\n",
2237
+		/*Print Swing base & current*/
24262238 		rtldm->cck_index, rtldm->swing_idx_cck_base);
24272239 	for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++) {
2428
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2429
-			 "TxPowerTracking: [OFDM] Swing Current Index: %d, Swing Base Index[%c]: %d\n",
2430
-			 rtldm->ofdm_index[p],
2431
-			 (p == RF90_PATH_A ? 'A' : 'B'),
2432
-			 rtldm->swing_idx_ofdm_base[p]);
2240
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2241
+			"TxPowerTracking: [OFDM] Swing Current Index: %d, Swing Base Index[%c]: %d\n",
2242
+			rtldm->ofdm_index[p],
2243
+			(p == RF90_PATH_A ? 'A' : 'B'),
2244
+			rtldm->swing_idx_ofdm_base[p]);
24332245 	}
24342246 
24352247 	if ((rtldm->power_index_offset[RF90_PATH_A] != 0 ||
....@@ -2446,38 +2258,38 @@
24462258 		 *  set tx power in tx agc for 88E.
24472259 		 */
24482260 		if (thermal_value > rtldm->thermalvalue) {
2449
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2450
-				 "Temperature Increasing(A): delta_pi: %d , delta_t: %d,Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
2451
-				 rtldm->power_index_offset[RF90_PATH_A],
2452
-				 delta, thermal_value,
2453
-				 rtlefuse->eeprom_thermalmeter,
2454
-				 rtldm->thermalvalue);
2261
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2262
+				"Temperature Increasing(A): delta_pi: %d , delta_t: %d,Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
2263
+				rtldm->power_index_offset[RF90_PATH_A],
2264
+				delta, thermal_value,
2265
+				rtlefuse->eeprom_thermalmeter,
2266
+				rtldm->thermalvalue);
24552267 		} else if (thermal_value < rtldm->thermalvalue) { /*Low temperature*/
2456
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2457
-				 "Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
2458
-				 rtldm->power_index_offset[RF90_PATH_A],
2459
-				 delta, thermal_value,
2460
-				 rtlefuse->eeprom_thermalmeter,
2461
-				 rtldm->thermalvalue);
2268
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2269
+				"Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",
2270
+				rtldm->power_index_offset[RF90_PATH_A],
2271
+				delta, thermal_value,
2272
+				rtlefuse->eeprom_thermalmeter,
2273
+				rtldm->thermalvalue);
24622274 		}
24632275 
24642276 		if (thermal_value > rtlefuse->eeprom_thermalmeter) {
2465
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2466
-				 "Temperature(%d) higher than PG value(%d)\n",
2467
-				 thermal_value, rtlefuse->eeprom_thermalmeter);
2277
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2278
+				"Temperature(%d) higher than PG value(%d)\n",
2279
+				thermal_value, rtlefuse->eeprom_thermalmeter);
24682280 
2469
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2470
-				 "****Enter POWER Tracking MIX_MODE****\n");
2281
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2282
+				"****Enter POWER Tracking MIX_MODE****\n");
24712283 			for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
24722284 					rtl8821ae_dm_txpwr_track_set_pwr(hw,
24732285 						MIX_MODE, p, index_for_channel);
24742286 		} else {
2475
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2476
-				 "Temperature(%d) lower than PG value(%d)\n",
2477
-				 thermal_value, rtlefuse->eeprom_thermalmeter);
2287
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2288
+				"Temperature(%d) lower than PG value(%d)\n",
2289
+				thermal_value, rtlefuse->eeprom_thermalmeter);
24782290 
2479
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2480
-				 "*****Enter POWER Tracking MIX_MODE*****\n");
2291
+			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2292
+				"*****Enter POWER Tracking MIX_MODE*****\n");
24812293 			for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
24822294 				rtl8812ae_dm_txpwr_track_set_pwr(hw,
24832295 					MIX_MODE, p, index_for_channel);
....@@ -2487,9 +2299,9 @@
24872299 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
24882300 			rtldm->swing_idx_ofdm_base[p] = rtldm->swing_idx_ofdm[p];
24892301 
2490
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2491
-			 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
2492
-			 rtldm->thermalvalue, thermal_value);
2302
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2303
+			"pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
2304
+			rtldm->thermalvalue, thermal_value);
24932305 		/*Record last Power Tracking Thermal Value*/
24942306 		rtldm->thermalvalue = thermal_value;
24952307 	}
....@@ -2510,7 +2322,7 @@
25102322 		}
25112323 	}
25122324 
2513
-	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===%s\n", __func__);
2325
+	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===%s\n", __func__);
25142326 }
25152327 
25162328 void rtl8821ae_dm_check_txpower_tracking_thermalmeter(struct ieee80211_hw *hw)
....@@ -2519,13 +2331,13 @@
25192331 	if (!rtlpriv->dm.tm_trigger) {
25202332 		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E, BIT(17)|BIT(16),
25212333 			      0x03);
2522
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2523
-			 "Trigger 8821ae Thermal Meter!!\n");
2334
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2335
+			"Trigger 8821ae Thermal Meter!!\n");
25242336 		rtlpriv->dm.tm_trigger = 1;
25252337 		return;
25262338 	} else {
2527
-		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2528
-			 "Schedule TxPowerTracking !!\n");
2339
+		rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
2340
+			"Schedule TxPowerTracking !!\n");
25292341 
25302342 		rtl8821ae_dm_txpower_tracking_callback_thermalmeter(hw);
25312343 		rtlpriv->dm.tm_trigger = 0;
....@@ -2544,14 +2356,14 @@
25442356 	struct ieee80211_sta *sta = NULL;
25452357 
25462358 	if (is_hal_stop(rtlhal)) {
2547
-		RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
2548
-			 "driver is going to unload\n");
2359
+		rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
2360
+			"driver is going to unload\n");
25492361 		return;
25502362 	}
25512363 
25522364 	if (!rtlpriv->dm.useramask) {
2553
-		RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
2554
-			 "driver does not control rate adaptive mask\n");
2365
+		rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
2366
+			"driver does not control rate adaptive mask\n");
25552367 		return;
25562368 	}
25572369 
....@@ -2579,14 +2391,14 @@
25792391 			p_ra->ratr_state = DM_RATR_STA_LOW;
25802392 
25812393 		if (p_ra->pre_ratr_state != p_ra->ratr_state) {
2582
-			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
2583
-				 "RSSI = %ld\n",
2584
-				  rtlpriv->dm.undec_sm_pwdb);
2585
-			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
2586
-				 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
2587
-			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
2588
-				 "PreState = %d, CurState = %d\n",
2589
-				  p_ra->pre_ratr_state, p_ra->ratr_state);
2394
+			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
2395
+				"RSSI = %ld\n",
2396
+				rtlpriv->dm.undec_sm_pwdb);
2397
+			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
2398
+				"RSSI_LEVEL = %d\n", p_ra->ratr_state);
2399
+			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,
2400
+				"PreState = %d, CurState = %d\n",
2401
+				p_ra->pre_ratr_state, p_ra->ratr_state);
25902402 
25912403 			rcu_read_lock();
25922404 			sta = rtl_find_sta(hw, mac->bssid);
....@@ -2641,22 +2453,22 @@
26412453 	if (b_bias_on_rx) {
26422454 		if (cur_tx_bytes > (cur_rx_bytes*4)) {
26432455 			*pb_is_cur_rdl_state = false;
2644
-			RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2645
-				 "Uplink Traffic\n");
2456
+			rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2457
+				"Uplink Traffic\n");
26462458 		} else {
26472459 			*pb_is_cur_rdl_state = true;
2648
-			RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2649
-				 "Balance Traffic\n");
2460
+			rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2461
+				"Balance Traffic\n");
26502462 		}
26512463 	} else {
26522464 		if (cur_rx_bytes > (cur_tx_bytes*4)) {
26532465 			*pb_is_cur_rdl_state = true;
2654
-			RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2655
-				 "Downlink	Traffic\n");
2466
+			rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2467
+				"Downlink	Traffic\n");
26562468 		} else {
26572469 			*pb_is_cur_rdl_state = false;
2658
-			RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2659
-				 "Balance Traffic\n");
2470
+			rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2471
+				"Balance Traffic\n");
26602472 		}
26612473 	}
26622474 	return;
....@@ -2676,15 +2488,14 @@
26762488 	u32 edca_be = 0x5ea42b;
26772489 	u8 iot_peer = 0;
26782490 	bool *pb_is_cur_rdl_state = NULL;
2679
-	bool b_last_is_cur_rdl_state = false;
26802491 	bool b_bias_on_rx = false;
26812492 	bool b_edca_turbo_on = false;
26822493 
2683
-	RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2684
-		 "rtl8821ae_dm_check_edca_turbo=====>\n");
2685
-	RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2686
-		 "Original BE PARAM: 0x%x\n",
2687
-		 rtl_read_dword(rtlpriv, DM_REG_EDCA_BE_11N));
2494
+	rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2495
+		"%s=====>\n", __func__);
2496
+	rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2497
+		"Original BE PARAM: 0x%x\n",
2498
+		rtl_read_dword(rtlpriv, DM_REG_EDCA_BE_11N));
26882499 
26892500 	if (rtlpriv->dm.dbginfo.num_non_be_pkt > 0x100)
26902501 		rtlpriv->dm.is_any_nonbepkts = true;
....@@ -2694,7 +2505,6 @@
26942505 	 * list paramter for different platform
26952506 	 *===============================
26962507 	 */
2697
-	b_last_is_cur_rdl_state = rtlpriv->dm.is_cur_rdlstate;
26982508 	pb_is_cur_rdl_state = &rtlpriv->dm.is_cur_rdlstate;
26992509 
27002510 	cur_tx_ok_cnt = rtlpriv->stats.txbytesunicast - rtldm->last_tx_ok_cnt;
....@@ -2717,20 +2527,20 @@
27172527 		}
27182528 	}
27192529 
2720
-	RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2721
-		 "bIsAnyNonBEPkts : 0x%x  bDisableFrameBursting : 0x%x\n",
2722
-		 rtlpriv->dm.is_any_nonbepkts,
2723
-		 rtlpriv->dm.disable_framebursting);
2530
+	rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2531
+		"bIsAnyNonBEPkts : 0x%x  bDisableFrameBursting : 0x%x\n",
2532
+		rtlpriv->dm.is_any_nonbepkts,
2533
+		rtlpriv->dm.disable_framebursting);
27242534 
2725
-	RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2726
-		 "bEdcaTurboOn : 0x%x bBiasOnRx : 0x%x\n",
2727
-		 b_edca_turbo_on, b_bias_on_rx);
2535
+	rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2536
+		"bEdcaTurboOn : 0x%x bBiasOnRx : 0x%x\n",
2537
+		b_edca_turbo_on, b_bias_on_rx);
27282538 
27292539 	if (b_edca_turbo_on) {
2730
-		RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2731
-			 "curTxOkCnt : 0x%llx\n", cur_tx_ok_cnt);
2732
-		RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2733
-			 "curRxOkCnt : 0x%llx\n", cur_rx_ok_cnt);
2540
+		rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2541
+			"curTxOkCnt : 0x%llx\n", cur_tx_ok_cnt);
2542
+		rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2543
+			"curRxOkCnt : 0x%llx\n", cur_rx_ok_cnt);
27342544 		if (b_bias_on_rx)
27352545 			rtl8821ae_dm_edca_choose_traffic_idx(hw, cur_tx_ok_cnt,
27362546 				cur_rx_ok_cnt, true, pb_is_cur_rdl_state);
....@@ -2742,14 +2552,14 @@
27422552 
27432553 		rtl_write_dword(rtlpriv, DM_REG_EDCA_BE_11N, edca_be);
27442554 
2745
-		RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2746
-			 "EDCA Turbo on: EDCA_BE:0x%x\n", edca_be);
2555
+		rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2556
+			"EDCA Turbo on: EDCA_BE:0x%x\n", edca_be);
27472557 
27482558 		rtlpriv->dm.current_turbo_edca = true;
27492559 
2750
-		RT_TRACE(rtlpriv, COMP_TURBO, DBG_LOUD,
2751
-			 "EDCA_BE_DL : 0x%x  EDCA_BE_UL : 0x%x  EDCA_BE : 0x%x\n",
2752
-			 edca_be_dl, edca_be_ul, edca_be);
2560
+		rtl_dbg(rtlpriv, COMP_TURBO, DBG_LOUD,
2561
+			"EDCA_BE_DL : 0x%x  EDCA_BE_UL : 0x%x  EDCA_BE : 0x%x\n",
2562
+			edca_be_dl, edca_be_ul, edca_be);
27532563 	} else {
27542564 		if (rtlpriv->dm.current_turbo_edca) {
27552565 			u8 tmp = AC0_BE;
....@@ -2795,8 +2605,8 @@
27952605 
27962606 	dm_digtable->pre_cck_cca_thres = dm_digtable->cur_cck_cca_thres;
27972607 	dm_digtable->cur_cck_cca_thres = cur_cck_cca_thresh;
2798
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
2799
-		 "CCK cca thresh hold =%x\n", dm_digtable->cur_cck_cca_thres);
2608
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_TRACE,
2609
+		"CCK cca thresh hold =%x\n", dm_digtable->cur_cck_cca_thres);
28002610 }
28012611 
28022612 static void rtl8821ae_dm_dynamic_atc_switch(struct ieee80211_hw *hw)
....@@ -2815,9 +2625,9 @@
28152625 			rtldm->atc_status = ATC_STATUS_ON;
28162626 		}
28172627 
2818
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "No link!!\n");
2819
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2820
-			 "atc_status = %d\n", rtldm->atc_status);
2628
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "No link!!\n");
2629
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2630
+			"atc_status = %d\n", rtldm->atc_status);
28212631 
28222632 		if (rtldm->crystal_cap != rtlpriv->efuse.crystalcap) {
28232633 			rtldm->crystal_cap = rtlpriv->efuse.crystalcap;
....@@ -2832,8 +2642,8 @@
28322642 					      0xfff000, (crystal_cap |
28332643 					      (crystal_cap << 6)));
28342644 		}
2835
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "crystal_cap = 0x%x\n",
2836
-			 rtldm->crystal_cap);
2645
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "crystal_cap = 0x%x\n",
2646
+			rtldm->crystal_cap);
28372647 	} else{
28382648 		/*1. Calculate CFO for path-A & path-B*/
28392649 		cfo_khz_a = (int)(rtldm->cfo_tail[0] * 3125) / 1280;
....@@ -2842,15 +2652,15 @@
28422652 
28432653 		/*2.No new packet*/
28442654 		if (packet_count == rtldm->packet_count_pre) {
2845
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2846
-				 "packet counter doesn't change\n");
2655
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2656
+				"packet counter doesn't change\n");
28472657 			return;
28482658 		}
28492659 
28502660 		rtldm->packet_count_pre = packet_count;
2851
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2852
-			 "packet counter = %d\n",
2853
-			 rtldm->packet_count);
2661
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2662
+			"packet counter = %d\n",
2663
+			rtldm->packet_count);
28542664 
28552665 		/*3.Average CFO*/
28562666 		if (rtlpriv->phy.rf_type == RF_1T1R)
....@@ -2858,22 +2668,22 @@
28582668 		else
28592669 			cfo_ave = (cfo_khz_a + cfo_khz_b) >> 1;
28602670 
2861
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2862
-			 "cfo_khz_a = %dkHz, cfo_khz_b = %dkHz, cfo_ave = %dkHz\n",
2863
-			 cfo_khz_a, cfo_khz_b, cfo_ave);
2671
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2672
+			"cfo_khz_a = %dkHz, cfo_khz_b = %dkHz, cfo_ave = %dkHz\n",
2673
+			cfo_khz_a, cfo_khz_b, cfo_ave);
28642674 
28652675 		/*4.Avoid abnormal large CFO*/
28662676 		cfo_ave_diff = (rtldm->cfo_ave_pre >= cfo_ave) ?
28672677 						(rtldm->cfo_ave_pre - cfo_ave) :
28682678 						(cfo_ave - rtldm->cfo_ave_pre);
28692679 
2870
-		if (cfo_ave_diff > 20 && rtldm->large_cfo_hit == 0) {
2871
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2872
-				 "first large CFO hit\n");
2873
-			rtldm->large_cfo_hit = 1;
2680
+		if (cfo_ave_diff > 20 && !rtldm->large_cfo_hit) {
2681
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2682
+				"first large CFO hit\n");
2683
+			rtldm->large_cfo_hit = true;
28742684 			return;
28752685 		} else
2876
-			rtldm->large_cfo_hit = 0;
2686
+			rtldm->large_cfo_hit = false;
28772687 
28782688 		rtldm->cfo_ave_pre = cfo_ave;
28792689 
....@@ -2890,9 +2700,9 @@
28902700 				rtldm->cfo_threshold = CFO_THRESHOLD_XTAL;
28912701 			}
28922702 		}
2893
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2894
-			 "Dynamic threshold = %d\n",
2895
-			 rtldm->cfo_threshold);
2703
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2704
+			"Dynamic threshold = %d\n",
2705
+			rtldm->cfo_threshold);
28962706 
28972707 		/* 2.Calculate Xtal offset*/
28982708 		if (cfo_ave > rtldm->cfo_threshold && rtldm->crystal_cap < 0x3f)
....@@ -2900,9 +2710,9 @@
29002710 		else if ((cfo_ave < -rtlpriv->dm.cfo_threshold) &&
29012711 			 rtlpriv->dm.crystal_cap > 0)
29022712 			adjust_xtal = ((cfo_ave + CFO_THRESHOLD_XTAL) >> 2) - 1;
2903
-		RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2904
-			 "Crystal cap = 0x%x, Crystal cap offset = %d\n",
2905
-			 rtldm->crystal_cap, adjust_xtal);
2713
+		rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2714
+			"Crystal cap = 0x%x, Crystal cap offset = %d\n",
2715
+			rtldm->crystal_cap, adjust_xtal);
29062716 
29072717 		/*3.Adjudt Crystal Cap.*/
29082718 		if (adjust_xtal != 0) {
....@@ -2924,9 +2734,9 @@
29242734 				rtl_set_bbreg(hw, REG_MAC_PHY_CTRL,
29252735 					      0xfff000, (crystal_cap |
29262736 					      (crystal_cap << 6)));
2927
-			RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
2928
-				 "New crystal cap = 0x%x\n",
2929
-				 rtldm->crystal_cap);
2737
+			rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
2738
+				"New crystal cap = 0x%x\n",
2739
+				rtldm->crystal_cap);
29302740 		}
29312741 	}
29322742 }
....@@ -2970,7 +2780,7 @@
29702780 	spin_unlock(&rtlpriv->locks.rf_ps_lock);
29712781 
29722782 	rtlpriv->dm.dbginfo.num_qry_beacon_pkt = 0;
2973
-	RT_TRACE(rtlpriv, COMP_DIG, DBG_DMESG, "\n");
2783
+	rtl_dbg(rtlpriv, COMP_DIG, DBG_DMESG, "\n");
29742784 }
29752785 
29762786 void rtl8821ae_dm_set_tx_ant_by_tx_info(struct ieee80211_hw *hw,
....@@ -2980,10 +2790,11 @@
29802790 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
29812791 	struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
29822792 	struct fast_ant_training *pfat_table = &rtldm->fat_table;
2793
+	__le32 *pdesc32 = (__le32 *)pdesc;
29832794 
29842795 	if (rtlhal->hw_type != HARDWARE_TYPE_RTL8812AE)
29852796 		return;
29862797 
29872798 	if (rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV)
2988
-		SET_TX_DESC_TX_ANT(pdesc, pfat_table->antsel_a[mac_id]);
2799
+		set_tx_desc_tx_ant(pdesc32, pfat_table->antsel_a[mac_id]);
29892800 }