add r8169 read mac form eeprom

hc

2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd

 kernel/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
..
..
@@ -8,7 +8,7 @@
8
8
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
9
9
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
10
10
  * Copyright(c) 2015        Intel Deutschland GmbH
11
- * Copyright(c) 2018        Intel Corporation
11
+ * Copyright(c) 2018 - 2019 Intel Corporation
12
12
  *
13
13
  * This program is free software; you can redistribute it and/or modify
14
14
  * it under the terms of version 2 of the GNU General Public License as
..
..
@@ -18,11 +18,6 @@
18
18
  * WITHOUT ANY WARRANTY; without even the implied warranty of
19
19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
20
20
  * 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
26
21
  *
27
22
  * The full GNU General Public License is included in this distribution
28
23
  * in the file called COPYING.
..
..
@@ -36,7 +31,7 @@
36
31
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
37
32
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
38
33
  * Copyright(c) 2015        Intel Deutschland GmbH
39
- * Copyright(c) 2018        Intel Corporation
34
+ * Copyright(c) 2018 - 2019 Intel Corporation
40
35
  * All rights reserved.
41
36
  *
42
37
  * Redistribution and use in source and binary forms, with or without
..
..
@@ -85,17 +80,11 @@
85
80
 
86
81
 /* NVM versions */
87
82
 #define IWL7260_NVM_VERSION		0x0a1d
88
-#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */
89
83
 #define IWL3160_NVM_VERSION		0x709
90
-#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */
91
84
 #define IWL3165_NVM_VERSION		0x709
92
-#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */
93
85
 #define IWL3168_NVM_VERSION		0xd01
94
-#define IWL3168_TX_POWER_VERSION	0xffff /* meaningless */
95
86
 #define IWL7265_NVM_VERSION		0x0a1d
96
-#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
97
87
 #define IWL7265D_NVM_VERSION		0x0c11
98
-#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
99
88
 
100
89
 /* DCCM offsets and lengths */
101
90
 #define IWL7000_DCCM_OFFSET		0x800000
..
..
@@ -118,10 +107,8 @@
118
107
 #define IWL7265D_FW_PRE "iwlwifi-7265D-"
119
108
 #define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"
120
109
 
121
-#define NVM_HW_SECTION_NUM_FAMILY_7000		0
122
-
123
110
 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,
125
112
 	.num_of_queues = 31,
126
113
 	.max_tfd_queue_size = 256,
127
114
 	.shadow_ram_support = true,
..
..
@@ -161,14 +148,13 @@
161
148
 };
162
149
 
163
150
 #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,		\
166
153
 	.led_mode = IWL_LED_RF_STATE,				\
167
-	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000,	\
154
+	.nvm_hw_section_num = 0,				\
168
155
 	.non_shared_ant = ANT_A,				\
169
156
 	.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
172
158
 
173
159
 #define IWL_DEVICE_7000						\
174
160
 	IWL_DEVICE_7000_COMMON,					\
..
..
@@ -196,7 +182,6 @@
196
182
 	IWL_DEVICE_7000,
197
183
 	.ht_params = &iwl7000_ht_params,
198
184
 	.nvm_ver = IWL7260_NVM_VERSION,
199
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
200
185
 	.host_interrupt_operation_mode = true,
201
186
 	.lp_xtal_workaround = true,
202
187
 	.dccm_len = IWL7260_DCCM_LEN,
..
..
@@ -208,7 +193,6 @@
208
193
 	IWL_DEVICE_7000,
209
194
 	.ht_params = &iwl7000_ht_params,
210
195
 	.nvm_ver = IWL7260_NVM_VERSION,
211
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
212
196
 	.high_temp = true,
213
197
 	.host_interrupt_operation_mode = true,
214
198
 	.lp_xtal_workaround = true,
..
..
@@ -222,7 +206,6 @@
222
206
 	IWL_DEVICE_7000,
223
207
 	.ht_params = &iwl7000_ht_params,
224
208
 	.nvm_ver = IWL7260_NVM_VERSION,
225
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
226
209
 	.host_interrupt_operation_mode = true,
227
210
 	.lp_xtal_workaround = true,
228
211
 	.dccm_len = IWL7260_DCCM_LEN,
..
..
@@ -234,7 +217,6 @@
234
217
 	IWL_DEVICE_7000,
235
218
 	.ht_params = &iwl7000_ht_params,
236
219
 	.nvm_ver = IWL7260_NVM_VERSION,
