aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorAssaf Krauss <assaf.krauss@intel.com>2008-03-11 19:17:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-03-13 19:32:32 -0400
commit6bc913bd965e03b5273a5366eecce5c28c9b01da (patch)
treeebc5aee6b2eb48660ab555af62b4da0119bd8446 /drivers/net/wireless
parenteb7ae89cb0b03e6e6e39737b1c8bcc1912281a00 (diff)
iwlwifi: Use eeprom form iwlcore
This patch puts in use eeprom from iwlcore module Signed-off-by: Assaf Krauss <assaf.krauss@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965-hw.h310
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c45
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.h4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h10
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c84
7 files changed, 30 insertions, 426 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 6b85cca9b3f1..59d9c90d3610 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,5 +1,5 @@
1obj-$(CONFIG_IWLCORE) += iwlcore.o 1obj-$(CONFIG_IWLCORE) += iwlcore.o
2iwlcore-objs = iwl-core.o 2iwlcore-objs = iwl-core.o iwl-eeprom.o
3 3
4obj-$(CONFIG_IWL3945) += iwl3945.o 4obj-$(CONFIG_IWL3945) += iwl3945.o
5iwl3945-objs = iwl3945-base.o iwl-3945.o iwl-3945-rs.o 5iwl3945-objs = iwl3945-base.o iwl-3945.o iwl-3945-rs.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index 4a29b44950a7..c66993eb5b6a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -92,316 +92,6 @@
92/* RSSI to dBm */ 92/* RSSI to dBm */
93#define IWL_RSSI_OFFSET 44 93#define IWL_RSSI_OFFSET 44
94 94
95/*
96 * EEPROM related constants, enums, and structures.
97 */
98
99/*
100 * EEPROM access time values:
101 *
102 * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG,
103 * then clearing (with subsequent read/modify/write) CSR_EEPROM_REG bit
104 * CSR_EEPROM_REG_BIT_CMD (0x2).
105 * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
106 * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
107 * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
108 */
109#define IWL_EEPROM_ACCESS_TIMEOUT 5000 /* uSec */
110#define IWL_EEPROM_ACCESS_DELAY 10 /* uSec */
111
112/*
113 * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.
114 *
115 * IBSS and/or AP operation is allowed *only* on those channels with
116 * (VALID && IBSS && ACTIVE && !RADAR). This restriction is in place because
117 * RADAR detection is not supported by the 4965 driver, but is a
118 * requirement for establishing a new network for legal operation on channels
119 * requiring RADAR detection or restricting ACTIVE scanning.
120 *
121 * NOTE: "WIDE" flag does not indicate anything about "FAT" 40 MHz channels.
122 * It only indicates that 20 MHz channel use is supported; FAT channel
123 * usage is indicated by a separate set of regulatory flags for each
124 * FAT channel pair.
125 *
126 * NOTE: Using a channel inappropriately will result in a uCode error!
127 */
128enum {
129 EEPROM_CHANNEL_VALID = (1 << 0), /* usable for this SKU/geo */
130 EEPROM_CHANNEL_IBSS = (1 << 1), /* usable as an IBSS channel */
131 /* Bit 2 Reserved */
132 EEPROM_CHANNEL_ACTIVE = (1 << 3), /* active scanning allowed */
133 EEPROM_CHANNEL_RADAR = (1 << 4), /* radar detection required */
134 EEPROM_CHANNEL_WIDE = (1 << 5), /* 20 MHz channel okay */
135 EEPROM_CHANNEL_NARROW = (1 << 6), /* 10 MHz channel (not used) */
136 EEPROM_CHANNEL_DFS = (1 << 7), /* dynamic freq selection candidate */
137};
138
139/* SKU Capabilities */
140#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE (1 << 0)
141#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE (1 << 1)
142
143/* *regulatory* channel data format in eeprom, one for each channel.
144 * There are separate entries for FAT (40 MHz) vs. normal (20 MHz) channels. */
145struct iwl4965_eeprom_channel {
146 u8 flags; /* EEPROM_CHANNEL_* flags copied from EEPROM */
147 s8 max_power_avg; /* max power (dBm) on this chnl, limit 31 */
148} __attribute__ ((packed));
149
150/* 4965 has two radio transmitters (and 3 radio receivers) */
151#define EEPROM_TX_POWER_TX_CHAINS (2)
152
153/* 4965 has room for up to 8 sets of txpower calibration data */
154#define EEPROM_TX_POWER_BANDS (8)
155
156/* 4965 factory calibration measures txpower gain settings for
157 * each of 3 target output levels */
158#define EEPROM_TX_POWER_MEASUREMENTS (3)
159
160/* 4965 driver does not work with txpower calibration version < 5.
161 * Look for this in calib_version member of struct iwl4965_eeprom. */
162#define EEPROM_TX_POWER_VERSION_NEW (5)
163
164
165/*
166 * 4965 factory calibration data for one txpower level, on one channel,
167 * measured on one of the 2 tx chains (radio transmitter and associated
168 * antenna). EEPROM contains:
169 *
170 * 1) Temperature (degrees Celsius) of device when measurement was made.
171 *
172 * 2) Gain table index used to achieve the target measurement power.
173 * This refers to the "well-known" gain tables (see iwl-4965-hw.h).
174 *
175 * 3) Actual measured output power, in half-dBm ("34" = 17 dBm).
176 *
177 * 4) RF power amplifier detector level measurement (not used).
178 */
179struct iwl4965_eeprom_calib_measure {
180 u8 temperature; /* Device temperature (Celsius) */
181 u8 gain_idx; /* Index into gain table */
182 u8 actual_pow; /* Measured RF output power, half-dBm */
183 s8 pa_det; /* Power amp detector level (not used) */
184} __attribute__ ((packed));
185
186
187/*
188 * 4965 measurement set for one channel. EEPROM contains:
189 *
190 * 1) Channel number measured
191 *
192 * 2) Measurements for each of 3 power levels for each of 2 radio transmitters
193 * (a.k.a. "tx chains") (6 measurements altogether)
194 */
195struct iwl4965_eeprom_calib_ch_info {
196 u8 ch_num;
197 struct iwl4965_eeprom_calib_measure measurements[EEPROM_TX_POWER_TX_CHAINS]
198 [EEPROM_TX_POWER_MEASUREMENTS];
199} __attribute__ ((packed));
200
201/*
202 * 4965 txpower subband info.
203 *
204 * For each frequency subband, EEPROM contains the following:
205 *
206 * 1) First and last channels within range of the subband. "0" values
207 * indicate that this sample set is not being used.
208 *
209 * 2) Sample measurement sets for 2 channels close to the range endpoints.
210 */
211struct iwl4965_eeprom_calib_subband_info {
212 u8 ch_from; /* channel number of lowest channel in subband */
213 u8 ch_to; /* channel number of highest channel in subband */
214 struct iwl4965_eeprom_calib_ch_info ch1;
215 struct iwl4965_eeprom_calib_ch_info ch2;
216} __attribute__ ((packed));
217
218
219/*
220 * 4965 txpower calibration info. EEPROM contains:
221 *
222 * 1) Factory-measured saturation power levels (maximum levels at which
223 * tx power amplifier can output a signal without too much distortion).
224 * There is one level for 2.4 GHz band and one for 5 GHz band. These
225 * values apply to all channels within each of the bands.
226 *
227 * 2) Factory-measured power supply voltage level. This is assumed to be
228 * constant (i.e. same value applies to all channels/bands) while the
229 * factory measurements are being made.
230 *
231 * 3) Up to 8 sets of factory-measured txpower calibration values.
232 * These are for different frequency ranges, since txpower gain
233 * characteristics of the analog radio circuitry vary with frequency.
234 *
235 * Not all sets need to be filled with data;
236 * struct iwl4965_eeprom_calib_subband_info contains range of channels
237 * (0 if unused) for each set of data.
238 */
239struct iwl4965_eeprom_calib_info {
240 u8 saturation_power24; /* half-dBm (e.g. "34" = 17 dBm) */
241 u8 saturation_power52; /* half-dBm */
242 s16 voltage; /* signed */
243 struct iwl4965_eeprom_calib_subband_info band_info[EEPROM_TX_POWER_BANDS];
244} __attribute__ ((packed));
245
246
247/*
248 * 4965 EEPROM map
249 */
250struct iwl4965_eeprom {
251 u8 reserved0[16];
252#define EEPROM_DEVICE_ID (2*0x08) /* 2 bytes */
253 u16 device_id; /* abs.ofs: 16 */
254 u8 reserved1[2];
255#define EEPROM_PMC (2*0x0A) /* 2 bytes */
256 u16 pmc; /* abs.ofs: 20 */
257 u8 reserved2[20];
258#define EEPROM_MAC_ADDRESS (2*0x15) /* 6 bytes */
259 u8 mac_address[6]; /* abs.ofs: 42 */
260 u8 reserved3[58];
261#define EEPROM_BOARD_REVISION (2*0x35) /* 2 bytes */
262 u16 board_revision; /* abs.ofs: 106 */
263 u8 reserved4[11];
264#define EEPROM_BOARD_PBA_NUMBER (2*0x3B+1) /* 9 bytes */
265 u8 board_pba_number[9]; /* abs.ofs: 119 */
266 u8 reserved5[8];
267#define EEPROM_VERSION (2*0x44) /* 2 bytes */
268 u16 version; /* abs.ofs: 136 */
269#define EEPROM_SKU_CAP (2*0x45) /* 1 bytes */
270 u8 sku_cap; /* abs.ofs: 138 */
271#define EEPROM_LEDS_MODE (2*0x45+1) /* 1 bytes */
272 u8 leds_mode; /* abs.ofs: 139 */
273#define EEPROM_OEM_MODE (2*0x46) /* 2 bytes */
274 u16 oem_mode;
275#define EEPROM_WOWLAN_MODE (2*0x47) /* 2 bytes */
276 u16 wowlan_mode; /* abs.ofs: 142 */
277#define EEPROM_LEDS_TIME_INTERVAL (2*0x48) /* 2 bytes */
278 u16 leds_time_interval; /* abs.ofs: 144 */
279#define EEPROM_LEDS_OFF_TIME (2*0x49) /* 1 bytes */
280 u8 leds_off_time; /* abs.ofs: 146 */
281#define EEPROM_LEDS_ON_TIME (2*0x49+1) /* 1 bytes */
282 u8 leds_on_time; /* abs.ofs: 147 */
283#define EEPROM_ALMGOR_M_VERSION (2*0x4A) /* 1 bytes */
284 u8 almgor_m_version; /* abs.ofs: 148 */
285#define EEPROM_ANTENNA_SWITCH_TYPE (2*0x4A+1) /* 1 bytes */
286 u8 antenna_switch_type; /* abs.ofs: 149 */
287 u8 reserved6[8];
288#define EEPROM_4965_BOARD_REVISION (2*0x4F) /* 2 bytes */
289 u16 board_revision_4965; /* abs.ofs: 158 */
290 u8 reserved7[13];
291#define EEPROM_4965_BOARD_PBA (2*0x56+1) /* 9 bytes */
292 u8 board_pba_number_4965[9]; /* abs.ofs: 173 */
293 u8 reserved8[10];
294#define EEPROM_REGULATORY_SKU_ID (2*0x60) /* 4 bytes */
295 u8 sku_id[4]; /* abs.ofs: 192 */
296
297/*
298 * Per-channel regulatory data.
299 *
300 * Each channel that *might* be supported by 3945 or 4965 has a fixed location
301 * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory
302 * txpower (MSB).
303 *
304 * Entries immediately below are for 20 MHz channel width. FAT (40 MHz)
305 * channels (only for 4965, not supported by 3945) appear later in the EEPROM.
306 *
307 * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
308 */
309#define EEPROM_REGULATORY_BAND_1 (2*0x62) /* 2 bytes */
310 u16 band_1_count; /* abs.ofs: 196 */
311#define EEPROM_REGULATORY_BAND_1_CHANNELS (2*0x63) /* 28 bytes */
312 struct iwl4965_eeprom_channel band_1_channels[14]; /* abs.ofs: 196 */
313
314/*
315 * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,
316 * 5.0 GHz channels 7, 8, 11, 12, 16
317 * (4915-5080MHz) (none of these is ever supported)
318 */
319#define EEPROM_REGULATORY_BAND_2 (2*0x71) /* 2 bytes */
320 u16 band_2_count; /* abs.ofs: 226 */
321#define EEPROM_REGULATORY_BAND_2_CHANNELS (2*0x72) /* 26 bytes */
322 struct iwl4965_eeprom_channel band_2_channels[13]; /* abs.ofs: 228 */
323
324/*
325 * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
326 * (5170-5320MHz)
327 */
328#define EEPROM_REGULATORY_BAND_3 (2*0x7F) /* 2 bytes */
329 u16 band_3_count; /* abs.ofs: 254 */
330#define EEPROM_REGULATORY_BAND_3_CHANNELS (2*0x80) /* 24 bytes */
331 struct iwl4965_eeprom_channel band_3_channels[12]; /* abs.ofs: 256 */
332
333/*
334 * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
335 * (5500-5700MHz)
336 */
337#define EEPROM_REGULATORY_BAND_4 (2*0x8C) /* 2 bytes */
338 u16 band_4_count; /* abs.ofs: 280 */
339#define EEPROM_REGULATORY_BAND_4_CHANNELS (2*0x8D) /* 22 bytes */
340 struct iwl4965_eeprom_channel band_4_channels[11]; /* abs.ofs: 282 */
341
342/*
343 * 5.7 GHz channels 145, 149, 153, 157, 161, 165
344 * (5725-5825MHz)
345 */
346#define EEPROM_REGULATORY_BAND_5 (2*0x98) /* 2 bytes */
347 u16 band_5_count; /* abs.ofs: 304 */
348#define EEPROM_REGULATORY_BAND_5_CHANNELS (2*0x99) /* 12 bytes */
349 struct iwl4965_eeprom_channel band_5_channels[6]; /* abs.ofs: 306 */
350
351 u8 reserved10[2];
352
353
354/*
355 * 2.4 GHz FAT channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)
356 *
357 * The channel listed is the center of the lower 20 MHz half of the channel.
358 * The overall center frequency is actually 2 channels (10 MHz) above that,
359 * and the upper half of each FAT channel is centered 4 channels (20 MHz) away
360 * from the lower half; e.g. the upper half of FAT channel 1 is channel 5,
361 * and the overall FAT channel width centers on channel 3.
362 *
363 * NOTE: The RXON command uses 20 MHz channel numbers to specify the
364 * control channel to which to tune. RXON also specifies whether the
365 * control channel is the upper or lower half of a FAT channel.
366 *
367 * NOTE: 4965 does not support FAT channels on 2.4 GHz.
368 */
369#define EEPROM_REGULATORY_BAND_24_FAT_CHANNELS (2*0xA0) /* 14 bytes */
370 struct iwl4965_eeprom_channel band_24_channels[7]; /* abs.ofs: 320 */
371 u8 reserved11[2];
372
373/*
374 * 5.2 GHz FAT channels 36 (40), 44 (48), 52 (56), 60 (64),
375 * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)
376 */
377#define EEPROM_REGULATORY_BAND_52_FAT_CHANNELS (2*0xA8) /* 22 bytes */
378 struct iwl4965_eeprom_channel band_52_channels[11]; /* abs.ofs: 336 */
379 u8 reserved12[6];
380
381/*
382 * 4965 driver requires txpower calibration format version 5 or greater.
383 * Driver does not work with txpower calibration version < 5.
384 * This value is simply a 16-bit number, no major/minor versions here.
385 */
386#define EEPROM_CALIB_VERSION_OFFSET (2*0xB6) /* 2 bytes */
387 u16 calib_version; /* abs.ofs: 364 */
388 u8 reserved13[2];
389 u8 reserved14[96]; /* abs.ofs: 368 */
390
391/*
392 * 4965 Txpower calibration data.
393 */
394#define EEPROM_IWL_CALIB_TXPOWER_OFFSET (2*0xE8) /* 48 bytes */
395 struct iwl4965_eeprom_calib_info calib_info; /* abs.ofs: 464 */
396
397 u8 reserved16[140]; /* fill out to full 1024 byte block */
398
399
400} __attribute__ ((packed));
401
402#define IWL_EEPROM_IMAGE_SIZE 1024
403
404/* End of EEPROM */
405 95
406#include "iwl-4965-commands.h" 96#include "iwl-4965-commands.h"
407 97
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index a79e8c383a39..dc55ff294b73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -38,6 +38,7 @@
38#include <linux/etherdevice.h> 38#include <linux/etherdevice.h>
39#include <asm/unaligned.h> 39#include <asm/unaligned.h>
40 40
41#include "iwl-eeprom.h"
41#include "iwl-core.h" 42#include "iwl-core.h"
42#include "iwl-4965.h" 43#include "iwl-4965.h"
43#include "iwl-helpers.h" 44#include "iwl-helpers.h"
@@ -4824,10 +4825,23 @@ void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv)
4824 cancel_delayed_work(&priv->init_alive_start); 4825 cancel_delayed_work(&priv->init_alive_start);
4825} 4826}
4826 4827
4828static struct iwl_lib_ops iwl4965_lib = {
4829 .eeprom_ops = {
4830 .verify_signature = iwlcore_eeprom_verify_signature,
4831 .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
4832 .release_semaphore = iwlcore_eeprom_release_semaphore,
4833 },
4834};
4835
4836static struct iwl_ops iwl4965_ops = {
4837 .lib = &iwl4965_lib,
4838};
4839
4827static struct iwl_cfg iwl4965_agn_cfg = { 4840static struct iwl_cfg iwl4965_agn_cfg = {
4828 .name = "4965AGN", 4841 .name = "4965AGN",
4829 .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode", 4842 .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode",
4830 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, 4843 .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
4844 .ops = &iwl4965_ops,
4831}; 4845};
4832 4846
4833struct pci_device_id iwl4965_hw_card_ids[] = { 4847struct pci_device_id iwl4965_hw_card_ids[] = {
@@ -4836,35 +4850,4 @@ struct pci_device_id iwl4965_hw_card_ids[] = {
4836 {0} 4850 {0}
4837}; 4851};
4838 4852
4839/*
4840 * The device's EEPROM semaphore prevents conflicts between driver and uCode
4841 * when accessing the EEPROM; each access is a series of pulses to/from the
4842 * EEPROM chip, not a single event, so even reads could conflict if they
4843 * weren't arbitrated by the semaphore.
4844 */
4845int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv)
4846{
4847 u16 count;
4848 int rc;
4849
4850 for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
4851 /* Request semaphore */
4852 iwl4965_set_bit(priv, CSR_HW_IF_CONFIG_REG,
4853 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
4854
4855 /* See if we got it */
4856 rc = iwl4965_poll_bit(priv, CSR_HW_IF_CONFIG_REG,
4857 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
4858 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
4859 EEPROM_SEM_TIMEOUT);
4860 if (rc >= 0) {
4861 IWL_DEBUG_IO("Acquired semaphore after %d tries.\n",
4862 count+1);
4863 return rc;
4864 }
4865 }
4866
4867 return rc;
4868}
4869
4870MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids); 4853MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 6ce408137365..f4e395fcb807 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -40,6 +40,7 @@
40extern struct pci_device_id iwl4965_hw_card_ids[]; 40extern struct pci_device_id iwl4965_hw_card_ids[];
41 41
42#define DRV_NAME "iwl4965" 42#define DRV_NAME "iwl4965"
43#include "iwl-eeprom.h"
43#include "iwl-4965-hw.h" 44#include "iwl-4965-hw.h"
44#include "iwl-csr.h" 45#include "iwl-csr.h"
45#include "iwl-prph.h" 46#include "iwl-prph.h"
@@ -640,7 +641,6 @@ extern u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,
640extern int iwl4965_is_network_packet(struct iwl4965_priv *priv, 641extern int iwl4965_is_network_packet(struct iwl4965_priv *priv,
641 struct ieee80211_hdr *header); 642 struct ieee80211_hdr *header);
642extern int iwl4965_power_init_handle(struct iwl4965_priv *priv); 643extern int iwl4965_power_init_handle(struct iwl4965_priv *priv);
643extern int iwl4965_eeprom_init(struct iwl4965_priv *priv);
644extern void iwl4965_handle_data_packet_monitor(struct iwl4965_priv *priv, 644extern void iwl4965_handle_data_packet_monitor(struct iwl4965_priv *priv,
645 struct iwl4965_rx_mem_buffer *rxb, 645 struct iwl4965_rx_mem_buffer *rxb,
646 void *data, short len, 646 void *data, short len,
@@ -746,8 +746,6 @@ struct iwl4965_priv;
746/* 746/*
747 * Forward declare iwl-4965.c functions for iwl-base.c 747 * Forward declare iwl-4965.c functions for iwl-base.c
748 */ 748 */
749extern int iwl4965_eeprom_acquire_semaphore(struct iwl4965_priv *priv);
750
751extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv, 749extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,
752 struct iwl4965_tx_queue *txq, 750 struct iwl4965_tx_queue *txq,
753 u16 byte_cnt); 751 u16 byte_cnt);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index b8383c83f18d..9ca539861db2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -31,6 +31,7 @@
31#include <linux/version.h> 31#include <linux/version.h>
32 32
33#include "iwl-4965-debug.h" 33#include "iwl-4965-debug.h"
34#include "iwl-eeprom.h"
34#include "iwl-core.h" 35#include "iwl-core.h"
35 36
36MODULE_DESCRIPTION("iwl core"); 37MODULE_DESCRIPTION("iwl core");
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index bdd32f891683..88fd49abdabd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -75,10 +75,20 @@
75#define IWL_SKU_A 0x2 75#define IWL_SKU_A 0x2
76#define IWL_SKU_N 0x8 76#define IWL_SKU_N 0x8
77 77
78struct iwl_lib_ops {
79 /* eeprom operations (as defined in iwl-eeprom.h) */
80 struct iwl_eeprom_ops eeprom_ops;
81};
82
83struct iwl_ops {
84 const struct iwl_lib_ops *lib;
85};
86
78struct iwl_cfg { 87struct iwl_cfg {
79 const char *name; 88 const char *name;
80 const char *fw_name; 89 const char *fw_name;
81 unsigned int sku; 90 unsigned int sku;
91 const struct iwl_ops *ops;
82}; 92};
83 93
84#endif /* __iwl_core_h__ */ 94#endif /* __iwl_core_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index ce1c3f68fde0..d84a7f296d90 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -45,6 +45,7 @@
45 45
46#include <asm/div64.h> 46#include <asm/div64.h>
47 47
48#include "iwl-eeprom.h"
48#include "iwl-core.h" 49#include "iwl-core.h"
49#include "iwl-4965.h" 50#include "iwl-4965.h"
50#include "iwl-helpers.h" 51#include "iwl-helpers.h"
@@ -1562,85 +1563,6 @@ static int iwl4965_send_beacon_cmd(struct iwl4965_priv *priv)
1562 1563
1563/****************************************************************************** 1564/******************************************************************************
1564 * 1565 *
1565 * EEPROM related functions
1566 *
1567 ******************************************************************************/
1568
1569static void get_eeprom_mac(struct iwl4965_priv *priv, u8 *mac)
1570{
1571 memcpy(mac, priv->eeprom.mac_address, 6);
1572}
1573
1574static inline void iwl4965_eeprom_release_semaphore(struct iwl4965_priv *priv)
1575{
1576 iwl4965_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
1577 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
1578}
1579
1580/**
1581 * iwl4965_eeprom_init - read EEPROM contents
1582 *
1583 * Load the EEPROM contents from adapter into priv->eeprom
1584 *
1585 * NOTE: This routine uses the non-debug IO access functions.
1586 */
1587int iwl4965_eeprom_init(struct iwl4965_priv *priv)
1588{
1589 u16 *e = (u16 *)&priv->eeprom;
1590 u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
1591 u32 r;
1592 int sz = sizeof(priv->eeprom);
1593 int rc;
1594 int i;
1595 u16 addr;
1596
1597 /* The EEPROM structure has several padding buffers within it
1598 * and when adding new EEPROM maps is subject to programmer errors
1599 * which may be very difficult to identify without explicitly
1600 * checking the resulting size of the eeprom map. */
1601 BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);
1602
1603 if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
1604 IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
1605 return -ENOENT;
1606 }
1607
1608 /* Make sure driver (instead of uCode) is allowed to read EEPROM */
1609 rc = iwl4965_eeprom_acquire_semaphore(priv);
1610 if (rc < 0) {
1611 IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
1612 return -ENOENT;
1613 }
1614
1615 /* eeprom is an array of 16bit values */
1616 for (addr = 0; addr < sz; addr += sizeof(u16)) {
1617 _iwl4965_write32(priv, CSR_EEPROM_REG, addr << 1);
1618 _iwl4965_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);
1619
1620 for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;
1621 i += IWL_EEPROM_ACCESS_DELAY) {
1622 r = _iwl4965_read_direct32(priv, CSR_EEPROM_REG);
1623 if (r & CSR_EEPROM_REG_READ_VALID_MSK)
1624 break;
1625 udelay(IWL_EEPROM_ACCESS_DELAY);
1626 }
1627
1628 if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
1629 IWL_ERROR("Time out reading EEPROM[%d]", addr);
1630 rc = -ETIMEDOUT;
1631 goto done;
1632 }
1633 e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
1634 }
1635 rc = 0;
1636
1637done:
1638 iwl4965_eeprom_release_semaphore(priv);
1639 return rc;
1640}
1641
1642/******************************************************************************
1643 *
1644 * Misc. internal state and helper functions 1566 * Misc. internal state and helper functions
1645 * 1567 *
1646 ******************************************************************************/ 1568 ******************************************************************************/
@@ -8765,13 +8687,13 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
8765 goto out_remove_sysfs; 8687 goto out_remove_sysfs;
8766 } 8688 }
8767 /* Read the EEPROM */ 8689 /* Read the EEPROM */
8768 err = iwl4965_eeprom_init(priv); 8690 err = iwl_eeprom_init(priv);
8769 if (err) { 8691 if (err) {
8770 IWL_ERROR("Unable to init EEPROM\n"); 8692 IWL_ERROR("Unable to init EEPROM\n");
8771 goto out_remove_sysfs; 8693 goto out_remove_sysfs;
8772 } 8694 }
8773 /* MAC Address location in EEPROM same for 3945/4965 */ 8695 /* MAC Address location in EEPROM same for 3945/4965 */
8774 get_eeprom_mac(priv, priv->mac_addr); 8696 iwl_eeprom_get_mac(priv, priv->mac_addr);
8775 IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr)); 8697 IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
8776 SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr); 8698 SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
8777 8699