forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
....@@ -8,7 +8,7 @@
88  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
99  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
1010  * Copyright(c) 2015        Intel Deutschland GmbH
11
- * Copyright(c) 2018        Intel Corporation
11
+ * Copyright(c) 2018 - 2019 Intel Corporation
1212  *
1313  * This program is free software; you can redistribute it and/or modify
1414  * it under the terms of version 2 of the GNU General Public License as
....@@ -18,11 +18,6 @@
1818  * WITHOUT ANY WARRANTY; without even the implied warranty of
1919  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
2020  * General Public License for more details.
21
- *
22
- * You should have received a copy of the GNU General Public License
23
- * along with this program; if not, write to the Free Software
24
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
25
- * USA
2621  *
2722  * The full GNU General Public License is included in this distribution
2823  * in the file called COPYING.
....@@ -36,7 +31,7 @@
3631  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
3732  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
3833  * Copyright(c) 2015        Intel Deutschland GmbH
39
- * Copyright(c) 2018        Intel Corporation
34
+ * Copyright(c) 2018 - 2019 Intel Corporation
4035  * All rights reserved.
4136  *
4237  * Redistribution and use in source and binary forms, with or without
....@@ -85,17 +80,11 @@
8580 
8681 /* NVM versions */
8782 #define IWL7260_NVM_VERSION		0x0a1d
88
-#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */
8983 #define IWL3160_NVM_VERSION		0x709
90
-#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */
9184 #define IWL3165_NVM_VERSION		0x709
92
-#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */
9385 #define IWL3168_NVM_VERSION		0xd01
94
-#define IWL3168_TX_POWER_VERSION	0xffff /* meaningless */
9586 #define IWL7265_NVM_VERSION		0x0a1d
96
-#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
9787 #define IWL7265D_NVM_VERSION		0x0c11
98
-#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
9988 
10089 /* DCCM offsets and lengths */
10190 #define IWL7000_DCCM_OFFSET		0x800000
....@@ -118,10 +107,8 @@
118107 #define IWL7265D_FW_PRE "iwlwifi-7265D-"
119108 #define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"
120109 
121
-#define NVM_HW_SECTION_NUM_FAMILY_7000		0
122
-
123110 static const struct iwl_base_params iwl7000_base_params = {
124
-	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,
111
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_16K,
125112 	.num_of_queues = 31,
126113 	.max_tfd_queue_size = 256,
127114 	.shadow_ram_support = true,
....@@ -161,14 +148,13 @@
161148 };
162149 
163150 #define IWL_DEVICE_7000_COMMON					\
164
-	.device_family = IWL_DEVICE_FAMILY_7000,		\
165
-	.base_params = &iwl7000_base_params,			\
151
+	.trans.device_family = IWL_DEVICE_FAMILY_7000,		\
152
+	.trans.base_params = &iwl7000_base_params,		\
166153 	.led_mode = IWL_LED_RF_STATE,				\
167
-	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\
154
+	.nvm_hw_section_num = 0,				\
168155 	.non_shared_ant = ANT_A,				\
169156 	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
170
-	.dccm_offset = IWL7000_DCCM_OFFSET,			\
171
-	.csr = &iwl_csr_v1
157
+	.dccm_offset = IWL7000_DCCM_OFFSET
172158 
173159 #define IWL_DEVICE_7000						\
174160 	IWL_DEVICE_7000_COMMON,					\
....@@ -196,7 +182,6 @@
196182 	IWL_DEVICE_7000,
197183 	.ht_params = &iwl7000_ht_params,
198184 	.nvm_ver = IWL7260_NVM_VERSION,
199
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
200185 	.host_interrupt_operation_mode = true,
201186 	.lp_xtal_workaround = true,
202187 	.dccm_len = IWL7260_DCCM_LEN,
....@@ -208,7 +193,6 @@
208193 	IWL_DEVICE_7000,
209194 	.ht_params = &iwl7000_ht_params,
210195 	.nvm_ver = IWL7260_NVM_VERSION,
211
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
212196 	.high_temp = true,
213197 	.host_interrupt_operation_mode = true,
214198 	.lp_xtal_workaround = true,
....@@ -222,7 +206,6 @@
222206 	IWL_DEVICE_7000,
223207 	.ht_params = &iwl7000_ht_params,
224208 	.nvm_ver = IWL7260_NVM_VERSION,
225
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
226209 	.host_interrupt_operation_mode = true,
227210 	.lp_xtal_workaround = true,
228211 	.dccm_len = IWL7260_DCCM_LEN,
....@@ -234,7 +217,6 @@
234217 	IWL_DEVICE_7000,
235218 	.ht_params = &iwl7000_ht_params,
236219 	.nvm_ver = IWL7260_NVM_VERSION,
237
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
238220 	.host_interrupt_operation_mode = true,
239221 	.lp_xtal_workaround = true,
240222 	.dccm_len = IWL7260_DCCM_LEN,
....@@ -246,7 +228,6 @@
246228 	IWL_DEVICE_7000,
247229 	.ht_params = &iwl7000_ht_params,
248230 	.nvm_ver = IWL3160_NVM_VERSION,
249
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
250231 	.host_interrupt_operation_mode = true,
251232 	.dccm_len = IWL3160_DCCM_LEN,
252233 };
....@@ -257,7 +238,6 @@
257238 	IWL_DEVICE_7000,
258239 	.ht_params = &iwl7000_ht_params,
259240 	.nvm_ver = IWL3160_NVM_VERSION,
260
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
261241 	.host_interrupt_operation_mode = true,
262242 	.dccm_len = IWL3160_DCCM_LEN,
263243 };
....@@ -268,7 +248,6 @@
268248 	IWL_DEVICE_7000,
269249 	.ht_params = &iwl7000_ht_params,
270250 	.nvm_ver = IWL3160_NVM_VERSION,
271
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
272251 	.host_interrupt_operation_mode = true,
273252 	.dccm_len = IWL3160_DCCM_LEN,
274253 };
....@@ -296,7 +275,6 @@
296275 	IWL_DEVICE_7005D,
297276 	.ht_params = &iwl7000_ht_params,
298277 	.nvm_ver = IWL3165_NVM_VERSION,
299
-	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,
300278 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
301279 	.dccm_len = IWL7265_DCCM_LEN,
302280 };
....@@ -307,7 +285,6 @@
307285 	IWL_DEVICE_3008,
308286 	.ht_params = &iwl7000_ht_params,
309287 	.nvm_ver = IWL3168_NVM_VERSION,
310
-	.nvm_calib_ver = IWL3168_TX_POWER_VERSION,
311288 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
312289 	.dccm_len = IWL7265_DCCM_LEN,
313290 	.nvm_type = IWL_NVM_SDP,
....@@ -319,7 +296,6 @@
319296 	IWL_DEVICE_7005,
320297 	.ht_params = &iwl7265_ht_params,
321298 	.nvm_ver = IWL7265_NVM_VERSION,
322
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
323299 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
324300 	.dccm_len = IWL7265_DCCM_LEN,
325301 };
....@@ -330,7 +306,6 @@
330306 	IWL_DEVICE_7005,
331307 	.ht_params = &iwl7265_ht_params,
332308 	.nvm_ver = IWL7265_NVM_VERSION,
333
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
334309 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
335310 	.dccm_len = IWL7265_DCCM_LEN,
336311 };
....@@ -341,7 +316,6 @@
341316 	IWL_DEVICE_7005,
342317 	.ht_params = &iwl7265_ht_params,
343318 	.nvm_ver = IWL7265_NVM_VERSION,
344
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
345319 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
346320 	.dccm_len = IWL7265_DCCM_LEN,
347321 };
....@@ -352,7 +326,6 @@
352326 	IWL_DEVICE_7005D,
353327 	.ht_params = &iwl7265_ht_params,
354328 	.nvm_ver = IWL7265D_NVM_VERSION,
355
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
356329 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
357330 	.dccm_len = IWL7265_DCCM_LEN,
358331 };
....@@ -363,7 +336,6 @@
363336 	IWL_DEVICE_7005D,
364337 	.ht_params = &iwl7265_ht_params,
365338 	.nvm_ver = IWL7265D_NVM_VERSION,
366
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
367339 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
368340 	.dccm_len = IWL7265_DCCM_LEN,
369341 };
....@@ -374,7 +346,6 @@
374346 	IWL_DEVICE_7005D,
375347 	.ht_params = &iwl7265_ht_params,
376348 	.nvm_ver = IWL7265D_NVM_VERSION,
377
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
378349 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
379350 	.dccm_len = IWL7265_DCCM_LEN,
380351 };