forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2013  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-2013  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../efuse.h"
....@@ -90,22 +68,25 @@
9068 	struct rtl_priv *rtlpriv = rtl_priv(hw);
9169 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
9270 	struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
71
+	struct sk_buff_head free_list;
9372 	unsigned long flags;
9473 
74
+	skb_queue_head_init(&free_list);
9575 	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
9676 	while (skb_queue_len(&ring->queue)) {
9777 		struct rtl_tx_desc *entry = &ring->desc[ring->idx];
9878 		struct sk_buff *skb = __skb_dequeue(&ring->queue);
9979 
100
-		pci_unmap_single(rtlpci->pdev,
101
-				 rtlpriv->cfg->ops->get_desc(
102
-				 hw,
103
-				 (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
104
-				 skb->len, PCI_DMA_TODEVICE);
105
-		kfree_skb(skb);
80
+		dma_unmap_single(&rtlpci->pdev->dev,
81
+				 rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
82
+						true, HW_DESC_TXBUFF_ADDR),
83
+				 skb->len, DMA_TO_DEVICE);
84
+		__skb_queue_tail(&free_list, skb);
10685 		ring->idx = (ring->idx + 1) % ring->entries;
10786 	}
10887 	spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
88
+
89
+	__skb_queue_purge(&free_list);
10990 }
11091 
11192 static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
....@@ -162,9 +143,9 @@
162143 			if (content & IMR_CPWM) {
163144 				rtl_write_word(rtlpriv, isr_regaddr, 0x0100);
164145 				rtlhal->fw_ps_state = FW_PS_STATE_RF_ON_88E;
165
-				RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
166
-					 "Receive CPWM INT!!! Set pHalData->FwPSState = %X\n",
167
-					 rtlhal->fw_ps_state);
146
+				rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,
147
+					"Receive CPWM INT!!! Set pHalData->FwPSState = %X\n",
148
+					rtlhal->fw_ps_state);
168149 			}
169150 		}
170151 
....@@ -422,8 +403,8 @@
422403 	case HW_VAR_SLOT_TIME:{
423404 		u8 e_aci;
424405 
425
-		RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
426
-			 "HW_VAR_SLOT_TIME %x\n", val[0]);
406
+		rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
407
+			"HW_VAR_SLOT_TIME %x\n", val[0]);
427408 
428409 		rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
429410 
....@@ -467,9 +448,9 @@
467448 
468449 			*val = min_spacing_to_set;
469450 
470
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
471
-				 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
472
-				  mac->min_space_cfg);
451
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
452
+				"Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
453
+				mac->min_space_cfg);
473454 
474455 			rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
475456 				       mac->min_space_cfg);
....@@ -481,9 +462,9 @@
481462 		density_to_set = *val;
482463 		mac->min_space_cfg |= (density_to_set << 3);
483464 
484
-		RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
485
-			 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
486
-			  mac->min_space_cfg);
465
+		rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
466
+			"Set HW_VAR_SHORTGI_DENSITY: %#x\n",
467
+			mac->min_space_cfg);
487468 
488469 		rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
489470 			       mac->min_space_cfg);
....@@ -522,9 +503,9 @@
522503 
523504 			}
524505 
525
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
526
-				 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
527
-				  factor_toset);
506
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
507
+				"Set HW_VAR_AMPDU_FACTOR: %#x\n",
508
+				factor_toset);
528509 		}
529510 		break; }
530511 	case HW_VAR_AC_PARAM:{
....@@ -558,9 +539,9 @@
558539 				acm_ctrl |= ACMHW_VOQEN;
559540 				break;
560541 			default:
561
-				RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
562
-					 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
563
-					 acm);
542
+				rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
543
+					"HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
544
+					acm);
564545 				break;
565546 			}
566547 		} else {
....@@ -581,9 +562,9 @@
581562 			}
582563 		}
583564 
584
-		RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
585
-			 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
586
-			 acm_ctrl);
565
+		rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,
566
+			"SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
567
+			acm_ctrl);
587568 		rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
588569 		break; }
589570 	case HW_VAR_RCR:
....@@ -797,22 +778,22 @@
797778 
798779 	for (i = 0; i < (txpktbuf_bndy - 1); i++) {
799780 		status = _rtl88ee_llt_write(hw, i, i + 1);
800
-		if (true != status)
781
+		if (!status)
801782 			return status;
802783 	}
803784 
804785 	status = _rtl88ee_llt_write(hw, (txpktbuf_bndy - 1), 0xFF);
805
-	if (true != status)
786
+	if (!status)
806787 		return status;
807788 
808789 	for (i = txpktbuf_bndy; i < maxpage; i++) {
809790 		status = _rtl88ee_llt_write(hw, i, (i + 1));
810
-		if (true != status)
791
+		if (!status)
811792 			return status;
812793 	}
813794 
814795 	status = _rtl88ee_llt_write(hw, maxpage, txpktbuf_bndy);
815
-	if (true != status)
796
+	if (!status)
816797 		return status;
817798 
818799 	return true;
....@@ -856,8 +837,8 @@
856837 	if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
857838 				      PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
858839 				      RTL8188EE_NIC_ENABLE_FLOW)) {
859
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
860
-			 "init MAC Fail as rtl_hal_pwrseqcmdparsing\n");
840
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
841
+			"init MAC Fail as rtl_hal_pwrseqcmdparsing\n");
861842 		return false;
862843 	}
863844 
....@@ -891,9 +872,9 @@
891872 	rtl_write_byte(rtlpriv, MSR, 0x00);
892873 
893874 	if (!rtlhal->mac_func_enable) {
894
-		if (_rtl88ee_llt_table_init(hw) == false) {
895
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
896
-				 "LLT table init fail\n");
875
+		if (!_rtl88ee_llt_table_init(hw)) {
876
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
877
+				"LLT table init fail\n");
897878 			return false;
898879 		}
899880 	}
....@@ -951,12 +932,8 @@
951932 static void _rtl88ee_hw_configure(struct ieee80211_hw *hw)
952933 {
953934 	struct rtl_priv *rtlpriv = rtl_priv(hw);
954
-	u8 reg_bw_opmode;
955
-	u32 reg_ratr, reg_prsr;
935
+	u32 reg_prsr;
956936 
957
-	reg_bw_opmode = BW_OPMODE_20MHZ;
958
-	reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
959
-	    RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
960937 	reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
961938 
962939 	rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
....@@ -1028,14 +1005,14 @@
10281005 	struct rtl_priv *rtlpriv = rtl_priv(hw);
10291006 	u8 sec_reg_value;
10301007 
1031
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
1032
-		 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
1033
-		  rtlpriv->sec.pairwise_enc_algorithm,
1034
-		  rtlpriv->sec.group_enc_algorithm);
1008
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
1009
+		"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
1010
+		rtlpriv->sec.pairwise_enc_algorithm,
1011
+		rtlpriv->sec.group_enc_algorithm);
10351012 
10361013 	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
1037
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
1038
-			 "not open hw encryption\n");
1014
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
1015
+			"not open hw encryption\n");
10391016 		return;
10401017 	}
10411018 
....@@ -1050,8 +1027,8 @@
10501027 
10511028 	rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
10521029 
1053
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
1054
-		 "The SECR-value %x\n", sec_reg_value);
1030
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
1031
+		"The SECR-value %x\n", sec_reg_value);
10551032 
10561033 	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
10571034 }
....@@ -1065,7 +1042,7 @@
10651042 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
10661043 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
10671044 	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
1068
-	bool rtstatus = true;
1045
+	bool rtstatus;
10691046 	int err = 0;
10701047 	u8 tmp_u1b, u1byte;
10711048 	unsigned long flags;
....@@ -1094,7 +1071,7 @@
10941071 	}
10951072 
10961073 	rtstatus = _rtl88ee_init_mac(hw);
1097
-	if (rtstatus != true) {
1074
+	if (!rtstatus) {
10981075 		pr_info("Init MAC failed\n");
10991076 		err = 1;
11001077 		goto exit;
....@@ -1102,8 +1079,8 @@
11021079 
11031080 	err = rtl88e_download_fw(hw, false);
11041081 	if (err) {
1105
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1106
-			 "Failed to download FW. Init HW without FW now..\n");
1082
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1083
+			"Failed to download FW. Init HW without FW now..\n");
11071084 		err = 1;
11081085 		goto exit;
11091086 	}
....@@ -1156,9 +1133,9 @@
11561133 			rtl88e_phy_set_rfpath_switch(hw, false);
11571134 			rtlpriv->dm.fat_table.rx_idle_ant = AUX_ANT;
11581135 		}
1159
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "rx idle ant %s\n",
1160
-			 (rtlpriv->dm.fat_table.rx_idle_ant == MAIN_ANT) ?
1161
-			 ("MAIN_ANT") : ("AUX_ANT"));
1136
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "rx idle ant %s\n",
1137
+			(rtlpriv->dm.fat_table.rx_idle_ant == MAIN_ANT) ?
1138
+			("MAIN_ANT") : ("AUX_ANT"));
11621139 
11631140 		if (rtlphy->iqk_initialized) {
11641141 			rtl88e_phy_iq_calibrate(hw, true);
....@@ -1174,7 +1151,7 @@
11741151 	tmp_u1b = efuse_read_1byte(hw, 0x1FA);
11751152 	if (!(tmp_u1b & BIT(0))) {
11761153 		rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
1177
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");
1154
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "PA BIAS path A\n");
11781155 	}
11791156 
11801157 	if (!(tmp_u1b & BIT(4))) {
....@@ -1183,7 +1160,7 @@
11831160 		rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
11841161 		udelay(10);
11851162 		rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
1186
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "under 1.5V\n");
1163
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "under 1.5V\n");
11871164 	}
11881165 	rtl_write_byte(rtlpriv, REG_NAV_CTRL+2,  ((30000+127)/128));
11891166 	rtl88e_dm_init(hw);
....@@ -1211,9 +1188,9 @@
12111188 	}
12121189 
12131190 	rtlphy->rf_type = RF_1T1R;
1214
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1215
-		 "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
1216
-		 "RF_2T2R" : "RF_1T1R");
1191
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1192
+		"Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
1193
+		"RF_2T2R" : "RF_1T1R");
12171194 
12181195 	return version;
12191196 }
....@@ -1229,26 +1206,26 @@
12291206 	switch (type) {
12301207 	case NL80211_IFTYPE_UNSPECIFIED:
12311208 		mode = MSR_NOLINK;
1232
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1233
-			 "Set Network type to NO LINK!\n");
1209
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1210
+			"Set Network type to NO LINK!\n");
12341211 		break;
12351212 	case NL80211_IFTYPE_ADHOC:
12361213 	case NL80211_IFTYPE_MESH_POINT:
12371214 		mode = MSR_ADHOC;
1238
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1239
-			 "Set Network type to Ad Hoc!\n");
1215
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1216
+			"Set Network type to Ad Hoc!\n");
12401217 		break;
12411218 	case NL80211_IFTYPE_STATION:
12421219 		mode = MSR_INFRA;
12431220 		ledaction = LED_CTL_LINK;
1244
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1245
-			 "Set Network type to STA!\n");
1221
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1222
+			"Set Network type to STA!\n");
12461223 		break;
12471224 	case NL80211_IFTYPE_AP:
12481225 		mode = MSR_AP;
12491226 		ledaction = LED_CTL_LINK;
1250
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1251
-			 "Set Network type to AP!\n");
1227
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1228
+			"Set Network type to AP!\n");
12521229 		break;
12531230 	default:
12541231 		pr_err("Network type %d not support!\n", type);
....@@ -1274,9 +1251,9 @@
12741251 		_rtl88ee_resume_tx_beacon(hw);
12751252 		_rtl88ee_disable_bcn_sub_func(hw);
12761253 	} else {
1277
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1278
-			 "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
1279
-			 mode);
1254
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1255
+			"Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n",
1256
+			mode);
12801257 	}
12811258 
12821259 	rtl_write_byte(rtlpriv, MSR, bt_msr | mode);
....@@ -1396,7 +1373,7 @@
13961373 	rtlhal->mac_func_enable = false;
13971374 	rtlpriv->intf_ops->enable_aspm(hw);
13981375 
1399
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");
1376
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "POWER OFF adapter\n");
14001377 	u1b_tmp = rtl_read_byte(rtlpriv, REG_TX_RPT_CTRL);
14011378 	rtl_write_byte(rtlpriv, REG_TX_RPT_CTRL, u1b_tmp & (~BIT(1)));
14021379 
....@@ -1453,7 +1430,7 @@
14531430 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
14541431 	enum nl80211_iftype opmode;
14551432 
1456
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8188ee card disable\n");
1433
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "RTL8188ee card disable\n");
14571434 
14581435 	mac->link_state = MAC80211_NOLINK;
14591436 	opmode = NL80211_IFTYPE_UNSPECIFIED;
....@@ -1512,8 +1489,8 @@
15121489 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
15131490 	u16 bcn_interval = mac->beacon_interval;
15141491 
1515
-	RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
1516
-		 "beacon_interval:%d\n", bcn_interval);
1492
+	rtl_dbg(rtlpriv, COMP_BEACON, DBG_DMESG,
1493
+		"beacon_interval:%d\n", bcn_interval);
15171494 	/*rtl88ee_disable_interrupt(hw);*/
15181495 	rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
15191496 	/*rtl88ee_enable_interrupt(hw);*/
....@@ -1525,8 +1502,8 @@
15251502 	struct rtl_priv *rtlpriv = rtl_priv(hw);
15261503 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
15271504 
1528
-	RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
1529
-		 "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
1505
+	rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD,
1506
+		"add_msr:%x, rm_msr:%x\n", add_msr, rm_msr);
15301507 
15311508 	if (add_msr)
15321509 		rtlpci->irq_mask[0] |= add_msr;
....@@ -1585,15 +1562,15 @@
15851562 	struct rtl_priv *rtlpriv = rtl_priv(hw);
15861563 	u32 rfpath, eeaddr = EEPROM_TX_PWR_INX, group, txcnt = 0;
15871564 
1588
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1589
-		 "hal_ReadPowerValueFromPROM88E():PROMContent[0x%x]=0x%x\n",
1590
-		 (eeaddr+1), hwinfo[eeaddr+1]);
1565
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1566
+		"hal_ReadPowerValueFromPROM88E():PROMContent[0x%x]=0x%x\n",
1567
+		(eeaddr + 1), hwinfo[eeaddr + 1]);
15911568 	if (0xFF == hwinfo[eeaddr+1])  /*YJ,add,120316*/
15921569 		autoload_fail = true;
15931570 
15941571 	if (autoload_fail) {
1595
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1596
-			 "auto load fail : Use Default value!\n");
1572
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1573
+			"auto load fail : Use Default value!\n");
15971574 		for (rfpath = 0 ; rfpath < MAX_RF_PATH ; rfpath++) {
15981575 			/* 2.4G default value */
15991576 			set_24g_base(pwrinfo24g, rfpath);
....@@ -1852,8 +1829,8 @@
18521829 	if (rtlefuse->eeprom_oemid == 0xFF)
18531830 		rtlefuse->eeprom_oemid = 0;
18541831 
1855
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1856
-		 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
1832
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1833
+		"EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
18571834 	/* set channel plan from efuse */
18581835 	rtlefuse->channel_plan = rtlefuse->eeprom_channelplan;
18591836 	/*tx power*/
....@@ -1951,8 +1928,8 @@
19511928 	default:
19521929 		break;
19531930 	}
1954
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
1955
-		 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
1931
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
1932
+		"RT Customized ID: 0x%02X\n", rtlhal->oem_id);
19561933 }
19571934 
19581935 void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw)
....@@ -1969,18 +1946,18 @@
19691946 	else
19701947 		rtlpriv->dm.rfpath_rxenable[0] =
19711948 		    rtlpriv->dm.rfpath_rxenable[1] = true;
1972
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
1973
-						rtlhal->version);
1949
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
1950
+		rtlhal->version);
19741951 	tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
19751952 	if (tmp_u1b & BIT(4)) {
1976
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
1953
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
19771954 		rtlefuse->epromtype = EEPROM_93C46;
19781955 	} else {
1979
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
1956
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
19801957 		rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
19811958 	}
19821959 	if (tmp_u1b & BIT(5)) {
1983
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
1960
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
19841961 		rtlefuse->autoload_failflag = false;
19851962 		_rtl88ee_read_adapter_info(hw);
19861963 	} else {
....@@ -2075,8 +2052,8 @@
20752052 
20762053 	rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
20772054 
2078
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2079
-		 "%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
2055
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
2056
+		"%x\n", rtl_read_dword(rtlpriv, REG_ARFR0));
20802057 }
20812058 
20822059 static void rtl88ee_update_hal_rate_mask(struct ieee80211_hw *hw,
....@@ -2195,17 +2172,17 @@
21952172 	}
21962173 	sta_entry->ratr_index = ratr_index;
21972174 
2198
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2199
-		 "ratr_bitmap :%x\n", ratr_bitmap);
2175
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
2176
+		"ratr_bitmap :%x\n", ratr_bitmap);
22002177 	*(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |
22012178 			     (ratr_index << 28);
22022179 	rate_mask[4] = macid | (b_shortgi ? 0x20 : 0x00) | 0x80;
2203
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2204
-		 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
2205
-		 ratr_index, ratr_bitmap,
2206
-		 rate_mask[0], rate_mask[1],
2207
-		 rate_mask[2], rate_mask[3],
2208
-		 rate_mask[4]);
2180
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
2181
+		"Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
2182
+		ratr_index, ratr_bitmap,
2183
+		rate_mask[0], rate_mask[1],
2184
+		rate_mask[2], rate_mask[3],
2185
+		rate_mask[4]);
22092186 	rtl88e_fill_h2c_cmd(hw, H2C_88E_RA_MASK, 5, rate_mask);
22102187 	_rtl88ee_set_bcn_ctrl_reg(hw, BIT(3), 0);
22112188 }
....@@ -2262,16 +2239,16 @@
22622239 	e_rfpowerstate_toset = (u4tmp & BIT(31)) ? ERFON : ERFOFF;
22632240 
22642241 	if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
2265
-		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
2266
-			 "GPIOChangeRF  - HW Radio ON, RF ON\n");
2242
+		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
2243
+			"GPIOChangeRF  - HW Radio ON, RF ON\n");
22672244 
22682245 		e_rfpowerstate_toset = ERFON;
22692246 		ppsc->hwradiooff = false;
22702247 		b_actuallyset = true;
22712248 	} else if ((!ppsc->hwradiooff) &&
22722249 		   (e_rfpowerstate_toset == ERFOFF)) {
2273
-		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
2274
-			 "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
2250
+		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
2251
+			"GPIOChangeRF  - HW Radio OFF, RF OFF\n");
22752252 
22762253 		e_rfpowerstate_toset = ERFOFF;
22772254 		ppsc->hwradiooff = true;
....@@ -2321,7 +2298,7 @@
23212298 		u8 cam_offset = 0;
23222299 		u8 clear_number = 5;
23232300 
2324
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
2301
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
23252302 
23262303 		for (idx = 0; idx < clear_number; idx++) {
23272304 			rtl_cam_mark_invalid(hw, cam_offset + idx);
....@@ -2380,27 +2357,27 @@
23802357 		}
23812358 
23822359 		if (rtlpriv->sec.key_len[key_index] == 0) {
2383
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2384
-				 "delete one entry, entry_id is %d\n",
2385
-				 entry_id);
2360
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2361
+				"delete one entry, entry_id is %d\n",
2362
+				entry_id);
23862363 			if (mac->opmode == NL80211_IFTYPE_AP ||
23872364 				mac->opmode == NL80211_IFTYPE_MESH_POINT)
23882365 				rtl_cam_del_entry(hw, p_macaddr);
23892366 			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
23902367 		} else {
2391
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2392
-				 "add one entry\n");
2368
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2369
+				"add one entry\n");
23932370 			if (is_pairwise) {
2394
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2395
-					 "set Pairwise key\n");
2371
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2372
+					"set Pairwise key\n");
23962373 
23972374 				rtl_cam_add_one_entry(hw, macaddr, key_index,
23982375 						      entry_id, enc_algo,
23992376 						      CAM_CONFIG_NO_USEDK,
24002377 						      rtlpriv->sec.key_buf[key_index]);
24012378 			} else {
2402
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2403
-					 "set group key\n");
2379
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2380
+					"set group key\n");
24042381 
24052382 				if (mac->opmode == NL80211_IFTYPE_ADHOC) {
24062383 					rtl_cam_add_one_entry(hw,
....@@ -2512,13 +2489,12 @@
25122489 		if (rtlpriv->btcoexist.bt_ant_isolation)
25132490 			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);
25142491 
2515
-		u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) &
2516
-			 BIT_OFFSET_LEN_MASK_32(0, 1);
2492
+		u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) & BIT(0);
25172493 		u1_tmp = u1_tmp |
25182494 			 ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?
2519
-			 0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |
2495
+			 0 : BIT((1)) |
25202496 			 ((rtlpriv->btcoexist.bt_service == BT_SCO) ?
2521
-			 0 : BIT_OFFSET_LEN_MASK_32(2, 1));
2497
+			 0 : BIT(2)));
25222498 		rtl_write_byte(rtlpriv, 0x4fd, u1_tmp);
25232499 
25242500 		rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+4, 0xaaaa9aaa);
....@@ -2528,11 +2504,11 @@
25282504 		/* Config to 1T1R. */
25292505 		if (rtlphy->rf_type == RF_1T1R) {
25302506 			u1_tmp = rtl_read_byte(rtlpriv, ROFDM0_TRXPATHENABLE);
2531
-			u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));
2507
+			u1_tmp &= ~(BIT(1));
25322508 			rtl_write_byte(rtlpriv, ROFDM0_TRXPATHENABLE, u1_tmp);
25332509 
25342510 			u1_tmp = rtl_read_byte(rtlpriv, ROFDM1_TRXPATHENABLE);
2535
-			u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));
2511
+			u1_tmp &= ~(BIT(1));
25362512 			rtl_write_byte(rtlpriv, ROFDM1_TRXPATHENABLE, u1_tmp);
25372513 		}
25382514 	}