forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.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 "../pci.h"
....@@ -61,7 +39,7 @@
6139 	u32 pagenums, remainsize;
6240 	u32 page, offset;
6341 
64
-	RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
42
+	rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "FW size is %d bytes,\n", size);
6543 
6644 	rtl_fill_dummy(bufferptr, &size);
6745 
....@@ -97,9 +75,9 @@
9775 		 (!(value32 & FWDL_CHKSUM_RPT)));
9876 
9977 	if (counter >= FW_8821AE_POLLING_TIMEOUT_COUNT) {
100
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
101
-			 "chksum report fail! REG_MCUFWDL:0x%08x .\n",
102
-			  value32);
78
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
79
+			"chksum report fail! REG_MCUFWDL:0x%08x .\n",
80
+			value32);
10381 		goto exit;
10482 	}
10583 	value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
....@@ -176,15 +154,15 @@
176154 		fwsize = rtlhal->fwsize;
177155 	}
178156 
179
-	RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
180
-		 "%s Firmware SIZE %d\n",
181
-		 buse_wake_on_wlan_fw ? "Wowlan" : "Normal", fwsize);
157
+	rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,
158
+		"%s Firmware SIZE %d\n",
159
+		buse_wake_on_wlan_fw ? "Wowlan" : "Normal", fwsize);
182160 
183161 	if (IS_FW_HEADER_EXIST_8812(pfwheader) ||
184162 	    IS_FW_HEADER_EXIST_8821(pfwheader)) {
185
-		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
186
-			 "Firmware Version(%d), Signature(%#x)\n",
187
-			 pfwheader->version, pfwheader->signature);
163
+		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,
164
+			"Firmware Version(%d), Signature(%#x)\n",
165
+			pfwheader->version, pfwheader->signature);
188166 
189167 		pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
190168 		fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);
....@@ -202,11 +180,11 @@
202180 
203181 	err = _rtl8821ae_fw_free_to_go(hw);
204182 	if (err) {
205
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
206
-			 "Firmware is not ready to run!\n");
183
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,
184
+			"Firmware is not ready to run!\n");
207185 	} else {
208
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
209
-			 "Firmware is ready to run!\n");
186
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD,
187
+			"Firmware is ready to run!\n");
210188 	}
211189 
212190 	return 0;
....@@ -221,13 +199,13 @@
221199 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
222200 	/* 1. Before WoWLAN or After WOWLAN we need to re-download Fw. */
223201 	if (rtl8821ae_download_fw(hw, used_wowlan_fw)) {
224
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
225
-			 "Re-Download Firmware failed!!\n");
202
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
203
+			"Re-Download Firmware failed!!\n");
226204 		rtlhal->fw_ready = false;
227205 		return;
228206 	}
229
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
230
-		 "Re-Download Firmware Success !!\n");
207
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
208
+		"Re-Download Firmware Success !!\n");
231209 	rtlhal->fw_ready = true;
232210 
233211 	/* 2. Re-Init the variables about Fw related setting. */
....@@ -271,22 +249,22 @@
271249 	unsigned long flag = 0;
272250 	u8 idx = 0;
273251 
274
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
252
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
275253 
276254 	while (true) {
277255 		spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
278256 		if (rtlhal->h2c_setinprogress) {
279
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
280
-				 "H2C set in progress! Wait to set..element_id(%d).\n",
281
-				 element_id);
257
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
258
+				"H2C set in progress! Wait to set..element_id(%d).\n",
259
+				element_id);
282260 
283261 			while (rtlhal->h2c_setinprogress) {
284262 				spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
285263 						       flag);
286264 				h2c_waitcounter++;
287
-				RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
288
-					 "Wait 100 us (%d times)...\n",
289
-					  h2c_waitcounter);
265
+				rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
266
+					"Wait 100 us (%d times)...\n",
267
+					h2c_waitcounter);
290268 				udelay(100);
291269 
292270 				if (h2c_waitcounter > 1000)
....@@ -322,8 +300,8 @@
322300 			box_extreg = REG_HMEBOX_EXT_3;
323301 			break;
324302 		default:
325
-			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
326
-				 "switch case %#x not processed\n", boxnum);
303
+			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
304
+				"switch case %#x not processed\n", boxnum);
327305 			break;
328306 		}
329307 
....@@ -346,9 +324,9 @@
346324 				/*wait until Fw read*/
347325 				wait_h2c_limmit--;
348326 				if (wait_h2c_limmit == 0) {
349
-					RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
350
-						 "Waiting too long for FW read clear HMEBox(%d)!\n",
351
-						 boxnum);
327
+					rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
328
+						"Waiting too long for FW read clear HMEBox(%d)!\n",
329
+						boxnum);
352330 					break;
353331 				}
354332 
....@@ -357,25 +335,25 @@
357335 				isfw_read =
358336 				  _rtl8821ae_check_fw_read_last_h2c(hw, boxnum);
359337 				u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
360
-				RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
361
-					 "Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
362
-					 boxnum, u1b_tmp);
338
+				rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
339
+					"Waiting for FW read clear HMEBox(%d)!!! 0x130 = %2x\n",
340
+					boxnum, u1b_tmp);
363341 			}
364342 		}
365343 
366344 		if (!isfw_read) {
367
-			RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
368
-				 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
369
-				 boxnum);
345
+			rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
346
+				"Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
347
+				boxnum);
370348 			break;
371349 		}
372350 
373351 		memset(boxcontent, 0, sizeof(boxcontent));
374352 		memset(boxextcontent, 0, sizeof(boxextcontent));
375353 		boxcontent[0] = element_id;
376
-		RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
377
-			 "Write element_id box_reg(%4x) = %2x\n",
378
-			 box_reg, element_id);
354
+		rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
355
+			"Write element_id box_reg(%4x) = %2x\n",
356
+			box_reg, element_id);
379357 
380358 		switch (cmd_len) {
381359 		case 1:
....@@ -411,8 +389,8 @@
411389 			}
412390 			break;
413391 		default:
414
-			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
415
-				 "switch case %#x not processed\n", cmd_len);
392
+			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
393
+				"switch case %#x not processed\n", cmd_len);
416394 			break;
417395 		}
418396 
....@@ -422,16 +400,16 @@
422400 		if (rtlhal->last_hmeboxnum == 4)
423401 			rtlhal->last_hmeboxnum = 0;
424402 
425
-		RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
426
-			 "pHalData->last_hmeboxnum  = %d\n",
427
-			  rtlhal->last_hmeboxnum);
403
+		rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
404
+			"pHalData->last_hmeboxnum  = %d\n",
405
+			rtlhal->last_hmeboxnum);
428406 	}
429407 
430408 	spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
431409 	rtlhal->h2c_setinprogress = false;
432410 	spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
433411 
434
-	RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
412
+	rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
435413 }
436414 
437415 void rtl8821ae_fill_h2c_cmd(struct ieee80211_hw *hw,
....@@ -480,8 +458,8 @@
480458 	u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN+1);
481459 	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN+1, (u1b_tmp | BIT(2)));
482460 
483
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
484
-		 "_8051Reset8812ae(): 8051 reset success .\n");
461
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
462
+		"_8051Reset8812ae(): 8051 reset success .\n");
485463 }
486464 
487465 void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
....@@ -500,8 +478,8 @@
500478 	if (bt_ctrl_lps)
501479 		mode = (bt_lps_on ? FW_PS_MIN_MODE : FW_PS_ACTIVE_MODE);
502480 
503
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",
504
-		 mode, bt_ctrl_lps);
481
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",
482
+		mode, bt_ctrl_lps);
505483 
506484 	switch (mode) {
507485 	case FW_PS_MIN_MODE:
....@@ -612,7 +590,7 @@
612590 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
613591 	u8 fw_wowlan_info[H2C_8821AE_WOWLAN_LENGTH] = {0};
614592 
615
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "enable(%d)\n", func_en);
593
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "enable(%d)\n", func_en);
616594 
617595 	SET_8812_H2CCMD_WOWLAN_FUNC_ENABLE(fw_wowlan_info,
618596 					   (func_en ? true : false));
....@@ -646,9 +624,9 @@
646624 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
647625 	u8 remote_wake_ctrl_parm[H2C_8821AE_REMOTE_WAKE_CTRL_LEN] = {0};
648626 
649
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
650
-		 "enable=%d, ARP offload=%d, GTK offload=%d\n",
651
-		 enable, ppsc->arp_offload_enable, ppsc->gtk_offload_enable);
627
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
628
+		"enable=%d, ARP offload=%d, GTK offload=%d\n",
629
+		enable, ppsc->arp_offload_enable, ppsc->gtk_offload_enable);
652630 
653631 	SET_8812_H2CCMD_REMOTE_WAKECTRL_ENABLE(remote_wake_ctrl_parm, enable);
654632 	SET_8812_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(remote_wake_ctrl_parm,
....@@ -673,7 +651,7 @@
673651 	struct rtl_priv *rtlpriv = rtl_priv(hw);
674652 	u8 keep_alive_info[H2C_8821AE_KEEP_ALIVE_CTRL_LENGTH] = {0};
675653 
676
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Enable(%d)\n", func_en);
654
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Enable(%d)\n", func_en);
677655 
678656 	SET_8812_H2CCMD_KEEP_ALIVE_ENABLE(keep_alive_info, func_en);
679657 	/* 1: the period is controled by driver, 0: by Fw default */
....@@ -712,9 +690,9 @@
712690 	struct rtl_security *sec = &rtlpriv->sec;
713691 	u8 remote_wakeup_sec_info[H2C_8821AE_AOAC_GLOBAL_INFO_LEN] = {0};
714692 
715
-	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
716
-		 "PairwiseEncAlgorithm=%d, GroupEncAlgorithm=%d\n",
717
-		 sec->pairwise_enc_algorithm, sec->group_enc_algorithm);
693
+	rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
694
+		"PairwiseEncAlgorithm=%d, GroupEncAlgorithm=%d\n",
695
+		sec->pairwise_enc_algorithm, sec->group_enc_algorithm);
718696 
719697 	SET_8812_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(
720698 						remote_wakeup_sec_info,
....@@ -844,9 +822,9 @@
844822 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
845823 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
846824 	/* page 3: qos null data */
847
-	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
848
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
849
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
825
+	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
826
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
827
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
850828 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
851829 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
852830 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -877,9 +855,9 @@
877855 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
878856 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
879857 	/* page 4: BT qos null data */
880
-	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
881
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
882
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
858
+	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
859
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
860
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
883861 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
884862 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
885863 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -911,9 +889,9 @@
911889 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
912890 	/* page 5~7 is for wowlan */
913891 	/* page 5: ARP resp */
914
-	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
915
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
916
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
892
+	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
893
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
894
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
917895 	0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
918896 	0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
919897 	0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
....@@ -1015,7 +993,7 @@
1015993 	/* page 0: beacon */
1016994 	0x80, 0x00, 0x00, 0x00,  0xFF, 0xFF, 0xFF, 0xFF,
1017995 	0xFF, 0xFF, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1018
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x60, 0x00,
996
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x60, 0x00,
1019997 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
1020998 	0x64, 0x00, 0x20, 0x04,  0x00, 0x03, 0x32, 0x31,
1021999 	0x35, 0x01, 0x08, 0x82,  0x84, 0x8B, 0x96, 0x0C,
....@@ -1078,8 +1056,8 @@
10781056 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
10791057 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
10801058 	/* page 1: ps-poll */
1081
-	0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0xB2, 0xA7,
1082
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1059
+	0xA4, 0x10, 0x09, 0xC0,  0x84, 0xC9, 0XB2, 0xA7,
1060
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
10831061 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
10841062 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
10851063 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -1143,9 +1121,9 @@
11431121 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
11441122 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
11451123 	/* page 2: null data */
1146
-	0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
1147
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1148
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
1124
+	0x48, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
1125
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1126
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
11491127 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
11501128 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
11511129 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -1208,9 +1186,9 @@
12081186 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12091187 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12101188 	/* page 3: Qos null data */
1211
-	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
1212
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1213
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
1189
+	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
1190
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1191
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
12141192 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12151193 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12161194 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -1273,9 +1251,9 @@
12731251 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12741252 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12751253 	/* page 4: BT Qos null data */
1276
-	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
1277
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1278
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
1254
+	0xC8, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
1255
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1256
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
12791257 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12801258 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
12811259 	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
....@@ -1339,9 +1317,9 @@
13391317 	0x00, 0x80, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
13401318 	/* page 5~7 is for wowlan */
13411319 	/* page 5: ARP resp */
1342
-	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0xB2, 0xA7,
1343
-	0xB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1344
-	0x84, 0xC9, 0xB2, 0xA7,  0xB3, 0x6E, 0x00, 0x00,
1320
+	0x08, 0x01, 0x00, 0x00,  0x84, 0xC9, 0XB2, 0xA7,
1321
+	0XB3, 0x6E, 0x00, 0xE0,  0x4C, 0x02, 0x51, 0x02,
1322
+	0x84, 0xC9, 0XB2, 0xA7,  0XB3, 0x6E, 0x00, 0x00,
13451323 	0xAA, 0xAA, 0x03, 0x00,  0x00, 0x00, 0x08, 0x06,
13461324 	0x00, 0x01, 0x08, 0x00,  0x06, 0x04, 0x00, 0x02,
13471325 	0x00, 0xE0, 0x4C, 0x02,  0x51, 0x02, 0x00, 0x00,
....@@ -1543,8 +1521,8 @@
15431521 	struct sk_buff *skb = NULL;
15441522 	u32 totalpacketlen;
15451523 	bool rtstatus;
1546
-	u8 u1RsvdPageLoc[5] = { 0 };
1547
-	u8 u1RsvdPageLoc2[7] = { 0 };
1524
+	u8 u1rsvdpageloc[5] = { 0 };
1525
+	u8 u1rsvdpageloc2[7] = { 0 };
15481526 	bool b_dlok = false;
15491527 	u8 *beacon;
15501528 	u8 *p_pspoll;
....@@ -1574,7 +1552,7 @@
15741552 	SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
15751553 	SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
15761554 
1577
-	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1555
+	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
15781556 
15791557 	/*--------------------------------------------------------
15801558 	 *			(3) null data
....@@ -1585,7 +1563,7 @@
15851563 	SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
15861564 	SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
15871565 
1588
-	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1566
+	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
15891567 
15901568 	/*---------------------------------------------------------
15911569 	 *			(4) Qos null data
....@@ -1596,7 +1574,7 @@
15961574 	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
15971575 	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
15981576 
1599
-	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1577
+	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
16001578 
16011579 	/*---------------------------------------------------------
16021580 	 *			(5) BT Qos null data
....@@ -1607,7 +1585,7 @@
16071585 	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
16081586 	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
16091587 
1610
-	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1588
+	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
16111589 
16121590 	if (!dl_whole_packets) {
16131591 		totalpacketlen = 512 * (BT_QOSNULL_PG + 1) - 40;
....@@ -1622,20 +1600,20 @@
16221600 	SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
16231601 	SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
16241602 
1625
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1603
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
16261604 
16271605 	/*---------------------------------------------------------
16281606 	 *			(7) Remote Wake Ctrl
16291607 	 *----------------------------------------------------------
16301608 	 */
1631
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1609
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
16321610 								REMOTE_PG);
16331611 
16341612 	/*---------------------------------------------------------
16351613 	 *			(8) GTK Ext Memory
16361614 	 *----------------------------------------------------------
16371615 	 */
1638
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1616
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
16391617 
16401618 	totalpacketlen = TOTAL_RESERVED_PKT_LEN_8812 - 40;
16411619 
....@@ -1656,20 +1634,20 @@
16561634 
16571635 	if (!b_dl_finished && b_dlok) {
16581636 		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1659
-			      "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1637
+			      "H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
16601638 		rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1661
-				       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1639
+				       sizeof(u1rsvdpageloc), u1rsvdpageloc);
16621640 		if (dl_whole_packets) {
16631641 			RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1664
-				      "wowlan H2C_RSVDPAGE:\n", u1RsvdPageLoc2, 7);
1642
+				      "wowlan H2C_RSVDPAGE:\n", u1rsvdpageloc2, 7);
16651643 			rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1666
-					       sizeof(u1RsvdPageLoc2), u1RsvdPageLoc2);
1644
+					       sizeof(u1rsvdpageloc2), u1rsvdpageloc2);
16671645 		}
16681646 	}
16691647 
16701648 	if (!b_dlok)
1671
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1672
-			 "Set RSVD page location to Fw FAIL!!!!!!.\n");
1649
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1650
+			"Set RSVD page location to Fw FAIL!!!!!!.\n");
16731651 }
16741652 
16751653 void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
....@@ -1680,8 +1658,8 @@
16801658 	struct sk_buff *skb = NULL;
16811659 	u32 totalpacketlen;
16821660 	bool rtstatus;
1683
-	u8 u1RsvdPageLoc[5] = { 0 };
1684
-	u8 u1RsvdPageLoc2[7] = { 0 };
1661
+	u8 u1rsvdpageloc[5] = { 0 };
1662
+	u8 u1rsvdpageloc2[7] = { 0 };
16851663 	bool b_dlok = false;
16861664 	u8 *beacon;
16871665 	u8 *p_pspoll;
....@@ -1711,7 +1689,7 @@
17111689 	SET_80211_PS_POLL_BSSID(p_pspoll, mac->bssid);
17121690 	SET_80211_PS_POLL_TA(p_pspoll, mac->mac_addr);
17131691 
1714
-	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1RsvdPageLoc, PSPOLL_PG);
1692
+	SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1rsvdpageloc, PSPOLL_PG);
17151693 
17161694 	/*--------------------------------------------------------
17171695 	 *			(3) null data
....@@ -1722,7 +1700,7 @@
17221700 	SET_80211_HDR_ADDRESS2(nullfunc, mac->mac_addr);
17231701 	SET_80211_HDR_ADDRESS3(nullfunc, mac->bssid);
17241702 
1725
-	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1RsvdPageLoc, NULL_PG);
1703
+	SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(u1rsvdpageloc, NULL_PG);
17261704 
17271705 	/*---------------------------------------------------------
17281706 	 *			(4) Qos null data
....@@ -1733,7 +1711,7 @@
17331711 	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);
17341712 	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);
17351713 
1736
-	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1RsvdPageLoc, QOSNULL_PG);
1714
+	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOSNULL_PG);
17371715 
17381716 	/*---------------------------------------------------------
17391717 	 *			(5) Qos null data
....@@ -1744,7 +1722,7 @@
17441722 	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);
17451723 	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);
17461724 
1747
-	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1RsvdPageLoc, BT_QOSNULL_PG);
1725
+	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOSNULL_PG);
17481726 
17491727 	if (!dl_whole_packets) {
17501728 		totalpacketlen = 256 * (BT_QOSNULL_PG + 1) - 40;
....@@ -1759,20 +1737,20 @@
17591737 	SET_80211_HDR_ADDRESS2(arpresp, mac->mac_addr);
17601738 	SET_80211_HDR_ADDRESS3(arpresp, mac->bssid);
17611739 
1762
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1RsvdPageLoc2, ARPRESP_PG);
1740
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(u1rsvdpageloc2, ARPRESP_PG);
17631741 
17641742 	/*---------------------------------------------------------
17651743 	 *			(7) Remote Wake Ctrl
17661744 	 *----------------------------------------------------------
17671745 	 */
1768
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1RsvdPageLoc2,
1746
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(u1rsvdpageloc2,
17691747 									REMOTE_PG);
17701748 
17711749 	/*---------------------------------------------------------
17721750 	 *			(8) GTK Ext Memory
17731751 	 *----------------------------------------------------------
17741752 	 */
1775
-	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1RsvdPageLoc2, GTKEXT_PG);
1753
+	SET_8821AE_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(u1rsvdpageloc2, GTKEXT_PG);
17761754 
17771755 	totalpacketlen = TOTAL_RESERVED_PKT_LEN_8821 - 40;
17781756 
....@@ -1793,25 +1771,25 @@
17931771 		b_dlok = true;
17941772 
17951773 	if (!b_dl_finished && b_dlok) {
1796
-		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
1797
-			 "Set RSVD page location to Fw.\n");
1774
+		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
1775
+			"Set RSVD page location to Fw.\n");
17981776 		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
1799
-				"H2C_RSVDPAGE:\n", u1RsvdPageLoc, 5);
1777
+				"H2C_RSVDPAGE:\n", u1rsvdpageloc, 5);
18001778 		rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_RSVDPAGE,
1801
-				       sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
1779
+				       sizeof(u1rsvdpageloc), u1rsvdpageloc);
18021780 		if (dl_whole_packets) {
18031781 			RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
18041782 				      "wowlan H2C_RSVDPAGE:\n",
1805
-				      u1RsvdPageLoc2, 7);
1783
+				      u1rsvdpageloc2, 7);
18061784 			rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_AOAC_RSVDPAGE,
1807
-					       sizeof(u1RsvdPageLoc2),
1808
-					       u1RsvdPageLoc2);
1785
+					       sizeof(u1rsvdpageloc2),
1786
+					       u1rsvdpageloc2);
18091787 		}
18101788 	}
18111789 
18121790 	if (!b_dlok) {
1813
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1814
-			 "Set RSVD page location to Fw FAIL!!!!!!.\n");
1791
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1792
+			"Set RSVD page location to Fw FAIL!!!!!!.\n");
18151793 	}
18161794 }
18171795 
....@@ -1837,11 +1815,11 @@
18371815 
18381816 	switch (p2p_ps_state) {
18391817 	case P2P_PS_DISABLE:
1840
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
1818
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_DISABLE\n");
18411819 		memset(p2p_ps_offload, 0, sizeof(*p2p_ps_offload));
18421820 		break;
18431821 	case P2P_PS_ENABLE:
1844
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
1822
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_ENABLE\n");
18451823 		/* update CTWindow value. */
18461824 		if (p2pinfo->ctwindow > 0) {
18471825 			p2p_ps_offload->ctwindow_en = 1;
....@@ -1895,11 +1873,11 @@
18951873 		}
18961874 		break;
18971875 	case P2P_PS_SCAN:
1898
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
1876
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN\n");
18991877 		p2p_ps_offload->discovery = 1;
19001878 		break;
19011879 	case P2P_PS_SCAN_DONE:
1902
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
1880
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "P2P_PS_SCAN_DONE\n");
19031881 		p2p_ps_offload->discovery = 0;
19041882 		p2pinfo->p2p_ps_state = P2P_PS_ENABLE;
19051883 		break;