forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2012  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-2012  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../efuse.h"
....@@ -144,8 +122,8 @@
144122 	case HAL_DEF_WOWLAN:
145123 		break;
146124 	default:
147
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
148
-			 "switch case %#x not processed\n", variable);
125
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
126
+			"switch case %#x not processed\n", variable);
149127 		break;
150128 	}
151129 }
....@@ -209,8 +187,8 @@
209187 	case HW_VAR_SLOT_TIME:{
210188 			u8 e_aci;
211189 
212
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
213
-				 "HW_VAR_SLOT_TIME %x\n", val[0]);
190
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
191
+				"HW_VAR_SLOT_TIME %x\n", val[0]);
214192 
215193 			rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
216194 
....@@ -249,9 +227,9 @@
249227 
250228 				*val = min_spacing_to_set;
251229 
252
-				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
253
-					 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
254
-					  mac->min_space_cfg);
230
+				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
231
+					"Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
232
+					mac->min_space_cfg);
255233 
256234 				rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
257235 					       mac->min_space_cfg);
....@@ -264,9 +242,9 @@
264242 			density_to_set = *((u8 *)val);
265243 			mac->min_space_cfg |= (density_to_set << 3);
266244 
267
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
268
-				 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
269
-				  mac->min_space_cfg);
245
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
246
+				"Set HW_VAR_SHORTGI_DENSITY: %#x\n",
247
+				mac->min_space_cfg);
270248 
271249 			rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
272250 				       mac->min_space_cfg);
....@@ -311,9 +289,9 @@
311289 						       p_regtoset[index]);
312290 				}
313291 
314
-				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
315
-					 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
316
-					  factor_toset);
292
+				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
293
+					"Set HW_VAR_AMPDU_FACTOR: %#x\n",
294
+					factor_toset);
317295 			}
318296 			break;
319297 		}
....@@ -350,9 +328,9 @@
350328 					acm_ctrl |= ACMHW_VOQEN;
351329 					break;
352330 				default:
353
-					RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
354
-						 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
355
-						 acm);
331
+					rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
332
+						"HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
333
+						acm);
356334 					break;
357335 				}
358336 			} else {
....@@ -367,16 +345,16 @@
367345 					acm_ctrl &= (~ACMHW_VOQEN);
368346 					break;
369347 				default:
370
-					RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
371
-						 "switch case %#x not processed\n",
372
-						 e_aci);
348
+					rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
349
+						"switch case %#x not processed\n",
350
+						e_aci);
373351 					break;
374352 				}
375353 			}
376354 
377
-			RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
378
-				 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
379
-				 acm_ctrl);
355
+			rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,
356
+				"SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
357
+				acm_ctrl);
380358 			rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
381359 			break;
382360 		}
....@@ -548,8 +526,8 @@
548526 			 break;
549527 		}
550528 	default:
551
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
552
-			 "switch case %#x not processed\n", variable);
529
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
530
+			"switch case %#x not processed\n", variable);
553531 		break;
554532 	}
555533 }
....@@ -636,22 +614,22 @@
636614 
637615 	for (i = 0; i < (txpktbuf_bndy - 1); i++) {
638616 		status = _rtl8723e_llt_write(hw, i, i + 1);
639
-		if (true != status)
617
+		if (!status)
640618 			return status;
641619 	}
642620 
643621 	status = _rtl8723e_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
644
-	if (true != status)
622
+	if (!status)
645623 		return status;
646624 
647625 	for (i = txpktbuf_bndy; i < maxpage; i++) {
648626 		status = _rtl8723e_llt_write(hw, i, (i + 1));
649
-		if (true != status)
627
+		if (!status)
650628 			return status;
651629 	}
652630 
653631 	status = _rtl8723e_llt_write(hw, maxpage, txpktbuf_bndy);
654
-	if (true != status)
632
+	if (!status)
655633 		return status;
656634 
657635 	rtl_write_byte(rtlpriv, REG_CR, 0xff);
....@@ -698,7 +676,7 @@
698676 
699677 	/* HW Power on sequence */
700678 	if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
701
-		PWR_INTF_PCI_MSK, Rtl8723_NIC_ENABLE_FLOW))
679
+		PWR_INTF_PCI_MSK, RTL8723_NIC_ENABLE_FLOW))
702680 		return false;
703681 
704682 	bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+2);
....@@ -725,8 +703,8 @@
725703 	} while (tmpu2b != 0xc290 && retry < 100);
726704 
727705 	if (retry >= 100) {
728
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
729
-			 "InitMAC(): ePHY configure fail!!!\n");
706
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
707
+			"InitMAC(): ePHY configure fail!!!\n");
730708 		return false;
731709 	}
732710 
....@@ -799,11 +777,9 @@
799777 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
800778 	struct rtl_priv *rtlpriv = rtl_priv(hw);
801779 	u8 reg_bw_opmode;
802
-	u32 reg_ratr, reg_prsr;
780
+	u32 reg_prsr;
803781 
804782 	reg_bw_opmode = BW_OPMODE_20MHZ;
805
-	reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
806
-	    RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
807783 	reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
808784 
809785 	rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8);
....@@ -902,14 +878,14 @@
902878 	struct rtl_priv *rtlpriv = rtl_priv(hw);
903879 	u8 sec_reg_value;
904880 
905
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
906
-		 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
907
-		  rtlpriv->sec.pairwise_enc_algorithm,
908
-		  rtlpriv->sec.group_enc_algorithm);
881
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
882
+		"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
883
+		rtlpriv->sec.pairwise_enc_algorithm,
884
+		rtlpriv->sec.group_enc_algorithm);
909885 
910886 	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
911
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
912
-			 "not open hw encryption\n");
887
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
888
+			"not open hw encryption\n");
913889 		return;
914890 	}
915891 
....@@ -924,8 +900,8 @@
924900 
925901 	rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
926902 
927
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
928
-		 "The SECR-value %x\n", sec_reg_value);
903
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
904
+		"The SECR-value %x\n", sec_reg_value);
929905 
930906 	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
931907 
....@@ -958,7 +934,7 @@
958934 
959935 	rtlpriv->intf_ops->disable_aspm(hw);
960936 	rtstatus = _rtl8712e_init_mac(hw);
961
-	if (rtstatus != true) {
937
+	if (!rtstatus) {
962938 		pr_err("Init MAC failed\n");
963939 		err = 1;
964940 		goto exit;
....@@ -966,8 +942,8 @@
966942 
967943 	err = rtl8723_download_fw(hw, false, FW_8723A_POLLING_TIMEOUT_COUNT);
968944 	if (err) {
969
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
970
-			 "Failed to download FW. Init HW without FW now..\n");
945
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
946
+			"Failed to download FW. Init HW without FW now..\n");
971947 		err = 1;
972948 		goto exit;
973949 	}
....@@ -990,7 +966,7 @@
990966 	if (IS_VENDOR_UMC_A_CUT(rtlhal->version)) {
991967 		rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD, 0x30255);
992968 		rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G2, MASKDWORD, 0x50a00);
993
-	} else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
969
+	} else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
994970 		rtl_set_rfreg(hw, RF90_PATH_A, 0x0C, MASKDWORD, 0x894AE);
995971 		rtl_set_rfreg(hw, RF90_PATH_A, 0x0A, MASKDWORD, 0x1AF31);
996972 		rtl_set_rfreg(hw, RF90_PATH_A, RF_IPA, MASKDWORD, 0x8F425);
....@@ -1033,7 +1009,7 @@
10331009 	tmp_u1b = efuse_read_1byte(hw, 0x1FA);
10341010 	if (!(tmp_u1b & BIT(0))) {
10351011 		rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
1036
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path A\n");
1012
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path A\n");
10371013 	}
10381014 
10391015 	if (!(tmp_u1b & BIT(4))) {
....@@ -1042,7 +1018,7 @@
10421018 		rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
10431019 		udelay(10);
10441020 		rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
1045
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
1021
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
10461022 	}
10471023 	rtl8723e_dm_init(hw);
10481024 exit:
....@@ -1093,16 +1069,16 @@
10931069 	}
10941070 	switch (version) {
10951071 	case VERSION_TEST_UMC_CHIP_8723:
1096
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1097
-			 "Chip Version ID: VERSION_TEST_UMC_CHIP_8723.\n");
1098
-			break;
1072
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1073
+			"Chip Version ID: VERSION_TEST_UMC_CHIP_8723.\n");
1074
+		break;
10991075 	case VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT:
1100
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1101
-			 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT.\n");
1076
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1077
+			"Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT.\n");
11021078 		break;
11031079 	case VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT:
1104
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1105
-			 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT.\n");
1080
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1081
+			"Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT.\n");
11061082 		break;
11071083 	default:
11081084 		pr_err("Chip Version ID: Unknown. Bug?\n");
....@@ -1112,7 +1088,7 @@
11121088 	if (IS_8723_SERIES(version))
11131089 		rtlphy->rf_type = RF_1T1R;
11141090 
1115
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Chip RF Type: %s\n",
1091
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Chip RF Type: %s\n",
11161092 		(rtlphy->rf_type == RF_2T2R) ? "RF_2T2R" : "RF_1T1R");
11171093 
11181094 	return version;
....@@ -1127,30 +1103,30 @@
11271103 	u8 mode = MSR_NOLINK;
11281104 
11291105 	rtl_write_dword(rtlpriv, REG_BCN_CTRL, 0);
1130
-	RT_TRACE(rtlpriv, COMP_BEACON, DBG_LOUD,
1106
+	rtl_dbg(rtlpriv, COMP_BEACON, DBG_LOUD,
11311107 		"clear 0x550 when set HW_VAR_MEDIA_STATUS\n");
11321108 
11331109 	switch (type) {
11341110 	case NL80211_IFTYPE_UNSPECIFIED:
11351111 		mode = MSR_NOLINK;
1136
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1112
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
11371113 			"Set Network type to NO LINK!\n");
11381114 		break;
11391115 	case NL80211_IFTYPE_ADHOC:
11401116 		mode = MSR_ADHOC;
1141
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1117
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
11421118 			"Set Network type to Ad Hoc!\n");
11431119 		break;
11441120 	case NL80211_IFTYPE_STATION:
11451121 		mode = MSR_INFRA;
11461122 		ledaction = LED_CTL_LINK;
1147
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1123
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
11481124 			"Set Network type to STA!\n");
11491125 		break;
11501126 	case NL80211_IFTYPE_AP:
11511127 		mode = MSR_AP;
11521128 		ledaction = LED_CTL_LINK;
1153
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1129
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
11541130 			"Set Network type to AP!\n");
11551131 		break;
11561132 	default:
....@@ -1177,9 +1153,9 @@
11771153 		_rtl8723e_resume_tx_beacon(hw);
11781154 		_rtl8723e_disable_bcn_sub_func(hw);
11791155 	} else {
1180
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1181
-			 "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
1182
-			 mode);
1156
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1157
+			"Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
1158
+			mode);
11831159 	}
11841160 
11851161 	rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
....@@ -1286,7 +1262,7 @@
12861262 	/* Combo (PCIe + USB) Card and PCIe-MF Card */
12871263 	/* 1. Run LPS WL RFOFF flow */
12881264 	rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
1289
-				 PWR_INTF_PCI_MSK, Rtl8723_NIC_LPS_ENTER_FLOW);
1265
+				 PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
12901266 
12911267 	/* 2. 0x1F[7:0] = 0 */
12921268 	/* turn off RF */
....@@ -1306,7 +1282,7 @@
13061282 
13071283 	/* HW card disable configuration. */
13081284 	rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
1309
-		PWR_INTF_PCI_MSK, Rtl8723_NIC_DISABLE_FLOW);
1285
+		PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
13101286 
13111287 	/* Reset MCU IO Wrapper */
13121288 	u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);
....@@ -1374,8 +1350,8 @@
13741350 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
13751351 	u16 bcn_interval = mac->beacon_interval;
13761352 
1377
-	RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
1378
-		 "beacon_interval:%d\n", bcn_interval);
1353
+	rtl_dbg(rtlpriv, COMP_BEACON, DBG_DMESG,
1354
+		"beacon_interval:%d\n", bcn_interval);
13791355 	rtl8723e_disable_interrupt(hw);
13801356 	rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
13811357 	rtl8723e_enable_interrupt(hw);
....@@ -1387,8 +1363,8 @@
13871363 	struct rtl_priv *rtlpriv = rtl_priv(hw);
13881364 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
13891365 
1390
-	RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
1391
-		 "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
1366
+	rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD,
1367
+		"add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
13921368 
13931369 	if (add_msr)
13941370 		rtlpci->irq_mask[0] |= add_msr;
....@@ -1806,8 +1782,8 @@
18061782 	default:
18071783 		break;
18081784 	}
1809
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
1810
-		 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
1785
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
1786
+		"RT Customized ID: 0x%02X\n", rtlhal->oem_id);
18111787 }
18121788 
18131789 void rtl8723e_read_eeprom_info(struct ieee80211_hw *hw)
....@@ -1830,19 +1806,19 @@
18301806 	else
18311807 		rtlpriv->dm.rfpath_rxenable[0] =
18321808 		    rtlpriv->dm.rfpath_rxenable[1] = true;
1833
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
1834
-						rtlhal->version);
1809
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
1810
+		rtlhal->version);
18351811 
18361812 	tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
18371813 	if (tmp_u1b & BIT(4)) {
1838
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
1814
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
18391815 		rtlefuse->epromtype = EEPROM_93C46;
18401816 	} else {
1841
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
1817
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
18421818 		rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
18431819 	}
18441820 	if (tmp_u1b & BIT(5)) {
1845
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
1821
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
18461822 		rtlefuse->autoload_failflag = false;
18471823 		_rtl8723e_read_adapter_info(hw, false);
18481824 	} else {
....@@ -1938,8 +1914,8 @@
19381914 
19391915 	rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
19401916 
1941
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
1942
-		 "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
1917
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
1918
+		"%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
19431919 }
19441920 
19451921 static void rtl8723e_update_hal_rate_mask(struct ieee80211_hw *hw,
....@@ -2060,17 +2036,17 @@
20602036 	}
20612037 	sta_entry->ratr_index = ratr_index;
20622038 
2063
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2064
-		 "ratr_bitmap :%x\n", ratr_bitmap);
2039
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
2040
+		"ratr_bitmap :%x\n", ratr_bitmap);
20652041 	*(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
20662042 			     (ratr_index << 28);
20672043 	rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
2068
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2069
-		 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
2070
-		  ratr_index, ratr_bitmap,
2071
-		  rate_mask[0], rate_mask[1],
2072
-		  rate_mask[2], rate_mask[3],
2073
-		  rate_mask[4]);
2044
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
2045
+		"Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
2046
+		ratr_index, ratr_bitmap,
2047
+		rate_mask[0], rate_mask[1],
2048
+		rate_mask[2], rate_mask[3],
2049
+		rate_mask[4]);
20742050 	rtl8723e_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
20752051 }
20762052 
....@@ -2135,15 +2111,15 @@
21352111 		e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF;
21362112 
21372113 	if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
2138
-		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
2139
-			 "GPIOChangeRF  - HW Radio ON, RF ON\n");
2114
+		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
2115
+			"GPIOChangeRF  - HW Radio ON, RF ON\n");
21402116 
21412117 		e_rfpowerstate_toset = ERFON;
21422118 		ppsc->hwradiooff = false;
21432119 		b_actuallyset = true;
21442120 	} else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) {
2145
-		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
2146
-			 "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
2121
+		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
2122
+			"GPIOChangeRF  - HW Radio OFF, RF OFF\n");
21472123 
21482124 		e_rfpowerstate_toset = ERFOFF;
21492125 		ppsc->hwradiooff = true;
....@@ -2194,7 +2170,7 @@
21942170 		u8 cam_offset = 0;
21952171 		u8 clear_number = 5;
21962172 
2197
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
2173
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
21982174 
21992175 		for (idx = 0; idx < clear_number; idx++) {
22002176 			rtl_cam_mark_invalid(hw, cam_offset + idx);
....@@ -2222,8 +2198,8 @@
22222198 			enc_algo = CAM_AES;
22232199 			break;
22242200 		default:
2225
-			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
2226
-				 "switch case %#x not processed\n", enc_algo);
2201
+			rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,
2202
+				"switch case %#x not processed\n", enc_algo);
22272203 			enc_algo = CAM_TKIP;
22282204 			break;
22292205 		}
....@@ -2253,26 +2229,26 @@
22532229 		}
22542230 
22552231 		if (rtlpriv->sec.key_len[key_index] == 0) {
2256
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2257
-				 "delete one entry, entry_id is %d\n",
2258
-				 entry_id);
2232
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2233
+				"delete one entry, entry_id is %d\n",
2234
+				entry_id);
22592235 			if (mac->opmode == NL80211_IFTYPE_AP)
22602236 				rtl_cam_del_entry(hw, p_macaddr);
22612237 			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
22622238 		} else {
2263
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2264
-				 "add one entry\n");
2239
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2240
+				"add one entry\n");
22652241 			if (is_pairwise) {
2266
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2267
-					 "set Pairwise key\n");
2242
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2243
+					"set Pairwise key\n");
22682244 
22692245 				rtl_cam_add_one_entry(hw, macaddr, key_index,
22702246 						      entry_id, enc_algo,
22712247 						      CAM_CONFIG_NO_USEDK,
22722248 						      rtlpriv->sec.key_buf[key_index]);
22732249 			} else {
2274
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2275
-					 "set group key\n");
2250
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2251
+					"set group key\n");
22762252 
22772253 				if (mac->opmode == NL80211_IFTYPE_ADHOC) {
22782254 					rtl_cam_add_one_entry(hw,
....@@ -2312,9 +2288,9 @@
23122288 	rtlpriv->btcoexist.bt_radio_shared_type =
23132289 		rtlpriv->btcoexist.eeprom_bt_radio_shared;
23142290 
2315
-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2316
-		 "BT Coexistence = 0x%x\n",
2317
-		 rtlpriv->btcoexist.bt_coexistence);
2291
+	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2292
+		"BT Coexistence = 0x%x\n",
2293
+		rtlpriv->btcoexist.bt_coexistence);
23182294 
23192295 	if (rtlpriv->btcoexist.bt_coexistence) {
23202296 		rtlpriv->btcoexist.bt_busy_traffic = false;
....@@ -2325,47 +2301,47 @@
23252301 		rtlpriv->btcoexist.previous_state = 0;
23262302 
23272303 		if (rtlpriv->btcoexist.bt_ant_num == ANT_X2) {
2328
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2329
-				 "BlueTooth BT_Ant_Num = Antx2\n");
2304
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2305
+				"BlueTooth BT_Ant_Num = Antx2\n");
23302306 		} else if (rtlpriv->btcoexist.bt_ant_num == ANT_X1) {
2331
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2332
-				 "BlueTooth BT_Ant_Num = Antx1\n");
2307
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2308
+				"BlueTooth BT_Ant_Num = Antx1\n");
23332309 		}
23342310 		switch (rtlpriv->btcoexist.bt_coexist_type) {
23352311 		case BT_2WIRE:
2336
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2337
-				 "BlueTooth BT_CoexistType = BT_2Wire\n");
2312
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2313
+				"BlueTooth BT_CoexistType = BT_2Wire\n");
23382314 			break;
23392315 		case BT_ISSC_3WIRE:
2340
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2341
-				 "BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
2316
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2317
+				"BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
23422318 			break;
23432319 		case BT_ACCEL:
2344
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2345
-				 "BlueTooth BT_CoexistType = BT_ACCEL\n");
2320
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2321
+				"BlueTooth BT_CoexistType = BT_ACCEL\n");
23462322 			break;
23472323 		case BT_CSR_BC4:
2348
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2349
-				 "BlueTooth BT_CoexistType = BT_CSR_BC4\n");
2324
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2325
+				"BlueTooth BT_CoexistType = BT_CSR_BC4\n");
23502326 			break;
23512327 		case BT_CSR_BC8:
2352
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2353
-				 "BlueTooth BT_CoexistType = BT_CSR_BC8\n");
2328
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2329
+				"BlueTooth BT_CoexistType = BT_CSR_BC8\n");
23542330 			break;
23552331 		case BT_RTL8756:
2356
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2357
-				 "BlueTooth BT_CoexistType = BT_RTL8756\n");
2332
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2333
+				"BlueTooth BT_CoexistType = BT_RTL8756\n");
23582334 			break;
23592335 		default:
2360
-			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2361
-				 "BlueTooth BT_CoexistType = Unknown\n");
2336
+			rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2337
+				"BlueTooth BT_CoexistType = Unknown\n");
23622338 			break;
23632339 		}
2364
-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2365
-			 "BlueTooth BT_Ant_isolation = %d\n",
2340
+		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2341
+			"BlueTooth BT_Ant_isolation = %d\n",
23662342 			 rtlpriv->btcoexist.bt_ant_isolation);
2367
-		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2368
-			 "BT_RadioSharedType = 0x%x\n",
2343
+		rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_TRACE,
2344
+			"BT_RadioSharedType = 0x%x\n",
23692345 			 rtlpriv->btcoexist.bt_radio_shared_type);
23702346 		rtlpriv->btcoexist.bt_active_zero_cnt = 0;
23712347 		rtlpriv->btcoexist.cur_bt_disabled = false;