237
-	.nvm_calib_ver = IWL7260_TX_POWER_VERSION,
238
220
 	.host_interrupt_operation_mode = true,
239
221
 	.lp_xtal_workaround = true,
240
222
 	.dccm_len = IWL7260_DCCM_LEN,
..
..
@@ -246,7 +228,6 @@
246
228
 	IWL_DEVICE_7000,
247
229
 	.ht_params = &iwl7000_ht_params,
248
230
 	.nvm_ver = IWL3160_NVM_VERSION,
249
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
250
231
 	.host_interrupt_operation_mode = true,
251
232
 	.dccm_len = IWL3160_DCCM_LEN,
252
233
 };
..
..
@@ -257,7 +238,6 @@
257
238
 	IWL_DEVICE_7000,
258
239
 	.ht_params = &iwl7000_ht_params,
259
240
 	.nvm_ver = IWL3160_NVM_VERSION,
260
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
261
241
 	.host_interrupt_operation_mode = true,
262
242
 	.dccm_len = IWL3160_DCCM_LEN,
263
243
 };
..
..
@@ -268,7 +248,6 @@
268
248
 	IWL_DEVICE_7000,
269
249
 	.ht_params = &iwl7000_ht_params,
270
250
 	.nvm_ver = IWL3160_NVM_VERSION,
271
-	.nvm_calib_ver = IWL3160_TX_POWER_VERSION,
272
251
 	.host_interrupt_operation_mode = true,
273
252
 	.dccm_len = IWL3160_DCCM_LEN,
274
253
 };
..
..
@@ -296,7 +275,6 @@
296
275
 	IWL_DEVICE_7005D,
297
276
 	.ht_params = &iwl7000_ht_params,
298
277
 	.nvm_ver = IWL3165_NVM_VERSION,
299
-	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,
300
278
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
301
279
 	.dccm_len = IWL7265_DCCM_LEN,
302
280
 };
..
..
@@ -307,7 +285,6 @@
307
285
 	IWL_DEVICE_3008,
308
286
 	.ht_params = &iwl7000_ht_params,
309
287
 	.nvm_ver = IWL3168_NVM_VERSION,
310
-	.nvm_calib_ver = IWL3168_TX_POWER_VERSION,
311
288
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
312
289
 	.dccm_len = IWL7265_DCCM_LEN,
313
290
 	.nvm_type = IWL_NVM_SDP,
..
..
@@ -319,7 +296,6 @@
319
296
 	IWL_DEVICE_7005,
320
297
 	.ht_params = &iwl7265_ht_params,
321
298
 	.nvm_ver = IWL7265_NVM_VERSION,
322
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
323
299
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
324
300
 	.dccm_len = IWL7265_DCCM_LEN,
325
301
 };
..
..
@@ -330,7 +306,6 @@
330
306
 	IWL_DEVICE_7005,
331
307
 	.ht_params = &iwl7265_ht_params,
332
308
 	.nvm_ver = IWL7265_NVM_VERSION,
333
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
334
309
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
335
310
 	.dccm_len = IWL7265_DCCM_LEN,
336
311
 };
..
..
@@ -341,7 +316,6 @@
341
316
 	IWL_DEVICE_7005,
342
317
 	.ht_params = &iwl7265_ht_params,
343
318
 	.nvm_ver = IWL7265_NVM_VERSION,
344
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
345
319
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
346
320
 	.dccm_len = IWL7265_DCCM_LEN,
347
321
 };
..
..
@@ -352,7 +326,6 @@
352
326
 	IWL_DEVICE_7005D,
353
327
 	.ht_params = &iwl7265_ht_params,
354
328
 	.nvm_ver = IWL7265D_NVM_VERSION,
355
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
356
329
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
357
330
 	.dccm_len = IWL7265_DCCM_LEN,
358
331
 };
..
..
@@ -363,7 +336,6 @@
363
336
 	IWL_DEVICE_7005D,
364
337
 	.ht_params = &iwl7265_ht_params,
365
338
 	.nvm_ver = IWL7265D_NVM_VERSION,
366
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
367
339
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
368
340
 	.dccm_len = IWL7265_DCCM_LEN,
369
341
 };
..
..
@@ -374,7 +346,6 @@
374
346
 	IWL_DEVICE_7005D,
375
347
 	.ht_params = &iwl7265_ht_params,
376
348
 	.nvm_ver = IWL7265D_NVM_VERSION,
377
-	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,
378
349
 	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
379
350
 	.dccm_len = IWL7265_DCCM_LEN,
380
351
 };