移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/realtek/rtlwifi/cam.c
..
..
@@ -1,27 +1,6 @@
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.*/
3
+
25
4
 #include "wifi.h"
26
5
 #include "cam.h"
27
6
 #include <linux/export.h>
..
..
@@ -64,14 +43,14 @@
64
43
 			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
65
44
 					target_command);
66
45
 
67
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
68
-				 "WRITE %x: %x\n",
69
-				 rtlpriv->cfg->maps[WCAMI], target_content);
70
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
71
-				 "The Key ID is %d\n", entry_no);
72
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
73
-				 "WRITE %x: %x\n",
74
-				 rtlpriv->cfg->maps[RWCAM], target_command);
46
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
47
+				"WRITE %x: %x\n",
48
+				rtlpriv->cfg->maps[WCAMI], target_content);
49
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
50
+				"The Key ID is %d\n", entry_no);
51
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
52
+				"WRITE %x: %x\n",
53
+				rtlpriv->cfg->maps[RWCAM], target_command);
75
54
 
76
55
 		} else if (entry_i == 1) {
77
56
 
..
..
@@ -85,10 +64,10 @@
85
64
 			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
86
65
 					target_command);
87
66
 
88
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
89
-				 "WRITE A4: %x\n", target_content);
90
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
91
-				 "WRITE A0: %x\n", target_command);
67
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
68
+				"WRITE A4: %x\n", target_content);
69
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
70
+				"WRITE A0: %x\n", target_command);
92
71
 
93
72
 		} else {
94
73
 
..
..
@@ -104,15 +83,15 @@
104
83
 			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
105
84
 					target_command);
106
85
 
107
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
108
-				 "WRITE A4: %x\n", target_content);
109
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
110
-				 "WRITE A0: %x\n", target_command);
86
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
87
+				"WRITE A4: %x\n", target_content);
88
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
89
+				"WRITE A0: %x\n", target_command);
111
90
 		}
112
91
 	}
113
92
 
114
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
115
-		 "after set key, usconfig:%x\n", us_config);
93
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
94
+		"after set key, usconfig:%x\n", us_config);
116
95
 }
117
96
 
118
97
 u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
..
..
@@ -122,14 +101,14 @@
122
101
 	u32 us_config;
123
102
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
124
103
 
125
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
126
-		 "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
127
-		 ul_entry_idx, ul_key_id, ul_enc_alg,
128
-		 ul_default_key, mac_addr);
104
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
105
+		"EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
106
+		ul_entry_idx, ul_key_id, ul_enc_alg,
107
+		ul_default_key, mac_addr);
129
108
 
130
109
 	if (ul_key_id == TOTAL_CAM_ENTRY) {
131
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
132
-			 "ulKeyId exceed!\n");
110
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
111
+			"ulKeyId exceed!\n");
133
112
 		return 0;
134
113
 	}
135
114
 
..
..
@@ -141,7 +120,7 @@
141
120
 	rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,
142
121
 			      (u8 *)key_content, us_config);
143
122
 
144
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "end\n");
123
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "end\n");
145
124
 
146
125
 	return 1;
147
126
 
..
..
@@ -154,7 +133,7 @@
154
133
 	u32 ul_command;
155
134
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
156
135
 
157
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);
136
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);
158
137
 
159
138
 	ul_command = ul_key_id * CAM_CONTENT_COUNT;
160
139
 	ul_command = ul_command | BIT(31) | BIT(16);
..
..
@@ -162,10 +141,10 @@
162
141
 	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], 0);
163
142
 	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
164
143
 
165
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
166
-		 "rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0);
167
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
168
-		 "rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command);
144
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
145
+		"%s: WRITE A4: %x\n", __func__, 0);
146
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
147
+		"%s: WRITE A0: %x\n", __func__, ul_command);
169
148
 
170
149
 	return 0;
171
150
 
..
..
@@ -216,10 +195,10 @@
216
195
 	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], ul_content);
217
196
 	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
218
197
 
219
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
220
-		 "rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content);
221
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
222
-		 "rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command);
198
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
199
+		"%s: WRITE A4: %x\n", __func__, ul_content);
200
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
201
+		"%s: WRITE A0: %x\n", __func__, ul_command);
223
202
 }
224
203
 EXPORT_SYMBOL(rtl_cam_mark_invalid);
225
204
 
..
..
@@ -266,12 +245,10 @@
266
245
 		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[WCAMI], ul_content);
267
246
 		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
268
247
 
269
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
270
-			 "rtl_cam_empty_entry(): WRITE A4: %x\n",
271
-			 ul_content);
272
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
273
-			 "rtl_cam_empty_entry(): WRITE A0: %x\n",
274
-			 ul_command);
248
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
249
+			"%s: WRITE A4: %x\n", __func__, ul_content);
250
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD,
251
+			"%s: WRITE A0: %x\n", __func__, ul_command);
275
252
 	}
276
253
 
277
254
 }
..
..
@@ -334,8 +311,8 @@
334
311
 			/* Remove from HW Security CAM */
335
312
 			eth_zero_addr(rtlpriv->sec.hwsec_cam_sta_addr[i]);
336
313
 			rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
337
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
338
-				 "&&&&&&&&&del entry %d\n", i);
314
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
315
+				"&&&&&&&&&del entry %d\n", i);
339
316
 		}
340
317
 	}
341
318
 	return;