修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
..
..
@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2014  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-2014  Realtek Corporation.*/
25
3
 
26
4
 #include "../wifi.h"
27
5
 #include "phy_common.h"
..
..
@@ -36,15 +14,15 @@
36
14
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
37
15
 	u32 returnvalue, originalvalue, bitshift;
38
16
 
39
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
40
-		 "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
17
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
18
+		"regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask);
41
19
 	originalvalue = rtl_read_dword(rtlpriv, regaddr);
42
20
 	bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
43
21
 	returnvalue = (originalvalue & bitmask) >> bitshift;
44
22
 
45
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
46
-		 "BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
47
-		 regaddr, originalvalue);
23
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
24
+		"BBR MASK=0x%x Addr[0x%x]=0x%x\n", bitmask,
25
+		regaddr, originalvalue);
48
26
 	return returnvalue;
49
27
 }
50
28
 EXPORT_SYMBOL_GPL(rtl8723_phy_query_bb_reg);
..
..
@@ -55,9 +33,9 @@
55
33
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
56
34
 	u32 originalvalue, bitshift;
57
35
 
58
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
59
-		 "regaddr(%#x), bitmask(%#x), data(%#x)\n", regaddr, bitmask,
60
-		 data);
36
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
37
+		"regaddr(%#x), bitmask(%#x), data(%#x)\n", regaddr, bitmask,
38
+		data);
61
39
 
62
40
 	if (bitmask != MASKDWORD) {
63
41
 		originalvalue = rtl_read_dword(rtlpriv, regaddr);
..
..
@@ -67,21 +45,17 @@
67
45
 
68
46
 	rtl_write_dword(rtlpriv, regaddr, data);
69
47
 
70
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
71
-		 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
72
-		 regaddr, bitmask, data);
48
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
49
+		"regaddr(%#x), bitmask(%#x), data(%#x)\n",
50
+		regaddr, bitmask, data);
73
51
 }
74
52
 EXPORT_SYMBOL_GPL(rtl8723_phy_set_bb_reg);
75
53
 
76
54
 u32 rtl8723_phy_calculate_bit_shift(u32 bitmask)
77
55
 {
78
-	u32 i;
56
+	u32 i = ffs(bitmask);
79
57
 
80
-	for (i = 0; i <= 31; i++) {
81
-		if (((bitmask >> i) & 0x1) == 1)
82
-			break;
83
-	}
84
-	return i;
58
+	return i ? i - 1 : 32;
85
59
 }
86
60
 EXPORT_SYMBOL_GPL(rtl8723_phy_calculate_bit_shift);
87
61
 
..
..
@@ -111,12 +85,10 @@
111
85
 	    (newoffset << 23) | BLSSIREADEDGE;
112
86
 	rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
113
87
 		      tmplong & (~BLSSIREADEDGE));
114
-	mdelay(1);
115
88
 	rtl_set_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD, tmplong2);
116
-	mdelay(1);
117
89
 	rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
118
90
 		      tmplong | BLSSIREADEDGE);
119
-	mdelay(1);
91
+	udelay(120);
120
92
 	if (rfpath == RF90_PATH_A)
121
93
 		rfpi_enable = (u8) rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER1,
122
94
 						 BIT(8));
..
..
@@ -129,9 +101,9 @@
129
101
 	else
130
102
 		retvalue = rtl_get_bbreg(hw, pphyreg->rf_rb,
131
103
 					 BLSSIREADBACKDATA);
132
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
133
-		 "RFR-%d Addr[0x%x]=0x%x\n",
134
-		 rfpath, pphyreg->rf_rb, retvalue);
104
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
105
+		"RFR-%d Addr[0x%x]=0x%x\n",
106
+		rfpath, pphyreg->rf_rb, retvalue);
135
107
 	return retvalue;
136
108
 }
137
109
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_read);
..
..
@@ -154,10 +126,10 @@
154
126
 	newoffset = offset;
155
127
 	data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
156
128
 	rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
157
-	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
158
-		 "RFW-%d Addr[0x%x]=0x%x\n",
159
-		 rfpath, pphyreg->rf3wire_offset,
160
-		 data_and_addr);
129
+	rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
130
+		"RFW-%d Addr[0x%x]=0x%x\n",
131
+		rfpath, pphyreg->rf3wire_offset,
132
+		data_and_addr);
161
133
 }
162
134
 EXPORT_SYMBOL_GPL(rtl8723_phy_rf_serial_write);
163
135