aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c5106
1 files changed, 1258 insertions, 3848 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 93be74a1f13..0cd8cb96a5e 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1,6 +1,6 @@
1/****************************************************************************** 1/******************************************************************************
2 * 2 *
3 * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved. 3 * Copyright(c) 2003 - 2009 Intel Corporation. All rights reserved.
4 * 4 *
5 * Portions of this file are derived from the ipw3945 project, as well 5 * Portions of this file are derived from the ipw3945 project, as well
6 * as portions of the ieee80211 subsystem header files. 6 * as portions of the ieee80211 subsystem header files.
@@ -46,40 +46,25 @@
46 46
47#include <asm/div64.h> 47#include <asm/div64.h>
48 48
49#include "iwl-3945-core.h" 49#define DRV_NAME "iwl3945"
50
51#include "iwl-fh.h"
52#include "iwl-3945-fh.h"
53#include "iwl-commands.h"
54#include "iwl-sta.h"
50#include "iwl-3945.h" 55#include "iwl-3945.h"
51#include "iwl-helpers.h" 56#include "iwl-helpers.h"
52 57#include "iwl-core.h"
53#ifdef CONFIG_IWL3945_DEBUG 58#include "iwl-dev.h"
54u32 iwl3945_debug_level;
55#endif
56
57static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv,
58 struct iwl3945_tx_queue *txq);
59
60/******************************************************************************
61 *
62 * module boiler plate
63 *
64 ******************************************************************************/
65
66/* module parameters */
67static int iwl3945_param_disable_hw_scan; /* def: 0 = use 3945's h/w scan */
68static u32 iwl3945_param_debug; /* def: 0 = minimal debug log messages */
69static int iwl3945_param_disable; /* def: 0 = enable radio */
70static int iwl3945_param_antenna; /* def: 0 = both antennas (use diversity) */
71int iwl3945_param_hwcrypto; /* def: 0 = use software encryption */
72int iwl3945_param_queues_num = IWL39_MAX_NUM_QUEUES; /* def: 8 Tx queues */
73 59
74/* 60/*
75 * module name, copyright, version, etc. 61 * module name, copyright, version, etc.
76 * NOTE: DRV_NAME is defined in iwlwifi.h for use by iwl-debug.h and printk
77 */ 62 */
78 63
79#define DRV_DESCRIPTION \ 64#define DRV_DESCRIPTION \
80"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux" 65"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"
81 66
82#ifdef CONFIG_IWL3945_DEBUG 67#ifdef CONFIG_IWLWIFI_DEBUG
83#define VD "d" 68#define VD "d"
84#else 69#else
85#define VD 70#define VD
@@ -91,10 +76,10 @@ int iwl3945_param_queues_num = IWL39_MAX_NUM_QUEUES; /* def: 8 Tx queues */
91#define VS 76#define VS
92#endif 77#endif
93 78
94#define IWLWIFI_VERSION "1.2.26k" VD VS 79#define IWL39_VERSION "1.2.26k" VD VS
95#define DRV_COPYRIGHT "Copyright(c) 2003-2008 Intel Corporation" 80#define DRV_COPYRIGHT "Copyright(c) 2003-2009 Intel Corporation"
96#define DRV_AUTHOR "<ilw@linux.intel.com>" 81#define DRV_AUTHOR "<ilw@linux.intel.com>"
97#define DRV_VERSION IWLWIFI_VERSION 82#define DRV_VERSION IWL39_VERSION
98 83
99 84
100MODULE_DESCRIPTION(DRV_DESCRIPTION); 85MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -102,235 +87,13 @@ MODULE_VERSION(DRV_VERSION);
102MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); 87MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
103MODULE_LICENSE("GPL"); 88MODULE_LICENSE("GPL");
104 89
105static const struct ieee80211_supported_band *iwl3945_get_band( 90 /* module parameters */
106 struct iwl3945_priv *priv, enum ieee80211_band band) 91struct iwl_mod_params iwl3945_mod_params = {
107{ 92 .num_of_queues = IWL39_MAX_NUM_QUEUES,
108 return priv->hw->wiphy->bands[band]; 93 .sw_crypto = 1,
109} 94 .restart_fw = 1,
110 95 /* the rest are 0 by default */
111/*************** DMA-QUEUE-GENERAL-FUNCTIONS ***** 96};
112 * DMA services
113 *
114 * Theory of operation
115 *
116 * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer
117 * of buffer descriptors, each of which points to one or more data buffers for
118 * the device to read from or fill. Driver and device exchange status of each
119 * queue via "read" and "write" pointers. Driver keeps minimum of 2 empty
120 * entries in each circular buffer, to protect against confusing empty and full
121 * queue states.
122 *
123 * The device reads or writes the data in the queues via the device's several
124 * DMA/FIFO channels. Each queue is mapped to a single DMA channel.
125 *
126 * For Tx queue, there are low mark and high mark limits. If, after queuing
127 * the packet for Tx, free space become < low mark, Tx queue stopped. When
128 * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
129 * Tx queue resumed.
130 *
131 * The 3945 operates with six queues: One receive queue, one transmit queue
132 * (#4) for sending commands to the device firmware, and four transmit queues
133 * (#0-3) for data tx via EDCA. An additional 2 HCCA queues are unused.
134 ***************************************************/
135
136int iwl3945_queue_space(const struct iwl3945_queue *q)
137{
138 int s = q->read_ptr - q->write_ptr;
139
140 if (q->read_ptr > q->write_ptr)
141 s -= q->n_bd;
142
143 if (s <= 0)
144 s += q->n_window;
145 /* keep some reserve to not confuse empty and full situations */
146 s -= 2;
147 if (s < 0)
148 s = 0;
149 return s;
150}
151
152int iwl3945_x2_queue_used(const struct iwl3945_queue *q, int i)
153{
154 return q->write_ptr > q->read_ptr ?
155 (i >= q->read_ptr && i < q->write_ptr) :
156 !(i < q->read_ptr && i >= q->write_ptr);
157}
158
159
160static inline u8 get_cmd_index(struct iwl3945_queue *q, u32 index, int is_huge)
161{
162 /* This is for scan command, the big buffer at end of command array */
163 if (is_huge)
164 return q->n_window; /* must be power of 2 */
165
166 /* Otherwise, use normal size buffers */
167 return index & (q->n_window - 1);
168}
169
170/**
171 * iwl3945_queue_init - Initialize queue's high/low-water and read/write indexes
172 */
173static int iwl3945_queue_init(struct iwl3945_priv *priv, struct iwl3945_queue *q,
174 int count, int slots_num, u32 id)
175{
176 q->n_bd = count;
177 q->n_window = slots_num;
178 q->id = id;
179
180 /* count must be power-of-two size, otherwise iwl_queue_inc_wrap
181 * and iwl_queue_dec_wrap are broken. */
182 BUG_ON(!is_power_of_2(count));
183
184 /* slots_num must be power-of-two size, otherwise
185 * get_cmd_index is broken. */
186 BUG_ON(!is_power_of_2(slots_num));
187
188 q->low_mark = q->n_window / 4;
189 if (q->low_mark < 4)
190 q->low_mark = 4;
191
192 q->high_mark = q->n_window / 8;
193 if (q->high_mark < 2)
194 q->high_mark = 2;
195
196 q->write_ptr = q->read_ptr = 0;
197
198 return 0;
199}
200
201/**
202 * iwl3945_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
203 */
204static int iwl3945_tx_queue_alloc(struct iwl3945_priv *priv,
205 struct iwl3945_tx_queue *txq, u32 id)
206{
207 struct pci_dev *dev = priv->pci_dev;
208
209 /* Driver private data, only for Tx (not command) queues,
210 * not shared with device. */
211 if (id != IWL_CMD_QUEUE_NUM) {
212 txq->txb = kmalloc(sizeof(txq->txb[0]) *
213 TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
214 if (!txq->txb) {
215 IWL_ERROR("kmalloc for auxiliary BD "
216 "structures failed\n");
217 goto error;
218 }
219 } else
220 txq->txb = NULL;
221
222 /* Circular buffer of transmit frame descriptors (TFDs),
223 * shared with device */
224 txq->bd = pci_alloc_consistent(dev,
225 sizeof(txq->bd[0]) * TFD_QUEUE_SIZE_MAX,
226 &txq->q.dma_addr);
227
228 if (!txq->bd) {
229 IWL_ERROR("pci_alloc_consistent(%zd) failed\n",
230 sizeof(txq->bd[0]) * TFD_QUEUE_SIZE_MAX);
231 goto error;
232 }
233 txq->q.id = id;
234
235 return 0;
236
237 error:
238 kfree(txq->txb);
239 txq->txb = NULL;
240
241 return -ENOMEM;
242}
243
244/**
245 * iwl3945_tx_queue_init - Allocate and initialize one tx/cmd queue
246 */
247int iwl3945_tx_queue_init(struct iwl3945_priv *priv,
248 struct iwl3945_tx_queue *txq, int slots_num, u32 txq_id)
249{
250 struct pci_dev *dev = priv->pci_dev;
251 int len;
252 int rc = 0;
253
254 /*
255 * Alloc buffer array for commands (Tx or other types of commands).
256 * For the command queue (#4), allocate command space + one big
257 * command for scan, since scan command is very huge; the system will
258 * not have two scans at the same time, so only one is needed.
259 * For data Tx queues (all other queues), no super-size command
260 * space is needed.
261 */
262 len = sizeof(struct iwl3945_cmd) * slots_num;
263 if (txq_id == IWL_CMD_QUEUE_NUM)
264 len += IWL_MAX_SCAN_SIZE;
265 txq->cmd = pci_alloc_consistent(dev, len, &txq->dma_addr_cmd);
266 if (!txq->cmd)
267 return -ENOMEM;
268
269 /* Alloc driver data array and TFD circular buffer */
270 rc = iwl3945_tx_queue_alloc(priv, txq, txq_id);
271 if (rc) {
272 pci_free_consistent(dev, len, txq->cmd, txq->dma_addr_cmd);
273
274 return -ENOMEM;
275 }
276 txq->need_update = 0;
277
278 /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
279 * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
280 BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX & (TFD_QUEUE_SIZE_MAX - 1));
281
282 /* Initialize queue high/low-water, head/tail indexes */
283 iwl3945_queue_init(priv, &txq->q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
284
285 /* Tell device where to find queue, enable DMA channel. */
286 iwl3945_hw_tx_queue_init(priv, txq);
287
288 return 0;
289}
290
291/**
292 * iwl3945_tx_queue_free - Deallocate DMA queue.
293 * @txq: Transmit queue to deallocate.
294 *
295 * Empty queue by removing and destroying all BD's.
296 * Free all buffers.
297 * 0-fill, but do not free "txq" descriptor structure.
298 */
299void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq)
300{
301 struct iwl3945_queue *q = &txq->q;
302 struct pci_dev *dev = priv->pci_dev;
303 int len;
304
305 if (q->n_bd == 0)
306 return;
307
308 /* first, empty all BD's */
309 for (; q->write_ptr != q->read_ptr;
310 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
311 iwl3945_hw_txq_free_tfd(priv, txq);
312
313 len = sizeof(struct iwl3945_cmd) * q->n_window;
314 if (q->id == IWL_CMD_QUEUE_NUM)
315 len += IWL_MAX_SCAN_SIZE;
316
317 /* De-alloc array of command/tx buffers */
318 pci_free_consistent(dev, len, txq->cmd, txq->dma_addr_cmd);
319
320 /* De-alloc circular buffer of TFDs */
321 if (txq->q.n_bd)
322 pci_free_consistent(dev, sizeof(struct iwl3945_tfd_frame) *
323 txq->q.n_bd, txq->bd, txq->q.dma_addr);
324
325 /* De-alloc array of per-TFD driver data */
326 kfree(txq->txb);
327 txq->txb = NULL;
328
329 /* 0-fill queue descriptor structure */
330 memset(txq, 0, sizeof(*txq));
331}
332
333const u8 iwl3945_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
334 97
335/*************** STATION TABLE MANAGEMENT **** 98/*************** STATION TABLE MANAGEMENT ****
336 * mac80211 should be examined to determine if sta_info is duplicating 99 * mac80211 should be examined to determine if sta_info is duplicating
@@ -344,7 +107,7 @@ const u8 iwl3945_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
344 * 107 *
345 * NOTE: This does not remove station from device's station table. 108 * NOTE: This does not remove station from device's station table.
346 */ 109 */
347static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap) 110static u8 iwl3945_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
348{ 111{
349 int index = IWL_INVALID_STATION; 112 int index = IWL_INVALID_STATION;
350 int i; 113 int i;
@@ -355,11 +118,11 @@ static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int
355 if (is_ap) 118 if (is_ap)
356 index = IWL_AP_ID; 119 index = IWL_AP_ID;
357 else if (is_broadcast_ether_addr(addr)) 120 else if (is_broadcast_ether_addr(addr))
358 index = priv->hw_setting.bcast_sta_id; 121 index = priv->hw_params.bcast_sta_id;
359 else 122 else
360 for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++) 123 for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++)
361 if (priv->stations[i].used && 124 if (priv->stations_39[i].used &&
362 !compare_ether_addr(priv->stations[i].sta.sta.addr, 125 !compare_ether_addr(priv->stations_39[i].sta.sta.addr,
363 addr)) { 126 addr)) {
364 index = i; 127 index = i;
365 break; 128 break;
@@ -368,8 +131,8 @@ static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int
368 if (unlikely(index == IWL_INVALID_STATION)) 131 if (unlikely(index == IWL_INVALID_STATION))
369 goto out; 132 goto out;
370 133
371 if (priv->stations[index].used) { 134 if (priv->stations_39[index].used) {
372 priv->stations[index].used = 0; 135 priv->stations_39[index].used = 0;
373 priv->num_stations--; 136 priv->num_stations--;
374 } 137 }
375 138
@@ -386,14 +149,14 @@ out:
386 * 149 *
387 * NOTE: This does not clear or otherwise alter the device's station table. 150 * NOTE: This does not clear or otherwise alter the device's station table.
388 */ 151 */
389static void iwl3945_clear_stations_table(struct iwl3945_priv *priv) 152static void iwl3945_clear_stations_table(struct iwl_priv *priv)
390{ 153{
391 unsigned long flags; 154 unsigned long flags;
392 155
393 spin_lock_irqsave(&priv->sta_lock, flags); 156 spin_lock_irqsave(&priv->sta_lock, flags);
394 157
395 priv->num_stations = 0; 158 priv->num_stations = 0;
396 memset(priv->stations, 0, sizeof(priv->stations)); 159 memset(priv->stations_39, 0, sizeof(priv->stations_39));
397 160
398 spin_unlock_irqrestore(&priv->sta_lock, flags); 161 spin_unlock_irqrestore(&priv->sta_lock, flags);
399} 162}
@@ -401,7 +164,7 @@ static void iwl3945_clear_stations_table(struct iwl3945_priv *priv)
401/** 164/**
402 * iwl3945_add_station - Add station to station tables in driver and device 165 * iwl3945_add_station - Add station to station tables in driver and device
403 */ 166 */
404u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8 flags) 167u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
405{ 168{
406 int i; 169 int i;
407 int index = IWL_INVALID_STATION; 170 int index = IWL_INVALID_STATION;
@@ -413,16 +176,16 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
413 if (is_ap) 176 if (is_ap)
414 index = IWL_AP_ID; 177 index = IWL_AP_ID;
415 else if (is_broadcast_ether_addr(addr)) 178 else if (is_broadcast_ether_addr(addr))
416 index = priv->hw_setting.bcast_sta_id; 179 index = priv->hw_params.bcast_sta_id;
417 else 180 else
418 for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++) { 181 for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++) {
419 if (!compare_ether_addr(priv->stations[i].sta.sta.addr, 182 if (!compare_ether_addr(priv->stations_39[i].sta.sta.addr,
420 addr)) { 183 addr)) {
421 index = i; 184 index = i;
422 break; 185 break;
423 } 186 }
424 187
425 if (!priv->stations[i].used && 188 if (!priv->stations_39[i].used &&
426 index == IWL_INVALID_STATION) 189 index == IWL_INVALID_STATION)
427 index = i; 190 index = i;
428 } 191 }
@@ -434,14 +197,14 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
434 return index; 197 return index;
435 } 198 }
436 199
437 if (priv->stations[index].used && 200 if (priv->stations_39[index].used &&
438 !compare_ether_addr(priv->stations[index].sta.sta.addr, addr)) { 201 !compare_ether_addr(priv->stations_39[index].sta.sta.addr, addr)) {
439 spin_unlock_irqrestore(&priv->sta_lock, flags_spin); 202 spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
440 return index; 203 return index;
441 } 204 }
442 205
443 IWL_DEBUG_ASSOC("Add STA ID %d: %pM\n", index, addr); 206 IWL_DEBUG_ASSOC(priv, "Add STA ID %d: %pM\n", index, addr);
444 station = &priv->stations[index]; 207 station = &priv->stations_39[index];
445 station->used = 1; 208 station->used = 1;
446 priv->num_stations++; 209 priv->num_stations++;
447 210
@@ -460,531 +223,35 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
460 /* Turn on both antennas for the station... */ 223 /* Turn on both antennas for the station... */
461 station->sta.rate_n_flags = 224 station->sta.rate_n_flags =
462 iwl3945_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK); 225 iwl3945_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
463 station->current_rate.rate_n_flags =
464 le16_to_cpu(station->sta.rate_n_flags);
465 226
466 spin_unlock_irqrestore(&priv->sta_lock, flags_spin); 227 spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
467 228
468 /* Add station to device's station table */ 229 /* Add station to device's station table */
469 iwl3945_send_add_station(priv, &station->sta, flags); 230 iwl_send_add_sta(priv,
231 (struct iwl_addsta_cmd *)&station->sta, flags);
470 return index; 232 return index;
471 233
472} 234}
473 235
474/*************** DRIVER STATUS FUNCTIONS *****/ 236static int iwl3945_send_rxon_assoc(struct iwl_priv *priv)
475
476static inline int iwl3945_is_ready(struct iwl3945_priv *priv)
477{
478 /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
479 * set but EXIT_PENDING is not */
480 return test_bit(STATUS_READY, &priv->status) &&
481 test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&
482 !test_bit(STATUS_EXIT_PENDING, &priv->status);
483}
484
485static inline int iwl3945_is_alive(struct iwl3945_priv *priv)
486{
487 return test_bit(STATUS_ALIVE, &priv->status);
488}
489
490static inline int iwl3945_is_init(struct iwl3945_priv *priv)
491{
492 return test_bit(STATUS_INIT, &priv->status);
493}
494
495static inline int iwl3945_is_rfkill_sw(struct iwl3945_priv *priv)
496{
497 return test_bit(STATUS_RF_KILL_SW, &priv->status);
498}
499
500static inline int iwl3945_is_rfkill_hw(struct iwl3945_priv *priv)
501{
502 return test_bit(STATUS_RF_KILL_HW, &priv->status);
503}
504
505static inline int iwl3945_is_rfkill(struct iwl3945_priv *priv)
506{
507 return iwl3945_is_rfkill_hw(priv) ||
508 iwl3945_is_rfkill_sw(priv);
509}
510
511static inline int iwl3945_is_ready_rf(struct iwl3945_priv *priv)
512{
513
514 if (iwl3945_is_rfkill(priv))
515 return 0;
516
517 return iwl3945_is_ready(priv);
518}
519
520/*************** HOST COMMAND QUEUE FUNCTIONS *****/
521
522#define IWL_CMD(x) case x: return #x
523
524static const char *get_cmd_string(u8 cmd)
525{
526 switch (cmd) {
527 IWL_CMD(REPLY_ALIVE);
528 IWL_CMD(REPLY_ERROR);
529 IWL_CMD(REPLY_RXON);
530 IWL_CMD(REPLY_RXON_ASSOC);
531 IWL_CMD(REPLY_QOS_PARAM);
532 IWL_CMD(REPLY_RXON_TIMING);
533 IWL_CMD(REPLY_ADD_STA);
534 IWL_CMD(REPLY_REMOVE_STA);
535 IWL_CMD(REPLY_REMOVE_ALL_STA);
536 IWL_CMD(REPLY_3945_RX);
537 IWL_CMD(REPLY_TX);
538 IWL_CMD(REPLY_RATE_SCALE);
539 IWL_CMD(REPLY_LEDS_CMD);
540 IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
541 IWL_CMD(RADAR_NOTIFICATION);
542 IWL_CMD(REPLY_QUIET_CMD);
543 IWL_CMD(REPLY_CHANNEL_SWITCH);
544 IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);
545 IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
546 IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
547 IWL_CMD(POWER_TABLE_CMD);
548 IWL_CMD(PM_SLEEP_NOTIFICATION);
549 IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
550 IWL_CMD(REPLY_SCAN_CMD);
551 IWL_CMD(REPLY_SCAN_ABORT_CMD);
552 IWL_CMD(SCAN_START_NOTIFICATION);
553 IWL_CMD(SCAN_RESULTS_NOTIFICATION);
554 IWL_CMD(SCAN_COMPLETE_NOTIFICATION);
555 IWL_CMD(BEACON_NOTIFICATION);
556 IWL_CMD(REPLY_TX_BEACON);
557 IWL_CMD(WHO_IS_AWAKE_NOTIFICATION);
558 IWL_CMD(QUIET_NOTIFICATION);
559 IWL_CMD(REPLY_TX_PWR_TABLE_CMD);
560 IWL_CMD(MEASURE_ABORT_NOTIFICATION);
561 IWL_CMD(REPLY_BT_CONFIG);
562 IWL_CMD(REPLY_STATISTICS_CMD);
563 IWL_CMD(STATISTICS_NOTIFICATION);
564 IWL_CMD(REPLY_CARD_STATE_CMD);
565 IWL_CMD(CARD_STATE_NOTIFICATION);
566 IWL_CMD(MISSED_BEACONS_NOTIFICATION);
567 default:
568 return "UNKNOWN";
569
570 }
571}
572
573#define HOST_COMPLETE_TIMEOUT (HZ / 2)
574
575/**
576 * iwl3945_enqueue_hcmd - enqueue a uCode command
577 * @priv: device private data point
578 * @cmd: a point to the ucode command structure
579 *
580 * The function returns < 0 values to indicate the operation is
581 * failed. On success, it turns the index (> 0) of command in the
582 * command queue.
583 */
584static int iwl3945_enqueue_hcmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd)
585{
586 struct iwl3945_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM];
587 struct iwl3945_queue *q = &txq->q;
588 struct iwl3945_tfd_frame *tfd;
589 u32 *control_flags;
590 struct iwl3945_cmd *out_cmd;
591 u32 idx;
592 u16 fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
593 dma_addr_t phys_addr;
594 int pad;
595 u16 count;
596 int ret;
597 unsigned long flags;
598
599 /* If any of the command structures end up being larger than
600 * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
601 * we will need to increase the size of the TFD entries */
602 BUG_ON((fix_size > TFD_MAX_PAYLOAD_SIZE) &&
603 !(cmd->meta.flags & CMD_SIZE_HUGE));
604
605
606 if (iwl3945_is_rfkill(priv)) {
607 IWL_DEBUG_INFO("Not sending command - RF KILL");
608 return -EIO;
609 }
610
611 if (iwl3945_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) {
612 IWL_ERROR("No space for Tx\n");
613 return -ENOSPC;
614 }
615
616 spin_lock_irqsave(&priv->hcmd_lock, flags);
617
618 tfd = &txq->bd[q->write_ptr];
619 memset(tfd, 0, sizeof(*tfd));
620
621 control_flags = (u32 *) tfd;
622
623 idx = get_cmd_index(q, q->write_ptr, cmd->meta.flags & CMD_SIZE_HUGE);
624 out_cmd = &txq->cmd[idx];
625
626 out_cmd->hdr.cmd = cmd->id;
627 memcpy(&out_cmd->meta, &cmd->meta, sizeof(cmd->meta));
628 memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len);
629
630 /* At this point, the out_cmd now has all of the incoming cmd
631 * information */
632
633 out_cmd->hdr.flags = 0;
634 out_cmd->hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(IWL_CMD_QUEUE_NUM) |
635 INDEX_TO_SEQ(q->write_ptr));
636 if (out_cmd->meta.flags & CMD_SIZE_HUGE)
637 out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
638
639 phys_addr = txq->dma_addr_cmd + sizeof(txq->cmd[0]) * idx +
640 offsetof(struct iwl3945_cmd, hdr);
641 iwl3945_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
642
643 pad = U32_PAD(cmd->len);
644 count = TFD_CTL_COUNT_GET(*control_flags);
645 *control_flags = TFD_CTL_COUNT_SET(count) | TFD_CTL_PAD_SET(pad);
646
647 IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
648 "%d bytes at %d[%d]:%d\n",
649 get_cmd_string(out_cmd->hdr.cmd),
650 out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence),
651 fix_size, q->write_ptr, idx, IWL_CMD_QUEUE_NUM);
652
653 txq->need_update = 1;
654
655 /* Increment and update queue's write index */
656 q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
657 ret = iwl3945_tx_queue_update_write_ptr(priv, txq);
658
659 spin_unlock_irqrestore(&priv->hcmd_lock, flags);
660 return ret ? ret : idx;
661}
662
663static int iwl3945_send_cmd_async(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd)
664{
665 int ret;
666
667 BUG_ON(!(cmd->meta.flags & CMD_ASYNC));
668
669 /* An asynchronous command can not expect an SKB to be set. */
670 BUG_ON(cmd->meta.flags & CMD_WANT_SKB);
671
672 /* An asynchronous command MUST have a callback. */
673 BUG_ON(!cmd->meta.u.callback);
674
675 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
676 return -EBUSY;
677
678 ret = iwl3945_enqueue_hcmd(priv, cmd);
679 if (ret < 0) {
680 IWL_ERROR("Error sending %s: iwl3945_enqueue_hcmd failed: %d\n",
681 get_cmd_string(cmd->id), ret);
682 return ret;
683 }
684 return 0;
685}
686
687static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd)
688{
689 int cmd_idx;
690 int ret;
691
692 BUG_ON(cmd->meta.flags & CMD_ASYNC);
693
694 /* A synchronous command can not have a callback set. */
695 BUG_ON(cmd->meta.u.callback != NULL);
696
697 if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
698 IWL_ERROR("Error sending %s: Already sending a host command\n",
699 get_cmd_string(cmd->id));
700 ret = -EBUSY;
701 goto out;
702 }
703
704 set_bit(STATUS_HCMD_ACTIVE, &priv->status);
705
706 if (cmd->meta.flags & CMD_WANT_SKB)
707 cmd->meta.source = &cmd->meta;
708
709 cmd_idx = iwl3945_enqueue_hcmd(priv, cmd);
710 if (cmd_idx < 0) {
711 ret = cmd_idx;
712 IWL_ERROR("Error sending %s: iwl3945_enqueue_hcmd failed: %d\n",
713 get_cmd_string(cmd->id), ret);
714 goto out;
715 }
716
717 ret = wait_event_interruptible_timeout(priv->wait_command_queue,
718 !test_bit(STATUS_HCMD_ACTIVE, &priv->status),
719 HOST_COMPLETE_TIMEOUT);
720 if (!ret) {
721 if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
722 IWL_ERROR("Error sending %s: time out after %dms.\n",
723 get_cmd_string(cmd->id),
724 jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
725
726 clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
727 ret = -ETIMEDOUT;
728 goto cancel;
729 }
730 }
731
732 if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
733 IWL_DEBUG_INFO("Command %s aborted: RF KILL Switch\n",
734 get_cmd_string(cmd->id));
735 ret = -ECANCELED;
736 goto fail;
737 }
738 if (test_bit(STATUS_FW_ERROR, &priv->status)) {
739 IWL_DEBUG_INFO("Command %s failed: FW Error\n",
740 get_cmd_string(cmd->id));
741 ret = -EIO;
742 goto fail;
743 }
744 if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) {
745 IWL_ERROR("Error: Response NULL in '%s'\n",
746 get_cmd_string(cmd->id));
747 ret = -EIO;
748 goto cancel;
749 }
750
751 ret = 0;
752 goto out;
753
754cancel:
755 if (cmd->meta.flags & CMD_WANT_SKB) {
756 struct iwl3945_cmd *qcmd;
757
758 /* Cancel the CMD_WANT_SKB flag for the cmd in the
759 * TX cmd queue. Otherwise in case the cmd comes
760 * in later, it will possibly set an invalid
761 * address (cmd->meta.source). */
762 qcmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_idx];
763 qcmd->meta.flags &= ~CMD_WANT_SKB;
764 }
765fail:
766 if (cmd->meta.u.skb) {
767 dev_kfree_skb_any(cmd->meta.u.skb);
768 cmd->meta.u.skb = NULL;
769 }
770out:
771 clear_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status);
772 return ret;
773}
774
775int iwl3945_send_cmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd)
776{
777 if (cmd->meta.flags & CMD_ASYNC)
778 return iwl3945_send_cmd_async(priv, cmd);
779
780 return iwl3945_send_cmd_sync(priv, cmd);
781}
782
783int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, const void *data)
784{
785 struct iwl3945_host_cmd cmd = {
786 .id = id,
787 .len = len,
788 .data = data,
789 };
790
791 return iwl3945_send_cmd_sync(priv, &cmd);
792}
793
794static int __must_check iwl3945_send_cmd_u32(struct iwl3945_priv *priv, u8 id, u32 val)
795{
796 struct iwl3945_host_cmd cmd = {
797 .id = id,
798 .len = sizeof(val),
799 .data = &val,
800 };
801
802 return iwl3945_send_cmd_sync(priv, &cmd);
803}
804
805int iwl3945_send_statistics_request(struct iwl3945_priv *priv)
806{
807 return iwl3945_send_cmd_u32(priv, REPLY_STATISTICS_CMD, 0);
808}
809
810/**
811 * iwl3945_set_rxon_channel - Set the phymode and channel values in staging RXON
812 * @band: 2.4 or 5 GHz band
813 * @channel: Any channel valid for the requested band
814
815 * In addition to setting the staging RXON, priv->band is also set.
816 *
817 * NOTE: Does not commit to the hardware; it sets appropriate bit fields
818 * in the staging RXON flag structure based on the band
819 */
820static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv,
821 enum ieee80211_band band,
822 u16 channel)
823{
824 if (!iwl3945_get_channel_info(priv, band, channel)) {
825 IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",
826 channel, band);
827 return -EINVAL;
828 }
829
830 if ((le16_to_cpu(priv->staging_rxon.channel) == channel) &&
831 (priv->band == band))
832 return 0;
833
834 priv->staging_rxon.channel = cpu_to_le16(channel);
835 if (band == IEEE80211_BAND_5GHZ)
836 priv->staging_rxon.flags &= ~RXON_FLG_BAND_24G_MSK;
837 else
838 priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
839
840 priv->band = band;
841
842 IWL_DEBUG_INFO("Staging channel set to %d [%d]\n", channel, band);
843
844 return 0;
845}
846
847/**
848 * iwl3945_check_rxon_cmd - validate RXON structure is valid
849 *
850 * NOTE: This is really only useful during development and can eventually
851 * be #ifdef'd out once the driver is stable and folks aren't actively
852 * making changes
853 */
854static int iwl3945_check_rxon_cmd(struct iwl3945_rxon_cmd *rxon)
855{
856 int error = 0;
857 int counter = 1;
858
859 if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
860 error |= le32_to_cpu(rxon->flags &
861 (RXON_FLG_TGJ_NARROW_BAND_MSK |
862 RXON_FLG_RADAR_DETECT_MSK));
863 if (error)
864 IWL_WARNING("check 24G fields %d | %d\n",
865 counter++, error);
866 } else {
867 error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?
868 0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);
869 if (error)
870 IWL_WARNING("check 52 fields %d | %d\n",
871 counter++, error);
872 error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);
873 if (error)
874 IWL_WARNING("check 52 CCK %d | %d\n",
875 counter++, error);
876 }
877 error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;
878 if (error)
879 IWL_WARNING("check mac addr %d | %d\n", counter++, error);
880
881 /* make sure basic rates 6Mbps and 1Mbps are supported */
882 error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&
883 ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));
884 if (error)
885 IWL_WARNING("check basic rate %d | %d\n", counter++, error);
886
887 error |= (le16_to_cpu(rxon->assoc_id) > 2007);
888 if (error)
889 IWL_WARNING("check assoc id %d | %d\n", counter++, error);
890
891 error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
892 == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));
893 if (error)
894 IWL_WARNING("check CCK and short slot %d | %d\n",
895 counter++, error);
896
897 error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
898 == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));
899 if (error)
900 IWL_WARNING("check CCK & auto detect %d | %d\n",
901 counter++, error);
902
903 error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
904 RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);
905 if (error)
906 IWL_WARNING("check TGG and auto detect %d | %d\n",
907 counter++, error);
908
909 if ((rxon->flags & RXON_FLG_DIS_DIV_MSK))
910 error |= ((rxon->flags & (RXON_FLG_ANT_B_MSK |
911 RXON_FLG_ANT_A_MSK)) == 0);
912 if (error)
913 IWL_WARNING("check antenna %d %d\n", counter++, error);
914
915 if (error)
916 IWL_WARNING("Tuning to channel %d\n",
917 le16_to_cpu(rxon->channel));
918
919 if (error) {
920 IWL_ERROR("Not a valid iwl3945_rxon_assoc_cmd field values\n");
921 return -1;
922 }
923 return 0;
924}
925
926/**
927 * iwl3945_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
928 * @priv: staging_rxon is compared to active_rxon
929 *
930 * If the RXON structure is changing enough to require a new tune,
931 * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
932 * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
933 */
934static int iwl3945_full_rxon_required(struct iwl3945_priv *priv)
935{
936
937 /* These items are only settable from the full RXON command */
938 if (!(iwl3945_is_associated(priv)) ||
939 compare_ether_addr(priv->staging_rxon.bssid_addr,
940 priv->active_rxon.bssid_addr) ||
941 compare_ether_addr(priv->staging_rxon.node_addr,
942 priv->active_rxon.node_addr) ||
943 compare_ether_addr(priv->staging_rxon.wlap_bssid_addr,
944 priv->active_rxon.wlap_bssid_addr) ||
945 (priv->staging_rxon.dev_type != priv->active_rxon.dev_type) ||
946 (priv->staging_rxon.channel != priv->active_rxon.channel) ||
947 (priv->staging_rxon.air_propagation !=
948 priv->active_rxon.air_propagation) ||
949 (priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id))
950 return 1;
951
952 /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
953 * be updated with the RXON_ASSOC command -- however only some
954 * flag transitions are allowed using RXON_ASSOC */
955
956 /* Check if we are not switching bands */
957 if ((priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) !=
958 (priv->active_rxon.flags & RXON_FLG_BAND_24G_MSK))
959 return 1;
960
961 /* Check if we are switching association toggle */
962 if ((priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) !=
963 (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK))
964 return 1;
965
966 return 0;
967}
968
969static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv)
970{ 237{
971 int rc = 0; 238 int rc = 0;
972 struct iwl3945_rx_packet *res = NULL; 239 struct iwl_rx_packet *res = NULL;
973 struct iwl3945_rxon_assoc_cmd rxon_assoc; 240 struct iwl3945_rxon_assoc_cmd rxon_assoc;
974 struct iwl3945_host_cmd cmd = { 241 struct iwl_host_cmd cmd = {
975 .id = REPLY_RXON_ASSOC, 242 .id = REPLY_RXON_ASSOC,
976 .len = sizeof(rxon_assoc), 243 .len = sizeof(rxon_assoc),
977 .meta.flags = CMD_WANT_SKB, 244 .meta.flags = CMD_WANT_SKB,
978 .data = &rxon_assoc, 245 .data = &rxon_assoc,
979 }; 246 };
980 const struct iwl3945_rxon_cmd *rxon1 = &priv->staging_rxon; 247 const struct iwl_rxon_cmd *rxon1 = &priv->staging_rxon;
981 const struct iwl3945_rxon_cmd *rxon2 = &priv->active_rxon; 248 const struct iwl_rxon_cmd *rxon2 = &priv->active_rxon;
982 249
983 if ((rxon1->flags == rxon2->flags) && 250 if ((rxon1->flags == rxon2->flags) &&
984 (rxon1->filter_flags == rxon2->filter_flags) && 251 (rxon1->filter_flags == rxon2->filter_flags) &&
985 (rxon1->cck_basic_rates == rxon2->cck_basic_rates) && 252 (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&
986 (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) { 253 (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {
987 IWL_DEBUG_INFO("Using current RXON_ASSOC. Not resending.\n"); 254 IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC. Not resending.\n");
988 return 0; 255 return 0;
989 } 256 }
990 257
@@ -994,13 +261,13 @@ static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv)
994 rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates; 261 rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates;
995 rxon_assoc.reserved = 0; 262 rxon_assoc.reserved = 0;
996 263
997 rc = iwl3945_send_cmd_sync(priv, &cmd); 264 rc = iwl_send_cmd_sync(priv, &cmd);
998 if (rc) 265 if (rc)
999 return rc; 266 return rc;
1000 267
1001 res = (struct iwl3945_rx_packet *)cmd.meta.u.skb->data; 268 res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
1002 if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 269 if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
1003 IWL_ERROR("Bad return from REPLY_RXON_ASSOC command\n"); 270 IWL_ERR(priv, "Bad return from REPLY_RXON_ASSOC command\n");
1004 rc = -EIO; 271 rc = -EIO;
1005 } 272 }
1006 273
@@ -1011,6 +278,43 @@ static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv)
1011} 278}
1012 279
1013/** 280/**
281 * iwl3945_get_antenna_flags - Get antenna flags for RXON command
282 * @priv: eeprom and antenna fields are used to determine antenna flags
283 *
284 * priv->eeprom39 is used to determine if antenna AUX/MAIN are reversed
285 * iwl3945_mod_params.antenna specifies the antenna diversity mode:
286 *
287 * IWL_ANTENNA_DIVERSITY - NIC selects best antenna by itself
288 * IWL_ANTENNA_MAIN - Force MAIN antenna
289 * IWL_ANTENNA_AUX - Force AUX antenna
290 */
291__le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv)
292{
293 struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
294
295 switch (iwl3945_mod_params.antenna) {
296 case IWL_ANTENNA_DIVERSITY:
297 return 0;
298
299 case IWL_ANTENNA_MAIN:
300 if (eeprom->antenna_switch_type)
301 return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
302 return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
303
304 case IWL_ANTENNA_AUX:
305 if (eeprom->antenna_switch_type)
306 return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
307 return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
308 }
309
310 /* bad antenna selector value */
311 IWL_ERR(priv, "Bad antenna selector value (0x%x)\n",
312 iwl3945_mod_params.antenna);
313
314 return 0; /* "diversity" is default if error */
315}
316
317/**
1014 * iwl3945_commit_rxon - commit staging_rxon to hardware 318 * iwl3945_commit_rxon - commit staging_rxon to hardware
1015 * 319 *
1016 * The RXON command in staging_rxon is committed to the hardware and 320 * The RXON command in staging_rxon is committed to the hardware and
@@ -1018,41 +322,42 @@ static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv)
1018 * function correctly transitions out of the RXON_ASSOC_MSK state if 322 * function correctly transitions out of the RXON_ASSOC_MSK state if
1019 * a HW tune is required based on the RXON structure changes. 323 * a HW tune is required based on the RXON structure changes.
1020 */ 324 */
1021static int iwl3945_commit_rxon(struct iwl3945_priv *priv) 325static int iwl3945_commit_rxon(struct iwl_priv *priv)
1022{ 326{
1023 /* cast away the const for active_rxon in this function */ 327 /* cast away the const for active_rxon in this function */
1024 struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon; 328 struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
329 struct iwl3945_rxon_cmd *staging_rxon = (void *)&priv->staging_rxon;
1025 int rc = 0; 330 int rc = 0;
1026 331
1027 if (!iwl3945_is_alive(priv)) 332 if (!iwl_is_alive(priv))
1028 return -1; 333 return -1;
1029 334
1030 /* always get timestamp with Rx frame */ 335 /* always get timestamp with Rx frame */
1031 priv->staging_rxon.flags |= RXON_FLG_TSF2HOST_MSK; 336 staging_rxon->flags |= RXON_FLG_TSF2HOST_MSK;
1032 337
1033 /* select antenna */ 338 /* select antenna */
1034 priv->staging_rxon.flags &= 339 staging_rxon->flags &=
1035 ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK); 340 ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK);
1036 priv->staging_rxon.flags |= iwl3945_get_antenna_flags(priv); 341 staging_rxon->flags |= iwl3945_get_antenna_flags(priv);
1037 342
1038 rc = iwl3945_check_rxon_cmd(&priv->staging_rxon); 343 rc = iwl_check_rxon_cmd(priv);
1039 if (rc) { 344 if (rc) {
1040 IWL_ERROR("Invalid RXON configuration. Not committing.\n"); 345 IWL_ERR(priv, "Invalid RXON configuration. Not committing.\n");
1041 return -EINVAL; 346 return -EINVAL;
1042 } 347 }
1043 348
1044 /* If we don't need to send a full RXON, we can use 349 /* If we don't need to send a full RXON, we can use
1045 * iwl3945_rxon_assoc_cmd which is used to reconfigure filter 350 * iwl3945_rxon_assoc_cmd which is used to reconfigure filter
1046 * and other flags for the current radio configuration. */ 351 * and other flags for the current radio configuration. */
1047 if (!iwl3945_full_rxon_required(priv)) { 352 if (!iwl_full_rxon_required(priv)) {
1048 rc = iwl3945_send_rxon_assoc(priv); 353 rc = iwl3945_send_rxon_assoc(priv);
1049 if (rc) { 354 if (rc) {
1050 IWL_ERROR("Error setting RXON_ASSOC " 355 IWL_ERR(priv, "Error setting RXON_ASSOC "
1051 "configuration (%d).\n", rc); 356 "configuration (%d).\n", rc);
1052 return rc; 357 return rc;
1053 } 358 }
1054 359
1055 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); 360 memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
1056 361
1057 return 0; 362 return 0;
1058 } 363 }
@@ -1061,12 +366,18 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
1061 * an RXON_ASSOC and the new config wants the associated mask enabled, 366 * an RXON_ASSOC and the new config wants the associated mask enabled,
1062 * we must clear the associated from the active configuration 367 * we must clear the associated from the active configuration
1063 * before we apply the new config */ 368 * before we apply the new config */
1064 if (iwl3945_is_associated(priv) && 369 if (iwl_is_associated(priv) &&
1065 (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK)) { 370 (staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK)) {
1066 IWL_DEBUG_INFO("Toggling associated bit on current RXON\n"); 371 IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");
1067 active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; 372 active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
1068 373
1069 rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON, 374 /*
375 * reserved4 and 5 could have been filled by the iwlcore code.
376 * Let's clear them before pushing to the 3945.
377 */
378 active_rxon->reserved4 = 0;
379 active_rxon->reserved5 = 0;
380 rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
1070 sizeof(struct iwl3945_rxon_cmd), 381 sizeof(struct iwl3945_rxon_cmd),
1071 &priv->active_rxon); 382 &priv->active_rxon);
1072 383
@@ -1074,231 +385,78 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
1074 * active_rxon back to what it was previously */ 385 * active_rxon back to what it was previously */
1075 if (rc) { 386 if (rc) {
1076 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK; 387 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
1077 IWL_ERROR("Error clearing ASSOC_MSK on current " 388 IWL_ERR(priv, "Error clearing ASSOC_MSK on current "
1078 "configuration (%d).\n", rc); 389 "configuration (%d).\n", rc);
1079 return rc; 390 return rc;
1080 } 391 }
1081 } 392 }
1082 393
1083 IWL_DEBUG_INFO("Sending RXON\n" 394 IWL_DEBUG_INFO(priv, "Sending RXON\n"
1084 "* with%s RXON_FILTER_ASSOC_MSK\n" 395 "* with%s RXON_FILTER_ASSOC_MSK\n"
1085 "* channel = %d\n" 396 "* channel = %d\n"
1086 "* bssid = %pM\n", 397 "* bssid = %pM\n",
1087 ((priv->staging_rxon.filter_flags & 398 ((priv->staging_rxon.filter_flags &
1088 RXON_FILTER_ASSOC_MSK) ? "" : "out"), 399 RXON_FILTER_ASSOC_MSK) ? "" : "out"),
1089 le16_to_cpu(priv->staging_rxon.channel), 400 le16_to_cpu(staging_rxon->channel),
1090 priv->staging_rxon.bssid_addr); 401 staging_rxon->bssid_addr);
402
403 /*
404 * reserved4 and 5 could have been filled by the iwlcore code.
405 * Let's clear them before pushing to the 3945.
406 */
407 staging_rxon->reserved4 = 0;
408 staging_rxon->reserved5 = 0;
1091 409
1092 /* Apply the new configuration */ 410 /* Apply the new configuration */
1093 rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON, 411 rc = iwl_send_cmd_pdu(priv, REPLY_RXON,
1094 sizeof(struct iwl3945_rxon_cmd), &priv->staging_rxon); 412 sizeof(struct iwl3945_rxon_cmd),
413 staging_rxon);
1095 if (rc) { 414 if (rc) {
1096 IWL_ERROR("Error setting new configuration (%d).\n", rc); 415 IWL_ERR(priv, "Error setting new configuration (%d).\n", rc);
1097 return rc; 416 return rc;
1098 } 417 }
1099 418
1100 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); 419 memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
1101 420
1102 iwl3945_clear_stations_table(priv); 421 iwl3945_clear_stations_table(priv);
1103 422
1104 /* If we issue a new RXON command which required a tune then we must 423 /* If we issue a new RXON command which required a tune then we must
1105 * send a new TXPOWER command or we won't be able to Tx any frames */ 424 * send a new TXPOWER command or we won't be able to Tx any frames */
1106 rc = iwl3945_hw_reg_send_txpower(priv); 425 rc = priv->cfg->ops->lib->send_tx_power(priv);
1107 if (rc) { 426 if (rc) {
1108 IWL_ERROR("Error setting Tx power (%d).\n", rc); 427 IWL_ERR(priv, "Error setting Tx power (%d).\n", rc);
1109 return rc; 428 return rc;
1110 } 429 }
1111 430
1112 /* Add the broadcast address so we can send broadcast frames */ 431 /* Add the broadcast address so we can send broadcast frames */
1113 if (iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0) == 432 if (iwl3945_add_station(priv, iwl_bcast_addr, 0, 0) ==
1114 IWL_INVALID_STATION) { 433 IWL_INVALID_STATION) {
1115 IWL_ERROR("Error adding BROADCAST address for transmit.\n"); 434 IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");
1116 return -EIO; 435 return -EIO;
1117 } 436 }
1118 437
1119 /* If we have set the ASSOC_MSK and we are in BSS mode then 438 /* If we have set the ASSOC_MSK and we are in BSS mode then
1120 * add the IWL_AP_ID to the station rate table */ 439 * add the IWL_AP_ID to the station rate table */
1121 if (iwl3945_is_associated(priv) && 440 if (iwl_is_associated(priv) &&
1122 (priv->iw_mode == NL80211_IFTYPE_STATION)) 441 (priv->iw_mode == NL80211_IFTYPE_STATION))
1123 if (iwl3945_add_station(priv, priv->active_rxon.bssid_addr, 1, 0) 442 if (iwl3945_add_station(priv, priv->active_rxon.bssid_addr,
443 1, 0)
1124 == IWL_INVALID_STATION) { 444 == IWL_INVALID_STATION) {
1125 IWL_ERROR("Error adding AP address for transmit.\n"); 445 IWL_ERR(priv, "Error adding AP address for transmit\n");
1126 return -EIO; 446 return -EIO;
1127 } 447 }
1128 448
1129 /* Init the hardware's rate fallback order based on the band */ 449 /* Init the hardware's rate fallback order based on the band */
1130 rc = iwl3945_init_hw_rate_table(priv); 450 rc = iwl3945_init_hw_rate_table(priv);
1131 if (rc) { 451 if (rc) {
1132 IWL_ERROR("Error setting HW rate table: %02X\n", rc); 452 IWL_ERR(priv, "Error setting HW rate table: %02X\n", rc);
1133 return -EIO; 453 return -EIO;
1134 } 454 }
1135 455
1136 return 0; 456 return 0;
1137} 457}
1138 458
1139static int iwl3945_send_bt_config(struct iwl3945_priv *priv) 459static int iwl3945_update_sta_key_info(struct iwl_priv *priv,
1140{
1141 struct iwl3945_bt_cmd bt_cmd = {
1142 .flags = 3,
1143 .lead_time = 0xAA,
1144 .max_kill = 1,
1145 .kill_ack_mask = 0,
1146 .kill_cts_mask = 0,
1147 };
1148
1149 return iwl3945_send_cmd_pdu(priv, REPLY_BT_CONFIG,
1150 sizeof(struct iwl3945_bt_cmd), &bt_cmd);
1151}
1152
1153static int iwl3945_send_scan_abort(struct iwl3945_priv *priv)
1154{
1155 int rc = 0;
1156 struct iwl3945_rx_packet *res;
1157 struct iwl3945_host_cmd cmd = {
1158 .id = REPLY_SCAN_ABORT_CMD,
1159 .meta.flags = CMD_WANT_SKB,
1160 };
1161
1162 /* If there isn't a scan actively going on in the hardware
1163 * then we are in between scan bands and not actually
1164 * actively scanning, so don't send the abort command */
1165 if (!test_bit(STATUS_SCAN_HW, &priv->status)) {
1166 clear_bit(STATUS_SCAN_ABORTING, &priv->status);
1167 return 0;
1168 }
1169
1170 rc = iwl3945_send_cmd_sync(priv, &cmd);
1171 if (rc) {
1172 clear_bit(STATUS_SCAN_ABORTING, &priv->status);
1173 return rc;
1174 }
1175
1176 res = (struct iwl3945_rx_packet *)cmd.meta.u.skb->data;
1177 if (res->u.status != CAN_ABORT_STATUS) {
1178 /* The scan abort will return 1 for success or
1179 * 2 for "failure". A failure condition can be
1180 * due to simply not being in an active scan which
1181 * can occur if we send the scan abort before we
1182 * the microcode has notified us that a scan is
1183 * completed. */
1184 IWL_DEBUG_INFO("SCAN_ABORT returned %d.\n", res->u.status);
1185 clear_bit(STATUS_SCAN_ABORTING, &priv->status);
1186 clear_bit(STATUS_SCAN_HW, &priv->status);
1187 }
1188
1189 dev_kfree_skb_any(cmd.meta.u.skb);
1190
1191 return rc;
1192}
1193
1194static int iwl3945_card_state_sync_callback(struct iwl3945_priv *priv,
1195 struct iwl3945_cmd *cmd,
1196 struct sk_buff *skb)
1197{
1198 return 1;
1199}
1200
1201/*
1202 * CARD_STATE_CMD
1203 *
1204 * Use: Sets the device's internal card state to enable, disable, or halt
1205 *
1206 * When in the 'enable' state the card operates as normal.
1207 * When in the 'disable' state, the card enters into a low power mode.
1208 * When in the 'halt' state, the card is shut down and must be fully
1209 * restarted to come back on.
1210 */
1211static int iwl3945_send_card_state(struct iwl3945_priv *priv, u32 flags, u8 meta_flag)
1212{
1213 struct iwl3945_host_cmd cmd = {
1214 .id = REPLY_CARD_STATE_CMD,
1215 .len = sizeof(u32),
1216 .data = &flags,
1217 .meta.flags = meta_flag,
1218 };
1219
1220 if (meta_flag & CMD_ASYNC)
1221 cmd.meta.u.callback = iwl3945_card_state_sync_callback;
1222
1223 return iwl3945_send_cmd(priv, &cmd);
1224}
1225
1226static int iwl3945_add_sta_sync_callback(struct iwl3945_priv *priv,
1227 struct iwl3945_cmd *cmd, struct sk_buff *skb)
1228{
1229 struct iwl3945_rx_packet *res = NULL;
1230
1231 if (!skb) {
1232 IWL_ERROR("Error: Response NULL in REPLY_ADD_STA.\n");
1233 return 1;
1234 }
1235
1236 res = (struct iwl3945_rx_packet *)skb->data;
1237 if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
1238 IWL_ERROR("Bad return from REPLY_ADD_STA (0x%08X)\n",
1239 res->hdr.flags);
1240 return 1;
1241 }
1242
1243 switch (res->u.add_sta.status) {
1244 case ADD_STA_SUCCESS_MSK:
1245 break;
1246 default:
1247 break;
1248 }
1249
1250 /* We didn't cache the SKB; let the caller free it */
1251 return 1;
1252}
1253
1254int iwl3945_send_add_station(struct iwl3945_priv *priv,
1255 struct iwl3945_addsta_cmd *sta, u8 flags)
1256{
1257 struct iwl3945_rx_packet *res = NULL;
1258 int rc = 0;
1259 struct iwl3945_host_cmd cmd = {
1260 .id = REPLY_ADD_STA,
1261 .len = sizeof(struct iwl3945_addsta_cmd),
1262 .meta.flags = flags,
1263 .data = sta,
1264 };
1265
1266 if (flags & CMD_ASYNC)
1267 cmd.meta.u.callback = iwl3945_add_sta_sync_callback;
1268 else
1269 cmd.meta.flags |= CMD_WANT_SKB;
1270
1271 rc = iwl3945_send_cmd(priv, &cmd);
1272
1273 if (rc || (flags & CMD_ASYNC))
1274 return rc;
1275
1276 res = (struct iwl3945_rx_packet *)cmd.meta.u.skb->data;
1277 if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
1278 IWL_ERROR("Bad return from REPLY_ADD_STA (0x%08X)\n",
1279 res->hdr.flags);
1280 rc = -EIO;
1281 }
1282
1283 if (rc == 0) {
1284 switch (res->u.add_sta.status) {
1285 case ADD_STA_SUCCESS_MSK:
1286 IWL_DEBUG_INFO("REPLY_ADD_STA PASSED\n");
1287 break;
1288 default:
1289 rc = -EIO;
1290 IWL_WARNING("REPLY_ADD_STA failed\n");
1291 break;
1292 }
1293 }
1294
1295 priv->alloc_rxb_skb--;
1296 dev_kfree_skb_any(cmd.meta.u.skb);
1297
1298 return rc;
1299}
1300
1301static int iwl3945_update_sta_key_info(struct iwl3945_priv *priv,
1302 struct ieee80211_key_conf *keyconf, 460 struct ieee80211_key_conf *keyconf,
1303 u8 sta_id) 461 u8 sta_id)
1304{ 462{
@@ -1318,46 +476,49 @@ static int iwl3945_update_sta_key_info(struct iwl3945_priv *priv,
1318 return -EINVAL; 476 return -EINVAL;
1319 } 477 }
1320 spin_lock_irqsave(&priv->sta_lock, flags); 478 spin_lock_irqsave(&priv->sta_lock, flags);
1321 priv->stations[sta_id].keyinfo.alg = keyconf->alg; 479 priv->stations_39[sta_id].keyinfo.alg = keyconf->alg;
1322 priv->stations[sta_id].keyinfo.keylen = keyconf->keylen; 480 priv->stations_39[sta_id].keyinfo.keylen = keyconf->keylen;
1323 memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 481 memcpy(priv->stations_39[sta_id].keyinfo.key, keyconf->key,
1324 keyconf->keylen); 482 keyconf->keylen);
1325 483
1326 memcpy(priv->stations[sta_id].sta.key.key, keyconf->key, 484 memcpy(priv->stations_39[sta_id].sta.key.key, keyconf->key,
1327 keyconf->keylen); 485 keyconf->keylen);
1328 priv->stations[sta_id].sta.key.key_flags = key_flags; 486 priv->stations_39[sta_id].sta.key.key_flags = key_flags;
1329 priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; 487 priv->stations_39[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
1330 priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; 488 priv->stations_39[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
1331 489
1332 spin_unlock_irqrestore(&priv->sta_lock, flags); 490 spin_unlock_irqrestore(&priv->sta_lock, flags);
1333 491
1334 IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n"); 492 IWL_DEBUG_INFO(priv, "hwcrypto: modify ucode station key info\n");
1335 iwl3945_send_add_station(priv, &priv->stations[sta_id].sta, 0); 493 iwl_send_add_sta(priv,
494 (struct iwl_addsta_cmd *)&priv->stations_39[sta_id].sta, 0);
1336 return 0; 495 return 0;
1337} 496}
1338 497
1339static int iwl3945_clear_sta_key_info(struct iwl3945_priv *priv, u8 sta_id) 498static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
1340{ 499{
1341 unsigned long flags; 500 unsigned long flags;
1342 501
1343 spin_lock_irqsave(&priv->sta_lock, flags); 502 spin_lock_irqsave(&priv->sta_lock, flags);
1344 memset(&priv->stations[sta_id].keyinfo, 0, sizeof(struct iwl3945_hw_key)); 503 memset(&priv->stations_39[sta_id].keyinfo, 0, sizeof(struct iwl3945_hw_key));
1345 memset(&priv->stations[sta_id].sta.key, 0, sizeof(struct iwl3945_keyinfo)); 504 memset(&priv->stations_39[sta_id].sta.key, 0,
1346 priv->stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC; 505 sizeof(struct iwl4965_keyinfo));
1347 priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; 506 priv->stations_39[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;
1348 priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; 507 priv->stations_39[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
508 priv->stations_39[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
1349 spin_unlock_irqrestore(&priv->sta_lock, flags); 509 spin_unlock_irqrestore(&priv->sta_lock, flags);
1350 510
1351 IWL_DEBUG_INFO("hwcrypto: clear ucode station key info\n"); 511 IWL_DEBUG_INFO(priv, "hwcrypto: clear ucode station key info\n");
1352 iwl3945_send_add_station(priv, &priv->stations[sta_id].sta, 0); 512 iwl_send_add_sta(priv,
513 (struct iwl_addsta_cmd *)&priv->stations_39[sta_id].sta, 0);
1353 return 0; 514 return 0;
1354} 515}
1355 516
1356static void iwl3945_clear_free_frames(struct iwl3945_priv *priv) 517static void iwl3945_clear_free_frames(struct iwl_priv *priv)
1357{ 518{
1358 struct list_head *element; 519 struct list_head *element;
1359 520
1360 IWL_DEBUG_INFO("%d frames on pre-allocated heap on clear.\n", 521 IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",
1361 priv->frames_count); 522 priv->frames_count);
1362 523
1363 while (!list_empty(&priv->free_frames)) { 524 while (!list_empty(&priv->free_frames)) {
@@ -1368,20 +529,20 @@ static void iwl3945_clear_free_frames(struct iwl3945_priv *priv)
1368 } 529 }
1369 530
1370 if (priv->frames_count) { 531 if (priv->frames_count) {
1371 IWL_WARNING("%d frames still in use. Did we lose one?\n", 532 IWL_WARN(priv, "%d frames still in use. Did we lose one?\n",
1372 priv->frames_count); 533 priv->frames_count);
1373 priv->frames_count = 0; 534 priv->frames_count = 0;
1374 } 535 }
1375} 536}
1376 537
1377static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl3945_priv *priv) 538static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv)
1378{ 539{
1379 struct iwl3945_frame *frame; 540 struct iwl3945_frame *frame;
1380 struct list_head *element; 541 struct list_head *element;
1381 if (list_empty(&priv->free_frames)) { 542 if (list_empty(&priv->free_frames)) {
1382 frame = kzalloc(sizeof(*frame), GFP_KERNEL); 543 frame = kzalloc(sizeof(*frame), GFP_KERNEL);
1383 if (!frame) { 544 if (!frame) {
1384 IWL_ERROR("Could not allocate frame!\n"); 545 IWL_ERR(priv, "Could not allocate frame!\n");
1385 return NULL; 546 return NULL;
1386 } 547 }
1387 548
@@ -1394,18 +555,18 @@ static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl3945_priv *priv)
1394 return list_entry(element, struct iwl3945_frame, list); 555 return list_entry(element, struct iwl3945_frame, list);
1395} 556}
1396 557
1397static void iwl3945_free_frame(struct iwl3945_priv *priv, struct iwl3945_frame *frame) 558static void iwl3945_free_frame(struct iwl_priv *priv, struct iwl3945_frame *frame)
1398{ 559{
1399 memset(frame, 0, sizeof(*frame)); 560 memset(frame, 0, sizeof(*frame));
1400 list_add(&frame->list, &priv->free_frames); 561 list_add(&frame->list, &priv->free_frames);
1401} 562}
1402 563
1403unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, 564unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
1404 struct ieee80211_hdr *hdr, 565 struct ieee80211_hdr *hdr,
1405 int left) 566 int left)
1406{ 567{
1407 568
1408 if (!iwl3945_is_associated(priv) || !priv->ibss_beacon || 569 if (!iwl_is_associated(priv) || !priv->ibss_beacon ||
1409 ((priv->iw_mode != NL80211_IFTYPE_ADHOC) && 570 ((priv->iw_mode != NL80211_IFTYPE_ADHOC) &&
1410 (priv->iw_mode != NL80211_IFTYPE_AP))) 571 (priv->iw_mode != NL80211_IFTYPE_AP)))
1411 return 0; 572 return 0;
@@ -1418,31 +579,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv,
1418 return priv->ibss_beacon->len; 579 return priv->ibss_beacon->len;
1419} 580}
1420 581
1421static u8 iwl3945_rate_get_lowest_plcp(struct iwl3945_priv *priv) 582static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)
1422{
1423 u8 i;
1424 int rate_mask;
1425
1426 /* Set rate mask*/
1427 if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK)
1428 rate_mask = priv->active_rate_basic & IWL_CCK_RATES_MASK;
1429 else
1430 rate_mask = priv->active_rate_basic & IWL_OFDM_RATES_MASK;
1431
1432 for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID;
1433 i = iwl3945_rates[i].next_ieee) {
1434 if (rate_mask & (1 << i))
1435 return iwl3945_rates[i].plcp;
1436 }
1437
1438 /* No valid rate was found. Assign the lowest one */
1439 if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK)
1440 return IWL_RATE_1M_PLCP;
1441 else
1442 return IWL_RATE_6M_PLCP;
1443}
1444
1445static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv)
1446{ 583{
1447 struct iwl3945_frame *frame; 584 struct iwl3945_frame *frame;
1448 unsigned int frame_size; 585 unsigned int frame_size;
@@ -1452,16 +589,16 @@ static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv)
1452 frame = iwl3945_get_free_frame(priv); 589 frame = iwl3945_get_free_frame(priv);
1453 590
1454 if (!frame) { 591 if (!frame) {
1455 IWL_ERROR("Could not obtain free frame buffer for beacon " 592 IWL_ERR(priv, "Could not obtain free frame buffer for beacon "
1456 "command.\n"); 593 "command.\n");
1457 return -ENOMEM; 594 return -ENOMEM;
1458 } 595 }
1459 596
1460 rate = iwl3945_rate_get_lowest_plcp(priv); 597 rate = iwl_rate_get_lowest_plcp(priv);
1461 598
1462 frame_size = iwl3945_hw_get_beacon_cmd(priv, frame, rate); 599 frame_size = iwl3945_hw_get_beacon_cmd(priv, frame, rate);
1463 600
1464 rc = iwl3945_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size, 601 rc = iwl_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
1465 &frame->u.cmd[0]); 602 &frame->u.cmd[0]);
1466 603
1467 iwl3945_free_frame(priv, frame); 604 iwl3945_free_frame(priv, frame);
@@ -1469,307 +606,27 @@ static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv)
1469 return rc; 606 return rc;
1470} 607}
1471 608
1472/****************************************************************************** 609static void iwl3945_unset_hw_params(struct iwl_priv *priv)
1473 *
1474 * EEPROM related functions
1475 *
1476 ******************************************************************************/
1477
1478static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac)
1479{ 610{
1480 memcpy(mac, priv->eeprom.mac_address, 6); 611 if (priv->shared_virt)
1481}
1482
1483/*
1484 * Clear the OWNER_MSK, to establish driver (instead of uCode running on
1485 * embedded controller) as EEPROM reader; each read is a series of pulses
1486 * to/from the EEPROM chip, not a single event, so even reads could conflict
1487 * if they weren't arbitrated by some ownership mechanism. Here, the driver
1488 * simply claims ownership, which should be safe when this function is called
1489 * (i.e. before loading uCode!).
1490 */
1491static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv)
1492{
1493 _iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
1494 return 0;
1495}
1496
1497/**
1498 * iwl3945_eeprom_init - read EEPROM contents
1499 *
1500 * Load the EEPROM contents from adapter into priv->eeprom
1501 *
1502 * NOTE: This routine uses the non-debug IO access functions.
1503 */
1504int iwl3945_eeprom_init(struct iwl3945_priv *priv)
1505{
1506 u16 *e = (u16 *)&priv->eeprom;
1507 u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP);
1508 int sz = sizeof(priv->eeprom);
1509 int ret;
1510 u16 addr;
1511
1512 /* The EEPROM structure has several padding buffers within it
1513 * and when adding new EEPROM maps is subject to programmer errors
1514 * which may be very difficult to identify without explicitly
1515 * checking the resulting size of the eeprom map. */
1516 BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);
1517
1518 if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
1519 IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
1520 return -ENOENT;
1521 }
1522
1523 /* Make sure driver (instead of uCode) is allowed to read EEPROM */
1524 ret = iwl3945_eeprom_acquire_semaphore(priv);
1525 if (ret < 0) {
1526 IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
1527 return -ENOENT;
1528 }
1529
1530 /* eeprom is an array of 16bit values */
1531 for (addr = 0; addr < sz; addr += sizeof(u16)) {
1532 u32 r;
1533
1534 _iwl3945_write32(priv, CSR_EEPROM_REG,
1535 CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
1536 _iwl3945_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);
1537 ret = iwl3945_poll_direct_bit(priv, CSR_EEPROM_REG,
1538 CSR_EEPROM_REG_READ_VALID_MSK,
1539 IWL_EEPROM_ACCESS_TIMEOUT);
1540 if (ret < 0) {
1541 IWL_ERROR("Time out reading EEPROM[%d]\n", addr);
1542 return ret;
1543 }
1544
1545 r = _iwl3945_read_direct32(priv, CSR_EEPROM_REG);
1546 e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
1547 }
1548
1549 return 0;
1550}
1551
1552static void iwl3945_unset_hw_setting(struct iwl3945_priv *priv)
1553{
1554 if (priv->hw_setting.shared_virt)
1555 pci_free_consistent(priv->pci_dev, 612 pci_free_consistent(priv->pci_dev,
1556 sizeof(struct iwl3945_shared), 613 sizeof(struct iwl3945_shared),
1557 priv->hw_setting.shared_virt, 614 priv->shared_virt,
1558 priv->hw_setting.shared_phys); 615 priv->shared_phys);
1559}
1560
1561/**
1562 * iwl3945_supported_rate_to_ie - fill in the supported rate in IE field
1563 *
1564 * return : set the bit for each supported rate insert in ie
1565 */
1566static u16 iwl3945_supported_rate_to_ie(u8 *ie, u16 supported_rate,
1567 u16 basic_rate, int *left)
1568{
1569 u16 ret_rates = 0, bit;
1570 int i;
1571 u8 *cnt = ie;
1572 u8 *rates = ie + 1;
1573
1574 for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
1575 if (bit & supported_rate) {
1576 ret_rates |= bit;
1577 rates[*cnt] = iwl3945_rates[i].ieee |
1578 ((bit & basic_rate) ? 0x80 : 0x00);
1579 (*cnt)++;
1580 (*left)--;
1581 if ((*left <= 0) ||
1582 (*cnt >= IWL_SUPPORTED_RATES_IE_LEN))
1583 break;
1584 }
1585 }
1586
1587 return ret_rates;
1588}
1589
1590/**
1591 * iwl3945_fill_probe_req - fill in all required fields and IE for probe request
1592 */
1593static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv,
1594 struct ieee80211_mgmt *frame,
1595 int left)
1596{
1597 int len = 0;
1598 u8 *pos = NULL;
1599 u16 active_rates, ret_rates, cck_rates;
1600
1601 /* Make sure there is enough space for the probe request,
1602 * two mandatory IEs and the data */
1603 left -= 24;
1604 if (left < 0)
1605 return 0;
1606 len += 24;
1607
1608 frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
1609 memcpy(frame->da, iwl3945_broadcast_addr, ETH_ALEN);
1610 memcpy(frame->sa, priv->mac_addr, ETH_ALEN);
1611 memcpy(frame->bssid, iwl3945_broadcast_addr, ETH_ALEN);
1612 frame->seq_ctrl = 0;
1613
1614 /* fill in our indirect SSID IE */
1615 /* ...next IE... */
1616
1617 left -= 2;
1618 if (left < 0)
1619 return 0;
1620 len += 2;
1621 pos = &(frame->u.probe_req.variable[0]);
1622 *pos++ = WLAN_EID_SSID;
1623 *pos++ = 0;
1624
1625 /* fill in supported rate */
1626 /* ...next IE... */
1627 left -= 2;
1628 if (left < 0)
1629 return 0;
1630
1631 /* ... fill it in... */
1632 *pos++ = WLAN_EID_SUPP_RATES;
1633 *pos = 0;
1634
1635 priv->active_rate = priv->rates_mask;
1636 active_rates = priv->active_rate;
1637 priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
1638
1639 cck_rates = IWL_CCK_RATES_MASK & active_rates;
1640 ret_rates = iwl3945_supported_rate_to_ie(pos, cck_rates,
1641 priv->active_rate_basic, &left);
1642 active_rates &= ~ret_rates;
1643
1644 ret_rates = iwl3945_supported_rate_to_ie(pos, active_rates,
1645 priv->active_rate_basic, &left);
1646 active_rates &= ~ret_rates;
1647
1648 len += 2 + *pos;
1649 pos += (*pos) + 1;
1650 if (active_rates == 0)
1651 goto fill_end;
1652
1653 /* fill in supported extended rate */
1654 /* ...next IE... */
1655 left -= 2;
1656 if (left < 0)
1657 return 0;
1658 /* ... fill it in... */
1659 *pos++ = WLAN_EID_EXT_SUPP_RATES;
1660 *pos = 0;
1661 iwl3945_supported_rate_to_ie(pos, active_rates,
1662 priv->active_rate_basic, &left);
1663 if (*pos > 0)
1664 len += 2 + *pos;
1665
1666 fill_end:
1667 return (u16)len;
1668} 616}
1669 617
1670/* 618/*
1671 * QoS support 619 * QoS support
1672*/ 620*/
1673static int iwl3945_send_qos_params_command(struct iwl3945_priv *priv, 621static int iwl3945_send_qos_params_command(struct iwl_priv *priv,
1674 struct iwl3945_qosparam_cmd *qos) 622 struct iwl_qosparam_cmd *qos)
1675{ 623{
1676 624
1677 return iwl3945_send_cmd_pdu(priv, REPLY_QOS_PARAM, 625 return iwl_send_cmd_pdu(priv, REPLY_QOS_PARAM,
1678 sizeof(struct iwl3945_qosparam_cmd), qos); 626 sizeof(struct iwl_qosparam_cmd), qos);
1679}
1680
1681static void iwl3945_reset_qos(struct iwl3945_priv *priv)
1682{
1683 u16 cw_min = 15;
1684 u16 cw_max = 1023;
1685 u8 aifs = 2;
1686 u8 is_legacy = 0;
1687 unsigned long flags;
1688 int i;
1689
1690 spin_lock_irqsave(&priv->lock, flags);
1691 priv->qos_data.qos_active = 0;
1692
1693 /* QoS always active in AP and ADHOC mode
1694 * In STA mode wait for association
1695 */
1696 if (priv->iw_mode == NL80211_IFTYPE_ADHOC ||
1697 priv->iw_mode == NL80211_IFTYPE_AP)
1698 priv->qos_data.qos_active = 1;
1699 else
1700 priv->qos_data.qos_active = 0;
1701
1702
1703 /* check for legacy mode */
1704 if ((priv->iw_mode == NL80211_IFTYPE_ADHOC &&
1705 (priv->active_rate & IWL_OFDM_RATES_MASK) == 0) ||
1706 (priv->iw_mode == NL80211_IFTYPE_STATION &&
1707 (priv->staging_rxon.flags & RXON_FLG_SHORT_SLOT_MSK) == 0)) {
1708 cw_min = 31;
1709 is_legacy = 1;
1710 }
1711
1712 if (priv->qos_data.qos_active)
1713 aifs = 3;
1714
1715 priv->qos_data.def_qos_parm.ac[0].cw_min = cpu_to_le16(cw_min);
1716 priv->qos_data.def_qos_parm.ac[0].cw_max = cpu_to_le16(cw_max);
1717 priv->qos_data.def_qos_parm.ac[0].aifsn = aifs;
1718 priv->qos_data.def_qos_parm.ac[0].edca_txop = 0;
1719 priv->qos_data.def_qos_parm.ac[0].reserved1 = 0;
1720
1721 if (priv->qos_data.qos_active) {
1722 i = 1;
1723 priv->qos_data.def_qos_parm.ac[i].cw_min = cpu_to_le16(cw_min);
1724 priv->qos_data.def_qos_parm.ac[i].cw_max = cpu_to_le16(cw_max);
1725 priv->qos_data.def_qos_parm.ac[i].aifsn = 7;
1726 priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
1727 priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
1728
1729 i = 2;
1730 priv->qos_data.def_qos_parm.ac[i].cw_min =
1731 cpu_to_le16((cw_min + 1) / 2 - 1);
1732 priv->qos_data.def_qos_parm.ac[i].cw_max =
1733 cpu_to_le16(cw_max);
1734 priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
1735 if (is_legacy)
1736 priv->qos_data.def_qos_parm.ac[i].edca_txop =
1737 cpu_to_le16(6016);
1738 else
1739 priv->qos_data.def_qos_parm.ac[i].edca_txop =
1740 cpu_to_le16(3008);
1741 priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
1742
1743 i = 3;
1744 priv->qos_data.def_qos_parm.ac[i].cw_min =
1745 cpu_to_le16((cw_min + 1) / 4 - 1);
1746 priv->qos_data.def_qos_parm.ac[i].cw_max =
1747 cpu_to_le16((cw_max + 1) / 2 - 1);
1748 priv->qos_data.def_qos_parm.ac[i].aifsn = 2;
1749 priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
1750 if (is_legacy)
1751 priv->qos_data.def_qos_parm.ac[i].edca_txop =
1752 cpu_to_le16(3264);
1753 else
1754 priv->qos_data.def_qos_parm.ac[i].edca_txop =
1755 cpu_to_le16(1504);
1756 } else {
1757 for (i = 1; i < 4; i++) {
1758 priv->qos_data.def_qos_parm.ac[i].cw_min =
1759 cpu_to_le16(cw_min);
1760 priv->qos_data.def_qos_parm.ac[i].cw_max =
1761 cpu_to_le16(cw_max);
1762 priv->qos_data.def_qos_parm.ac[i].aifsn = aifs;
1763 priv->qos_data.def_qos_parm.ac[i].edca_txop = 0;
1764 priv->qos_data.def_qos_parm.ac[i].reserved1 = 0;
1765 }
1766 }
1767 IWL_DEBUG_QOS("set QoS to default \n");
1768
1769 spin_unlock_irqrestore(&priv->lock, flags);
1770} 627}
1771 628
1772static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force) 629static void iwl3945_activate_qos(struct iwl_priv *priv, u8 force)
1773{ 630{
1774 unsigned long flags; 631 unsigned long flags;
1775 632
@@ -1790,8 +647,8 @@ static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force)
1790 647
1791 spin_unlock_irqrestore(&priv->lock, flags); 648 spin_unlock_irqrestore(&priv->lock, flags);
1792 649
1793 if (force || iwl3945_is_associated(priv)) { 650 if (force || iwl_is_associated(priv)) {
1794 IWL_DEBUG_QOS("send QoS cmd with QoS active %d \n", 651 IWL_DEBUG_QOS(priv, "send QoS cmd with QoS active %d \n",
1795 priv->qos_data.qos_active); 652 priv->qos_data.qos_active);
1796 653
1797 iwl3945_send_qos_params_command(priv, 654 iwl3945_send_qos_params_command(priv,
@@ -1799,236 +656,9 @@ static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force)
1799 } 656 }
1800} 657}
1801 658
1802/*
1803 * Power management (not Tx power!) functions
1804 */
1805#define MSEC_TO_USEC 1024
1806
1807#define NOSLP __constant_cpu_to_le32(0)
1808#define SLP IWL_POWER_DRIVER_ALLOW_SLEEP_MSK
1809#define SLP_TIMEOUT(T) __constant_cpu_to_le32((T) * MSEC_TO_USEC)
1810#define SLP_VEC(X0, X1, X2, X3, X4) {__constant_cpu_to_le32(X0), \
1811 __constant_cpu_to_le32(X1), \
1812 __constant_cpu_to_le32(X2), \
1813 __constant_cpu_to_le32(X3), \
1814 __constant_cpu_to_le32(X4)}
1815
1816
1817/* default power management (not Tx power) table values */
1818/* for TIM 0-10 */
1819static struct iwl3945_power_vec_entry range_0[IWL_POWER_AC] = {
1820 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0},
1821 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500), SLP_VEC(1, 2, 3, 4, 4)}, 0},
1822 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(300), SLP_VEC(2, 4, 6, 7, 7)}, 0},
1823 {{SLP, SLP_TIMEOUT(50), SLP_TIMEOUT(100), SLP_VEC(2, 6, 9, 9, 10)}, 0},
1824 {{SLP, SLP_TIMEOUT(50), SLP_TIMEOUT(25), SLP_VEC(2, 7, 9, 9, 10)}, 1},
1825 {{SLP, SLP_TIMEOUT(25), SLP_TIMEOUT(25), SLP_VEC(4, 7, 10, 10, 10)}, 1}
1826};
1827
1828/* for TIM > 10 */
1829static struct iwl3945_power_vec_entry range_1[IWL_POWER_AC] = {
1830 {{NOSLP, SLP_TIMEOUT(0), SLP_TIMEOUT(0), SLP_VEC(0, 0, 0, 0, 0)}, 0},
1831 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(500),
1832 SLP_VEC(1, 2, 3, 4, 0xFF)}, 0},
1833 {{SLP, SLP_TIMEOUT(200), SLP_TIMEOUT(300),
1834 SLP_VEC(2, 4, 6, 7, 0xFF)}, 0},
1835 {{SLP, SLP_TIMEOUT(50), SLP_TIMEOUT(100),
1836 SLP_VEC(2, 6, 9, 9, 0xFF)}, 0},
1837 {{SLP, SLP_TIMEOUT(50), SLP_TIMEOUT(25), SLP_VEC(2, 7, 9, 9, 0xFF)}, 0},
1838 {{SLP, SLP_TIMEOUT(25), SLP_TIMEOUT(25),
1839 SLP_VEC(4, 7, 10, 10, 0xFF)}, 0}
1840};
1841
1842int iwl3945_power_init_handle(struct iwl3945_priv *priv)
1843{
1844 int rc = 0, i;
1845 struct iwl3945_power_mgr *pow_data;
1846 int size = sizeof(struct iwl3945_power_vec_entry) * IWL_POWER_AC;
1847 u16 pci_pm;
1848
1849 IWL_DEBUG_POWER("Initialize power \n");
1850
1851 pow_data = &(priv->power_data);
1852
1853 memset(pow_data, 0, sizeof(*pow_data));
1854
1855 pow_data->active_index = IWL_POWER_RANGE_0;
1856 pow_data->dtim_val = 0xffff;
1857
1858 memcpy(&pow_data->pwr_range_0[0], &range_0[0], size);
1859 memcpy(&pow_data->pwr_range_1[0], &range_1[0], size);
1860
1861 rc = pci_read_config_word(priv->pci_dev, PCI_LINK_CTRL, &pci_pm);
1862 if (rc != 0)
1863 return 0;
1864 else {
1865 struct iwl3945_powertable_cmd *cmd;
1866
1867 IWL_DEBUG_POWER("adjust power command flags\n");
1868
1869 for (i = 0; i < IWL_POWER_AC; i++) {
1870 cmd = &pow_data->pwr_range_0[i].cmd;
1871
1872 if (pci_pm & 0x1)
1873 cmd->flags &= ~IWL_POWER_PCI_PM_MSK;
1874 else
1875 cmd->flags |= IWL_POWER_PCI_PM_MSK;
1876 }
1877 }
1878 return rc;
1879}
1880
1881static int iwl3945_update_power_cmd(struct iwl3945_priv *priv,
1882 struct iwl3945_powertable_cmd *cmd, u32 mode)
1883{
1884 int rc = 0, i;
1885 u8 skip;
1886 u32 max_sleep = 0;
1887 struct iwl3945_power_vec_entry *range;
1888 u8 period = 0;
1889 struct iwl3945_power_mgr *pow_data;
1890
1891 if (mode > IWL_POWER_INDEX_5) {
1892 IWL_DEBUG_POWER("Error invalid power mode \n");
1893 return -1;
1894 }
1895 pow_data = &(priv->power_data);
1896
1897 if (pow_data->active_index == IWL_POWER_RANGE_0)
1898 range = &pow_data->pwr_range_0[0];
1899 else
1900 range = &pow_data->pwr_range_1[1];
1901
1902 memcpy(cmd, &range[mode].cmd, sizeof(struct iwl3945_powertable_cmd));
1903
1904#ifdef IWL_MAC80211_DISABLE
1905 if (priv->assoc_network != NULL) {
1906 unsigned long flags;
1907
1908 period = priv->assoc_network->tim.tim_period;
1909 }
1910#endif /*IWL_MAC80211_DISABLE */
1911 skip = range[mode].no_dtim;
1912
1913 if (period == 0) {
1914 period = 1;
1915 skip = 0;
1916 }
1917
1918 if (skip == 0) {
1919 max_sleep = period;
1920 cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;
1921 } else {
1922 __le32 slp_itrvl = cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1];
1923 max_sleep = (le32_to_cpu(slp_itrvl) / period) * period;
1924 cmd->flags |= IWL_POWER_SLEEP_OVER_DTIM_MSK;
1925 }
1926
1927 for (i = 0; i < IWL_POWER_VEC_SIZE; i++) {
1928 if (le32_to_cpu(cmd->sleep_interval[i]) > max_sleep)
1929 cmd->sleep_interval[i] = cpu_to_le32(max_sleep);
1930 }
1931
1932 IWL_DEBUG_POWER("Flags value = 0x%08X\n", cmd->flags);
1933 IWL_DEBUG_POWER("Tx timeout = %u\n", le32_to_cpu(cmd->tx_data_timeout));
1934 IWL_DEBUG_POWER("Rx timeout = %u\n", le32_to_cpu(cmd->rx_data_timeout));
1935 IWL_DEBUG_POWER("Sleep interval vector = { %d , %d , %d , %d , %d }\n",
1936 le32_to_cpu(cmd->sleep_interval[0]),
1937 le32_to_cpu(cmd->sleep_interval[1]),
1938 le32_to_cpu(cmd->sleep_interval[2]),
1939 le32_to_cpu(cmd->sleep_interval[3]),
1940 le32_to_cpu(cmd->sleep_interval[4]));
1941
1942 return rc;
1943}
1944
1945static int iwl3945_send_power_mode(struct iwl3945_priv *priv, u32 mode)
1946{
1947 u32 uninitialized_var(final_mode);
1948 int rc;
1949 struct iwl3945_powertable_cmd cmd;
1950
1951 /* If on battery, set to 3,
1952 * if plugged into AC power, set to CAM ("continuously aware mode"),
1953 * else user level */
1954 switch (mode) {
1955 case IWL_POWER_BATTERY:
1956 final_mode = IWL_POWER_INDEX_3;
1957 break;
1958 case IWL_POWER_AC:
1959 final_mode = IWL_POWER_MODE_CAM;
1960 break;
1961 default:
1962 final_mode = mode;
1963 break;
1964 }
1965
1966 iwl3945_update_power_cmd(priv, &cmd, final_mode);
1967
1968 rc = iwl3945_send_cmd_pdu(priv, POWER_TABLE_CMD, sizeof(cmd), &cmd);
1969
1970 if (final_mode == IWL_POWER_MODE_CAM)
1971 clear_bit(STATUS_POWER_PMI, &priv->status);
1972 else
1973 set_bit(STATUS_POWER_PMI, &priv->status);
1974
1975 return rc;
1976}
1977
1978/**
1979 * iwl3945_scan_cancel - Cancel any currently executing HW scan
1980 *
1981 * NOTE: priv->mutex is not required before calling this function
1982 */
1983static int iwl3945_scan_cancel(struct iwl3945_priv *priv)
1984{
1985 if (!test_bit(STATUS_SCAN_HW, &priv->status)) {
1986 clear_bit(STATUS_SCANNING, &priv->status);
1987 return 0;
1988 }
1989
1990 if (test_bit(STATUS_SCANNING, &priv->status)) {
1991 if (!test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
1992 IWL_DEBUG_SCAN("Queuing scan abort.\n");
1993 set_bit(STATUS_SCAN_ABORTING, &priv->status);
1994 queue_work(priv->workqueue, &priv->abort_scan);
1995
1996 } else
1997 IWL_DEBUG_SCAN("Scan abort already in progress.\n");
1998
1999 return test_bit(STATUS_SCANNING, &priv->status);
2000 }
2001
2002 return 0;
2003}
2004
2005/**
2006 * iwl3945_scan_cancel_timeout - Cancel any currently executing HW scan
2007 * @ms: amount of time to wait (in milliseconds) for scan to abort
2008 *
2009 * NOTE: priv->mutex must be held before calling this function
2010 */
2011static int iwl3945_scan_cancel_timeout(struct iwl3945_priv *priv, unsigned long ms)
2012{
2013 unsigned long now = jiffies;
2014 int ret;
2015
2016 ret = iwl3945_scan_cancel(priv);
2017 if (ret && ms) {
2018 mutex_unlock(&priv->mutex);
2019 while (!time_after(jiffies, now + msecs_to_jiffies(ms)) &&
2020 test_bit(STATUS_SCANNING, &priv->status))
2021 msleep(1);
2022 mutex_lock(&priv->mutex);
2023
2024 return test_bit(STATUS_SCANNING, &priv->status);
2025 }
2026
2027 return ret;
2028}
2029 659
2030#define MAX_UCODE_BEACON_INTERVAL 1024 660#define MAX_UCODE_BEACON_INTERVAL 1024
2031#define INTEL_CONN_LISTEN_INTERVAL __constant_cpu_to_le16(0xA) 661#define INTEL_CONN_LISTEN_INTERVAL cpu_to_le16(0xA)
2032 662
2033static __le16 iwl3945_adjust_beacon_interval(u16 beacon_val) 663static __le16 iwl3945_adjust_beacon_interval(u16 beacon_val)
2034{ 664{
@@ -2043,7 +673,7 @@ static __le16 iwl3945_adjust_beacon_interval(u16 beacon_val)
2043 return cpu_to_le16(new_val); 673 return cpu_to_le16(new_val);
2044} 674}
2045 675
2046static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv) 676static void iwl3945_setup_rxon_timing(struct iwl_priv *priv)
2047{ 677{
2048 u64 interval_tm_unit; 678 u64 interval_tm_unit;
2049 u64 tsf, result; 679 u64 tsf, result;
@@ -2054,13 +684,10 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)
2054 conf = ieee80211_get_hw_conf(priv->hw); 684 conf = ieee80211_get_hw_conf(priv->hw);
2055 685
2056 spin_lock_irqsave(&priv->lock, flags); 686 spin_lock_irqsave(&priv->lock, flags);
2057 priv->rxon_timing.timestamp.dw[1] = cpu_to_le32(priv->timestamp1); 687 priv->rxon_timing.timestamp = cpu_to_le64(priv->timestamp);
2058 priv->rxon_timing.timestamp.dw[0] = cpu_to_le32(priv->timestamp0);
2059
2060 priv->rxon_timing.listen_interval = INTEL_CONN_LISTEN_INTERVAL; 688 priv->rxon_timing.listen_interval = INTEL_CONN_LISTEN_INTERVAL;
2061 689
2062 tsf = priv->timestamp1; 690 tsf = priv->timestamp;
2063 tsf = ((tsf << 32) | priv->timestamp0);
2064 691
2065 beacon_int = priv->beacon_int; 692 beacon_int = priv->beacon_int;
2066 spin_unlock_irqrestore(&priv->lock, flags); 693 spin_unlock_irqrestore(&priv->lock, flags);
@@ -2092,32 +719,32 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)
2092 priv->rxon_timing.beacon_init_val = 719 priv->rxon_timing.beacon_init_val =
2093 cpu_to_le32((u32) ((u64) interval_tm_unit - result)); 720 cpu_to_le32((u32) ((u64) interval_tm_unit - result));
2094 721
2095 IWL_DEBUG_ASSOC 722 IWL_DEBUG_ASSOC(priv,
2096 ("beacon interval %d beacon timer %d beacon tim %d\n", 723 "beacon interval %d beacon timer %d beacon tim %d\n",
2097 le16_to_cpu(priv->rxon_timing.beacon_interval), 724 le16_to_cpu(priv->rxon_timing.beacon_interval),
2098 le32_to_cpu(priv->rxon_timing.beacon_init_val), 725 le32_to_cpu(priv->rxon_timing.beacon_init_val),
2099 le16_to_cpu(priv->rxon_timing.atim_window)); 726 le16_to_cpu(priv->rxon_timing.atim_window));
2100} 727}
2101 728
2102static int iwl3945_scan_initiate(struct iwl3945_priv *priv) 729static int iwl3945_scan_initiate(struct iwl_priv *priv)
2103{ 730{
2104 if (!iwl3945_is_ready_rf(priv)) { 731 if (!iwl_is_ready_rf(priv)) {
2105 IWL_DEBUG_SCAN("Aborting scan due to not ready.\n"); 732 IWL_DEBUG_SCAN(priv, "Aborting scan due to not ready.\n");
2106 return -EIO; 733 return -EIO;
2107 } 734 }
2108 735
2109 if (test_bit(STATUS_SCANNING, &priv->status)) { 736 if (test_bit(STATUS_SCANNING, &priv->status)) {
2110 IWL_DEBUG_SCAN("Scan already in progress.\n"); 737 IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");
2111 return -EAGAIN; 738 return -EAGAIN;
2112 } 739 }
2113 740
2114 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { 741 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
2115 IWL_DEBUG_SCAN("Scan request while abort pending. " 742 IWL_DEBUG_SCAN(priv, "Scan request while abort pending. "
2116 "Queuing.\n"); 743 "Queuing.\n");
2117 return -EAGAIN; 744 return -EAGAIN;
2118 } 745 }
2119 746
2120 IWL_DEBUG_INFO("Starting scan...\n"); 747 IWL_DEBUG_INFO(priv, "Starting scan...\n");
2121 if (priv->cfg->sku & IWL_SKU_G) 748 if (priv->cfg->sku & IWL_SKU_G)
2122 priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ); 749 priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ);
2123 if (priv->cfg->sku & IWL_SKU_A) 750 if (priv->cfg->sku & IWL_SKU_A)
@@ -2131,144 +758,34 @@ static int iwl3945_scan_initiate(struct iwl3945_priv *priv)
2131 return 0; 758 return 0;
2132} 759}
2133 760
2134static int iwl3945_set_rxon_hwcrypto(struct iwl3945_priv *priv, int hw_decrypt) 761static int iwl3945_set_mode(struct iwl_priv *priv, int mode)
2135{
2136 struct iwl3945_rxon_cmd *rxon = &priv->staging_rxon;
2137
2138 if (hw_decrypt)
2139 rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
2140 else
2141 rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
2142
2143 return 0;
2144}
2145
2146static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv,
2147 enum ieee80211_band band)
2148{
2149 if (band == IEEE80211_BAND_5GHZ) {
2150 priv->staging_rxon.flags &=
2151 ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
2152 | RXON_FLG_CCK_MSK);
2153 priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
2154 } else {
2155 /* Copied from iwl3945_bg_post_associate() */
2156 if (priv->assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
2157 priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;
2158 else
2159 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
2160
2161 if (priv->iw_mode == NL80211_IFTYPE_ADHOC)
2162 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
2163
2164 priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
2165 priv->staging_rxon.flags |= RXON_FLG_AUTO_DETECT_MSK;
2166 priv->staging_rxon.flags &= ~RXON_FLG_CCK_MSK;
2167 }
2168}
2169
2170/*
2171 * initialize rxon structure with default values from eeprom
2172 */
2173static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv,
2174 int mode)
2175{
2176 const struct iwl3945_channel_info *ch_info;
2177
2178 memset(&priv->staging_rxon, 0, sizeof(priv->staging_rxon));
2179
2180 switch (mode) {
2181 case NL80211_IFTYPE_AP:
2182 priv->staging_rxon.dev_type = RXON_DEV_TYPE_AP;
2183 break;
2184
2185 case NL80211_IFTYPE_STATION:
2186 priv->staging_rxon.dev_type = RXON_DEV_TYPE_ESS;
2187 priv->staging_rxon.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
2188 break;
2189
2190 case NL80211_IFTYPE_ADHOC:
2191 priv->staging_rxon.dev_type = RXON_DEV_TYPE_IBSS;
2192 priv->staging_rxon.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
2193 priv->staging_rxon.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
2194 RXON_FILTER_ACCEPT_GRP_MSK;
2195 break;
2196
2197 case NL80211_IFTYPE_MONITOR:
2198 priv->staging_rxon.dev_type = RXON_DEV_TYPE_SNIFFER;
2199 priv->staging_rxon.filter_flags = RXON_FILTER_PROMISC_MSK |
2200 RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
2201 break;
2202 default:
2203 IWL_ERROR("Unsupported interface type %d\n", mode);
2204 break;
2205 }
2206
2207#if 0
2208 /* TODO: Figure out when short_preamble would be set and cache from
2209 * that */
2210 if (!hw_to_local(priv->hw)->short_preamble)
2211 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
2212 else
2213 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
2214#endif
2215
2216 ch_info = iwl3945_get_channel_info(priv, priv->band,
2217 le16_to_cpu(priv->active_rxon.channel));
2218
2219 if (!ch_info)
2220 ch_info = &priv->channel_info[0];
2221
2222 /*
2223 * in some case A channels are all non IBSS
2224 * in this case force B/G channel
2225 */
2226 if ((mode == NL80211_IFTYPE_ADHOC) && !(is_channel_ibss(ch_info)))
2227 ch_info = &priv->channel_info[0];
2228
2229 priv->staging_rxon.channel = cpu_to_le16(ch_info->channel);
2230 if (is_channel_a_band(ch_info))
2231 priv->band = IEEE80211_BAND_5GHZ;
2232 else
2233 priv->band = IEEE80211_BAND_2GHZ;
2234
2235 iwl3945_set_flags_for_phymode(priv, priv->band);
2236
2237 priv->staging_rxon.ofdm_basic_rates =
2238 (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
2239 priv->staging_rxon.cck_basic_rates =
2240 (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
2241}
2242
2243static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)
2244{ 762{
2245 if (mode == NL80211_IFTYPE_ADHOC) { 763 if (mode == NL80211_IFTYPE_ADHOC) {
2246 const struct iwl3945_channel_info *ch_info; 764 const struct iwl_channel_info *ch_info;
2247 765
2248 ch_info = iwl3945_get_channel_info(priv, 766 ch_info = iwl_get_channel_info(priv,
2249 priv->band, 767 priv->band,
2250 le16_to_cpu(priv->staging_rxon.channel)); 768 le16_to_cpu(priv->staging_rxon.channel));
2251 769
2252 if (!ch_info || !is_channel_ibss(ch_info)) { 770 if (!ch_info || !is_channel_ibss(ch_info)) {
2253 IWL_ERROR("channel %d not IBSS channel\n", 771 IWL_ERR(priv, "channel %d not IBSS channel\n",
2254 le16_to_cpu(priv->staging_rxon.channel)); 772 le16_to_cpu(priv->staging_rxon.channel));
2255 return -EINVAL; 773 return -EINVAL;
2256 } 774 }
2257 } 775 }
2258 776
2259 iwl3945_connection_init_rx_config(priv, mode); 777 iwl_connection_init_rx_config(priv, mode);
2260 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
2261 778
2262 iwl3945_clear_stations_table(priv); 779 iwl3945_clear_stations_table(priv);
2263 780
2264 /* don't commit rxon if rf-kill is on*/ 781 /* don't commit rxon if rf-kill is on*/
2265 if (!iwl3945_is_ready_rf(priv)) 782 if (!iwl_is_ready_rf(priv))
2266 return -EAGAIN; 783 return -EAGAIN;
2267 784
2268 cancel_delayed_work(&priv->scan_check); 785 cancel_delayed_work(&priv->scan_check);
2269 if (iwl3945_scan_cancel_timeout(priv, 100)) { 786 if (iwl_scan_cancel_timeout(priv, 100)) {
2270 IWL_WARNING("Aborted scan still in progress after 100ms\n"); 787 IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
2271 IWL_DEBUG_MAC80211("leaving - scan abort failed.\n"); 788 IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
2272 return -EAGAIN; 789 return -EAGAIN;
2273 } 790 }
2274 791
@@ -2277,49 +794,50 @@ static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)
2277 return 0; 794 return 0;
2278} 795}
2279 796
2280static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv, 797static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
2281 struct ieee80211_tx_info *info, 798 struct ieee80211_tx_info *info,
2282 struct iwl3945_cmd *cmd, 799 struct iwl_cmd *cmd,
2283 struct sk_buff *skb_frag, 800 struct sk_buff *skb_frag,
2284 int last_frag) 801 int last_frag)
2285{ 802{
803 struct iwl3945_tx_cmd *tx = (struct iwl3945_tx_cmd *)cmd->cmd.payload;
2286 struct iwl3945_hw_key *keyinfo = 804 struct iwl3945_hw_key *keyinfo =
2287 &priv->stations[info->control.hw_key->hw_key_idx].keyinfo; 805 &priv->stations_39[info->control.hw_key->hw_key_idx].keyinfo;
2288 806
2289 switch (keyinfo->alg) { 807 switch (keyinfo->alg) {
2290 case ALG_CCMP: 808 case ALG_CCMP:
2291 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM; 809 tx->sec_ctl = TX_CMD_SEC_CCM;
2292 memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen); 810 memcpy(tx->key, keyinfo->key, keyinfo->keylen);
2293 IWL_DEBUG_TX("tx_cmd with AES hwcrypto\n"); 811 IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");
2294 break; 812 break;
2295 813
2296 case ALG_TKIP: 814 case ALG_TKIP:
2297#if 0 815#if 0
2298 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_TKIP; 816 tx->sec_ctl = TX_CMD_SEC_TKIP;
2299 817
2300 if (last_frag) 818 if (last_frag)
2301 memcpy(cmd->cmd.tx.tkip_mic.byte, skb_frag->tail - 8, 819 memcpy(tx->tkip_mic.byte, skb_frag->tail - 8,
2302 8); 820 8);
2303 else 821 else
2304 memset(cmd->cmd.tx.tkip_mic.byte, 0, 8); 822 memset(tx->tkip_mic.byte, 0, 8);
2305#endif 823#endif
2306 break; 824 break;
2307 825
2308 case ALG_WEP: 826 case ALG_WEP:
2309 cmd->cmd.tx.sec_ctl = TX_CMD_SEC_WEP | 827 tx->sec_ctl = TX_CMD_SEC_WEP |
2310 (info->control.hw_key->hw_key_idx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT; 828 (info->control.hw_key->hw_key_idx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT;
2311 829
2312 if (keyinfo->keylen == 13) 830 if (keyinfo->keylen == 13)
2313 cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128; 831 tx->sec_ctl |= TX_CMD_SEC_KEY128;
2314 832
2315 memcpy(&cmd->cmd.tx.key[3], keyinfo->key, keyinfo->keylen); 833 memcpy(&tx->key[3], keyinfo->key, keyinfo->keylen);
2316 834
2317 IWL_DEBUG_TX("Configuring packet for WEP encryption " 835 IWL_DEBUG_TX(priv, "Configuring packet for WEP encryption "
2318 "with key %d\n", info->control.hw_key->hw_key_idx); 836 "with key %d\n", info->control.hw_key->hw_key_idx);
2319 break; 837 break;
2320 838
2321 default: 839 default:
2322 printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg); 840 IWL_ERR(priv, "Unknown encode alg %d\n", keyinfo->alg);
2323 break; 841 break;
2324 } 842 }
2325} 843}
@@ -2327,17 +845,17 @@ static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv,
2327/* 845/*
2328 * handle build REPLY_TX command notification. 846 * handle build REPLY_TX command notification.
2329 */ 847 */
2330static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv, 848static void iwl3945_build_tx_cmd_basic(struct iwl_priv *priv,
2331 struct iwl3945_cmd *cmd, 849 struct iwl_cmd *cmd,
2332 struct ieee80211_tx_info *info, 850 struct ieee80211_tx_info *info,
2333 struct ieee80211_hdr *hdr, 851 struct ieee80211_hdr *hdr, u8 std_id)
2334 int is_unicast, u8 std_id)
2335{ 852{
853 struct iwl3945_tx_cmd *tx = (struct iwl3945_tx_cmd *)cmd->cmd.payload;
854 __le32 tx_flags = tx->tx_flags;
2336 __le16 fc = hdr->frame_control; 855 __le16 fc = hdr->frame_control;
2337 __le32 tx_flags = cmd->cmd.tx.tx_flags;
2338 u8 rc_flags = info->control.rates[0].flags; 856 u8 rc_flags = info->control.rates[0].flags;
2339 857
2340 cmd->cmd.tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; 858 tx->stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
2341 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { 859 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
2342 tx_flags |= TX_CMD_FLG_ACK_MSK; 860 tx_flags |= TX_CMD_FLG_ACK_MSK;
2343 if (ieee80211_is_mgmt(fc)) 861 if (ieee80211_is_mgmt(fc))
@@ -2350,13 +868,13 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv,
2350 tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK; 868 tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
2351 } 869 }
2352 870
2353 cmd->cmd.tx.sta_id = std_id; 871 tx->sta_id = std_id;
2354 if (ieee80211_has_morefrags(fc)) 872 if (ieee80211_has_morefrags(fc))
2355 tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; 873 tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
2356 874
2357 if (ieee80211_is_data_qos(fc)) { 875 if (ieee80211_is_data_qos(fc)) {
2358 u8 *qc = ieee80211_get_qos_ctl(hdr); 876 u8 *qc = ieee80211_get_qos_ctl(hdr);
2359 cmd->cmd.tx.tid_tspec = qc[0] & 0xf; 877 tx->tid_tspec = qc[0] & 0xf;
2360 tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK; 878 tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
2361 } else { 879 } else {
2362 tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK; 880 tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
@@ -2376,25 +894,25 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv,
2376 tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK); 894 tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
2377 if (ieee80211_is_mgmt(fc)) { 895 if (ieee80211_is_mgmt(fc)) {
2378 if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc)) 896 if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))
2379 cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3); 897 tx->timeout.pm_frame_timeout = cpu_to_le16(3);
2380 else 898 else
2381 cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2); 899 tx->timeout.pm_frame_timeout = cpu_to_le16(2);
2382 } else { 900 } else {
2383 cmd->cmd.tx.timeout.pm_frame_timeout = 0; 901 tx->timeout.pm_frame_timeout = 0;
2384#ifdef CONFIG_IWL3945_LEDS 902#ifdef CONFIG_IWL3945_LEDS
2385 priv->rxtxpackets += le16_to_cpu(cmd->cmd.tx.len); 903 priv->rxtxpackets += le16_to_cpu(cmd->cmd.tx.len);
2386#endif 904#endif
2387 } 905 }
2388 906
2389 cmd->cmd.tx.driver_txop = 0; 907 tx->driver_txop = 0;
2390 cmd->cmd.tx.tx_flags = tx_flags; 908 tx->tx_flags = tx_flags;
2391 cmd->cmd.tx.next_frame_len = 0; 909 tx->next_frame_len = 0;
2392} 910}
2393 911
2394/** 912/**
2395 * iwl3945_get_sta_id - Find station's index within station table 913 * iwl3945_get_sta_id - Find station's index within station table
2396 */ 914 */
2397static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *hdr) 915static int iwl3945_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
2398{ 916{
2399 int sta_id; 917 int sta_id;
2400 u16 fc = le16_to_cpu(hdr->frame_control); 918 u16 fc = le16_to_cpu(hdr->frame_control);
@@ -2402,7 +920,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
2402 /* If this frame is broadcast or management, use broadcast station id */ 920 /* If this frame is broadcast or management, use broadcast station id */
2403 if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) || 921 if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) ||
2404 is_multicast_ether_addr(hdr->addr1)) 922 is_multicast_ether_addr(hdr->addr1))
2405 return priv->hw_setting.bcast_sta_id; 923 return priv->hw_params.bcast_sta_id;
2406 924
2407 switch (priv->iw_mode) { 925 switch (priv->iw_mode) {
2408 926
@@ -2416,7 +934,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
2416 sta_id = iwl3945_hw_find_station(priv, hdr->addr1); 934 sta_id = iwl3945_hw_find_station(priv, hdr->addr1);
2417 if (sta_id != IWL_INVALID_STATION) 935 if (sta_id != IWL_INVALID_STATION)
2418 return sta_id; 936 return sta_id;
2419 return priv->hw_setting.bcast_sta_id; 937 return priv->hw_params.bcast_sta_id;
2420 938
2421 /* If this frame is going out to an IBSS network, find the station, 939 /* If this frame is going out to an IBSS network, find the station,
2422 * or create a new station table entry */ 940 * or create a new station table entry */
@@ -2431,38 +949,38 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
2431 if (sta_id != IWL_INVALID_STATION) 949 if (sta_id != IWL_INVALID_STATION)
2432 return sta_id; 950 return sta_id;
2433 951
2434 IWL_DEBUG_DROP("Station %pM not in station map. " 952 IWL_DEBUG_DROP(priv, "Station %pM not in station map. "
2435 "Defaulting to broadcast...\n", 953 "Defaulting to broadcast...\n",
2436 hdr->addr1); 954 hdr->addr1);
2437 iwl3945_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr)); 955 iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
2438 return priv->hw_setting.bcast_sta_id; 956 return priv->hw_params.bcast_sta_id;
2439 } 957 }
2440 /* If we are in monitor mode, use BCAST. This is required for 958 /* If we are in monitor mode, use BCAST. This is required for
2441 * packet injection. */ 959 * packet injection. */
2442 case NL80211_IFTYPE_MONITOR: 960 case NL80211_IFTYPE_MONITOR:
2443 return priv->hw_setting.bcast_sta_id; 961 return priv->hw_params.bcast_sta_id;
2444 962
2445 default: 963 default:
2446 IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode); 964 IWL_WARN(priv, "Unknown mode of operation: %d\n",
2447 return priv->hw_setting.bcast_sta_id; 965 priv->iw_mode);
966 return priv->hw_params.bcast_sta_id;
2448 } 967 }
2449} 968}
2450 969
2451/* 970/*
2452 * start REPLY_TX command process 971 * start REPLY_TX command process
2453 */ 972 */
2454static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) 973static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
2455{ 974{
2456 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; 975 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
2457 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 976 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
2458 struct iwl3945_tfd_frame *tfd; 977 struct iwl3945_tx_cmd *tx;
2459 u32 *control_flags; 978 struct iwl_tx_queue *txq = NULL;
2460 int txq_id = skb_get_queue_mapping(skb); 979 struct iwl_queue *q = NULL;
2461 struct iwl3945_tx_queue *txq = NULL; 980 struct iwl_cmd *out_cmd = NULL;
2462 struct iwl3945_queue *q = NULL;
2463 dma_addr_t phys_addr; 981 dma_addr_t phys_addr;
2464 dma_addr_t txcmd_phys; 982 dma_addr_t txcmd_phys;
2465 struct iwl3945_cmd *out_cmd = NULL; 983 int txq_id = skb_get_queue_mapping(skb);
2466 u16 len, idx, len_org, hdr_len; 984 u16 len, idx, len_org, hdr_len;
2467 u8 id; 985 u8 id;
2468 u8 unicast; 986 u8 unicast;
@@ -2476,13 +994,13 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2476 int rc; 994 int rc;
2477 995
2478 spin_lock_irqsave(&priv->lock, flags); 996 spin_lock_irqsave(&priv->lock, flags);
2479 if (iwl3945_is_rfkill(priv)) { 997 if (iwl_is_rfkill(priv)) {
2480 IWL_DEBUG_DROP("Dropping - RF KILL\n"); 998 IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
2481 goto drop_unlock; 999 goto drop_unlock;
2482 } 1000 }
2483 1001
2484 if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == IWL_INVALID_RATE) { 1002 if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == IWL_INVALID_RATE) {
2485 IWL_ERROR("ERROR: No TX rate available.\n"); 1003 IWL_ERR(priv, "ERROR: No TX rate available.\n");
2486 goto drop_unlock; 1004 goto drop_unlock;
2487 } 1005 }
2488 1006
@@ -2491,21 +1009,21 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2491 1009
2492 fc = hdr->frame_control; 1010 fc = hdr->frame_control;
2493 1011
2494#ifdef CONFIG_IWL3945_DEBUG 1012#ifdef CONFIG_IWLWIFI_DEBUG
2495 if (ieee80211_is_auth(fc)) 1013 if (ieee80211_is_auth(fc))
2496 IWL_DEBUG_TX("Sending AUTH frame\n"); 1014 IWL_DEBUG_TX(priv, "Sending AUTH frame\n");
2497 else if (ieee80211_is_assoc_req(fc)) 1015 else if (ieee80211_is_assoc_req(fc))
2498 IWL_DEBUG_TX("Sending ASSOC frame\n"); 1016 IWL_DEBUG_TX(priv, "Sending ASSOC frame\n");
2499 else if (ieee80211_is_reassoc_req(fc)) 1017 else if (ieee80211_is_reassoc_req(fc))
2500 IWL_DEBUG_TX("Sending REASSOC frame\n"); 1018 IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");
2501#endif 1019#endif
2502 1020
2503 /* drop all data frame if we are not associated */ 1021 /* drop all data frame if we are not associated */
2504 if (ieee80211_is_data(fc) && 1022 if (ieee80211_is_data(fc) &&
2505 (priv->iw_mode != NL80211_IFTYPE_MONITOR) && /* packet injection */ 1023 (priv->iw_mode != NL80211_IFTYPE_MONITOR) && /* packet injection */
2506 (!iwl3945_is_associated(priv) || 1024 (!iwl_is_associated(priv) ||
2507 ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) { 1025 ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) {
2508 IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n"); 1026 IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");
2509 goto drop_unlock; 1027 goto drop_unlock;
2510 } 1028 }
2511 1029
@@ -2516,21 +1034,21 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2516 /* Find (or create) index into station table for destination station */ 1034 /* Find (or create) index into station table for destination station */
2517 sta_id = iwl3945_get_sta_id(priv, hdr); 1035 sta_id = iwl3945_get_sta_id(priv, hdr);
2518 if (sta_id == IWL_INVALID_STATION) { 1036 if (sta_id == IWL_INVALID_STATION) {
2519 IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n", 1037 IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
2520 hdr->addr1); 1038 hdr->addr1);
2521 goto drop; 1039 goto drop;
2522 } 1040 }
2523 1041
2524 IWL_DEBUG_RATE("station Id %d\n", sta_id); 1042 IWL_DEBUG_RATE(priv, "station Id %d\n", sta_id);
2525 1043
2526 if (ieee80211_is_data_qos(fc)) { 1044 if (ieee80211_is_data_qos(fc)) {
2527 qc = ieee80211_get_qos_ctl(hdr); 1045 qc = ieee80211_get_qos_ctl(hdr);
2528 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; 1046 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
2529 seq_number = priv->stations[sta_id].tid[tid].seq_number & 1047 seq_number = priv->stations_39[sta_id].tid[tid].seq_number &
2530 IEEE80211_SCTL_SEQ; 1048 IEEE80211_SCTL_SEQ;
2531 hdr->seq_ctrl = cpu_to_le16(seq_number) | 1049 hdr->seq_ctrl = cpu_to_le16(seq_number) |
2532 (hdr->seq_ctrl & 1050 (hdr->seq_ctrl &
2533 __constant_cpu_to_le16(IEEE80211_SCTL_FRAG)); 1051 cpu_to_le16(IEEE80211_SCTL_FRAG));
2534 seq_number += 0x10; 1052 seq_number += 0x10;
2535 } 1053 }
2536 1054
@@ -2540,20 +1058,17 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2540 1058
2541 spin_lock_irqsave(&priv->lock, flags); 1059 spin_lock_irqsave(&priv->lock, flags);
2542 1060
2543 /* Set up first empty TFD within this queue's circular TFD buffer */
2544 tfd = &txq->bd[q->write_ptr];
2545 memset(tfd, 0, sizeof(*tfd));
2546 control_flags = (u32 *) tfd;
2547 idx = get_cmd_index(q, q->write_ptr, 0); 1061 idx = get_cmd_index(q, q->write_ptr, 0);
2548 1062
2549 /* Set up driver data for this TFD */ 1063 /* Set up driver data for this TFD */
2550 memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl3945_tx_info)); 1064 memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
2551 txq->txb[q->write_ptr].skb[0] = skb; 1065 txq->txb[q->write_ptr].skb[0] = skb;
2552 1066
2553 /* Init first empty entry in queue's array of Tx/cmd buffers */ 1067 /* Init first empty entry in queue's array of Tx/cmd buffers */
2554 out_cmd = &txq->cmd[idx]; 1068 out_cmd = txq->cmd[idx];
1069 tx = (struct iwl3945_tx_cmd *)out_cmd->cmd.payload;
2555 memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr)); 1070 memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
2556 memset(&out_cmd->cmd.tx, 0, sizeof(out_cmd->cmd.tx)); 1071 memset(tx, 0, sizeof(*tx));
2557 1072
2558 /* 1073 /*
2559 * Set up the Tx-command (not MAC!) header. 1074 * Set up the Tx-command (not MAC!) header.
@@ -2566,7 +1081,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2566 INDEX_TO_SEQ(q->write_ptr))); 1081 INDEX_TO_SEQ(q->write_ptr)));
2567 1082
2568 /* Copy MAC header from skb into command buffer */ 1083 /* Copy MAC header from skb into command buffer */
2569 memcpy(out_cmd->cmd.tx.hdr, hdr, hdr_len); 1084 memcpy(tx->hdr, hdr, hdr_len);
2570 1085
2571 /* 1086 /*
2572 * Use the first empty entry in this queue's command buffer array 1087 * Use the first empty entry in this queue's command buffer array
@@ -2577,8 +1092,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2577 * of the MAC header (device reads on dword boundaries). 1092 * of the MAC header (device reads on dword boundaries).
2578 * We'll tell device about this padding later. 1093 * We'll tell device about this padding later.
2579 */ 1094 */
2580 len = priv->hw_setting.tx_cmd_len + 1095 len = sizeof(struct iwl3945_tx_cmd) +
2581 sizeof(struct iwl3945_cmd_header) + hdr_len; 1096 sizeof(struct iwl_cmd_header) + hdr_len;
2582 1097
2583 len_org = len; 1098 len_org = len;
2584 len = (len + 3) & ~3; 1099 len = (len + 3) & ~3;
@@ -2590,12 +1105,19 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2590 1105
2591 /* Physical address of this Tx command's header (not MAC header!), 1106 /* Physical address of this Tx command's header (not MAC header!),
2592 * within command buffer array. */ 1107 * within command buffer array. */
2593 txcmd_phys = txq->dma_addr_cmd + sizeof(struct iwl3945_cmd) * idx + 1108 txcmd_phys = pci_map_single(priv->pci_dev,
2594 offsetof(struct iwl3945_cmd, hdr); 1109 out_cmd, sizeof(struct iwl_cmd),
1110 PCI_DMA_TODEVICE);
1111 pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys);
1112 pci_unmap_len_set(&out_cmd->meta, len, sizeof(struct iwl_cmd));
1113 /* Add buffer containing Tx command and MAC(!) header to TFD's
1114 * first entry */
1115 txcmd_phys += offsetof(struct iwl_cmd, hdr);
2595 1116
2596 /* Add buffer containing Tx command and MAC(!) header to TFD's 1117 /* Add buffer containing Tx command and MAC(!) header to TFD's
2597 * first entry */ 1118 * first entry */
2598 iwl3945_hw_txq_attach_buf_to_tfd(priv, tfd, txcmd_phys, len); 1119 priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
1120 txcmd_phys, len, 1, 0);
2599 1121
2600 if (info->control.hw_key) 1122 if (info->control.hw_key)
2601 iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, 0); 1123 iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, 0);
@@ -2606,60 +1128,52 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
2606 if (len) { 1128 if (len) {
2607 phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len, 1129 phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
2608 len, PCI_DMA_TODEVICE); 1130 len, PCI_DMA_TODEVICE);
2609 iwl3945_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, len); 1131 priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
1132 phys_addr, len,
1133 0, U32_PAD(len));
2610 } 1134 }
2611 1135
2612 if (!len)
2613 /* If there is no payload, then we use only one Tx buffer */
2614 *control_flags = TFD_CTL_COUNT_SET(1);
2615 else
2616 /* Else use 2 buffers.
2617 * Tell 3945 about any padding after MAC header */
2618 *control_flags = TFD_CTL_COUNT_SET(2) |
2619 TFD_CTL_PAD_SET(U32_PAD(len));
2620
2621 /* Total # bytes to be transmitted */ 1136 /* Total # bytes to be transmitted */
2622 len = (u16)skb->len; 1137 len = (u16)skb->len;
2623 out_cmd->cmd.tx.len = cpu_to_le16(len); 1138 tx->len = cpu_to_le16(len);
2624 1139
2625 /* TODO need this for burst mode later on */ 1140 /* TODO need this for burst mode later on */
2626 iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, unicast, sta_id); 1141 iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, sta_id);
2627 1142
2628 /* set is_hcca to 0; it probably will never be implemented */ 1143 /* set is_hcca to 0; it probably will never be implemented */
2629 iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0); 1144 iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0);
2630 1145
2631 out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; 1146 tx->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK;
2632 out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; 1147 tx->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK;
2633 1148
2634 if (!ieee80211_has_morefrags(hdr->frame_control)) { 1149 if (!ieee80211_has_morefrags(hdr->frame_control)) {
2635 txq->need_update = 1; 1150 txq->need_update = 1;
2636 if (qc) 1151 if (qc)
2637 priv->stations[sta_id].tid[tid].seq_number = seq_number; 1152 priv->stations_39[sta_id].tid[tid].seq_number = seq_number;
2638 } else { 1153 } else {
2639 wait_write_ptr = 1; 1154 wait_write_ptr = 1;
2640 txq->need_update = 0; 1155 txq->need_update = 0;
2641 } 1156 }
2642 1157
2643 iwl3945_print_hex_dump(IWL_DL_TX, out_cmd->cmd.payload, 1158 iwl_print_hex_dump(priv, IWL_DL_TX, tx, sizeof(*tx));
2644 sizeof(out_cmd->cmd.tx));
2645 1159
2646 iwl3945_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr, 1160 iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx->hdr,
2647 ieee80211_hdrlen(fc)); 1161 ieee80211_hdrlen(fc));
2648 1162
2649 /* Tell device the write index *just past* this latest filled TFD */ 1163 /* Tell device the write index *just past* this latest filled TFD */
2650 q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); 1164 q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
2651 rc = iwl3945_tx_queue_update_write_ptr(priv, txq); 1165 rc = iwl_txq_update_write_ptr(priv, txq);
2652 spin_unlock_irqrestore(&priv->lock, flags); 1166 spin_unlock_irqrestore(&priv->lock, flags);
2653 1167
2654 if (rc) 1168 if (rc)
2655 return rc; 1169 return rc;
2656 1170
2657 if ((iwl3945_queue_space(q) < q->high_mark) 1171 if ((iwl_queue_space(q) < q->high_mark)
2658 && priv->mac80211_registered) { 1172 && priv->mac80211_registered) {
2659 if (wait_write_ptr) { 1173 if (wait_write_ptr) {
2660 spin_lock_irqsave(&priv->lock, flags); 1174 spin_lock_irqsave(&priv->lock, flags);
2661 txq->need_update = 1; 1175 txq->need_update = 1;
2662 iwl3945_tx_queue_update_write_ptr(priv, txq); 1176 iwl_txq_update_write_ptr(priv, txq);
2663 spin_unlock_irqrestore(&priv->lock, flags); 1177 spin_unlock_irqrestore(&priv->lock, flags);
2664 } 1178 }
2665 1179
@@ -2674,86 +1188,32 @@ drop:
2674 return -1; 1188 return -1;
2675} 1189}
2676 1190
2677static void iwl3945_set_rate(struct iwl3945_priv *priv) 1191static void iwl3945_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
2678{
2679 const struct ieee80211_supported_band *sband = NULL;
2680 struct ieee80211_rate *rate;
2681 int i;
2682
2683 sband = iwl3945_get_band(priv, priv->band);
2684 if (!sband) {
2685 IWL_ERROR("Failed to set rate: unable to get hw mode\n");
2686 return;
2687 }
2688
2689 priv->active_rate = 0;
2690 priv->active_rate_basic = 0;
2691
2692 IWL_DEBUG_RATE("Setting rates for %s GHz\n",
2693 sband->band == IEEE80211_BAND_2GHZ ? "2.4" : "5");
2694
2695 for (i = 0; i < sband->n_bitrates; i++) {
2696 rate = &sband->bitrates[i];
2697 if ((rate->hw_value < IWL_RATE_COUNT) &&
2698 !(rate->flags & IEEE80211_CHAN_DISABLED)) {
2699 IWL_DEBUG_RATE("Adding rate index %d (plcp %d)\n",
2700 rate->hw_value, iwl3945_rates[rate->hw_value].plcp);
2701 priv->active_rate |= (1 << rate->hw_value);
2702 }
2703 }
2704
2705 IWL_DEBUG_RATE("Set active_rate = %0x, active_rate_basic = %0x\n",
2706 priv->active_rate, priv->active_rate_basic);
2707
2708 /*
2709 * If a basic rate is configured, then use it (adding IWL_RATE_1M_MASK)
2710 * otherwise set it to the default of all CCK rates and 6, 12, 24 for
2711 * OFDM
2712 */
2713 if (priv->active_rate_basic & IWL_CCK_BASIC_RATES_MASK)
2714 priv->staging_rxon.cck_basic_rates =
2715 ((priv->active_rate_basic &
2716 IWL_CCK_RATES_MASK) >> IWL_FIRST_CCK_RATE) & 0xF;
2717 else
2718 priv->staging_rxon.cck_basic_rates =
2719 (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
2720
2721 if (priv->active_rate_basic & IWL_OFDM_BASIC_RATES_MASK)
2722 priv->staging_rxon.ofdm_basic_rates =
2723 ((priv->active_rate_basic &
2724 (IWL_OFDM_BASIC_RATES_MASK | IWL_RATE_6M_MASK)) >>
2725 IWL_FIRST_OFDM_RATE) & 0xFF;
2726 else
2727 priv->staging_rxon.ofdm_basic_rates =
2728 (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
2729}
2730
2731static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)
2732{ 1192{
2733 unsigned long flags; 1193 unsigned long flags;
2734 1194
2735 if (!!disable_radio == test_bit(STATUS_RF_KILL_SW, &priv->status)) 1195 if (!!disable_radio == test_bit(STATUS_RF_KILL_SW, &priv->status))
2736 return; 1196 return;
2737 1197
2738 IWL_DEBUG_RF_KILL("Manual SW RF KILL set to: RADIO %s\n", 1198 IWL_DEBUG_RF_KILL(priv, "Manual SW RF KILL set to: RADIO %s\n",
2739 disable_radio ? "OFF" : "ON"); 1199 disable_radio ? "OFF" : "ON");
2740 1200
2741 if (disable_radio) { 1201 if (disable_radio) {
2742 iwl3945_scan_cancel(priv); 1202 iwl_scan_cancel(priv);
2743 /* FIXME: This is a workaround for AP */ 1203 /* FIXME: This is a workaround for AP */
2744 if (priv->iw_mode != NL80211_IFTYPE_AP) { 1204 if (priv->iw_mode != NL80211_IFTYPE_AP) {
2745 spin_lock_irqsave(&priv->lock, flags); 1205 spin_lock_irqsave(&priv->lock, flags);
2746 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_SET, 1206 iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
2747 CSR_UCODE_SW_BIT_RFKILL); 1207 CSR_UCODE_SW_BIT_RFKILL);
2748 spin_unlock_irqrestore(&priv->lock, flags); 1208 spin_unlock_irqrestore(&priv->lock, flags);
2749 iwl3945_send_card_state(priv, CARD_STATE_CMD_DISABLE, 0); 1209 iwl_send_card_state(priv, CARD_STATE_CMD_DISABLE, 0);
2750 set_bit(STATUS_RF_KILL_SW, &priv->status); 1210 set_bit(STATUS_RF_KILL_SW, &priv->status);
2751 } 1211 }
2752 return; 1212 return;
2753 } 1213 }
2754 1214
2755 spin_lock_irqsave(&priv->lock, flags); 1215 spin_lock_irqsave(&priv->lock, flags);
2756 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); 1216 iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
2757 1217
2758 clear_bit(STATUS_RF_KILL_SW, &priv->status); 1218 clear_bit(STATUS_RF_KILL_SW, &priv->status);
2759 spin_unlock_irqrestore(&priv->lock, flags); 1219 spin_unlock_irqrestore(&priv->lock, flags);
@@ -2762,13 +1222,13 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)
2762 msleep(10); 1222 msleep(10);
2763 1223
2764 spin_lock_irqsave(&priv->lock, flags); 1224 spin_lock_irqsave(&priv->lock, flags);
2765 iwl3945_read32(priv, CSR_UCODE_DRV_GP1); 1225 iwl_read32(priv, CSR_UCODE_DRV_GP1);
2766 if (!iwl3945_grab_nic_access(priv)) 1226 if (!iwl_grab_nic_access(priv))
2767 iwl3945_release_nic_access(priv); 1227 iwl_release_nic_access(priv);
2768 spin_unlock_irqrestore(&priv->lock, flags); 1228 spin_unlock_irqrestore(&priv->lock, flags);
2769 1229
2770 if (test_bit(STATUS_RF_KILL_HW, &priv->status)) { 1230 if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
2771 IWL_DEBUG_RF_KILL("Can not turn radio back on - " 1231 IWL_DEBUG_RF_KILL(priv, "Can not turn radio back on - "
2772 "disabled by HW switch\n"); 1232 "disabled by HW switch\n");
2773 return; 1233 return;
2774 } 1234 }
@@ -2778,38 +1238,6 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)
2778 return; 1238 return;
2779} 1239}
2780 1240
2781void iwl3945_set_decrypted_flag(struct iwl3945_priv *priv, struct sk_buff *skb,
2782 u32 decrypt_res, struct ieee80211_rx_status *stats)
2783{
2784 u16 fc =
2785 le16_to_cpu(((struct ieee80211_hdr *)skb->data)->frame_control);
2786
2787 if (priv->active_rxon.filter_flags & RXON_FILTER_DIS_DECRYPT_MSK)
2788 return;
2789
2790 if (!(fc & IEEE80211_FCTL_PROTECTED))
2791 return;
2792
2793 IWL_DEBUG_RX("decrypt_res:0x%x\n", decrypt_res);
2794 switch (decrypt_res & RX_RES_STATUS_SEC_TYPE_MSK) {
2795 case RX_RES_STATUS_SEC_TYPE_TKIP:
2796 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
2797 RX_RES_STATUS_BAD_ICV_MIC)
2798 stats->flag |= RX_FLAG_MMIC_ERROR;
2799 case RX_RES_STATUS_SEC_TYPE_WEP:
2800 case RX_RES_STATUS_SEC_TYPE_CCMP:
2801 if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
2802 RX_RES_STATUS_DECRYPT_OK) {
2803 IWL_DEBUG_RX("hw decrypt successfully!!!\n");
2804 stats->flag |= RX_FLAG_DECRYPTED;
2805 }
2806 break;
2807
2808 default:
2809 break;
2810 }
2811}
2812
2813#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT 1241#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
2814 1242
2815#include "iwl-spectrum.h" 1243#include "iwl-spectrum.h"
@@ -2863,13 +1291,13 @@ static __le32 iwl3945_add_beacon_time(u32 base, u32 addon, u32 beacon_interval)
2863 return cpu_to_le32(res); 1291 return cpu_to_le32(res);
2864} 1292}
2865 1293
2866static int iwl3945_get_measurement(struct iwl3945_priv *priv, 1294static int iwl3945_get_measurement(struct iwl_priv *priv,
2867 struct ieee80211_measurement_params *params, 1295 struct ieee80211_measurement_params *params,
2868 u8 type) 1296 u8 type)
2869{ 1297{
2870 struct iwl3945_spectrum_cmd spectrum; 1298 struct iwl_spectrum_cmd spectrum;
2871 struct iwl3945_rx_packet *res; 1299 struct iwl_rx_packet *res;
2872 struct iwl3945_host_cmd cmd = { 1300 struct iwl_host_cmd cmd = {
2873 .id = REPLY_SPECTRUM_MEASUREMENT_CMD, 1301 .id = REPLY_SPECTRUM_MEASUREMENT_CMD,
2874 .data = (void *)&spectrum, 1302 .data = (void *)&spectrum,
2875 .meta.flags = CMD_WANT_SKB, 1303 .meta.flags = CMD_WANT_SKB,
@@ -2879,7 +1307,7 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
2879 int spectrum_resp_status; 1307 int spectrum_resp_status;
2880 int duration = le16_to_cpu(params->duration); 1308 int duration = le16_to_cpu(params->duration);
2881 1309
2882 if (iwl3945_is_associated(priv)) 1310 if (iwl_is_associated(priv))
2883 add_time = 1311 add_time =
2884 iwl3945_usecs_to_beacons( 1312 iwl3945_usecs_to_beacons(
2885 le64_to_cpu(params->start_time) - priv->last_tsf, 1313 le64_to_cpu(params->start_time) - priv->last_tsf,
@@ -2894,7 +1322,7 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
2894 cmd.len = sizeof(spectrum); 1322 cmd.len = sizeof(spectrum);
2895 spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len)); 1323 spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));
2896 1324
2897 if (iwl3945_is_associated(priv)) 1325 if (iwl_is_associated(priv))
2898 spectrum.start_time = 1326 spectrum.start_time =
2899 iwl3945_add_beacon_time(priv->last_beacon_time, 1327 iwl3945_add_beacon_time(priv->last_beacon_time,
2900 add_time, 1328 add_time,
@@ -2909,13 +1337,13 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
2909 spectrum.flags |= RXON_FLG_BAND_24G_MSK | 1337 spectrum.flags |= RXON_FLG_BAND_24G_MSK |
2910 RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK; 1338 RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK;
2911 1339
2912 rc = iwl3945_send_cmd_sync(priv, &cmd); 1340 rc = iwl_send_cmd_sync(priv, &cmd);
2913 if (rc) 1341 if (rc)
2914 return rc; 1342 return rc;
2915 1343
2916 res = (struct iwl3945_rx_packet *)cmd.meta.u.skb->data; 1344 res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
2917 if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 1345 if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
2918 IWL_ERROR("Bad return from REPLY_RX_ON_ASSOC command\n"); 1346 IWL_ERR(priv, "Bad return from REPLY_RX_ON_ASSOC command\n");
2919 rc = -EIO; 1347 rc = -EIO;
2920 } 1348 }
2921 1349
@@ -2923,7 +1351,7 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
2923 switch (spectrum_resp_status) { 1351 switch (spectrum_resp_status) {
2924 case 0: /* Command will be handled */ 1352 case 0: /* Command will be handled */
2925 if (res->u.spectrum.id != 0xff) { 1353 if (res->u.spectrum.id != 0xff) {
2926 IWL_DEBUG_INFO("Replaced existing measurement: %d\n", 1354 IWL_DEBUG_INFO(priv, "Replaced existing measurement: %d\n",
2927 res->u.spectrum.id); 1355 res->u.spectrum.id);
2928 priv->measurement_status &= ~MEASUREMENT_READY; 1356 priv->measurement_status &= ~MEASUREMENT_READY;
2929 } 1357 }
@@ -2942,30 +1370,29 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
2942} 1370}
2943#endif 1371#endif
2944 1372
2945static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv, 1373static void iwl3945_rx_reply_alive(struct iwl_priv *priv,
2946 struct iwl3945_rx_mem_buffer *rxb) 1374 struct iwl_rx_mem_buffer *rxb)
2947{ 1375{
2948 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1376 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
2949 struct iwl3945_alive_resp *palive; 1377 struct iwl_alive_resp *palive;
2950 struct delayed_work *pwork; 1378 struct delayed_work *pwork;
2951 1379
2952 palive = &pkt->u.alive_frame; 1380 palive = &pkt->u.alive_frame;
2953 1381
2954 IWL_DEBUG_INFO("Alive ucode status 0x%08X revision " 1382 IWL_DEBUG_INFO(priv, "Alive ucode status 0x%08X revision "
2955 "0x%01X 0x%01X\n", 1383 "0x%01X 0x%01X\n",
2956 palive->is_valid, palive->ver_type, 1384 palive->is_valid, palive->ver_type,
2957 palive->ver_subtype); 1385 palive->ver_subtype);
2958 1386
2959 if (palive->ver_subtype == INITIALIZE_SUBTYPE) { 1387 if (palive->ver_subtype == INITIALIZE_SUBTYPE) {
2960 IWL_DEBUG_INFO("Initialization Alive received.\n"); 1388 IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
2961 memcpy(&priv->card_alive_init, 1389 memcpy(&priv->card_alive_init, &pkt->u.alive_frame,
2962 &pkt->u.alive_frame, 1390 sizeof(struct iwl_alive_resp));
2963 sizeof(struct iwl3945_init_alive_resp));
2964 pwork = &priv->init_alive_start; 1391 pwork = &priv->init_alive_start;
2965 } else { 1392 } else {
2966 IWL_DEBUG_INFO("Runtime Alive received.\n"); 1393 IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
2967 memcpy(&priv->card_alive, &pkt->u.alive_frame, 1394 memcpy(&priv->card_alive, &pkt->u.alive_frame,
2968 sizeof(struct iwl3945_alive_resp)); 1395 sizeof(struct iwl_alive_resp));
2969 pwork = &priv->alive_start; 1396 pwork = &priv->alive_start;
2970 iwl3945_disable_events(priv); 1397 iwl3945_disable_events(priv);
2971 } 1398 }
@@ -2976,24 +1403,26 @@ static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv,
2976 queue_delayed_work(priv->workqueue, pwork, 1403 queue_delayed_work(priv->workqueue, pwork,
2977 msecs_to_jiffies(5)); 1404 msecs_to_jiffies(5));
2978 else 1405 else
2979 IWL_WARNING("uCode did not respond OK.\n"); 1406 IWL_WARN(priv, "uCode did not respond OK.\n");
2980} 1407}
2981 1408
2982static void iwl3945_rx_reply_add_sta(struct iwl3945_priv *priv, 1409static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,
2983 struct iwl3945_rx_mem_buffer *rxb) 1410 struct iwl_rx_mem_buffer *rxb)
2984{ 1411{
2985 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1412#ifdef CONFIG_IWLWIFI_DEBUG
1413 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
1414#endif
2986 1415
2987 IWL_DEBUG_RX("Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status); 1416 IWL_DEBUG_RX(priv, "Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status);
2988 return; 1417 return;
2989} 1418}
2990 1419
2991static void iwl3945_rx_reply_error(struct iwl3945_priv *priv, 1420static void iwl3945_rx_reply_error(struct iwl_priv *priv,
2992 struct iwl3945_rx_mem_buffer *rxb) 1421 struct iwl_rx_mem_buffer *rxb)
2993{ 1422{
2994 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1423 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
2995 1424
2996 IWL_ERROR("Error Reply type 0x%08X cmd %s (0x%02X) " 1425 IWL_ERR(priv, "Error Reply type 0x%08X cmd %s (0x%02X) "
2997 "seq 0x%04X ser 0x%08X\n", 1426 "seq 0x%04X ser 0x%08X\n",
2998 le32_to_cpu(pkt->u.err_resp.error_type), 1427 le32_to_cpu(pkt->u.err_resp.error_type),
2999 get_cmd_string(pkt->u.err_resp.cmd_id), 1428 get_cmd_string(pkt->u.err_resp.cmd_id),
@@ -3002,28 +1431,15 @@ static void iwl3945_rx_reply_error(struct iwl3945_priv *priv,
3002 le32_to_cpu(pkt->u.err_resp.error_info)); 1431 le32_to_cpu(pkt->u.err_resp.error_info));
3003} 1432}
3004 1433
3005#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x 1434static void iwl3945_rx_spectrum_measure_notif(struct iwl_priv *priv,
3006 1435 struct iwl_rx_mem_buffer *rxb)
3007static void iwl3945_rx_csa(struct iwl3945_priv *priv, struct iwl3945_rx_mem_buffer *rxb)
3008{
3009 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data;
3010 struct iwl3945_rxon_cmd *rxon = (void *)&priv->active_rxon;
3011 struct iwl3945_csa_notification *csa = &(pkt->u.csa_notif);
3012 IWL_DEBUG_11H("CSA notif: channel %d, status %d\n",
3013 le16_to_cpu(csa->channel), le32_to_cpu(csa->status));
3014 rxon->channel = csa->channel;
3015 priv->staging_rxon.channel = csa->channel;
3016}
3017
3018static void iwl3945_rx_spectrum_measure_notif(struct iwl3945_priv *priv,
3019 struct iwl3945_rx_mem_buffer *rxb)
3020{ 1436{
3021#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT 1437#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
3022 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1438 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3023 struct iwl3945_spectrum_notification *report = &(pkt->u.spectrum_notif); 1439 struct iwl_spectrum_notification *report = &(pkt->u.spectrum_notif);
3024 1440
3025 if (!report->state) { 1441 if (!report->state) {
3026 IWL_DEBUG(IWL_DL_11H | IWL_DL_INFO, 1442 IWL_DEBUG(priv, IWL_DL_11H | IWL_DL_INFO,
3027 "Spectrum Measure Notification: Start\n"); 1443 "Spectrum Measure Notification: Start\n");
3028 return; 1444 return;
3029 } 1445 }
@@ -3033,38 +1449,39 @@ static void iwl3945_rx_spectrum_measure_notif(struct iwl3945_priv *priv,
3033#endif 1449#endif
3034} 1450}
3035 1451
3036static void iwl3945_rx_pm_sleep_notif(struct iwl3945_priv *priv, 1452static void iwl3945_rx_pm_sleep_notif(struct iwl_priv *priv,
3037 struct iwl3945_rx_mem_buffer *rxb) 1453 struct iwl_rx_mem_buffer *rxb)
3038{ 1454{
3039#ifdef CONFIG_IWL3945_DEBUG 1455#ifdef CONFIG_IWLWIFI_DEBUG
3040 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1456 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3041 struct iwl3945_sleep_notification *sleep = &(pkt->u.sleep_notif); 1457 struct iwl_sleep_notification *sleep = &(pkt->u.sleep_notif);
3042 IWL_DEBUG_RX("sleep mode: %d, src: %d\n", 1458 IWL_DEBUG_RX(priv, "sleep mode: %d, src: %d\n",
3043 sleep->pm_sleep_mode, sleep->pm_wakeup_src); 1459 sleep->pm_sleep_mode, sleep->pm_wakeup_src);
3044#endif 1460#endif
3045} 1461}
3046 1462
3047static void iwl3945_rx_pm_debug_statistics_notif(struct iwl3945_priv *priv, 1463static void iwl3945_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
3048 struct iwl3945_rx_mem_buffer *rxb) 1464 struct iwl_rx_mem_buffer *rxb)
3049{ 1465{
3050 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1466 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3051 IWL_DEBUG_RADIO("Dumping %d bytes of unhandled " 1467 IWL_DEBUG_RADIO(priv, "Dumping %d bytes of unhandled "
3052 "notification for %s:\n", 1468 "notification for %s:\n",
3053 le32_to_cpu(pkt->len), get_cmd_string(pkt->hdr.cmd)); 1469 le32_to_cpu(pkt->len), get_cmd_string(pkt->hdr.cmd));
3054 iwl3945_print_hex_dump(IWL_DL_RADIO, pkt->u.raw, le32_to_cpu(pkt->len)); 1470 iwl_print_hex_dump(priv, IWL_DL_RADIO, pkt->u.raw,
1471 le32_to_cpu(pkt->len));
3055} 1472}
3056 1473
3057static void iwl3945_bg_beacon_update(struct work_struct *work) 1474static void iwl3945_bg_beacon_update(struct work_struct *work)
3058{ 1475{
3059 struct iwl3945_priv *priv = 1476 struct iwl_priv *priv =
3060 container_of(work, struct iwl3945_priv, beacon_update); 1477 container_of(work, struct iwl_priv, beacon_update);
3061 struct sk_buff *beacon; 1478 struct sk_buff *beacon;
3062 1479
3063 /* Pull updated AP beacon from mac80211. will fail if not in AP mode */ 1480 /* Pull updated AP beacon from mac80211. will fail if not in AP mode */
3064 beacon = ieee80211_beacon_get(priv->hw, priv->vif); 1481 beacon = ieee80211_beacon_get(priv->hw, priv->vif);
3065 1482
3066 if (!beacon) { 1483 if (!beacon) {
3067 IWL_ERROR("update beacon failed\n"); 1484 IWL_ERR(priv, "update beacon failed\n");
3068 return; 1485 return;
3069 } 1486 }
3070 1487
@@ -3079,15 +1496,15 @@ static void iwl3945_bg_beacon_update(struct work_struct *work)
3079 iwl3945_send_beacon_cmd(priv); 1496 iwl3945_send_beacon_cmd(priv);
3080} 1497}
3081 1498
3082static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv, 1499static void iwl3945_rx_beacon_notif(struct iwl_priv *priv,
3083 struct iwl3945_rx_mem_buffer *rxb) 1500 struct iwl_rx_mem_buffer *rxb)
3084{ 1501{
3085#ifdef CONFIG_IWL3945_DEBUG 1502#ifdef CONFIG_IWLWIFI_DEBUG
3086 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1503 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3087 struct iwl3945_beacon_notif *beacon = &(pkt->u.beacon_status); 1504 struct iwl3945_beacon_notif *beacon = &(pkt->u.beacon_status);
3088 u8 rate = beacon->beacon_notify_hdr.rate; 1505 u8 rate = beacon->beacon_notify_hdr.rate;
3089 1506
3090 IWL_DEBUG_RX("beacon status %x retries %d iss %d " 1507 IWL_DEBUG_RX(priv, "beacon status %x retries %d iss %d "
3091 "tsf %d %d rate %d\n", 1508 "tsf %d %d rate %d\n",
3092 le32_to_cpu(beacon->beacon_notify_hdr.status) & TX_STATUS_MSK, 1509 le32_to_cpu(beacon->beacon_notify_hdr.status) & TX_STATUS_MSK,
3093 beacon->beacon_notify_hdr.failure_frame, 1510 beacon->beacon_notify_hdr.failure_frame,
@@ -3102,27 +1519,27 @@ static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv,
3102} 1519}
3103 1520
3104/* Service response to REPLY_SCAN_CMD (0x80) */ 1521/* Service response to REPLY_SCAN_CMD (0x80) */
3105static void iwl3945_rx_reply_scan(struct iwl3945_priv *priv, 1522static void iwl3945_rx_reply_scan(struct iwl_priv *priv,
3106 struct iwl3945_rx_mem_buffer *rxb) 1523 struct iwl_rx_mem_buffer *rxb)
3107{ 1524{
3108#ifdef CONFIG_IWL3945_DEBUG 1525#ifdef CONFIG_IWLWIFI_DEBUG
3109 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1526 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3110 struct iwl3945_scanreq_notification *notif = 1527 struct iwl_scanreq_notification *notif =
3111 (struct iwl3945_scanreq_notification *)pkt->u.raw; 1528 (struct iwl_scanreq_notification *)pkt->u.raw;
3112 1529
3113 IWL_DEBUG_RX("Scan request status = 0x%x\n", notif->status); 1530 IWL_DEBUG_RX(priv, "Scan request status = 0x%x\n", notif->status);
3114#endif 1531#endif
3115} 1532}
3116 1533
3117/* Service SCAN_START_NOTIFICATION (0x82) */ 1534/* Service SCAN_START_NOTIFICATION (0x82) */
3118static void iwl3945_rx_scan_start_notif(struct iwl3945_priv *priv, 1535static void iwl3945_rx_scan_start_notif(struct iwl_priv *priv,
3119 struct iwl3945_rx_mem_buffer *rxb) 1536 struct iwl_rx_mem_buffer *rxb)
3120{ 1537{
3121 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1538 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3122 struct iwl3945_scanstart_notification *notif = 1539 struct iwl_scanstart_notification *notif =
3123 (struct iwl3945_scanstart_notification *)pkt->u.raw; 1540 (struct iwl_scanstart_notification *)pkt->u.raw;
3124 priv->scan_start_tsf = le32_to_cpu(notif->tsf_low); 1541 priv->scan_start_tsf = le32_to_cpu(notif->tsf_low);
3125 IWL_DEBUG_SCAN("Scan start: " 1542 IWL_DEBUG_SCAN(priv, "Scan start: "
3126 "%d [802.11%s] " 1543 "%d [802.11%s] "
3127 "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n", 1544 "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n",
3128 notif->channel, 1545 notif->channel,
@@ -3132,14 +1549,16 @@ static void iwl3945_rx_scan_start_notif(struct iwl3945_priv *priv,
3132} 1549}
3133 1550
3134/* Service SCAN_RESULTS_NOTIFICATION (0x83) */ 1551/* Service SCAN_RESULTS_NOTIFICATION (0x83) */
3135static void iwl3945_rx_scan_results_notif(struct iwl3945_priv *priv, 1552static void iwl3945_rx_scan_results_notif(struct iwl_priv *priv,
3136 struct iwl3945_rx_mem_buffer *rxb) 1553 struct iwl_rx_mem_buffer *rxb)
3137{ 1554{
3138 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1555#ifdef CONFIG_IWLWIFI_DEBUG
3139 struct iwl3945_scanresults_notification *notif = 1556 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3140 (struct iwl3945_scanresults_notification *)pkt->u.raw; 1557 struct iwl_scanresults_notification *notif =
1558 (struct iwl_scanresults_notification *)pkt->u.raw;
1559#endif
3141 1560
3142 IWL_DEBUG_SCAN("Scan ch.res: " 1561 IWL_DEBUG_SCAN(priv, "Scan ch.res: "
3143 "%d [802.11%s] " 1562 "%d [802.11%s] "
3144 "(TSF: 0x%08X:%08X) - %d " 1563 "(TSF: 0x%08X:%08X) - %d "
3145 "elapsed=%lu usec (%dms since last)\n", 1564 "elapsed=%lu usec (%dms since last)\n",
@@ -3157,13 +1576,15 @@ static void iwl3945_rx_scan_results_notif(struct iwl3945_priv *priv,
3157} 1576}
3158 1577
3159/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */ 1578/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
3160static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv, 1579static void iwl3945_rx_scan_complete_notif(struct iwl_priv *priv,
3161 struct iwl3945_rx_mem_buffer *rxb) 1580 struct iwl_rx_mem_buffer *rxb)
3162{ 1581{
3163 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1582#ifdef CONFIG_IWLWIFI_DEBUG
3164 struct iwl3945_scancomplete_notification *scan_notif = (void *)pkt->u.raw; 1583 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
1584 struct iwl_scancomplete_notification *scan_notif = (void *)pkt->u.raw;
1585#endif
3165 1586
3166 IWL_DEBUG_SCAN("Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n", 1587 IWL_DEBUG_SCAN(priv, "Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",
3167 scan_notif->scanned_channels, 1588 scan_notif->scanned_channels,
3168 scan_notif->tsf_low, 1589 scan_notif->tsf_low,
3169 scan_notif->tsf_high, scan_notif->status); 1590 scan_notif->tsf_high, scan_notif->status);
@@ -3174,7 +1595,7 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv,
3174 /* The scan completion notification came in, so kill that timer... */ 1595 /* The scan completion notification came in, so kill that timer... */
3175 cancel_delayed_work(&priv->scan_check); 1596 cancel_delayed_work(&priv->scan_check);
3176 1597
3177 IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", 1598 IWL_DEBUG_INFO(priv, "Scan pass on %sGHz took %dms\n",
3178 (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? 1599 (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ?
3179 "2.4" : "5.2", 1600 "2.4" : "5.2",
3180 jiffies_to_msecs(elapsed_jiffies 1601 jiffies_to_msecs(elapsed_jiffies
@@ -3192,7 +1613,7 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv,
3192 * then we reset the scan state machine and terminate, 1613 * then we reset the scan state machine and terminate,
3193 * re-queuing another scan if one has been requested */ 1614 * re-queuing another scan if one has been requested */
3194 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { 1615 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
3195 IWL_DEBUG_INFO("Aborted scan completed.\n"); 1616 IWL_DEBUG_INFO(priv, "Aborted scan completed.\n");
3196 clear_bit(STATUS_SCAN_ABORTING, &priv->status); 1617 clear_bit(STATUS_SCAN_ABORTING, &priv->status);
3197 } else { 1618 } else {
3198 /* If there are more bands on this scan pass reschedule */ 1619 /* If there are more bands on this scan pass reschedule */
@@ -3202,11 +1623,11 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv,
3202 1623
3203 priv->last_scan_jiffies = jiffies; 1624 priv->last_scan_jiffies = jiffies;
3204 priv->next_scan_jiffies = 0; 1625 priv->next_scan_jiffies = 0;
3205 IWL_DEBUG_INFO("Setting scan to off\n"); 1626 IWL_DEBUG_INFO(priv, "Setting scan to off\n");
3206 1627
3207 clear_bit(STATUS_SCANNING, &priv->status); 1628 clear_bit(STATUS_SCANNING, &priv->status);
3208 1629
3209 IWL_DEBUG_INFO("Scan took %dms\n", 1630 IWL_DEBUG_INFO(priv, "Scan took %dms\n",
3210 jiffies_to_msecs(elapsed_jiffies(priv->scan_start, jiffies))); 1631 jiffies_to_msecs(elapsed_jiffies(priv->scan_start, jiffies)));
3211 1632
3212 queue_work(priv->workqueue, &priv->scan_completed); 1633 queue_work(priv->workqueue, &priv->scan_completed);
@@ -3220,18 +1641,18 @@ reschedule:
3220 1641
3221/* Handle notification from uCode that card's power state is changing 1642/* Handle notification from uCode that card's power state is changing
3222 * due to software, hardware, or critical temperature RFKILL */ 1643 * due to software, hardware, or critical temperature RFKILL */
3223static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv, 1644static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,
3224 struct iwl3945_rx_mem_buffer *rxb) 1645 struct iwl_rx_mem_buffer *rxb)
3225{ 1646{
3226 struct iwl3945_rx_packet *pkt = (void *)rxb->skb->data; 1647 struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
3227 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); 1648 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
3228 unsigned long status = priv->status; 1649 unsigned long status = priv->status;
3229 1650
3230 IWL_DEBUG_RF_KILL("Card state received: HW:%s SW:%s\n", 1651 IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s\n",
3231 (flags & HW_CARD_DISABLED) ? "Kill" : "On", 1652 (flags & HW_CARD_DISABLED) ? "Kill" : "On",
3232 (flags & SW_CARD_DISABLED) ? "Kill" : "On"); 1653 (flags & SW_CARD_DISABLED) ? "Kill" : "On");
3233 1654
3234 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_SET, 1655 iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
3235 CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); 1656 CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
3236 1657
3237 if (flags & HW_CARD_DISABLED) 1658 if (flags & HW_CARD_DISABLED)
@@ -3245,7 +1666,7 @@ static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv,
3245 else 1666 else
3246 clear_bit(STATUS_RF_KILL_SW, &priv->status); 1667 clear_bit(STATUS_RF_KILL_SW, &priv->status);
3247 1668
3248 iwl3945_scan_cancel(priv); 1669 iwl_scan_cancel(priv);
3249 1670
3250 if ((test_bit(STATUS_RF_KILL_HW, &status) != 1671 if ((test_bit(STATUS_RF_KILL_HW, &status) !=
3251 test_bit(STATUS_RF_KILL_HW, &priv->status)) || 1672 test_bit(STATUS_RF_KILL_HW, &priv->status)) ||
@@ -3265,12 +1686,12 @@ static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv,
3265 * This function chains into the hardware specific files for them to setup 1686 * This function chains into the hardware specific files for them to setup
3266 * any hardware specific handlers as well. 1687 * any hardware specific handlers as well.
3267 */ 1688 */
3268static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv) 1689static void iwl3945_setup_rx_handlers(struct iwl_priv *priv)
3269{ 1690{
3270 priv->rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive; 1691 priv->rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive;
3271 priv->rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta; 1692 priv->rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta;
3272 priv->rx_handlers[REPLY_ERROR] = iwl3945_rx_reply_error; 1693 priv->rx_handlers[REPLY_ERROR] = iwl3945_rx_reply_error;
3273 priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl3945_rx_csa; 1694 priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl_rx_csa;
3274 priv->rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] = 1695 priv->rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] =
3275 iwl3945_rx_spectrum_measure_notif; 1696 iwl3945_rx_spectrum_measure_notif;
3276 priv->rx_handlers[PM_SLEEP_NOTIFICATION] = iwl3945_rx_pm_sleep_notif; 1697 priv->rx_handlers[PM_SLEEP_NOTIFICATION] = iwl3945_rx_pm_sleep_notif;
@@ -3303,15 +1724,15 @@ static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv)
3303 * When FW advances 'R' index, all entries between old and new 'R' index 1724 * When FW advances 'R' index, all entries between old and new 'R' index
3304 * need to be reclaimed. 1725 * need to be reclaimed.
3305 */ 1726 */
3306static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv, 1727static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv,
3307 int txq_id, int index) 1728 int txq_id, int index)
3308{ 1729{
3309 struct iwl3945_tx_queue *txq = &priv->txq[txq_id]; 1730 struct iwl_tx_queue *txq = &priv->txq[txq_id];
3310 struct iwl3945_queue *q = &txq->q; 1731 struct iwl_queue *q = &txq->q;
3311 int nfreed = 0; 1732 int nfreed = 0;
3312 1733
3313 if ((index >= q->n_bd) || (iwl3945_x2_queue_used(q, index) == 0)) { 1734 if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
3314 IWL_ERROR("Read index for DMA queue txq id (%d), index %d, " 1735 IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "
3315 "is out of range [0-%d] %d %d.\n", txq_id, 1736 "is out of range [0-%d] %d %d.\n", txq_id,
3316 index, q->n_bd, q->write_ptr, q->read_ptr); 1737 index, q->n_bd, q->write_ptr, q->read_ptr);
3317 return; 1738 return;
@@ -3320,7 +1741,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv,
3320 for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index; 1741 for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index;
3321 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) { 1742 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
3322 if (nfreed > 1) { 1743 if (nfreed > 1) {
3323 IWL_ERROR("HCMD skipped: index (%d) %d %d\n", index, 1744 IWL_ERR(priv, "HCMD skipped: index (%d) %d %d\n", index,
3324 q->write_ptr, q->read_ptr); 1745 q->write_ptr, q->read_ptr);
3325 queue_work(priv->workqueue, &priv->restart); 1746 queue_work(priv->workqueue, &priv->restart);
3326 break; 1747 break;
@@ -3338,21 +1759,28 @@ static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv,
3338 * will be executed. The attached skb (if present) will only be freed 1759 * will be executed. The attached skb (if present) will only be freed
3339 * if the callback returns 1 1760 * if the callback returns 1
3340 */ 1761 */
3341static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv, 1762static void iwl3945_tx_cmd_complete(struct iwl_priv *priv,
3342 struct iwl3945_rx_mem_buffer *rxb) 1763 struct iwl_rx_mem_buffer *rxb)
3343{ 1764{
3344 struct iwl3945_rx_packet *pkt = (struct iwl3945_rx_packet *)rxb->skb->data; 1765 struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
3345 u16 sequence = le16_to_cpu(pkt->hdr.sequence); 1766 u16 sequence = le16_to_cpu(pkt->hdr.sequence);
3346 int txq_id = SEQ_TO_QUEUE(sequence); 1767 int txq_id = SEQ_TO_QUEUE(sequence);
3347 int index = SEQ_TO_INDEX(sequence); 1768 int index = SEQ_TO_INDEX(sequence);
3348 int huge = sequence & SEQ_HUGE_FRAME; 1769 int huge = !!(pkt->hdr.sequence & SEQ_HUGE_FRAME);
3349 int cmd_index; 1770 int cmd_index;
3350 struct iwl3945_cmd *cmd; 1771 struct iwl_cmd *cmd;
3351 1772
3352 BUG_ON(txq_id != IWL_CMD_QUEUE_NUM); 1773 if (WARN(txq_id != IWL_CMD_QUEUE_NUM,
1774 "wrong command queue %d, sequence 0x%X readp=%d writep=%d\n",
1775 txq_id, sequence,
1776 priv->txq[IWL_CMD_QUEUE_NUM].q.read_ptr,
1777 priv->txq[IWL_CMD_QUEUE_NUM].q.write_ptr)) {
1778 iwl_print_hex_dump(priv, IWL_DL_INFO , rxb, 32);
1779 return;
1780 }
3353 1781
3354 cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge); 1782 cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);
3355 cmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index]; 1783 cmd = priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];
3356 1784
3357 /* Input error checking is done when commands are added to queue. */ 1785 /* Input error checking is done when commands are added to queue. */
3358 if (cmd->meta.flags & CMD_WANT_SKB) { 1786 if (cmd->meta.flags & CMD_WANT_SKB) {
@@ -3417,7 +1845,6 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
3417 * 1845 *
3418 * Driver sequence: 1846 * Driver sequence:
3419 * 1847 *
3420 * iwl3945_rx_queue_alloc() Allocates rx_free
3421 * iwl3945_rx_replenish() Replenishes rx_free list from rx_used, and calls 1848 * iwl3945_rx_replenish() Replenishes rx_free list from rx_used, and calls
3422 * iwl3945_rx_queue_restock 1849 * iwl3945_rx_queue_restock
3423 * iwl3945_rx_queue_restock() Moves available buffers from rx_free into Rx 1850 * iwl3945_rx_queue_restock() Moves available buffers from rx_free into Rx
@@ -3426,7 +1853,7 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
3426 * are available, schedules iwl3945_rx_replenish 1853 * are available, schedules iwl3945_rx_replenish
3427 * 1854 *
3428 * -- enable interrupts -- 1855 * -- enable interrupts --
3429 * ISR - iwl3945_rx() Detach iwl3945_rx_mem_buffers from pool up to the 1856 * ISR - iwl3945_rx() Detach iwl_rx_mem_buffers from pool up to the
3430 * READ INDEX, detaching the SKB from the pool. 1857 * READ INDEX, detaching the SKB from the pool.
3431 * Moves the packet buffer from queue to rx_used. 1858 * Moves the packet buffer from queue to rx_used.
3432 * Calls iwl3945_rx_queue_restock to refill any empty 1859 * Calls iwl3945_rx_queue_restock to refill any empty
@@ -3436,70 +1863,9 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
3436 */ 1863 */
3437 1864
3438/** 1865/**
3439 * iwl3945_rx_queue_space - Return number of free slots available in queue.
3440 */
3441static int iwl3945_rx_queue_space(const struct iwl3945_rx_queue *q)
3442{
3443 int s = q->read - q->write;
3444 if (s <= 0)
3445 s += RX_QUEUE_SIZE;
3446 /* keep some buffer to not confuse full and empty queue */
3447 s -= 2;
3448 if (s < 0)
3449 s = 0;
3450 return s;
3451}
3452
3453/**
3454 * iwl3945_rx_queue_update_write_ptr - Update the write pointer for the RX queue
3455 */
3456int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, struct iwl3945_rx_queue *q)
3457{
3458 u32 reg = 0;
3459 int rc = 0;
3460 unsigned long flags;
3461
3462 spin_lock_irqsave(&q->lock, flags);
3463
3464 if (q->need_update == 0)
3465 goto exit_unlock;
3466
3467 /* If power-saving is in use, make sure device is awake */
3468 if (test_bit(STATUS_POWER_PMI, &priv->status)) {
3469 reg = iwl3945_read32(priv, CSR_UCODE_DRV_GP1);
3470
3471 if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
3472 iwl3945_set_bit(priv, CSR_GP_CNTRL,
3473 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
3474 goto exit_unlock;
3475 }
3476
3477 rc = iwl3945_grab_nic_access(priv);
3478 if (rc)
3479 goto exit_unlock;
3480
3481 /* Device expects a multiple of 8 */
3482 iwl3945_write_direct32(priv, FH_RSCSR_CHNL0_WPTR,
3483 q->write & ~0x7);
3484 iwl3945_release_nic_access(priv);
3485
3486 /* Else device is assumed to be awake */
3487 } else
3488 /* Device expects a multiple of 8 */
3489 iwl3945_write32(priv, FH_RSCSR_CHNL0_WPTR, q->write & ~0x7);
3490
3491
3492 q->need_update = 0;
3493
3494 exit_unlock:
3495 spin_unlock_irqrestore(&q->lock, flags);
3496 return rc;
3497}
3498
3499/**
3500 * iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr 1866 * iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
3501 */ 1867 */
3502static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl3945_priv *priv, 1868static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl_priv *priv,
3503 dma_addr_t dma_addr) 1869 dma_addr_t dma_addr)
3504{ 1870{
3505 return cpu_to_le32((u32)dma_addr); 1871 return cpu_to_le32((u32)dma_addr);
@@ -3516,24 +1882,24 @@ static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl3945_priv *priv,
3516 * also updates the memory address in the firmware to reference the new 1882 * also updates the memory address in the firmware to reference the new
3517 * target buffer. 1883 * target buffer.
3518 */ 1884 */
3519static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv) 1885static int iwl3945_rx_queue_restock(struct iwl_priv *priv)
3520{ 1886{
3521 struct iwl3945_rx_queue *rxq = &priv->rxq; 1887 struct iwl_rx_queue *rxq = &priv->rxq;
3522 struct list_head *element; 1888 struct list_head *element;
3523 struct iwl3945_rx_mem_buffer *rxb; 1889 struct iwl_rx_mem_buffer *rxb;
3524 unsigned long flags; 1890 unsigned long flags;
3525 int write, rc; 1891 int write, rc;
3526 1892
3527 spin_lock_irqsave(&rxq->lock, flags); 1893 spin_lock_irqsave(&rxq->lock, flags);
3528 write = rxq->write & ~0x7; 1894 write = rxq->write & ~0x7;
3529 while ((iwl3945_rx_queue_space(rxq) > 0) && (rxq->free_count)) { 1895 while ((iwl_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
3530 /* Get next free Rx buffer, remove from free list */ 1896 /* Get next free Rx buffer, remove from free list */
3531 element = rxq->rx_free.next; 1897 element = rxq->rx_free.next;
3532 rxb = list_entry(element, struct iwl3945_rx_mem_buffer, list); 1898 rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
3533 list_del(element); 1899 list_del(element);
3534 1900
3535 /* Point to Rx buffer via next RBD in circular buffer */ 1901 /* Point to Rx buffer via next RBD in circular buffer */
3536 rxq->bd[rxq->write] = iwl3945_dma_addr2rbd_ptr(priv, rxb->dma_addr); 1902 rxq->bd[rxq->write] = iwl3945_dma_addr2rbd_ptr(priv, rxb->real_dma_addr);
3537 rxq->queue[rxq->write] = rxb; 1903 rxq->queue[rxq->write] = rxb;
3538 rxq->write = (rxq->write + 1) & RX_QUEUE_MASK; 1904 rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
3539 rxq->free_count--; 1905 rxq->free_count--;
@@ -3552,7 +1918,7 @@ static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv)
3552 spin_lock_irqsave(&rxq->lock, flags); 1918 spin_lock_irqsave(&rxq->lock, flags);
3553 rxq->need_update = 1; 1919 rxq->need_update = 1;
3554 spin_unlock_irqrestore(&rxq->lock, flags); 1920 spin_unlock_irqrestore(&rxq->lock, flags);
3555 rc = iwl3945_rx_queue_update_write_ptr(priv, rxq); 1921 rc = iwl_rx_queue_update_write_ptr(priv, rxq);
3556 if (rc) 1922 if (rc)
3557 return rc; 1923 return rc;
3558 } 1924 }
@@ -3568,24 +1934,24 @@ static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv)
3568 * Also restock the Rx queue via iwl3945_rx_queue_restock. 1934 * Also restock the Rx queue via iwl3945_rx_queue_restock.
3569 * This is called as a scheduled work item (except for during initialization) 1935 * This is called as a scheduled work item (except for during initialization)
3570 */ 1936 */
3571static void iwl3945_rx_allocate(struct iwl3945_priv *priv) 1937static void iwl3945_rx_allocate(struct iwl_priv *priv)
3572{ 1938{
3573 struct iwl3945_rx_queue *rxq = &priv->rxq; 1939 struct iwl_rx_queue *rxq = &priv->rxq;
3574 struct list_head *element; 1940 struct list_head *element;
3575 struct iwl3945_rx_mem_buffer *rxb; 1941 struct iwl_rx_mem_buffer *rxb;
3576 unsigned long flags; 1942 unsigned long flags;
3577 spin_lock_irqsave(&rxq->lock, flags); 1943 spin_lock_irqsave(&rxq->lock, flags);
3578 while (!list_empty(&rxq->rx_used)) { 1944 while (!list_empty(&rxq->rx_used)) {
3579 element = rxq->rx_used.next; 1945 element = rxq->rx_used.next;
3580 rxb = list_entry(element, struct iwl3945_rx_mem_buffer, list); 1946 rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
3581 1947
3582 /* Alloc a new receive buffer */ 1948 /* Alloc a new receive buffer */
3583 rxb->skb = 1949 rxb->skb =
3584 alloc_skb(IWL_RX_BUF_SIZE, __GFP_NOWARN | GFP_ATOMIC); 1950 alloc_skb(priv->hw_params.rx_buf_size,
1951 __GFP_NOWARN | GFP_ATOMIC);
3585 if (!rxb->skb) { 1952 if (!rxb->skb) {
3586 if (net_ratelimit()) 1953 if (net_ratelimit())
3587 printk(KERN_CRIT DRV_NAME 1954 IWL_CRIT(priv, ": Can not allocate SKB buffers\n");
3588 ": Can not allocate SKB buffers\n");
3589 /* We don't reschedule replenish work here -- we will 1955 /* We don't reschedule replenish work here -- we will
3590 * call the restock method and if it still needs 1956 * call the restock method and if it still needs
3591 * more buffers it will schedule replenish */ 1957 * more buffers it will schedule replenish */
@@ -3604,9 +1970,10 @@ static void iwl3945_rx_allocate(struct iwl3945_priv *priv)
3604 list_del(element); 1970 list_del(element);
3605 1971
3606 /* Get physical address of RB/SKB */ 1972 /* Get physical address of RB/SKB */
3607 rxb->dma_addr = 1973 rxb->real_dma_addr = pci_map_single(priv->pci_dev,
3608 pci_map_single(priv->pci_dev, rxb->skb->data, 1974 rxb->skb->data,
3609 IWL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); 1975 priv->hw_params.rx_buf_size,
1976 PCI_DMA_FROMDEVICE);
3610 list_add_tail(&rxb->list, &rxq->rx_free); 1977 list_add_tail(&rxb->list, &rxq->rx_free);
3611 rxq->free_count++; 1978 rxq->free_count++;
3612 } 1979 }
@@ -3618,7 +1985,7 @@ static void iwl3945_rx_allocate(struct iwl3945_priv *priv)
3618 */ 1985 */
3619static void __iwl3945_rx_replenish(void *data) 1986static void __iwl3945_rx_replenish(void *data)
3620{ 1987{
3621 struct iwl3945_priv *priv = data; 1988 struct iwl_priv *priv = data;
3622 1989
3623 iwl3945_rx_allocate(priv); 1990 iwl3945_rx_allocate(priv);
3624 iwl3945_rx_queue_restock(priv); 1991 iwl3945_rx_queue_restock(priv);
@@ -3627,7 +1994,7 @@ static void __iwl3945_rx_replenish(void *data)
3627 1994
3628void iwl3945_rx_replenish(void *data) 1995void iwl3945_rx_replenish(void *data)
3629{ 1996{
3630 struct iwl3945_priv *priv = data; 1997 struct iwl_priv *priv = data;
3631 unsigned long flags; 1998 unsigned long flags;
3632 1999
3633 iwl3945_rx_allocate(priv); 2000 iwl3945_rx_allocate(priv);
@@ -3637,84 +2004,6 @@ void iwl3945_rx_replenish(void *data)
3637 spin_unlock_irqrestore(&priv->lock, flags); 2004 spin_unlock_irqrestore(&priv->lock, flags);
3638} 2005}
3639 2006
3640/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
3641 * If an SKB has been detached, the POOL needs to have its SKB set to NULL
3642 * This free routine walks the list of POOL entries and if SKB is set to
3643 * non NULL it is unmapped and freed
3644 */
3645static void iwl3945_rx_queue_free(struct iwl3945_priv *priv, struct iwl3945_rx_queue *rxq)
3646{
3647 int i;
3648 for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
3649 if (rxq->pool[i].skb != NULL) {
3650 pci_unmap_single(priv->pci_dev,
3651 rxq->pool[i].dma_addr,
3652 IWL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
3653 dev_kfree_skb(rxq->pool[i].skb);
3654 }
3655 }
3656
3657 pci_free_consistent(priv->pci_dev, 4 * RX_QUEUE_SIZE, rxq->bd,
3658 rxq->dma_addr);
3659 rxq->bd = NULL;
3660}
3661
3662int iwl3945_rx_queue_alloc(struct iwl3945_priv *priv)
3663{
3664 struct iwl3945_rx_queue *rxq = &priv->rxq;
3665 struct pci_dev *dev = priv->pci_dev;
3666 int i;
3667
3668 spin_lock_init(&rxq->lock);
3669 INIT_LIST_HEAD(&rxq->rx_free);
3670 INIT_LIST_HEAD(&rxq->rx_used);
3671
3672 /* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
3673 rxq->bd = pci_alloc_consistent(dev, 4 * RX_QUEUE_SIZE, &rxq->dma_addr);
3674 if (!rxq->bd)
3675 return -ENOMEM;
3676
3677 /* Fill the rx_used queue with _all_ of the Rx buffers */
3678 for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)
3679 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
3680
3681 /* Set us so that we have processed and used all buffers, but have
3682 * not restocked the Rx queue with fresh buffers */
3683 rxq->read = rxq->write = 0;
3684 rxq->free_count = 0;
3685 rxq->need_update = 0;
3686 return 0;
3687}
3688
3689void iwl3945_rx_queue_reset(struct iwl3945_priv *priv, struct iwl3945_rx_queue *rxq)
3690{
3691 unsigned long flags;
3692 int i;
3693 spin_lock_irqsave(&rxq->lock, flags);
3694 INIT_LIST_HEAD(&rxq->rx_free);
3695 INIT_LIST_HEAD(&rxq->rx_used);
3696 /* Fill the rx_used queue with _all_ of the Rx buffers */
3697 for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
3698 /* In the reset function, these buffers may have been allocated
3699 * to an SKB, so we need to unmap and free potential storage */
3700 if (rxq->pool[i].skb != NULL) {
3701 pci_unmap_single(priv->pci_dev,
3702 rxq->pool[i].dma_addr,
3703 IWL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
3704 priv->alloc_rxb_skb--;
3705 dev_kfree_skb(rxq->pool[i].skb);
3706 rxq->pool[i].skb = NULL;
3707 }
3708 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
3709 }
3710
3711 /* Set us so that we have processed and used all buffers, but have
3712 * not restocked the Rx queue with fresh buffers */
3713 rxq->read = rxq->write = 0;
3714 rxq->free_count = 0;
3715 spin_unlock_irqrestore(&rxq->lock, flags);
3716}
3717
3718/* Convert linear signal-to-noise ratio into dB */ 2007/* Convert linear signal-to-noise ratio into dB */
3719static u8 ratio2dB[100] = { 2008static u8 ratio2dB[100] = {
3720/* 0 1 2 3 4 5 6 7 8 9 */ 2009/* 0 1 2 3 4 5 6 7 8 9 */
@@ -3800,11 +2089,11 @@ int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm)
3800 * the appropriate handlers, including command responses, 2089 * the appropriate handlers, including command responses,
3801 * frame-received notifications, and other notifications. 2090 * frame-received notifications, and other notifications.
3802 */ 2091 */
3803static void iwl3945_rx_handle(struct iwl3945_priv *priv) 2092static void iwl3945_rx_handle(struct iwl_priv *priv)
3804{ 2093{
3805 struct iwl3945_rx_mem_buffer *rxb; 2094 struct iwl_rx_mem_buffer *rxb;
3806 struct iwl3945_rx_packet *pkt; 2095 struct iwl_rx_packet *pkt;
3807 struct iwl3945_rx_queue *rxq = &priv->rxq; 2096 struct iwl_rx_queue *rxq = &priv->rxq;
3808 u32 r, i; 2097 u32 r, i;
3809 int reclaim; 2098 int reclaim;
3810 unsigned long flags; 2099 unsigned long flags;
@@ -3813,14 +2102,14 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3813 2102
3814 /* uCode's read index (stored in shared DRAM) indicates the last Rx 2103 /* uCode's read index (stored in shared DRAM) indicates the last Rx
3815 * buffer that the driver may process (last buffer filled by ucode). */ 2104 * buffer that the driver may process (last buffer filled by ucode). */
3816 r = iwl3945_hw_get_rx_read(priv); 2105 r = le16_to_cpu(rxq->rb_stts->closed_rb_num) & 0x0FFF;
3817 i = rxq->read; 2106 i = rxq->read;
3818 2107
3819 if (iwl3945_rx_queue_space(rxq) > (RX_QUEUE_SIZE / 2)) 2108 if (iwl_rx_queue_space(rxq) > (RX_QUEUE_SIZE / 2))
3820 fill_rx = 1; 2109 fill_rx = 1;
3821 /* Rx interrupt, but nothing sent from uCode */ 2110 /* Rx interrupt, but nothing sent from uCode */
3822 if (i == r) 2111 if (i == r)
3823 IWL_DEBUG(IWL_DL_RX | IWL_DL_ISR, "r = %d, i = %d\n", r, i); 2112 IWL_DEBUG(priv, IWL_DL_RX | IWL_DL_ISR, "r = %d, i = %d\n", r, i);
3824 2113
3825 while (i != r) { 2114 while (i != r) {
3826 rxb = rxq->queue[i]; 2115 rxb = rxq->queue[i];
@@ -3832,10 +2121,10 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3832 2121
3833 rxq->queue[i] = NULL; 2122 rxq->queue[i] = NULL;
3834 2123
3835 pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr, 2124 pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->real_dma_addr,
3836 IWL_RX_BUF_SIZE, 2125 priv->hw_params.rx_buf_size,
3837 PCI_DMA_FROMDEVICE); 2126 PCI_DMA_FROMDEVICE);
3838 pkt = (struct iwl3945_rx_packet *)rxb->skb->data; 2127 pkt = (struct iwl_rx_packet *)rxb->skb->data;
3839 2128
3840 /* Reclaim a command buffer only if this packet is a response 2129 /* Reclaim a command buffer only if this packet is a response
3841 * to a (driver-originated) command. 2130 * to a (driver-originated) command.
@@ -3851,13 +2140,13 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3851 * handle those that need handling via function in 2140 * handle those that need handling via function in
3852 * rx_handlers table. See iwl3945_setup_rx_handlers() */ 2141 * rx_handlers table. See iwl3945_setup_rx_handlers() */
3853 if (priv->rx_handlers[pkt->hdr.cmd]) { 2142 if (priv->rx_handlers[pkt->hdr.cmd]) {
3854 IWL_DEBUG(IWL_DL_HOST_COMMAND | IWL_DL_RX | IWL_DL_ISR, 2143 IWL_DEBUG(priv, IWL_DL_HCMD | IWL_DL_RX | IWL_DL_ISR,
3855 "r = %d, i = %d, %s, 0x%02x\n", r, i, 2144 "r = %d, i = %d, %s, 0x%02x\n", r, i,
3856 get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd); 2145 get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
3857 priv->rx_handlers[pkt->hdr.cmd] (priv, rxb); 2146 priv->rx_handlers[pkt->hdr.cmd] (priv, rxb);
3858 } else { 2147 } else {
3859 /* No handling needed */ 2148 /* No handling needed */
3860 IWL_DEBUG(IWL_DL_HOST_COMMAND | IWL_DL_RX | IWL_DL_ISR, 2149 IWL_DEBUG(priv, IWL_DL_HCMD | IWL_DL_RX | IWL_DL_ISR,
3861 "r %d i %d No handler needed for %s, 0x%02x\n", 2150 "r %d i %d No handler needed for %s, 0x%02x\n",
3862 r, i, get_cmd_string(pkt->hdr.cmd), 2151 r, i, get_cmd_string(pkt->hdr.cmd),
3863 pkt->hdr.cmd); 2152 pkt->hdr.cmd);
@@ -3865,12 +2154,12 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3865 2154
3866 if (reclaim) { 2155 if (reclaim) {
3867 /* Invoke any callbacks, transfer the skb to caller, and 2156 /* Invoke any callbacks, transfer the skb to caller, and
3868 * fire off the (possibly) blocking iwl3945_send_cmd() 2157 * fire off the (possibly) blocking iwl_send_cmd()
3869 * as we reclaim the driver command queue */ 2158 * as we reclaim the driver command queue */
3870 if (rxb && rxb->skb) 2159 if (rxb && rxb->skb)
3871 iwl3945_tx_cmd_complete(priv, rxb); 2160 iwl3945_tx_cmd_complete(priv, rxb);
3872 else 2161 else
3873 IWL_WARNING("Claim null rxb?\n"); 2162 IWL_WARN(priv, "Claim null rxb?\n");
3874 } 2163 }
3875 2164
3876 /* For now we just don't re-use anything. We can tweak this 2165 /* For now we just don't re-use anything. We can tweak this
@@ -3882,8 +2171,9 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3882 rxb->skb = NULL; 2171 rxb->skb = NULL;
3883 } 2172 }
3884 2173
3885 pci_unmap_single(priv->pci_dev, rxb->dma_addr, 2174 pci_unmap_single(priv->pci_dev, rxb->real_dma_addr,
3886 IWL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); 2175 priv->hw_params.rx_buf_size,
2176 PCI_DMA_FROMDEVICE);
3887 spin_lock_irqsave(&rxq->lock, flags); 2177 spin_lock_irqsave(&rxq->lock, flags);
3888 list_add_tail(&rxb->list, &priv->rxq.rx_used); 2178 list_add_tail(&rxb->list, &priv->rxq.rx_used);
3889 spin_unlock_irqrestore(&rxq->lock, flags); 2179 spin_unlock_irqrestore(&rxq->lock, flags);
@@ -3905,81 +2195,16 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
3905 iwl3945_rx_queue_restock(priv); 2195 iwl3945_rx_queue_restock(priv);
3906} 2196}
3907 2197
3908/** 2198static void iwl3945_enable_interrupts(struct iwl_priv *priv)
3909 * iwl3945_tx_queue_update_write_ptr - Send new write index to hardware
3910 */
3911static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv,
3912 struct iwl3945_tx_queue *txq)
3913{ 2199{
3914 u32 reg = 0; 2200 IWL_DEBUG_ISR(priv, "Enabling interrupts\n");
3915 int rc = 0;
3916 int txq_id = txq->q.id;
3917
3918 if (txq->need_update == 0)
3919 return rc;
3920
3921 /* if we're trying to save power */
3922 if (test_bit(STATUS_POWER_PMI, &priv->status)) {
3923 /* wake up nic if it's powered down ...
3924 * uCode will wake up, and interrupt us again, so next
3925 * time we'll skip this part. */
3926 reg = iwl3945_read32(priv, CSR_UCODE_DRV_GP1);
3927
3928 if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
3929 IWL_DEBUG_INFO("Requesting wakeup, GP1 = 0x%x\n", reg);
3930 iwl3945_set_bit(priv, CSR_GP_CNTRL,
3931 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
3932 return rc;
3933 }
3934
3935 /* restore this queue's parameters in nic hardware. */
3936 rc = iwl3945_grab_nic_access(priv);
3937 if (rc)
3938 return rc;
3939 iwl3945_write_direct32(priv, HBUS_TARG_WRPTR,
3940 txq->q.write_ptr | (txq_id << 8));
3941 iwl3945_release_nic_access(priv);
3942
3943 /* else not in power-save mode, uCode will never sleep when we're
3944 * trying to tx (during RFKILL, we're not trying to tx). */
3945 } else
3946 iwl3945_write32(priv, HBUS_TARG_WRPTR,
3947 txq->q.write_ptr | (txq_id << 8));
3948
3949 txq->need_update = 0;
3950
3951 return rc;
3952}
3953
3954#ifdef CONFIG_IWL3945_DEBUG
3955static void iwl3945_print_rx_config_cmd(struct iwl3945_rxon_cmd *rxon)
3956{
3957 IWL_DEBUG_RADIO("RX CONFIG:\n");
3958 iwl3945_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
3959 IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
3960 IWL_DEBUG_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
3961 IWL_DEBUG_RADIO("u32 filter_flags: 0x%08x\n",
3962 le32_to_cpu(rxon->filter_flags));
3963 IWL_DEBUG_RADIO("u8 dev_type: 0x%x\n", rxon->dev_type);
3964 IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
3965 rxon->ofdm_basic_rates);
3966 IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
3967 IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
3968 IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
3969 IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
3970}
3971#endif
3972
3973static void iwl3945_enable_interrupts(struct iwl3945_priv *priv)
3974{
3975 IWL_DEBUG_ISR("Enabling interrupts\n");
3976 set_bit(STATUS_INT_ENABLED, &priv->status); 2201 set_bit(STATUS_INT_ENABLED, &priv->status);
3977 iwl3945_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK); 2202 iwl_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK);
3978} 2203}
3979 2204
3980 2205
3981/* call this function to flush any scheduled tasklet */ 2206/* call this function to flush any scheduled tasklet */
3982static inline void iwl_synchronize_irq(struct iwl3945_priv *priv) 2207static inline void iwl_synchronize_irq(struct iwl_priv *priv)
3983{ 2208{
3984 /* wait to make sure we flush pending tasklet*/ 2209 /* wait to make sure we flush pending tasklet*/
3985 synchronize_irq(priv->pci_dev->irq); 2210 synchronize_irq(priv->pci_dev->irq);
@@ -3987,18 +2212,18 @@ static inline void iwl_synchronize_irq(struct iwl3945_priv *priv)
3987} 2212}
3988 2213
3989 2214
3990static inline void iwl3945_disable_interrupts(struct iwl3945_priv *priv) 2215static inline void iwl3945_disable_interrupts(struct iwl_priv *priv)
3991{ 2216{
3992 clear_bit(STATUS_INT_ENABLED, &priv->status); 2217 clear_bit(STATUS_INT_ENABLED, &priv->status);
3993 2218
3994 /* disable interrupts from uCode/NIC to host */ 2219 /* disable interrupts from uCode/NIC to host */
3995 iwl3945_write32(priv, CSR_INT_MASK, 0x00000000); 2220 iwl_write32(priv, CSR_INT_MASK, 0x00000000);
3996 2221
3997 /* acknowledge/clear/reset any interrupts still pending 2222 /* acknowledge/clear/reset any interrupts still pending
3998 * from uCode or flow handler (Rx/Tx DMA) */ 2223 * from uCode or flow handler (Rx/Tx DMA) */
3999 iwl3945_write32(priv, CSR_INT, 0xffffffff); 2224 iwl_write32(priv, CSR_INT, 0xffffffff);
4000 iwl3945_write32(priv, CSR_FH_INT_STATUS, 0xffffffff); 2225 iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);
4001 IWL_DEBUG_ISR("Disabled interrupts\n"); 2226 IWL_DEBUG_ISR(priv, "Disabled interrupts\n");
4002} 2227}
4003 2228
4004static const char *desc_lookup(int i) 2229static const char *desc_lookup(int i)
@@ -4024,7 +2249,7 @@ static const char *desc_lookup(int i)
4024#define ERROR_START_OFFSET (1 * sizeof(u32)) 2249#define ERROR_START_OFFSET (1 * sizeof(u32))
4025#define ERROR_ELEM_SIZE (7 * sizeof(u32)) 2250#define ERROR_ELEM_SIZE (7 * sizeof(u32))
4026 2251
4027static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv) 2252static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
4028{ 2253{
4029 u32 i; 2254 u32 i;
4030 u32 desc, time, count, base, data1; 2255 u32 desc, time, count, base, data1;
@@ -4034,49 +2259,50 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv)
4034 base = le32_to_cpu(priv->card_alive.error_event_table_ptr); 2259 base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
4035 2260
4036 if (!iwl3945_hw_valid_rtc_data_addr(base)) { 2261 if (!iwl3945_hw_valid_rtc_data_addr(base)) {
4037 IWL_ERROR("Not valid error log pointer 0x%08X\n", base); 2262 IWL_ERR(priv, "Not valid error log pointer 0x%08X\n", base);
4038 return; 2263 return;
4039 } 2264 }
4040 2265
4041 rc = iwl3945_grab_nic_access(priv); 2266 rc = iwl_grab_nic_access(priv);
4042 if (rc) { 2267 if (rc) {
4043 IWL_WARNING("Can not read from adapter at this time.\n"); 2268 IWL_WARN(priv, "Can not read from adapter at this time.\n");
4044 return; 2269 return;
4045 } 2270 }
4046 2271
4047 count = iwl3945_read_targ_mem(priv, base); 2272 count = iwl_read_targ_mem(priv, base);
4048 2273
4049 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { 2274 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
4050 IWL_ERROR("Start IWL Error Log Dump:\n"); 2275 IWL_ERR(priv, "Start IWL Error Log Dump:\n");
4051 IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count); 2276 IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",
2277 priv->status, count);
4052 } 2278 }
4053 2279
4054 IWL_ERROR("Desc Time asrtPC blink2 " 2280 IWL_ERR(priv, "Desc Time asrtPC blink2 "
4055 "ilink1 nmiPC Line\n"); 2281 "ilink1 nmiPC Line\n");
4056 for (i = ERROR_START_OFFSET; 2282 for (i = ERROR_START_OFFSET;
4057 i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET; 2283 i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;
4058 i += ERROR_ELEM_SIZE) { 2284 i += ERROR_ELEM_SIZE) {
4059 desc = iwl3945_read_targ_mem(priv, base + i); 2285 desc = iwl_read_targ_mem(priv, base + i);
4060 time = 2286 time =
4061 iwl3945_read_targ_mem(priv, base + i + 1 * sizeof(u32)); 2287 iwl_read_targ_mem(priv, base + i + 1 * sizeof(u32));
4062 blink1 = 2288 blink1 =
4063 iwl3945_read_targ_mem(priv, base + i + 2 * sizeof(u32)); 2289 iwl_read_targ_mem(priv, base + i + 2 * sizeof(u32));
4064 blink2 = 2290 blink2 =
4065 iwl3945_read_targ_mem(priv, base + i + 3 * sizeof(u32)); 2291 iwl_read_targ_mem(priv, base + i + 3 * sizeof(u32));
4066 ilink1 = 2292 ilink1 =
4067 iwl3945_read_targ_mem(priv, base + i + 4 * sizeof(u32)); 2293 iwl_read_targ_mem(priv, base + i + 4 * sizeof(u32));
4068 ilink2 = 2294 ilink2 =
4069 iwl3945_read_targ_mem(priv, base + i + 5 * sizeof(u32)); 2295 iwl_read_targ_mem(priv, base + i + 5 * sizeof(u32));
4070 data1 = 2296 data1 =
4071 iwl3945_read_targ_mem(priv, base + i + 6 * sizeof(u32)); 2297 iwl_read_targ_mem(priv, base + i + 6 * sizeof(u32));
4072 2298
4073 IWL_ERROR 2299 IWL_ERR(priv,
4074 ("%-13s (#%d) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n", 2300 "%-13s (#%d) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
4075 desc_lookup(desc), desc, time, blink1, blink2, 2301 desc_lookup(desc), desc, time, blink1, blink2,
4076 ilink1, ilink2, data1); 2302 ilink1, ilink2, data1);
4077 } 2303 }
4078 2304
4079 iwl3945_release_nic_access(priv); 2305 iwl_release_nic_access(priv);
4080 2306
4081} 2307}
4082 2308
@@ -4085,9 +2311,9 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv)
4085/** 2311/**
4086 * iwl3945_print_event_log - Dump error event log to syslog 2312 * iwl3945_print_event_log - Dump error event log to syslog
4087 * 2313 *
4088 * NOTE: Must be called with iwl3945_grab_nic_access() already obtained! 2314 * NOTE: Must be called with iwl_grab_nic_access() already obtained!
4089 */ 2315 */
4090static void iwl3945_print_event_log(struct iwl3945_priv *priv, u32 start_idx, 2316static void iwl3945_print_event_log(struct iwl_priv *priv, u32 start_idx,
4091 u32 num_events, u32 mode) 2317 u32 num_events, u32 mode)
4092{ 2318{
4093 u32 i; 2319 u32 i;
@@ -4111,21 +2337,22 @@ static void iwl3945_print_event_log(struct iwl3945_priv *priv, u32 start_idx,
4111 /* "time" is actually "data" for mode 0 (no timestamp). 2337 /* "time" is actually "data" for mode 0 (no timestamp).
4112 * place event id # at far right for easier visual parsing. */ 2338 * place event id # at far right for easier visual parsing. */
4113 for (i = 0; i < num_events; i++) { 2339 for (i = 0; i < num_events; i++) {
4114 ev = iwl3945_read_targ_mem(priv, ptr); 2340 ev = iwl_read_targ_mem(priv, ptr);
4115 ptr += sizeof(u32); 2341 ptr += sizeof(u32);
4116 time = iwl3945_read_targ_mem(priv, ptr); 2342 time = iwl_read_targ_mem(priv, ptr);
4117 ptr += sizeof(u32); 2343 ptr += sizeof(u32);
4118 if (mode == 0) 2344 if (mode == 0) {
4119 IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */ 2345 /* data, ev */
4120 else { 2346 IWL_ERR(priv, "0x%08x\t%04u\n", time, ev);
4121 data = iwl3945_read_targ_mem(priv, ptr); 2347 } else {
2348 data = iwl_read_targ_mem(priv, ptr);
4122 ptr += sizeof(u32); 2349 ptr += sizeof(u32);
4123 IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev); 2350 IWL_ERR(priv, "%010u\t0x%08x\t%04u\n", time, data, ev);
4124 } 2351 }
4125 } 2352 }
4126} 2353}
4127 2354
4128static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv) 2355static void iwl3945_dump_nic_event_log(struct iwl_priv *priv)
4129{ 2356{
4130 int rc; 2357 int rc;
4131 u32 base; /* SRAM byte address of event log header */ 2358 u32 base; /* SRAM byte address of event log header */
@@ -4137,32 +2364,32 @@ static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv)
4137 2364
4138 base = le32_to_cpu(priv->card_alive.log_event_table_ptr); 2365 base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
4139 if (!iwl3945_hw_valid_rtc_data_addr(base)) { 2366 if (!iwl3945_hw_valid_rtc_data_addr(base)) {
4140 IWL_ERROR("Invalid event log pointer 0x%08X\n", base); 2367 IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);
4141 return; 2368 return;
4142 } 2369 }
4143 2370
4144 rc = iwl3945_grab_nic_access(priv); 2371 rc = iwl_grab_nic_access(priv);
4145 if (rc) { 2372 if (rc) {
4146 IWL_WARNING("Can not read from adapter at this time.\n"); 2373 IWL_WARN(priv, "Can not read from adapter at this time.\n");
4147 return; 2374 return;
4148 } 2375 }
4149 2376
4150 /* event log header */ 2377 /* event log header */
4151 capacity = iwl3945_read_targ_mem(priv, base); 2378 capacity = iwl_read_targ_mem(priv, base);
4152 mode = iwl3945_read_targ_mem(priv, base + (1 * sizeof(u32))); 2379 mode = iwl_read_targ_mem(priv, base + (1 * sizeof(u32)));
4153 num_wraps = iwl3945_read_targ_mem(priv, base + (2 * sizeof(u32))); 2380 num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));
4154 next_entry = iwl3945_read_targ_mem(priv, base + (3 * sizeof(u32))); 2381 next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32)));
4155 2382
4156 size = num_wraps ? capacity : next_entry; 2383 size = num_wraps ? capacity : next_entry;
4157 2384
4158 /* bail out if nothing in log */ 2385 /* bail out if nothing in log */
4159 if (size == 0) { 2386 if (size == 0) {
4160 IWL_ERROR("Start IWL Event Log Dump: nothing in log\n"); 2387 IWL_ERR(priv, "Start IWL Event Log Dump: nothing in log\n");
4161 iwl3945_release_nic_access(priv); 2388 iwl_release_nic_access(priv);
4162 return; 2389 return;
4163 } 2390 }
4164 2391
4165 IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n", 2392 IWL_ERR(priv, "Start IWL Event Log Dump: display count %d, wraps %d\n",
4166 size, num_wraps); 2393 size, num_wraps);
4167 2394
4168 /* if uCode has wrapped back to top of log, start at the oldest entry, 2395 /* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -4174,48 +2401,10 @@ static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv)
4174 /* (then/else) start at top of log */ 2401 /* (then/else) start at top of log */
4175 iwl3945_print_event_log(priv, 0, next_entry, mode); 2402 iwl3945_print_event_log(priv, 0, next_entry, mode);
4176 2403
4177 iwl3945_release_nic_access(priv); 2404 iwl_release_nic_access(priv);
4178} 2405}
4179 2406
4180/** 2407static void iwl3945_error_recovery(struct iwl_priv *priv)
4181 * iwl3945_irq_handle_error - called for HW or SW error interrupt from card
4182 */
4183static void iwl3945_irq_handle_error(struct iwl3945_priv *priv)
4184{
4185 /* Set the FW error flag -- cleared on iwl3945_down */
4186 set_bit(STATUS_FW_ERROR, &priv->status);
4187
4188 /* Cancel currently queued command. */
4189 clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
4190
4191#ifdef CONFIG_IWL3945_DEBUG
4192 if (iwl3945_debug_level & IWL_DL_FW_ERRORS) {
4193 iwl3945_dump_nic_error_log(priv);
4194 iwl3945_dump_nic_event_log(priv);
4195 iwl3945_print_rx_config_cmd(&priv->staging_rxon);
4196 }
4197#endif
4198
4199 wake_up_interruptible(&priv->wait_command_queue);
4200
4201 /* Keep the restart process from trying to send host
4202 * commands by clearing the INIT status bit */
4203 clear_bit(STATUS_READY, &priv->status);
4204
4205 if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
4206 IWL_DEBUG(IWL_DL_INFO | IWL_DL_FW_ERRORS,
4207 "Restarting adapter due to uCode error.\n");
4208
4209 if (iwl3945_is_associated(priv)) {
4210 memcpy(&priv->recovery_rxon, &priv->active_rxon,
4211 sizeof(priv->recovery_rxon));
4212 priv->error_recovering = 1;
4213 }
4214 queue_work(priv->workqueue, &priv->restart);
4215 }
4216}
4217
4218static void iwl3945_error_recovery(struct iwl3945_priv *priv)
4219{ 2408{
4220 unsigned long flags; 2409 unsigned long flags;
4221 2410
@@ -4232,12 +2421,12 @@ static void iwl3945_error_recovery(struct iwl3945_priv *priv)
4232 spin_unlock_irqrestore(&priv->lock, flags); 2421 spin_unlock_irqrestore(&priv->lock, flags);
4233} 2422}
4234 2423
4235static void iwl3945_irq_tasklet(struct iwl3945_priv *priv) 2424static void iwl3945_irq_tasklet(struct iwl_priv *priv)
4236{ 2425{
4237 u32 inta, handled = 0; 2426 u32 inta, handled = 0;
4238 u32 inta_fh; 2427 u32 inta_fh;
4239 unsigned long flags; 2428 unsigned long flags;
4240#ifdef CONFIG_IWL3945_DEBUG 2429#ifdef CONFIG_IWLWIFI_DEBUG
4241 u32 inta_mask; 2430 u32 inta_mask;
4242#endif 2431#endif
4243 2432
@@ -4246,20 +2435,20 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4246 /* Ack/clear/reset pending uCode interrupts. 2435 /* Ack/clear/reset pending uCode interrupts.
4247 * Note: Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS, 2436 * Note: Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
4248 * and will clear only when CSR_FH_INT_STATUS gets cleared. */ 2437 * and will clear only when CSR_FH_INT_STATUS gets cleared. */
4249 inta = iwl3945_read32(priv, CSR_INT); 2438 inta = iwl_read32(priv, CSR_INT);
4250 iwl3945_write32(priv, CSR_INT, inta); 2439 iwl_write32(priv, CSR_INT, inta);
4251 2440
4252 /* Ack/clear/reset pending flow-handler (DMA) interrupts. 2441 /* Ack/clear/reset pending flow-handler (DMA) interrupts.
4253 * Any new interrupts that happen after this, either while we're 2442 * Any new interrupts that happen after this, either while we're
4254 * in this tasklet, or later, will show up in next ISR/tasklet. */ 2443 * in this tasklet, or later, will show up in next ISR/tasklet. */
4255 inta_fh = iwl3945_read32(priv, CSR_FH_INT_STATUS); 2444 inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
4256 iwl3945_write32(priv, CSR_FH_INT_STATUS, inta_fh); 2445 iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);
4257 2446
4258#ifdef CONFIG_IWL3945_DEBUG 2447#ifdef CONFIG_IWLWIFI_DEBUG
4259 if (iwl3945_debug_level & IWL_DL_ISR) { 2448 if (priv->debug_level & IWL_DL_ISR) {
4260 /* just for debug */ 2449 /* just for debug */
4261 inta_mask = iwl3945_read32(priv, CSR_INT_MASK); 2450 inta_mask = iwl_read32(priv, CSR_INT_MASK);
4262 IWL_DEBUG_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", 2451 IWL_DEBUG_ISR(priv, "inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
4263 inta, inta_mask, inta_fh); 2452 inta, inta_mask, inta_fh);
4264 } 2453 }
4265#endif 2454#endif
@@ -4275,12 +2464,12 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4275 2464
4276 /* Now service all interrupt bits discovered above. */ 2465 /* Now service all interrupt bits discovered above. */
4277 if (inta & CSR_INT_BIT_HW_ERR) { 2466 if (inta & CSR_INT_BIT_HW_ERR) {
4278 IWL_ERROR("Microcode HW error detected. Restarting.\n"); 2467 IWL_ERR(priv, "Microcode HW error detected. Restarting.\n");
4279 2468
4280 /* Tell the device to stop sending interrupts */ 2469 /* Tell the device to stop sending interrupts */
4281 iwl3945_disable_interrupts(priv); 2470 iwl3945_disable_interrupts(priv);
4282 2471
4283 iwl3945_irq_handle_error(priv); 2472 iwl_irq_handle_error(priv);
4284 2473
4285 handled |= CSR_INT_BIT_HW_ERR; 2474 handled |= CSR_INT_BIT_HW_ERR;
4286 2475
@@ -4289,16 +2478,16 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4289 return; 2478 return;
4290 } 2479 }
4291 2480
4292#ifdef CONFIG_IWL3945_DEBUG 2481#ifdef CONFIG_IWLWIFI_DEBUG
4293 if (iwl3945_debug_level & (IWL_DL_ISR)) { 2482 if (priv->debug_level & (IWL_DL_ISR)) {
4294 /* NIC fires this, but we don't use it, redundant with WAKEUP */ 2483 /* NIC fires this, but we don't use it, redundant with WAKEUP */
4295 if (inta & CSR_INT_BIT_SCD) 2484 if (inta & CSR_INT_BIT_SCD)
4296 IWL_DEBUG_ISR("Scheduler finished to transmit " 2485 IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "
4297 "the frame/frames.\n"); 2486 "the frame/frames.\n");
4298 2487
4299 /* Alive notification via Rx interrupt will do the real work */ 2488 /* Alive notification via Rx interrupt will do the real work */
4300 if (inta & CSR_INT_BIT_ALIVE) 2489 if (inta & CSR_INT_BIT_ALIVE)
4301 IWL_DEBUG_ISR("Alive interrupt\n"); 2490 IWL_DEBUG_ISR(priv, "Alive interrupt\n");
4302 } 2491 }
4303#endif 2492#endif
4304 /* Safely ignore these bits for debug checks below */ 2493 /* Safely ignore these bits for debug checks below */
@@ -4306,22 +2495,22 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4306 2495
4307 /* Error detected by uCode */ 2496 /* Error detected by uCode */
4308 if (inta & CSR_INT_BIT_SW_ERR) { 2497 if (inta & CSR_INT_BIT_SW_ERR) {
4309 IWL_ERROR("Microcode SW error detected. Restarting 0x%X.\n", 2498 IWL_ERR(priv, "Microcode SW error detected. "
4310 inta); 2499 "Restarting 0x%X.\n", inta);
4311 iwl3945_irq_handle_error(priv); 2500 iwl_irq_handle_error(priv);
4312 handled |= CSR_INT_BIT_SW_ERR; 2501 handled |= CSR_INT_BIT_SW_ERR;
4313 } 2502 }
4314 2503
4315 /* uCode wakes up after power-down sleep */ 2504 /* uCode wakes up after power-down sleep */
4316 if (inta & CSR_INT_BIT_WAKEUP) { 2505 if (inta & CSR_INT_BIT_WAKEUP) {
4317 IWL_DEBUG_ISR("Wakeup interrupt\n"); 2506 IWL_DEBUG_ISR(priv, "Wakeup interrupt\n");
4318 iwl3945_rx_queue_update_write_ptr(priv, &priv->rxq); 2507 iwl_rx_queue_update_write_ptr(priv, &priv->rxq);
4319 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[0]); 2508 iwl_txq_update_write_ptr(priv, &priv->txq[0]);
4320 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[1]); 2509 iwl_txq_update_write_ptr(priv, &priv->txq[1]);
4321 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[2]); 2510 iwl_txq_update_write_ptr(priv, &priv->txq[2]);
4322 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[3]); 2511 iwl_txq_update_write_ptr(priv, &priv->txq[3]);
4323 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[4]); 2512 iwl_txq_update_write_ptr(priv, &priv->txq[4]);
4324 iwl3945_tx_queue_update_write_ptr(priv, &priv->txq[5]); 2513 iwl_txq_update_write_ptr(priv, &priv->txq[5]);
4325 2514
4326 handled |= CSR_INT_BIT_WAKEUP; 2515 handled |= CSR_INT_BIT_WAKEUP;
4327 } 2516 }
@@ -4335,25 +2524,24 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4335 } 2524 }
4336 2525
4337 if (inta & CSR_INT_BIT_FH_TX) { 2526 if (inta & CSR_INT_BIT_FH_TX) {
4338 IWL_DEBUG_ISR("Tx interrupt\n"); 2527 IWL_DEBUG_ISR(priv, "Tx interrupt\n");
4339 2528
4340 iwl3945_write32(priv, CSR_FH_INT_STATUS, (1 << 6)); 2529 iwl_write32(priv, CSR_FH_INT_STATUS, (1 << 6));
4341 if (!iwl3945_grab_nic_access(priv)) { 2530 if (!iwl_grab_nic_access(priv)) {
4342 iwl3945_write_direct32(priv, 2531 iwl_write_direct32(priv, FH39_TCSR_CREDIT
4343 FH_TCSR_CREDIT 2532 (FH39_SRVC_CHNL), 0x0);
4344 (ALM_FH_SRVC_CHNL), 0x0); 2533 iwl_release_nic_access(priv);
4345 iwl3945_release_nic_access(priv);
4346 } 2534 }
4347 handled |= CSR_INT_BIT_FH_TX; 2535 handled |= CSR_INT_BIT_FH_TX;
4348 } 2536 }
4349 2537
4350 if (inta & ~handled) 2538 if (inta & ~handled)
4351 IWL_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled); 2539 IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta & ~handled);
4352 2540
4353 if (inta & ~CSR_INI_SET_MASK) { 2541 if (inta & ~CSR_INI_SET_MASK) {
4354 IWL_WARNING("Disabled INTA bits 0x%08x were pending\n", 2542 IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
4355 inta & ~CSR_INI_SET_MASK); 2543 inta & ~CSR_INI_SET_MASK);
4356 IWL_WARNING(" with FH_INT = 0x%08x\n", inta_fh); 2544 IWL_WARN(priv, " with FH_INT = 0x%08x\n", inta_fh);
4357 } 2545 }
4358 2546
4359 /* Re-enable all interrupts */ 2547 /* Re-enable all interrupts */
@@ -4361,12 +2549,12 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4361 if (test_bit(STATUS_INT_ENABLED, &priv->status)) 2549 if (test_bit(STATUS_INT_ENABLED, &priv->status))
4362 iwl3945_enable_interrupts(priv); 2550 iwl3945_enable_interrupts(priv);
4363 2551
4364#ifdef CONFIG_IWL3945_DEBUG 2552#ifdef CONFIG_IWLWIFI_DEBUG
4365 if (iwl3945_debug_level & (IWL_DL_ISR)) { 2553 if (priv->debug_level & (IWL_DL_ISR)) {
4366 inta = iwl3945_read32(priv, CSR_INT); 2554 inta = iwl_read32(priv, CSR_INT);
4367 inta_mask = iwl3945_read32(priv, CSR_INT_MASK); 2555 inta_mask = iwl_read32(priv, CSR_INT_MASK);
4368 inta_fh = iwl3945_read32(priv, CSR_FH_INT_STATUS); 2556 inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
4369 IWL_DEBUG_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, " 2557 IWL_DEBUG_ISR(priv, "End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
4370 "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags); 2558 "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
4371 } 2559 }
4372#endif 2560#endif
@@ -4375,7 +2563,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
4375 2563
4376static irqreturn_t iwl3945_isr(int irq, void *data) 2564static irqreturn_t iwl3945_isr(int irq, void *data)
4377{ 2565{
4378 struct iwl3945_priv *priv = data; 2566 struct iwl_priv *priv = data;
4379 u32 inta, inta_mask; 2567 u32 inta, inta_mask;
4380 u32 inta_fh; 2568 u32 inta_fh;
4381 if (!priv) 2569 if (!priv)
@@ -4387,28 +2575,28 @@ static irqreturn_t iwl3945_isr(int irq, void *data)
4387 * back-to-back ISRs and sporadic interrupts from our NIC. 2575 * back-to-back ISRs and sporadic interrupts from our NIC.
4388 * If we have something to service, the tasklet will re-enable ints. 2576 * If we have something to service, the tasklet will re-enable ints.
4389 * If we *don't* have something, we'll re-enable before leaving here. */ 2577 * If we *don't* have something, we'll re-enable before leaving here. */
4390 inta_mask = iwl3945_read32(priv, CSR_INT_MASK); /* just for debug */ 2578 inta_mask = iwl_read32(priv, CSR_INT_MASK); /* just for debug */
4391 iwl3945_write32(priv, CSR_INT_MASK, 0x00000000); 2579 iwl_write32(priv, CSR_INT_MASK, 0x00000000);
4392 2580
4393 /* Discover which interrupts are active/pending */ 2581 /* Discover which interrupts are active/pending */
4394 inta = iwl3945_read32(priv, CSR_INT); 2582 inta = iwl_read32(priv, CSR_INT);
4395 inta_fh = iwl3945_read32(priv, CSR_FH_INT_STATUS); 2583 inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
4396 2584
4397 /* Ignore interrupt if there's nothing in NIC to service. 2585 /* Ignore interrupt if there's nothing in NIC to service.
4398 * This may be due to IRQ shared with another device, 2586 * This may be due to IRQ shared with another device,
4399 * or due to sporadic interrupts thrown from our NIC. */ 2587 * or due to sporadic interrupts thrown from our NIC. */
4400 if (!inta && !inta_fh) { 2588 if (!inta && !inta_fh) {
4401 IWL_DEBUG_ISR("Ignore interrupt, inta == 0, inta_fh == 0\n"); 2589 IWL_DEBUG_ISR(priv, "Ignore interrupt, inta == 0, inta_fh == 0\n");
4402 goto none; 2590 goto none;
4403 } 2591 }
4404 2592
4405 if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { 2593 if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
4406 /* Hardware disappeared */ 2594 /* Hardware disappeared */
4407 IWL_WARNING("HARDWARE GONE?? INTA == 0x%08x\n", inta); 2595 IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
4408 goto unplugged; 2596 goto unplugged;
4409 } 2597 }
4410 2598
4411 IWL_DEBUG_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", 2599 IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
4412 inta, inta_mask, inta_fh); 2600 inta, inta_mask, inta_fh);
4413 2601
4414 inta &= ~CSR_INT_BIT_SCD; 2602 inta &= ~CSR_INT_BIT_SCD;
@@ -4430,337 +2618,26 @@ unplugged:
4430 return IRQ_NONE; 2618 return IRQ_NONE;
4431} 2619}
4432 2620
4433/************************** EEPROM BANDS **************************** 2621static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,
4434 *
4435 * The iwl3945_eeprom_band definitions below provide the mapping from the
4436 * EEPROM contents to the specific channel number supported for each
4437 * band.
4438 *
4439 * For example, iwl3945_priv->eeprom.band_3_channels[4] from the band_3
4440 * definition below maps to physical channel 42 in the 5.2GHz spectrum.
4441 * The specific geography and calibration information for that channel
4442 * is contained in the eeprom map itself.
4443 *
4444 * During init, we copy the eeprom information and channel map
4445 * information into priv->channel_info_24/52 and priv->channel_map_24/52
4446 *
4447 * channel_map_24/52 provides the index in the channel_info array for a
4448 * given channel. We have to have two separate maps as there is channel
4449 * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
4450 * band_2
4451 *
4452 * A value of 0xff stored in the channel_map indicates that the channel
4453 * is not supported by the hardware at all.
4454 *
4455 * A value of 0xfe in the channel_map indicates that the channel is not
4456 * valid for Tx with the current hardware. This means that
4457 * while the system can tune and receive on a given channel, it may not
4458 * be able to associate or transmit any frames on that
4459 * channel. There is no corresponding channel information for that
4460 * entry.
4461 *
4462 *********************************************************************/
4463
4464/* 2.4 GHz */
4465static const u8 iwl3945_eeprom_band_1[14] = {
4466 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
4467};
4468
4469/* 5.2 GHz bands */
4470static const u8 iwl3945_eeprom_band_2[] = { /* 4915-5080MHz */
4471 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
4472};
4473
4474static const u8 iwl3945_eeprom_band_3[] = { /* 5170-5320MHz */
4475 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
4476};
4477
4478static const u8 iwl3945_eeprom_band_4[] = { /* 5500-5700MHz */
4479 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
4480};
4481
4482static const u8 iwl3945_eeprom_band_5[] = { /* 5725-5825MHz */
4483 145, 149, 153, 157, 161, 165
4484};
4485
4486static void iwl3945_init_band_reference(const struct iwl3945_priv *priv, int band,
4487 int *eeprom_ch_count,
4488 const struct iwl3945_eeprom_channel
4489 **eeprom_ch_info,
4490 const u8 **eeprom_ch_index)
4491{
4492 switch (band) {
4493 case 1: /* 2.4GHz band */
4494 *eeprom_ch_count = ARRAY_SIZE(iwl3945_eeprom_band_1);
4495 *eeprom_ch_info = priv->eeprom.band_1_channels;
4496 *eeprom_ch_index = iwl3945_eeprom_band_1;
4497 break;
4498 case 2: /* 4.9GHz band */
4499 *eeprom_ch_count = ARRAY_SIZE(iwl3945_eeprom_band_2);
4500 *eeprom_ch_info = priv->eeprom.band_2_channels;
4501 *eeprom_ch_index = iwl3945_eeprom_band_2;
4502 break;
4503 case 3: /* 5.2GHz band */
4504 *eeprom_ch_count = ARRAY_SIZE(iwl3945_eeprom_band_3);
4505 *eeprom_ch_info = priv->eeprom.band_3_channels;
4506 *eeprom_ch_index = iwl3945_eeprom_band_3;
4507 break;
4508 case 4: /* 5.5GHz band */
4509 *eeprom_ch_count = ARRAY_SIZE(iwl3945_eeprom_band_4);
4510 *eeprom_ch_info = priv->eeprom.band_4_channels;
4511 *eeprom_ch_index = iwl3945_eeprom_band_4;
4512 break;
4513 case 5: /* 5.7GHz band */
4514 *eeprom_ch_count = ARRAY_SIZE(iwl3945_eeprom_band_5);
4515 *eeprom_ch_info = priv->eeprom.band_5_channels;
4516 *eeprom_ch_index = iwl3945_eeprom_band_5;
4517 break;
4518 default:
4519 BUG();
4520 return;
4521 }
4522}
4523
4524/**
4525 * iwl3945_get_channel_info - Find driver's private channel info
4526 *
4527 * Based on band and channel number.
4528 */
4529const struct iwl3945_channel_info *iwl3945_get_channel_info(const struct iwl3945_priv *priv,
4530 enum ieee80211_band band, u16 channel)
4531{
4532 int i;
4533
4534 switch (band) {
4535 case IEEE80211_BAND_5GHZ:
4536 for (i = 14; i < priv->channel_count; i++) {
4537 if (priv->channel_info[i].channel == channel)
4538 return &priv->channel_info[i];
4539 }
4540 break;
4541
4542 case IEEE80211_BAND_2GHZ:
4543 if (channel >= 1 && channel <= 14)
4544 return &priv->channel_info[channel - 1];
4545 break;
4546 case IEEE80211_NUM_BANDS:
4547 WARN_ON(1);
4548 }
4549
4550 return NULL;
4551}
4552
4553#define CHECK_AND_PRINT(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
4554 ? # x " " : "")
4555
4556/**
4557 * iwl3945_init_channel_map - Set up driver's info for all possible channels
4558 */
4559static int iwl3945_init_channel_map(struct iwl3945_priv *priv)
4560{
4561 int eeprom_ch_count = 0;
4562 const u8 *eeprom_ch_index = NULL;
4563 const struct iwl3945_eeprom_channel *eeprom_ch_info = NULL;
4564 int band, ch;
4565 struct iwl3945_channel_info *ch_info;
4566
4567 if (priv->channel_count) {
4568 IWL_DEBUG_INFO("Channel map already initialized.\n");
4569 return 0;
4570 }
4571
4572 if (priv->eeprom.version < 0x2f) {
4573 IWL_WARNING("Unsupported EEPROM version: 0x%04X\n",
4574 priv->eeprom.version);
4575 return -EINVAL;
4576 }
4577
4578 IWL_DEBUG_INFO("Initializing regulatory info from EEPROM\n");
4579
4580 priv->channel_count =
4581 ARRAY_SIZE(iwl3945_eeprom_band_1) +
4582 ARRAY_SIZE(iwl3945_eeprom_band_2) +
4583 ARRAY_SIZE(iwl3945_eeprom_band_3) +
4584 ARRAY_SIZE(iwl3945_eeprom_band_4) +
4585 ARRAY_SIZE(iwl3945_eeprom_band_5);
4586
4587 IWL_DEBUG_INFO("Parsing data for %d channels.\n", priv->channel_count);
4588
4589 priv->channel_info = kzalloc(sizeof(struct iwl3945_channel_info) *
4590 priv->channel_count, GFP_KERNEL);
4591 if (!priv->channel_info) {
4592 IWL_ERROR("Could not allocate channel_info\n");
4593 priv->channel_count = 0;
4594 return -ENOMEM;
4595 }
4596
4597 ch_info = priv->channel_info;
4598
4599 /* Loop through the 5 EEPROM bands adding them in order to the
4600 * channel map we maintain (that contains additional information than
4601 * what just in the EEPROM) */
4602 for (band = 1; band <= 5; band++) {
4603
4604 iwl3945_init_band_reference(priv, band, &eeprom_ch_count,
4605 &eeprom_ch_info, &eeprom_ch_index);
4606
4607 /* Loop through each band adding each of the channels */
4608 for (ch = 0; ch < eeprom_ch_count; ch++) {
4609 ch_info->channel = eeprom_ch_index[ch];
4610 ch_info->band = (band == 1) ? IEEE80211_BAND_2GHZ :
4611 IEEE80211_BAND_5GHZ;
4612
4613 /* permanently store EEPROM's channel regulatory flags
4614 * and max power in channel info database. */
4615 ch_info->eeprom = eeprom_ch_info[ch];
4616
4617 /* Copy the run-time flags so they are there even on
4618 * invalid channels */
4619 ch_info->flags = eeprom_ch_info[ch].flags;
4620
4621 if (!(is_channel_valid(ch_info))) {
4622 IWL_DEBUG_INFO("Ch. %d Flags %x [%sGHz] - "
4623 "No traffic\n",
4624 ch_info->channel,
4625 ch_info->flags,
4626 is_channel_a_band(ch_info) ?
4627 "5.2" : "2.4");
4628 ch_info++;
4629 continue;
4630 }
4631
4632 /* Initialize regulatory-based run-time data */
4633 ch_info->max_power_avg = ch_info->curr_txpow =
4634 eeprom_ch_info[ch].max_power_avg;
4635 ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
4636 ch_info->min_power = 0;
4637
4638 IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"
4639 " %ddBm): Ad-Hoc %ssupported\n",
4640 ch_info->channel,
4641 is_channel_a_band(ch_info) ?
4642 "5.2" : "2.4",
4643 CHECK_AND_PRINT(VALID),
4644 CHECK_AND_PRINT(IBSS),
4645 CHECK_AND_PRINT(ACTIVE),
4646 CHECK_AND_PRINT(RADAR),
4647 CHECK_AND_PRINT(WIDE),
4648 CHECK_AND_PRINT(DFS),
4649 eeprom_ch_info[ch].flags,
4650 eeprom_ch_info[ch].max_power_avg,
4651 ((eeprom_ch_info[ch].
4652 flags & EEPROM_CHANNEL_IBSS)
4653 && !(eeprom_ch_info[ch].
4654 flags & EEPROM_CHANNEL_RADAR))
4655 ? "" : "not ");
4656
4657 /* Set the user_txpower_limit to the highest power
4658 * supported by any channel */
4659 if (eeprom_ch_info[ch].max_power_avg >
4660 priv->user_txpower_limit)
4661 priv->user_txpower_limit =
4662 eeprom_ch_info[ch].max_power_avg;
4663
4664 ch_info++;
4665 }
4666 }
4667
4668 /* Set up txpower settings in driver for all channels */
4669 if (iwl3945_txpower_set_from_eeprom(priv))
4670 return -EIO;
4671
4672 return 0;
4673}
4674
4675/*
4676 * iwl3945_free_channel_map - undo allocations in iwl3945_init_channel_map
4677 */
4678static void iwl3945_free_channel_map(struct iwl3945_priv *priv)
4679{
4680 kfree(priv->channel_info);
4681 priv->channel_count = 0;
4682}
4683
4684/* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after
4685 * sending probe req. This should be set long enough to hear probe responses
4686 * from more than one AP. */
4687#define IWL_ACTIVE_DWELL_TIME_24 (30) /* all times in msec */
4688#define IWL_ACTIVE_DWELL_TIME_52 (20)
4689
4690#define IWL_ACTIVE_DWELL_FACTOR_24GHZ (3)
4691#define IWL_ACTIVE_DWELL_FACTOR_52GHZ (2)
4692
4693/* For faster active scanning, scan will move to the next channel if fewer than
4694 * PLCP_QUIET_THRESH packets are heard on this channel within
4695 * ACTIVE_QUIET_TIME after sending probe request. This shortens the dwell
4696 * time if it's a quiet channel (nothing responded to our probe, and there's
4697 * no other traffic).
4698 * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */
4699#define IWL_PLCP_QUIET_THRESH __constant_cpu_to_le16(1) /* packets */
4700#define IWL_ACTIVE_QUIET_TIME __constant_cpu_to_le16(10) /* msec */
4701
4702/* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.
4703 * Must be set longer than active dwell time.
4704 * For the most reliable scan, set > AP beacon interval (typically 100msec). */
4705#define IWL_PASSIVE_DWELL_TIME_24 (20) /* all times in msec */
4706#define IWL_PASSIVE_DWELL_TIME_52 (10)
4707#define IWL_PASSIVE_DWELL_BASE (100)
4708#define IWL_CHANNEL_TUNE_TIME 5
4709
4710#define IWL_SCAN_PROBE_MASK(n) (BIT(n) | (BIT(n) - BIT(1)))
4711
4712static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv,
4713 enum ieee80211_band band,
4714 u8 n_probes)
4715{
4716 if (band == IEEE80211_BAND_5GHZ)
4717 return IWL_ACTIVE_DWELL_TIME_52 +
4718 IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
4719 else
4720 return IWL_ACTIVE_DWELL_TIME_24 +
4721 IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);
4722}
4723
4724static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv,
4725 enum ieee80211_band band)
4726{
4727 u16 passive = (band == IEEE80211_BAND_2GHZ) ?
4728 IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
4729 IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
4730
4731 if (iwl3945_is_associated(priv)) {
4732 /* If we're associated, we clamp the maximum passive
4733 * dwell time to be 98% of the beacon interval (minus
4734 * 2 * channel tune time) */
4735 passive = priv->beacon_int;
4736 if ((passive > IWL_PASSIVE_DWELL_BASE) || !passive)
4737 passive = IWL_PASSIVE_DWELL_BASE;
4738 passive = (passive * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;
4739 }
4740
4741 return passive;
4742}
4743
4744static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
4745 enum ieee80211_band band, 2622 enum ieee80211_band band,
4746 u8 is_active, u8 n_probes, 2623 u8 is_active, u8 n_probes,
4747 struct iwl3945_scan_channel *scan_ch) 2624 struct iwl3945_scan_channel *scan_ch)
4748{ 2625{
4749 const struct ieee80211_channel *channels = NULL; 2626 const struct ieee80211_channel *channels = NULL;
4750 const struct ieee80211_supported_band *sband; 2627 const struct ieee80211_supported_band *sband;
4751 const struct iwl3945_channel_info *ch_info; 2628 const struct iwl_channel_info *ch_info;
4752 u16 passive_dwell = 0; 2629 u16 passive_dwell = 0;
4753 u16 active_dwell = 0; 2630 u16 active_dwell = 0;
4754 int added, i; 2631 int added, i;
4755 2632
4756 sband = iwl3945_get_band(priv, band); 2633 sband = iwl_get_hw_mode(priv, band);
4757 if (!sband) 2634 if (!sband)
4758 return 0; 2635 return 0;
4759 2636
4760 channels = sband->channels; 2637 channels = sband->channels;
4761 2638
4762 active_dwell = iwl3945_get_active_dwell_time(priv, band, n_probes); 2639 active_dwell = iwl_get_active_dwell_time(priv, band, n_probes);
4763 passive_dwell = iwl3945_get_passive_dwell_time(priv, band); 2640 passive_dwell = iwl_get_passive_dwell_time(priv, band);
4764 2641
4765 if (passive_dwell <= active_dwell) 2642 if (passive_dwell <= active_dwell)
4766 passive_dwell = active_dwell + 1; 2643 passive_dwell = active_dwell + 1;
@@ -4771,9 +2648,9 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
4771 2648
4772 scan_ch->channel = channels[i].hw_value; 2649 scan_ch->channel = channels[i].hw_value;
4773 2650
4774 ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel); 2651 ch_info = iwl_get_channel_info(priv, band, scan_ch->channel);
4775 if (!is_channel_valid(ch_info)) { 2652 if (!is_channel_valid(ch_info)) {
4776 IWL_DEBUG_SCAN("Channel %d is INVALID for this band.\n", 2653 IWL_DEBUG_SCAN(priv, "Channel %d is INVALID for this band.\n",
4777 scan_ch->channel); 2654 scan_ch->channel);
4778 continue; 2655 continue;
4779 } 2656 }
@@ -4798,12 +2675,12 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
4798 * hearing clear Rx packet).*/ 2675 * hearing clear Rx packet).*/
4799 if (IWL_UCODE_API(priv->ucode_ver) >= 2) { 2676 if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
4800 if (n_probes) 2677 if (n_probes)
4801 scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); 2678 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
4802 } else { 2679 } else {
4803 /* uCode v1 does not allow setting direct probe bits on 2680 /* uCode v1 does not allow setting direct probe bits on
4804 * passive channel. */ 2681 * passive channel. */
4805 if ((scan_ch->type & 1) && n_probes) 2682 if ((scan_ch->type & 1) && n_probes)
4806 scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); 2683 scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
4807 } 2684 }
4808 2685
4809 /* Set txpower levels to defaults */ 2686 /* Set txpower levels to defaults */
@@ -4821,7 +2698,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
4821 */ 2698 */
4822 } 2699 }
4823 2700
4824 IWL_DEBUG_SCAN("Scanning %d [%s %d]\n", 2701 IWL_DEBUG_SCAN(priv, "Scanning %d [%s %d]\n",
4825 scan_ch->channel, 2702 scan_ch->channel,
4826 (scan_ch->type & 1) ? "ACTIVE" : "PASSIVE", 2703 (scan_ch->type & 1) ? "ACTIVE" : "PASSIVE",
4827 (scan_ch->type & 1) ? 2704 (scan_ch->type & 1) ?
@@ -4831,11 +2708,11 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
4831 added++; 2708 added++;
4832 } 2709 }
4833 2710
4834 IWL_DEBUG_SCAN("total channels to scan %d \n", added); 2711 IWL_DEBUG_SCAN(priv, "total channels to scan %d \n", added);
4835 return added; 2712 return added;
4836} 2713}
4837 2714
4838static void iwl3945_init_hw_rates(struct iwl3945_priv *priv, 2715static void iwl3945_init_hw_rates(struct iwl_priv *priv,
4839 struct ieee80211_rate *rates) 2716 struct ieee80211_rate *rates)
4840{ 2717{
4841 int i; 2718 int i;
@@ -4845,7 +2722,7 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
4845 rates[i].hw_value = i; /* Rate scaling will work on indexes */ 2722 rates[i].hw_value = i; /* Rate scaling will work on indexes */
4846 rates[i].hw_value_short = i; 2723 rates[i].hw_value_short = i;
4847 rates[i].flags = 0; 2724 rates[i].flags = 0;
4848 if ((i > IWL_LAST_OFDM_RATE) || (i < IWL_FIRST_OFDM_RATE)) { 2725 if ((i > IWL39_LAST_OFDM_RATE) || (i < IWL_FIRST_OFDM_RATE)) {
4849 /* 2726 /*
4850 * If CCK != 1M then set short preamble rate flag. 2727 * If CCK != 1M then set short preamble rate flag.
4851 */ 2728 */
@@ -4855,145 +2732,13 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
4855 } 2732 }
4856} 2733}
4857 2734
4858/**
4859 * iwl3945_init_geos - Initialize mac80211's geo/channel info based from eeprom
4860 */
4861static int iwl3945_init_geos(struct iwl3945_priv *priv)
4862{
4863 struct iwl3945_channel_info *ch;
4864 struct ieee80211_supported_band *sband;
4865 struct ieee80211_channel *channels;
4866 struct ieee80211_channel *geo_ch;
4867 struct ieee80211_rate *rates;
4868 int i = 0;
4869
4870 if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
4871 priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
4872 IWL_DEBUG_INFO("Geography modes already initialized.\n");
4873 set_bit(STATUS_GEO_CONFIGURED, &priv->status);
4874 return 0;
4875 }
4876
4877 channels = kzalloc(sizeof(struct ieee80211_channel) *
4878 priv->channel_count, GFP_KERNEL);
4879 if (!channels)
4880 return -ENOMEM;
4881
4882 rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_RATE_COUNT + 1)),
4883 GFP_KERNEL);
4884 if (!rates) {
4885 kfree(channels);
4886 return -ENOMEM;
4887 }
4888
4889 /* 5.2GHz channels start after the 2.4GHz channels */
4890 sband = &priv->bands[IEEE80211_BAND_5GHZ];
4891 sband->channels = &channels[ARRAY_SIZE(iwl3945_eeprom_band_1)];
4892 /* just OFDM */
4893 sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
4894 sband->n_bitrates = IWL_RATE_COUNT - IWL_FIRST_OFDM_RATE;
4895
4896 sband = &priv->bands[IEEE80211_BAND_2GHZ];
4897 sband->channels = channels;
4898 /* OFDM & CCK */
4899 sband->bitrates = rates;
4900 sband->n_bitrates = IWL_RATE_COUNT;
4901
4902 priv->ieee_channels = channels;
4903 priv->ieee_rates = rates;
4904
4905 iwl3945_init_hw_rates(priv, rates);
4906
4907 for (i = 0; i < priv->channel_count; i++) {
4908 ch = &priv->channel_info[i];
4909
4910 /* FIXME: might be removed if scan is OK*/
4911 if (!is_channel_valid(ch))
4912 continue;
4913
4914 if (is_channel_a_band(ch))
4915 sband = &priv->bands[IEEE80211_BAND_5GHZ];
4916 else
4917 sband = &priv->bands[IEEE80211_BAND_2GHZ];
4918
4919 geo_ch = &sband->channels[sband->n_channels++];
4920
4921 geo_ch->center_freq = ieee80211_channel_to_frequency(ch->channel);
4922 geo_ch->max_power = ch->max_power_avg;
4923 geo_ch->max_antenna_gain = 0xff;
4924 geo_ch->hw_value = ch->channel;
4925
4926 if (is_channel_valid(ch)) {
4927 if (!(ch->flags & EEPROM_CHANNEL_IBSS))
4928 geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
4929
4930 if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
4931 geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
4932
4933 if (ch->flags & EEPROM_CHANNEL_RADAR)
4934 geo_ch->flags |= IEEE80211_CHAN_RADAR;
4935
4936 if (ch->max_power_avg > priv->max_channel_txpower_limit)
4937 priv->max_channel_txpower_limit =
4938 ch->max_power_avg;
4939 } else {
4940 geo_ch->flags |= IEEE80211_CHAN_DISABLED;
4941 }
4942
4943 /* Save flags for reg domain usage */
4944 geo_ch->orig_flags = geo_ch->flags;
4945
4946 IWL_DEBUG_INFO("Channel %d Freq=%d[%sGHz] %s flag=0%X\n",
4947 ch->channel, geo_ch->center_freq,
4948 is_channel_a_band(ch) ? "5.2" : "2.4",
4949 geo_ch->flags & IEEE80211_CHAN_DISABLED ?
4950 "restricted" : "valid",
4951 geo_ch->flags);
4952 }
4953
4954 if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
4955 priv->cfg->sku & IWL_SKU_A) {
4956 printk(KERN_INFO DRV_NAME
4957 ": Incorrectly detected BG card as ABG. Please send "
4958 "your PCI ID 0x%04X:0x%04X to maintainer.\n",
4959 priv->pci_dev->device, priv->pci_dev->subsystem_device);
4960 priv->cfg->sku &= ~IWL_SKU_A;
4961 }
4962
4963 printk(KERN_INFO DRV_NAME
4964 ": Tunable channels: %d 802.11bg, %d 802.11a channels\n",
4965 priv->bands[IEEE80211_BAND_2GHZ].n_channels,
4966 priv->bands[IEEE80211_BAND_5GHZ].n_channels);
4967
4968 if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
4969 priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
4970 &priv->bands[IEEE80211_BAND_2GHZ];
4971 if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
4972 priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
4973 &priv->bands[IEEE80211_BAND_5GHZ];
4974
4975 set_bit(STATUS_GEO_CONFIGURED, &priv->status);
4976
4977 return 0;
4978}
4979
4980/*
4981 * iwl3945_free_geos - undo allocations in iwl3945_init_geos
4982 */
4983static void iwl3945_free_geos(struct iwl3945_priv *priv)
4984{
4985 kfree(priv->ieee_channels);
4986 kfree(priv->ieee_rates);
4987 clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
4988}
4989
4990/****************************************************************************** 2735/******************************************************************************
4991 * 2736 *
4992 * uCode download functions 2737 * uCode download functions
4993 * 2738 *
4994 ******************************************************************************/ 2739 ******************************************************************************/
4995 2740
4996static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv) 2741static void iwl3945_dealloc_ucode_pci(struct iwl_priv *priv)
4997{ 2742{
4998 iwl_free_fw_desc(priv->pci_dev, &priv->ucode_code); 2743 iwl_free_fw_desc(priv->pci_dev, &priv->ucode_code);
4999 iwl_free_fw_desc(priv->pci_dev, &priv->ucode_data); 2744 iwl_free_fw_desc(priv->pci_dev, &priv->ucode_data);
@@ -5007,29 +2752,30 @@ static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv)
5007 * iwl3945_verify_inst_full - verify runtime uCode image in card vs. host, 2752 * iwl3945_verify_inst_full - verify runtime uCode image in card vs. host,
5008 * looking at all data. 2753 * looking at all data.
5009 */ 2754 */
5010static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u32 len) 2755static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 len)
5011{ 2756{
5012 u32 val; 2757 u32 val;
5013 u32 save_len = len; 2758 u32 save_len = len;
5014 int rc = 0; 2759 int rc = 0;
5015 u32 errcnt; 2760 u32 errcnt;
5016 2761
5017 IWL_DEBUG_INFO("ucode inst image size is %u\n", len); 2762 IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
5018 2763
5019 rc = iwl3945_grab_nic_access(priv); 2764 rc = iwl_grab_nic_access(priv);
5020 if (rc) 2765 if (rc)
5021 return rc; 2766 return rc;
5022 2767
5023 iwl3945_write_direct32(priv, HBUS_TARG_MEM_RADDR, RTC_INST_LOWER_BOUND); 2768 iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,
2769 IWL39_RTC_INST_LOWER_BOUND);
5024 2770
5025 errcnt = 0; 2771 errcnt = 0;
5026 for (; len > 0; len -= sizeof(u32), image++) { 2772 for (; len > 0; len -= sizeof(u32), image++) {
5027 /* read data comes through single port, auto-incr addr */ 2773 /* read data comes through single port, auto-incr addr */
5028 /* NOTE: Use the debugless read so we don't flood kernel log 2774 /* NOTE: Use the debugless read so we don't flood kernel log
5029 * if IWL_DL_IO is set */ 2775 * if IWL_DL_IO is set */
5030 val = _iwl3945_read_direct32(priv, HBUS_TARG_MEM_RDAT); 2776 val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
5031 if (val != le32_to_cpu(*image)) { 2777 if (val != le32_to_cpu(*image)) {
5032 IWL_ERROR("uCode INST section is invalid at " 2778 IWL_ERR(priv, "uCode INST section is invalid at "
5033 "offset 0x%x, is 0x%x, s/b 0x%x\n", 2779 "offset 0x%x, is 0x%x, s/b 0x%x\n",
5034 save_len - len, val, le32_to_cpu(*image)); 2780 save_len - len, val, le32_to_cpu(*image));
5035 rc = -EIO; 2781 rc = -EIO;
@@ -5039,10 +2785,11 @@ static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u3
5039 } 2785 }
5040 } 2786 }
5041 2787
5042 iwl3945_release_nic_access(priv); 2788 iwl_release_nic_access(priv);
5043 2789
5044 if (!errcnt) 2790 if (!errcnt)
5045 IWL_DEBUG_INFO("ucode image in INSTRUCTION memory is good\n"); 2791 IWL_DEBUG_INFO(priv,
2792 "ucode image in INSTRUCTION memory is good\n");
5046 2793
5047 return rc; 2794 return rc;
5048} 2795}
@@ -5053,16 +2800,16 @@ static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u3
5053 * using sample data 100 bytes apart. If these sample points are good, 2800 * using sample data 100 bytes apart. If these sample points are good,
5054 * it's a pretty good bet that everything between them is good, too. 2801 * it's a pretty good bet that everything between them is good, too.
5055 */ 2802 */
5056static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image, u32 len) 2803static int iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)
5057{ 2804{
5058 u32 val; 2805 u32 val;
5059 int rc = 0; 2806 int rc = 0;
5060 u32 errcnt = 0; 2807 u32 errcnt = 0;
5061 u32 i; 2808 u32 i;
5062 2809
5063 IWL_DEBUG_INFO("ucode inst image size is %u\n", len); 2810 IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
5064 2811
5065 rc = iwl3945_grab_nic_access(priv); 2812 rc = iwl_grab_nic_access(priv);
5066 if (rc) 2813 if (rc)
5067 return rc; 2814 return rc;
5068 2815
@@ -5070,12 +2817,12 @@ static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image,
5070 /* read data comes through single port, auto-incr addr */ 2817 /* read data comes through single port, auto-incr addr */
5071 /* NOTE: Use the debugless read so we don't flood kernel log 2818 /* NOTE: Use the debugless read so we don't flood kernel log
5072 * if IWL_DL_IO is set */ 2819 * if IWL_DL_IO is set */
5073 iwl3945_write_direct32(priv, HBUS_TARG_MEM_RADDR, 2820 iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,
5074 i + RTC_INST_LOWER_BOUND); 2821 i + IWL39_RTC_INST_LOWER_BOUND);
5075 val = _iwl3945_read_direct32(priv, HBUS_TARG_MEM_RDAT); 2822 val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
5076 if (val != le32_to_cpu(*image)) { 2823 if (val != le32_to_cpu(*image)) {
5077#if 0 /* Enable this if you want to see details */ 2824#if 0 /* Enable this if you want to see details */
5078 IWL_ERROR("uCode INST section is invalid at " 2825 IWL_ERR(priv, "uCode INST section is invalid at "
5079 "offset 0x%x, is 0x%x, s/b 0x%x\n", 2826 "offset 0x%x, is 0x%x, s/b 0x%x\n",
5080 i, val, *image); 2827 i, val, *image);
5081#endif 2828#endif
@@ -5086,7 +2833,7 @@ static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image,
5086 } 2833 }
5087 } 2834 }
5088 2835
5089 iwl3945_release_nic_access(priv); 2836 iwl_release_nic_access(priv);
5090 2837
5091 return rc; 2838 return rc;
5092} 2839}
@@ -5096,7 +2843,7 @@ static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image,
5096 * iwl3945_verify_ucode - determine which instruction image is in SRAM, 2843 * iwl3945_verify_ucode - determine which instruction image is in SRAM,
5097 * and verify its contents 2844 * and verify its contents
5098 */ 2845 */
5099static int iwl3945_verify_ucode(struct iwl3945_priv *priv) 2846static int iwl3945_verify_ucode(struct iwl_priv *priv)
5100{ 2847{
5101 __le32 *image; 2848 __le32 *image;
5102 u32 len; 2849 u32 len;
@@ -5107,7 +2854,7 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv)
5107 len = priv->ucode_boot.len; 2854 len = priv->ucode_boot.len;
5108 rc = iwl3945_verify_inst_sparse(priv, image, len); 2855 rc = iwl3945_verify_inst_sparse(priv, image, len);
5109 if (rc == 0) { 2856 if (rc == 0) {
5110 IWL_DEBUG_INFO("Bootstrap uCode is good in inst SRAM\n"); 2857 IWL_DEBUG_INFO(priv, "Bootstrap uCode is good in inst SRAM\n");
5111 return 0; 2858 return 0;
5112 } 2859 }
5113 2860
@@ -5116,7 +2863,7 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv)
5116 len = priv->ucode_init.len; 2863 len = priv->ucode_init.len;
5117 rc = iwl3945_verify_inst_sparse(priv, image, len); 2864 rc = iwl3945_verify_inst_sparse(priv, image, len);
5118 if (rc == 0) { 2865 if (rc == 0) {
5119 IWL_DEBUG_INFO("Initialize uCode is good in inst SRAM\n"); 2866 IWL_DEBUG_INFO(priv, "Initialize uCode is good in inst SRAM\n");
5120 return 0; 2867 return 0;
5121 } 2868 }
5122 2869
@@ -5125,11 +2872,11 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv)
5125 len = priv->ucode_code.len; 2872 len = priv->ucode_code.len;
5126 rc = iwl3945_verify_inst_sparse(priv, image, len); 2873 rc = iwl3945_verify_inst_sparse(priv, image, len);
5127 if (rc == 0) { 2874 if (rc == 0) {
5128 IWL_DEBUG_INFO("Runtime uCode is good in inst SRAM\n"); 2875 IWL_DEBUG_INFO(priv, "Runtime uCode is good in inst SRAM\n");
5129 return 0; 2876 return 0;
5130 } 2877 }
5131 2878
5132 IWL_ERROR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n"); 2879 IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
5133 2880
5134 /* Since nothing seems to match, show first several data entries in 2881 /* Since nothing seems to match, show first several data entries in
5135 * instruction SRAM, so maybe visual inspection will give a clue. 2882 * instruction SRAM, so maybe visual inspection will give a clue.
@@ -5141,160 +2888,10 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv)
5141 return rc; 2888 return rc;
5142} 2889}
5143 2890
5144 2891static void iwl3945_nic_start(struct iwl_priv *priv)
5145/* check contents of special bootstrap uCode SRAM */
5146static int iwl3945_verify_bsm(struct iwl3945_priv *priv)
5147{
5148 __le32 *image = priv->ucode_boot.v_addr;
5149 u32 len = priv->ucode_boot.len;
5150 u32 reg;
5151 u32 val;
5152
5153 IWL_DEBUG_INFO("Begin verify bsm\n");
5154
5155 /* verify BSM SRAM contents */
5156 val = iwl3945_read_prph(priv, BSM_WR_DWCOUNT_REG);
5157 for (reg = BSM_SRAM_LOWER_BOUND;
5158 reg < BSM_SRAM_LOWER_BOUND + len;
5159 reg += sizeof(u32), image++) {
5160 val = iwl3945_read_prph(priv, reg);
5161 if (val != le32_to_cpu(*image)) {
5162 IWL_ERROR("BSM uCode verification failed at "
5163 "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
5164 BSM_SRAM_LOWER_BOUND,
5165 reg - BSM_SRAM_LOWER_BOUND, len,
5166 val, le32_to_cpu(*image));
5167 return -EIO;
5168 }
5169 }
5170
5171 IWL_DEBUG_INFO("BSM bootstrap uCode image OK\n");
5172
5173 return 0;
5174}
5175
5176/**
5177 * iwl3945_load_bsm - Load bootstrap instructions
5178 *
5179 * BSM operation:
5180 *
5181 * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program
5182 * in special SRAM that does not power down during RFKILL. When powering back
5183 * up after power-saving sleeps (or during initial uCode load), the BSM loads
5184 * the bootstrap program into the on-board processor, and starts it.
5185 *
5186 * The bootstrap program loads (via DMA) instructions and data for a new
5187 * program from host DRAM locations indicated by the host driver in the
5188 * BSM_DRAM_* registers. Once the new program is loaded, it starts
5189 * automatically.
5190 *
5191 * When initializing the NIC, the host driver points the BSM to the
5192 * "initialize" uCode image. This uCode sets up some internal data, then
5193 * notifies host via "initialize alive" that it is complete.
5194 *
5195 * The host then replaces the BSM_DRAM_* pointer values to point to the
5196 * normal runtime uCode instructions and a backup uCode data cache buffer
5197 * (filled initially with starting data values for the on-board processor),
5198 * then triggers the "initialize" uCode to load and launch the runtime uCode,
5199 * which begins normal operation.
5200 *
5201 * When doing a power-save shutdown, runtime uCode saves data SRAM into
5202 * the backup data cache in DRAM before SRAM is powered down.
5203 *
5204 * When powering back up, the BSM loads the bootstrap program. This reloads
5205 * the runtime uCode instructions and the backup data cache into SRAM,
5206 * and re-launches the runtime uCode from where it left off.
5207 */
5208static int iwl3945_load_bsm(struct iwl3945_priv *priv)
5209{
5210 __le32 *image = priv->ucode_boot.v_addr;
5211 u32 len = priv->ucode_boot.len;
5212 dma_addr_t pinst;
5213 dma_addr_t pdata;
5214 u32 inst_len;
5215 u32 data_len;
5216 int rc;
5217 int i;
5218 u32 done;
5219 u32 reg_offset;
5220
5221 IWL_DEBUG_INFO("Begin load bsm\n");
5222
5223 /* make sure bootstrap program is no larger than BSM's SRAM size */
5224 if (len > IWL_MAX_BSM_SIZE)
5225 return -EINVAL;
5226
5227 /* Tell bootstrap uCode where to find the "Initialize" uCode
5228 * in host DRAM ... host DRAM physical address bits 31:0 for 3945.
5229 * NOTE: iwl3945_initialize_alive_start() will replace these values,
5230 * after the "initialize" uCode has run, to point to
5231 * runtime/protocol instructions and backup data cache. */
5232 pinst = priv->ucode_init.p_addr;
5233 pdata = priv->ucode_init_data.p_addr;
5234 inst_len = priv->ucode_init.len;
5235 data_len = priv->ucode_init_data.len;
5236
5237 rc = iwl3945_grab_nic_access(priv);
5238 if (rc)
5239 return rc;
5240
5241 iwl3945_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
5242 iwl3945_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
5243 iwl3945_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
5244 iwl3945_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);
5245
5246 /* Fill BSM memory with bootstrap instructions */
5247 for (reg_offset = BSM_SRAM_LOWER_BOUND;
5248 reg_offset < BSM_SRAM_LOWER_BOUND + len;
5249 reg_offset += sizeof(u32), image++)
5250 _iwl3945_write_prph(priv, reg_offset,
5251 le32_to_cpu(*image));
5252
5253 rc = iwl3945_verify_bsm(priv);
5254 if (rc) {
5255 iwl3945_release_nic_access(priv);
5256 return rc;
5257 }
5258
5259 /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
5260 iwl3945_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);
5261 iwl3945_write_prph(priv, BSM_WR_MEM_DST_REG,
5262 RTC_INST_LOWER_BOUND);
5263 iwl3945_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
5264
5265 /* Load bootstrap code into instruction SRAM now,
5266 * to prepare to load "initialize" uCode */
5267 iwl3945_write_prph(priv, BSM_WR_CTRL_REG,
5268 BSM_WR_CTRL_REG_BIT_START);
5269
5270 /* Wait for load of bootstrap uCode to finish */
5271 for (i = 0; i < 100; i++) {
5272 done = iwl3945_read_prph(priv, BSM_WR_CTRL_REG);
5273 if (!(done & BSM_WR_CTRL_REG_BIT_START))
5274 break;
5275 udelay(10);
5276 }
5277 if (i < 100)
5278 IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i);
5279 else {
5280 IWL_ERROR("BSM write did not complete!\n");
5281 return -EIO;
5282 }
5283
5284 /* Enable future boot loads whenever power management unit triggers it
5285 * (e.g. when powering back up after power-save shutdown) */
5286 iwl3945_write_prph(priv, BSM_WR_CTRL_REG,
5287 BSM_WR_CTRL_REG_BIT_START_EN);
5288
5289 iwl3945_release_nic_access(priv);
5290
5291 return 0;
5292}
5293
5294static void iwl3945_nic_start(struct iwl3945_priv *priv)
5295{ 2892{
5296 /* Remove all resets to allow NIC to operate */ 2893 /* Remove all resets to allow NIC to operate */
5297 iwl3945_write32(priv, CSR_RESET, 0); 2894 iwl_write32(priv, CSR_RESET, 0);
5298} 2895}
5299 2896
5300/** 2897/**
@@ -5302,9 +2899,9 @@ static void iwl3945_nic_start(struct iwl3945_priv *priv)
5302 * 2899 *
5303 * Copy into buffers for card to fetch via bus-mastering 2900 * Copy into buffers for card to fetch via bus-mastering
5304 */ 2901 */
5305static int iwl3945_read_ucode(struct iwl3945_priv *priv) 2902static int iwl3945_read_ucode(struct iwl_priv *priv)
5306{ 2903{
5307 struct iwl3945_ucode *ucode; 2904 struct iwl_ucode *ucode;
5308 int ret = -EINVAL, index; 2905 int ret = -EINVAL, index;
5309 const struct firmware *ucode_raw; 2906 const struct firmware *ucode_raw;
5310 /* firmware file name contains uCode/driver compatibility version */ 2907 /* firmware file name contains uCode/driver compatibility version */
@@ -5322,7 +2919,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5322 sprintf(buf, "%s%u%s", name_pre, index, ".ucode"); 2919 sprintf(buf, "%s%u%s", name_pre, index, ".ucode");
5323 ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev); 2920 ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev);
5324 if (ret < 0) { 2921 if (ret < 0) {
5325 IWL_ERROR("%s firmware file req failed: Reason %d\n", 2922 IWL_ERR(priv, "%s firmware file req failed: %d\n",
5326 buf, ret); 2923 buf, ret);
5327 if (ret == -ENOENT) 2924 if (ret == -ENOENT)
5328 continue; 2925 continue;
@@ -5330,9 +2927,12 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5330 goto error; 2927 goto error;
5331 } else { 2928 } else {
5332 if (index < api_max) 2929 if (index < api_max)
5333 IWL_ERROR("Loaded firmware %s, which is deprecated. Please use API v%u instead.\n", 2930 IWL_ERR(priv, "Loaded firmware %s, "
2931 "which is deprecated. "
2932 " Please use API v%u instead.\n",
5334 buf, api_max); 2933 buf, api_max);
5335 IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n", 2934 IWL_DEBUG_INFO(priv, "Got firmware '%s' file "
2935 "(%zd bytes) from disk\n",
5336 buf, ucode_raw->size); 2936 buf, ucode_raw->size);
5337 break; 2937 break;
5338 } 2938 }
@@ -5343,7 +2943,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5343 2943
5344 /* Make sure that we got at least our header! */ 2944 /* Make sure that we got at least our header! */
5345 if (ucode_raw->size < sizeof(*ucode)) { 2945 if (ucode_raw->size < sizeof(*ucode)) {
5346 IWL_ERROR("File size way too small!\n"); 2946 IWL_ERR(priv, "File size way too small!\n");
5347 ret = -EINVAL; 2947 ret = -EINVAL;
5348 goto err_release; 2948 goto err_release;
5349 } 2949 }
@@ -5364,7 +2964,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5364 * on the API version read from firware header from here on forward */ 2964 * on the API version read from firware header from here on forward */
5365 2965
5366 if (api_ver < api_min || api_ver > api_max) { 2966 if (api_ver < api_min || api_ver > api_max) {
5367 IWL_ERROR("Driver unable to support your firmware API. " 2967 IWL_ERR(priv, "Driver unable to support your firmware API. "
5368 "Driver supports v%u, firmware is v%u.\n", 2968 "Driver supports v%u, firmware is v%u.\n",
5369 api_max, api_ver); 2969 api_max, api_ver);
5370 priv->ucode_ver = 0; 2970 priv->ucode_ver = 0;
@@ -5372,23 +2972,29 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5372 goto err_release; 2972 goto err_release;
5373 } 2973 }
5374 if (api_ver != api_max) 2974 if (api_ver != api_max)
5375 IWL_ERROR("Firmware has old API version. Expected %u, " 2975 IWL_ERR(priv, "Firmware has old API version. Expected %u, "
5376 "got %u. New firmware can be obtained " 2976 "got %u. New firmware can be obtained "
5377 "from http://www.intellinuxwireless.org.\n", 2977 "from http://www.intellinuxwireless.org.\n",
5378 api_max, api_ver); 2978 api_max, api_ver);
5379 2979
5380 printk(KERN_INFO DRV_NAME " loaded firmware version %u.%u.%u.%u\n", 2980 IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u\n",
5381 IWL_UCODE_MAJOR(priv->ucode_ver), 2981 IWL_UCODE_MAJOR(priv->ucode_ver),
5382 IWL_UCODE_MINOR(priv->ucode_ver), 2982 IWL_UCODE_MINOR(priv->ucode_ver),
5383 IWL_UCODE_API(priv->ucode_ver), 2983 IWL_UCODE_API(priv->ucode_ver),
5384 IWL_UCODE_SERIAL(priv->ucode_ver)); 2984 IWL_UCODE_SERIAL(priv->ucode_ver));
5385 IWL_DEBUG_INFO("f/w package hdr ucode version raw = 0x%x\n", 2985
2986 IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
5386 priv->ucode_ver); 2987 priv->ucode_ver);
5387 IWL_DEBUG_INFO("f/w package hdr runtime inst size = %u\n", inst_size); 2988 IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",
5388 IWL_DEBUG_INFO("f/w package hdr runtime data size = %u\n", data_size); 2989 inst_size);
5389 IWL_DEBUG_INFO("f/w package hdr init inst size = %u\n", init_size); 2990 IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %u\n",
5390 IWL_DEBUG_INFO("f/w package hdr init data size = %u\n", init_data_size); 2991 data_size);
5391 IWL_DEBUG_INFO("f/w package hdr boot inst size = %u\n", boot_size); 2992 IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %u\n",
2993 init_size);
2994 IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %u\n",
2995 init_data_size);
2996 IWL_DEBUG_INFO(priv, "f/w package hdr boot inst size = %u\n",
2997 boot_size);
5392 2998
5393 2999
5394 /* Verify size of file vs. image size info in file's header */ 3000 /* Verify size of file vs. image size info in file's header */
@@ -5396,40 +3002,43 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5396 inst_size + data_size + init_size + 3002 inst_size + data_size + init_size +
5397 init_data_size + boot_size) { 3003 init_data_size + boot_size) {
5398 3004
5399 IWL_DEBUG_INFO("uCode file size %d too small\n", 3005 IWL_DEBUG_INFO(priv, "uCode file size %zd too small\n",
5400 (int)ucode_raw->size); 3006 ucode_raw->size);
5401 ret = -EINVAL; 3007 ret = -EINVAL;
5402 goto err_release; 3008 goto err_release;
5403 } 3009 }
5404 3010
5405 /* Verify that uCode images will fit in card's SRAM */ 3011 /* Verify that uCode images will fit in card's SRAM */
5406 if (inst_size > IWL_MAX_INST_SIZE) { 3012 if (inst_size > IWL39_MAX_INST_SIZE) {
5407 IWL_DEBUG_INFO("uCode instr len %d too large to fit in\n", 3013 IWL_DEBUG_INFO(priv, "uCode instr len %d too large to fit in\n",
5408 inst_size); 3014 inst_size);
5409 ret = -EINVAL; 3015 ret = -EINVAL;
5410 goto err_release; 3016 goto err_release;
5411 } 3017 }
5412 3018
5413 if (data_size > IWL_MAX_DATA_SIZE) { 3019 if (data_size > IWL39_MAX_DATA_SIZE) {
5414 IWL_DEBUG_INFO("uCode data len %d too large to fit in\n", 3020 IWL_DEBUG_INFO(priv, "uCode data len %d too large to fit in\n",
5415 data_size); 3021 data_size);
5416 ret = -EINVAL; 3022 ret = -EINVAL;
5417 goto err_release; 3023 goto err_release;
5418 } 3024 }
5419 if (init_size > IWL_MAX_INST_SIZE) { 3025 if (init_size > IWL39_MAX_INST_SIZE) {
5420 IWL_DEBUG_INFO("uCode init instr len %d too large to fit in\n", 3026 IWL_DEBUG_INFO(priv,
3027 "uCode init instr len %d too large to fit in\n",
5421 init_size); 3028 init_size);
5422 ret = -EINVAL; 3029 ret = -EINVAL;
5423 goto err_release; 3030 goto err_release;
5424 } 3031 }
5425 if (init_data_size > IWL_MAX_DATA_SIZE) { 3032 if (init_data_size > IWL39_MAX_DATA_SIZE) {
5426 IWL_DEBUG_INFO("uCode init data len %d too large to fit in\n", 3033 IWL_DEBUG_INFO(priv,
3034 "uCode init data len %d too large to fit in\n",
5427 init_data_size); 3035 init_data_size);
5428 ret = -EINVAL; 3036 ret = -EINVAL;
5429 goto err_release; 3037 goto err_release;
5430 } 3038 }
5431 if (boot_size > IWL_MAX_BSM_SIZE) { 3039 if (boot_size > IWL39_MAX_BSM_SIZE) {
5432 IWL_DEBUG_INFO("uCode boot instr len %d too large to fit in\n", 3040 IWL_DEBUG_INFO(priv,
3041 "uCode boot instr len %d too large to fit in\n",
5433 boot_size); 3042 boot_size);
5434 ret = -EINVAL; 3043 ret = -EINVAL;
5435 goto err_release; 3044 goto err_release;
@@ -5479,16 +3088,18 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5479 /* Runtime instructions (first block of data in file) */ 3088 /* Runtime instructions (first block of data in file) */
5480 src = &ucode->data[0]; 3089 src = &ucode->data[0];
5481 len = priv->ucode_code.len; 3090 len = priv->ucode_code.len;
5482 IWL_DEBUG_INFO("Copying (but not loading) uCode instr len %Zd\n", len); 3091 IWL_DEBUG_INFO(priv,
3092 "Copying (but not loading) uCode instr len %zd\n", len);
5483 memcpy(priv->ucode_code.v_addr, src, len); 3093 memcpy(priv->ucode_code.v_addr, src, len);
5484 IWL_DEBUG_INFO("uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n", 3094 IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
5485 priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr); 3095 priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
5486 3096
5487 /* Runtime data (2nd block) 3097 /* Runtime data (2nd block)
5488 * NOTE: Copy into backup buffer will be done in iwl3945_up() */ 3098 * NOTE: Copy into backup buffer will be done in iwl3945_up() */
5489 src = &ucode->data[inst_size]; 3099 src = &ucode->data[inst_size];
5490 len = priv->ucode_data.len; 3100 len = priv->ucode_data.len;
5491 IWL_DEBUG_INFO("Copying (but not loading) uCode data len %Zd\n", len); 3101 IWL_DEBUG_INFO(priv,
3102 "Copying (but not loading) uCode data len %zd\n", len);
5492 memcpy(priv->ucode_data.v_addr, src, len); 3103 memcpy(priv->ucode_data.v_addr, src, len);
5493 memcpy(priv->ucode_data_backup.v_addr, src, len); 3104 memcpy(priv->ucode_data_backup.v_addr, src, len);
5494 3105
@@ -5496,8 +3107,8 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5496 if (init_size) { 3107 if (init_size) {
5497 src = &ucode->data[inst_size + data_size]; 3108 src = &ucode->data[inst_size + data_size];
5498 len = priv->ucode_init.len; 3109 len = priv->ucode_init.len;
5499 IWL_DEBUG_INFO("Copying (but not loading) init instr len %Zd\n", 3110 IWL_DEBUG_INFO(priv,
5500 len); 3111 "Copying (but not loading) init instr len %zd\n", len);
5501 memcpy(priv->ucode_init.v_addr, src, len); 3112 memcpy(priv->ucode_init.v_addr, src, len);
5502 } 3113 }
5503 3114
@@ -5505,16 +3116,16 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5505 if (init_data_size) { 3116 if (init_data_size) {
5506 src = &ucode->data[inst_size + data_size + init_size]; 3117 src = &ucode->data[inst_size + data_size + init_size];
5507 len = priv->ucode_init_data.len; 3118 len = priv->ucode_init_data.len;
5508 IWL_DEBUG_INFO("Copying (but not loading) init data len %d\n", 3119 IWL_DEBUG_INFO(priv,
5509 (int)len); 3120 "Copying (but not loading) init data len %zd\n", len);
5510 memcpy(priv->ucode_init_data.v_addr, src, len); 3121 memcpy(priv->ucode_init_data.v_addr, src, len);
5511 } 3122 }
5512 3123
5513 /* Bootstrap instructions (5th block) */ 3124 /* Bootstrap instructions (5th block) */
5514 src = &ucode->data[inst_size + data_size + init_size + init_data_size]; 3125 src = &ucode->data[inst_size + data_size + init_size + init_data_size];
5515 len = priv->ucode_boot.len; 3126 len = priv->ucode_boot.len;
5516 IWL_DEBUG_INFO("Copying (but not loading) boot instr len %d\n", 3127 IWL_DEBUG_INFO(priv,
5517 (int)len); 3128 "Copying (but not loading) boot instr len %zd\n", len);
5518 memcpy(priv->ucode_boot.v_addr, src, len); 3129 memcpy(priv->ucode_boot.v_addr, src, len);
5519 3130
5520 /* We have our copies now, allow OS release its copies */ 3131 /* We have our copies now, allow OS release its copies */
@@ -5522,7 +3133,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5522 return 0; 3133 return 0;
5523 3134
5524 err_pci_alloc: 3135 err_pci_alloc:
5525 IWL_ERROR("failed to allocate pci memory\n"); 3136 IWL_ERR(priv, "failed to allocate pci memory\n");
5526 ret = -ENOMEM; 3137 ret = -ENOMEM;
5527 iwl3945_dealloc_ucode_pci(priv); 3138 iwl3945_dealloc_ucode_pci(priv);
5528 3139
@@ -5543,7 +3154,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5543 * We need to replace them to load runtime uCode inst and data, 3154 * We need to replace them to load runtime uCode inst and data,
5544 * and to save runtime data when powering down. 3155 * and to save runtime data when powering down.
5545 */ 3156 */
5546static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv) 3157static int iwl3945_set_ucode_ptrs(struct iwl_priv *priv)
5547{ 3158{
5548 dma_addr_t pinst; 3159 dma_addr_t pinst;
5549 dma_addr_t pdata; 3160 dma_addr_t pdata;
@@ -5555,28 +3166,28 @@ static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv)
5555 pdata = priv->ucode_data_backup.p_addr; 3166 pdata = priv->ucode_data_backup.p_addr;
5556 3167
5557 spin_lock_irqsave(&priv->lock, flags); 3168 spin_lock_irqsave(&priv->lock, flags);
5558 rc = iwl3945_grab_nic_access(priv); 3169 rc = iwl_grab_nic_access(priv);
5559 if (rc) { 3170 if (rc) {
5560 spin_unlock_irqrestore(&priv->lock, flags); 3171 spin_unlock_irqrestore(&priv->lock, flags);
5561 return rc; 3172 return rc;
5562 } 3173 }
5563 3174
5564 /* Tell bootstrap uCode where to find image to load */ 3175 /* Tell bootstrap uCode where to find image to load */
5565 iwl3945_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst); 3176 iwl_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
5566 iwl3945_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata); 3177 iwl_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
5567 iwl3945_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, 3178 iwl_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
5568 priv->ucode_data.len); 3179 priv->ucode_data.len);
5569 3180
5570 /* Inst byte count must be last to set up, bit 31 signals uCode 3181 /* Inst byte count must be last to set up, bit 31 signals uCode
5571 * that all new ptr/size info is in place */ 3182 * that all new ptr/size info is in place */
5572 iwl3945_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, 3183 iwl_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
5573 priv->ucode_code.len | BSM_DRAM_INST_LOAD); 3184 priv->ucode_code.len | BSM_DRAM_INST_LOAD);
5574 3185
5575 iwl3945_release_nic_access(priv); 3186 iwl_release_nic_access(priv);
5576 3187
5577 spin_unlock_irqrestore(&priv->lock, flags); 3188 spin_unlock_irqrestore(&priv->lock, flags);
5578 3189
5579 IWL_DEBUG_INFO("Runtime uCode pointers are set.\n"); 3190 IWL_DEBUG_INFO(priv, "Runtime uCode pointers are set.\n");
5580 3191
5581 return rc; 3192 return rc;
5582} 3193}
@@ -5588,13 +3199,13 @@ static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv)
5588 * 3199 *
5589 * Tell "initialize" uCode to go ahead and load the runtime uCode. 3200 * Tell "initialize" uCode to go ahead and load the runtime uCode.
5590 */ 3201 */
5591static void iwl3945_init_alive_start(struct iwl3945_priv *priv) 3202static void iwl3945_init_alive_start(struct iwl_priv *priv)
5592{ 3203{
5593 /* Check alive response for "valid" sign from uCode */ 3204 /* Check alive response for "valid" sign from uCode */
5594 if (priv->card_alive_init.is_valid != UCODE_VALID_OK) { 3205 if (priv->card_alive_init.is_valid != UCODE_VALID_OK) {
5595 /* We had an error bringing up the hardware, so take it 3206 /* We had an error bringing up the hardware, so take it
5596 * all the way back down so we can try again */ 3207 * all the way back down so we can try again */
5597 IWL_DEBUG_INFO("Initialize Alive failed.\n"); 3208 IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n");
5598 goto restart; 3209 goto restart;
5599 } 3210 }
5600 3211
@@ -5604,18 +3215,18 @@ static void iwl3945_init_alive_start(struct iwl3945_priv *priv)
5604 if (iwl3945_verify_ucode(priv)) { 3215 if (iwl3945_verify_ucode(priv)) {
5605 /* Runtime instruction load was bad; 3216 /* Runtime instruction load was bad;
5606 * take it all the way back down so we can try again */ 3217 * take it all the way back down so we can try again */
5607 IWL_DEBUG_INFO("Bad \"initialize\" uCode load.\n"); 3218 IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n");
5608 goto restart; 3219 goto restart;
5609 } 3220 }
5610 3221
5611 /* Send pointers to protocol/runtime uCode image ... init code will 3222 /* Send pointers to protocol/runtime uCode image ... init code will
5612 * load and launch runtime uCode, which will send us another "Alive" 3223 * load and launch runtime uCode, which will send us another "Alive"
5613 * notification. */ 3224 * notification. */
5614 IWL_DEBUG_INFO("Initialization Alive received.\n"); 3225 IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
5615 if (iwl3945_set_ucode_ptrs(priv)) { 3226 if (iwl3945_set_ucode_ptrs(priv)) {
5616 /* Runtime instruction load won't happen; 3227 /* Runtime instruction load won't happen;
5617 * take it all the way back down so we can try again */ 3228 * take it all the way back down so we can try again */
5618 IWL_DEBUG_INFO("Couldn't set up uCode pointers.\n"); 3229 IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");
5619 goto restart; 3230 goto restart;
5620 } 3231 }
5621 return; 3232 return;
@@ -5634,18 +3245,18 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw,
5634 * from protocol/runtime uCode (initialization uCode's 3245 * from protocol/runtime uCode (initialization uCode's
5635 * Alive gets handled by iwl3945_init_alive_start()). 3246 * Alive gets handled by iwl3945_init_alive_start()).
5636 */ 3247 */
5637static void iwl3945_alive_start(struct iwl3945_priv *priv) 3248static void iwl3945_alive_start(struct iwl_priv *priv)
5638{ 3249{
5639 int rc = 0; 3250 int rc = 0;
5640 int thermal_spin = 0; 3251 int thermal_spin = 0;
5641 u32 rfkill; 3252 u32 rfkill;
5642 3253
5643 IWL_DEBUG_INFO("Runtime Alive received.\n"); 3254 IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
5644 3255
5645 if (priv->card_alive.is_valid != UCODE_VALID_OK) { 3256 if (priv->card_alive.is_valid != UCODE_VALID_OK) {
5646 /* We had an error bringing up the hardware, so take it 3257 /* We had an error bringing up the hardware, so take it
5647 * all the way back down so we can try again */ 3258 * all the way back down so we can try again */
5648 IWL_DEBUG_INFO("Alive failed.\n"); 3259 IWL_DEBUG_INFO(priv, "Alive failed.\n");
5649 goto restart; 3260 goto restart;
5650 } 3261 }
5651 3262
@@ -5655,21 +3266,21 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5655 if (iwl3945_verify_ucode(priv)) { 3266 if (iwl3945_verify_ucode(priv)) {
5656 /* Runtime instruction load was bad; 3267 /* Runtime instruction load was bad;
5657 * take it all the way back down so we can try again */ 3268 * take it all the way back down so we can try again */
5658 IWL_DEBUG_INFO("Bad runtime uCode load.\n"); 3269 IWL_DEBUG_INFO(priv, "Bad runtime uCode load.\n");
5659 goto restart; 3270 goto restart;
5660 } 3271 }
5661 3272
5662 iwl3945_clear_stations_table(priv); 3273 iwl3945_clear_stations_table(priv);
5663 3274
5664 rc = iwl3945_grab_nic_access(priv); 3275 rc = iwl_grab_nic_access(priv);
5665 if (rc) { 3276 if (rc) {
5666 IWL_WARNING("Can not read RFKILL status from adapter\n"); 3277 IWL_WARN(priv, "Can not read RFKILL status from adapter\n");
5667 return; 3278 return;
5668 } 3279 }
5669 3280
5670 rfkill = iwl3945_read_prph(priv, APMG_RFKILL_REG); 3281 rfkill = iwl_read_prph(priv, APMG_RFKILL_REG);
5671 IWL_DEBUG_INFO("RFKILL status: 0x%x\n", rfkill); 3282 IWL_DEBUG_INFO(priv, "RFKILL status: 0x%x\n", rfkill);
5672 iwl3945_release_nic_access(priv); 3283 iwl_release_nic_access(priv);
5673 3284
5674 if (rfkill & 0x1) { 3285 if (rfkill & 0x1) {
5675 clear_bit(STATUS_RF_KILL_HW, &priv->status); 3286 clear_bit(STATUS_RF_KILL_HW, &priv->status);
@@ -5681,7 +3292,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5681 } 3292 }
5682 3293
5683 if (thermal_spin) 3294 if (thermal_spin)
5684 IWL_DEBUG_INFO("Thermal calibration took %dus\n", 3295 IWL_DEBUG_INFO(priv, "Thermal calibration took %dus\n",
5685 thermal_spin * 10); 3296 thermal_spin * 10);
5686 } else 3297 } else
5687 set_bit(STATUS_RF_KILL_HW, &priv->status); 3298 set_bit(STATUS_RF_KILL_HW, &priv->status);
@@ -5692,7 +3303,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5692 /* Clear out the uCode error bit if it is set */ 3303 /* Clear out the uCode error bit if it is set */
5693 clear_bit(STATUS_FW_ERROR, &priv->status); 3304 clear_bit(STATUS_FW_ERROR, &priv->status);
5694 3305
5695 if (iwl3945_is_rfkill(priv)) 3306 if (iwl_is_rfkill(priv))
5696 return; 3307 return;
5697 3308
5698 ieee80211_wake_queues(priv->hw); 3309 ieee80211_wake_queues(priv->hw);
@@ -5700,9 +3311,9 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5700 priv->active_rate = priv->rates_mask; 3311 priv->active_rate = priv->rates_mask;
5701 priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK; 3312 priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
5702 3313
5703 iwl3945_send_power_mode(priv, IWL_POWER_LEVEL(priv->power_mode)); 3314 iwl_power_update_mode(priv, false);
5704 3315
5705 if (iwl3945_is_associated(priv)) { 3316 if (iwl_is_associated(priv)) {
5706 struct iwl3945_rxon_cmd *active_rxon = 3317 struct iwl3945_rxon_cmd *active_rxon =
5707 (struct iwl3945_rxon_cmd *)(&priv->active_rxon); 3318 (struct iwl3945_rxon_cmd *)(&priv->active_rxon);
5708 3319
@@ -5711,12 +3322,11 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5711 active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; 3322 active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
5712 } else { 3323 } else {
5713 /* Initialize our rx_config data */ 3324 /* Initialize our rx_config data */
5714 iwl3945_connection_init_rx_config(priv, priv->iw_mode); 3325 iwl_connection_init_rx_config(priv, priv->iw_mode);
5715 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
5716 } 3326 }
5717 3327
5718 /* Configure Bluetooth device coexistence support */ 3328 /* Configure Bluetooth device coexistence support */
5719 iwl3945_send_bt_config(priv); 3329 iwl_send_bt_config(priv);
5720 3330
5721 /* Configure the adapter for unassociated operation */ 3331 /* Configure the adapter for unassociated operation */
5722 iwl3945_commit_rxon(priv); 3332 iwl3945_commit_rxon(priv);
@@ -5725,7 +3335,7 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5725 3335
5726 iwl3945_led_register(priv); 3336 iwl3945_led_register(priv);
5727 3337
5728 IWL_DEBUG_INFO("ALIVE processing complete.\n"); 3338 IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
5729 set_bit(STATUS_READY, &priv->status); 3339 set_bit(STATUS_READY, &priv->status);
5730 wake_up_interruptible(&priv->wait_command_queue); 3340 wake_up_interruptible(&priv->wait_command_queue);
5731 3341
@@ -5746,15 +3356,15 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
5746 queue_work(priv->workqueue, &priv->restart); 3356 queue_work(priv->workqueue, &priv->restart);
5747} 3357}
5748 3358
5749static void iwl3945_cancel_deferred_work(struct iwl3945_priv *priv); 3359static void iwl3945_cancel_deferred_work(struct iwl_priv *priv);
5750 3360
5751static void __iwl3945_down(struct iwl3945_priv *priv) 3361static void __iwl3945_down(struct iwl_priv *priv)
5752{ 3362{
5753 unsigned long flags; 3363 unsigned long flags;
5754 int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status); 3364 int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);
5755 struct ieee80211_conf *conf = NULL; 3365 struct ieee80211_conf *conf = NULL;
5756 3366
5757 IWL_DEBUG_INFO(DRV_NAME " is going down\n"); 3367 IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");
5758 3368
5759 conf = ieee80211_get_hw_conf(priv->hw); 3369 conf = ieee80211_get_hw_conf(priv->hw);
5760 3370
@@ -5773,7 +3383,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
5773 clear_bit(STATUS_EXIT_PENDING, &priv->status); 3383 clear_bit(STATUS_EXIT_PENDING, &priv->status);
5774 3384
5775 /* stop and reset the on-board processor */ 3385 /* stop and reset the on-board processor */
5776 iwl3945_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET); 3386 iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
5777 3387
5778 /* tell the device to stop sending interrupts */ 3388 /* tell the device to stop sending interrupts */
5779 spin_lock_irqsave(&priv->lock, flags); 3389 spin_lock_irqsave(&priv->lock, flags);
@@ -5786,7 +3396,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
5786 3396
5787 /* If we have not previously called iwl3945_init() then 3397 /* If we have not previously called iwl3945_init() then
5788 * clear all bits but the RF Kill and SUSPEND bits and return */ 3398 * clear all bits but the RF Kill and SUSPEND bits and return */
5789 if (!iwl3945_is_init(priv)) { 3399 if (!iwl_is_init(priv)) {
5790 priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) << 3400 priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
5791 STATUS_RF_KILL_HW | 3401 STATUS_RF_KILL_HW |
5792 test_bit(STATUS_RF_KILL_SW, &priv->status) << 3402 test_bit(STATUS_RF_KILL_SW, &priv->status) <<
@@ -5815,29 +3425,31 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
5815 test_bit(STATUS_EXIT_PENDING, &priv->status) << 3425 test_bit(STATUS_EXIT_PENDING, &priv->status) <<
5816 STATUS_EXIT_PENDING; 3426 STATUS_EXIT_PENDING;
5817 3427
3428 priv->cfg->ops->lib->apm_ops.reset(priv);
5818 spin_lock_irqsave(&priv->lock, flags); 3429 spin_lock_irqsave(&priv->lock, flags);
5819 iwl3945_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ); 3430 iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
5820 spin_unlock_irqrestore(&priv->lock, flags); 3431 spin_unlock_irqrestore(&priv->lock, flags);
5821 3432
5822 iwl3945_hw_txq_ctx_stop(priv); 3433 iwl3945_hw_txq_ctx_stop(priv);
5823 iwl3945_hw_rxq_stop(priv); 3434 iwl3945_hw_rxq_stop(priv);
5824 3435
5825 spin_lock_irqsave(&priv->lock, flags); 3436 spin_lock_irqsave(&priv->lock, flags);
5826 if (!iwl3945_grab_nic_access(priv)) { 3437 if (!iwl_grab_nic_access(priv)) {
5827 iwl3945_write_prph(priv, APMG_CLK_DIS_REG, 3438 iwl_write_prph(priv, APMG_CLK_DIS_REG,
5828 APMG_CLK_VAL_DMA_CLK_RQT); 3439 APMG_CLK_VAL_DMA_CLK_RQT);
5829 iwl3945_release_nic_access(priv); 3440 iwl_release_nic_access(priv);
5830 } 3441 }
5831 spin_unlock_irqrestore(&priv->lock, flags); 3442 spin_unlock_irqrestore(&priv->lock, flags);
5832 3443
5833 udelay(5); 3444 udelay(5);
5834 3445
5835 iwl3945_hw_nic_stop_master(priv); 3446 if (exit_pending || test_bit(STATUS_IN_SUSPEND, &priv->status))
5836 iwl3945_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); 3447 priv->cfg->ops->lib->apm_ops.stop(priv);
5837 iwl3945_hw_nic_reset(priv); 3448 else
3449 priv->cfg->ops->lib->apm_ops.reset(priv);
5838 3450
5839 exit: 3451 exit:
5840 memset(&priv->card_alive, 0, sizeof(struct iwl3945_alive_resp)); 3452 memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
5841 3453
5842 if (priv->ibss_beacon) 3454 if (priv->ibss_beacon)
5843 dev_kfree_skb(priv->ibss_beacon); 3455 dev_kfree_skb(priv->ibss_beacon);
@@ -5847,7 +3459,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
5847 iwl3945_clear_free_frames(priv); 3459 iwl3945_clear_free_frames(priv);
5848} 3460}
5849 3461
5850static void iwl3945_down(struct iwl3945_priv *priv) 3462static void iwl3945_down(struct iwl_priv *priv)
5851{ 3463{
5852 mutex_lock(&priv->mutex); 3464 mutex_lock(&priv->mutex);
5853 __iwl3945_down(priv); 3465 __iwl3945_down(priv);
@@ -5858,58 +3470,58 @@ static void iwl3945_down(struct iwl3945_priv *priv)
5858 3470
5859#define MAX_HW_RESTARTS 5 3471#define MAX_HW_RESTARTS 5
5860 3472
5861static int __iwl3945_up(struct iwl3945_priv *priv) 3473static int __iwl3945_up(struct iwl_priv *priv)
5862{ 3474{
5863 int rc, i; 3475 int rc, i;
5864 3476
5865 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) { 3477 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
5866 IWL_WARNING("Exit pending; will not bring the NIC up\n"); 3478 IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");
5867 return -EIO; 3479 return -EIO;
5868 } 3480 }
5869 3481
5870 if (test_bit(STATUS_RF_KILL_SW, &priv->status)) { 3482 if (test_bit(STATUS_RF_KILL_SW, &priv->status)) {
5871 IWL_WARNING("Radio disabled by SW RF kill (module " 3483 IWL_WARN(priv, "Radio disabled by SW RF kill (module "
5872 "parameter)\n"); 3484 "parameter)\n");
5873 return -ENODEV; 3485 return -ENODEV;
5874 } 3486 }
5875 3487
5876 if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) { 3488 if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
5877 IWL_ERROR("ucode not available for device bring up\n"); 3489 IWL_ERR(priv, "ucode not available for device bring up\n");
5878 return -EIO; 3490 return -EIO;
5879 } 3491 }
5880 3492
5881 /* If platform's RF_KILL switch is NOT set to KILL */ 3493 /* If platform's RF_KILL switch is NOT set to KILL */
5882 if (iwl3945_read32(priv, CSR_GP_CNTRL) & 3494 if (iwl_read32(priv, CSR_GP_CNTRL) &
5883 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) 3495 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
5884 clear_bit(STATUS_RF_KILL_HW, &priv->status); 3496 clear_bit(STATUS_RF_KILL_HW, &priv->status);
5885 else { 3497 else {
5886 set_bit(STATUS_RF_KILL_HW, &priv->status); 3498 set_bit(STATUS_RF_KILL_HW, &priv->status);
5887 if (!test_bit(STATUS_IN_SUSPEND, &priv->status)) { 3499 if (!test_bit(STATUS_IN_SUSPEND, &priv->status)) {
5888 IWL_WARNING("Radio disabled by HW RF Kill switch\n"); 3500 IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");
5889 return -ENODEV; 3501 return -ENODEV;
5890 } 3502 }
5891 } 3503 }
5892 3504
5893 iwl3945_write32(priv, CSR_INT, 0xFFFFFFFF); 3505 iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
5894 3506
5895 rc = iwl3945_hw_nic_init(priv); 3507 rc = iwl3945_hw_nic_init(priv);
5896 if (rc) { 3508 if (rc) {
5897 IWL_ERROR("Unable to int nic\n"); 3509 IWL_ERR(priv, "Unable to int nic\n");
5898 return rc; 3510 return rc;
5899 } 3511 }
5900 3512
5901 /* make sure rfkill handshake bits are cleared */ 3513 /* make sure rfkill handshake bits are cleared */
5902 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); 3514 iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
5903 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_CLR, 3515 iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
5904 CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); 3516 CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
5905 3517
5906 /* clear (again), then enable host interrupts */ 3518 /* clear (again), then enable host interrupts */
5907 iwl3945_write32(priv, CSR_INT, 0xFFFFFFFF); 3519 iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
5908 iwl3945_enable_interrupts(priv); 3520 iwl3945_enable_interrupts(priv);
5909 3521
5910 /* really make sure rfkill handshake bits are cleared */ 3522 /* really make sure rfkill handshake bits are cleared */
5911 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); 3523 iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
5912 iwl3945_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); 3524 iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
5913 3525
5914 /* Copy original ucode data image from disk into backup cache. 3526 /* Copy original ucode data image from disk into backup cache.
5915 * This will be used to initialize the on-board processor's 3527 * This will be used to initialize the on-board processor's
@@ -5928,17 +3540,18 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
5928 /* load bootstrap state machine, 3540 /* load bootstrap state machine,
5929 * load bootstrap program into processor's memory, 3541 * load bootstrap program into processor's memory,
5930 * prepare to load the "initialize" uCode */ 3542 * prepare to load the "initialize" uCode */
5931 rc = iwl3945_load_bsm(priv); 3543 priv->cfg->ops->lib->load_ucode(priv);
5932 3544
5933 if (rc) { 3545 if (rc) {
5934 IWL_ERROR("Unable to set up bootstrap uCode: %d\n", rc); 3546 IWL_ERR(priv,
3547 "Unable to set up bootstrap uCode: %d\n", rc);
5935 continue; 3548 continue;
5936 } 3549 }
5937 3550
5938 /* start card; "initialize" will load runtime ucode */ 3551 /* start card; "initialize" will load runtime ucode */
5939 iwl3945_nic_start(priv); 3552 iwl3945_nic_start(priv);
5940 3553
5941 IWL_DEBUG_INFO(DRV_NAME " is coming up\n"); 3554 IWL_DEBUG_INFO(priv, DRV_NAME " is coming up\n");
5942 3555
5943 return 0; 3556 return 0;
5944 } 3557 }
@@ -5949,7 +3562,7 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
5949 3562
5950 /* tried to restart and config the device for as long as our 3563 /* tried to restart and config the device for as long as our
5951 * patience could withstand */ 3564 * patience could withstand */
5952 IWL_ERROR("Unable to initialize device after %d attempts.\n", i); 3565 IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);
5953 return -EIO; 3566 return -EIO;
5954} 3567}
5955 3568
@@ -5962,8 +3575,8 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
5962 3575
5963static void iwl3945_bg_init_alive_start(struct work_struct *data) 3576static void iwl3945_bg_init_alive_start(struct work_struct *data)
5964{ 3577{
5965 struct iwl3945_priv *priv = 3578 struct iwl_priv *priv =
5966 container_of(data, struct iwl3945_priv, init_alive_start.work); 3579 container_of(data, struct iwl_priv, init_alive_start.work);
5967 3580
5968 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3581 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
5969 return; 3582 return;
@@ -5975,8 +3588,8 @@ static void iwl3945_bg_init_alive_start(struct work_struct *data)
5975 3588
5976static void iwl3945_bg_alive_start(struct work_struct *data) 3589static void iwl3945_bg_alive_start(struct work_struct *data)
5977{ 3590{
5978 struct iwl3945_priv *priv = 3591 struct iwl_priv *priv =
5979 container_of(data, struct iwl3945_priv, alive_start.work); 3592 container_of(data, struct iwl_priv, alive_start.work);
5980 3593
5981 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3594 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
5982 return; 3595 return;
@@ -5986,66 +3599,31 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
5986 mutex_unlock(&priv->mutex); 3599 mutex_unlock(&priv->mutex);
5987} 3600}
5988 3601
5989static void iwl3945_bg_rf_kill(struct work_struct *work) 3602static void iwl3945_rfkill_poll(struct work_struct *data)
5990{ 3603{
5991 struct iwl3945_priv *priv = container_of(work, struct iwl3945_priv, rf_kill); 3604 struct iwl_priv *priv =
5992 3605 container_of(data, struct iwl_priv, rfkill_poll.work);
5993 wake_up_interruptible(&priv->wait_command_queue); 3606 unsigned long status = priv->status;
5994
5995 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
5996 return;
5997 3607
5998 mutex_lock(&priv->mutex); 3608 if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
3609 clear_bit(STATUS_RF_KILL_HW, &priv->status);
3610 else
3611 set_bit(STATUS_RF_KILL_HW, &priv->status);
5999 3612
6000 if (!iwl3945_is_rfkill(priv)) { 3613 if (test_bit(STATUS_RF_KILL_HW, &status) != test_bit(STATUS_RF_KILL_HW, &priv->status))
6001 IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL, 3614 queue_work(priv->workqueue, &priv->rf_kill);
6002 "HW and/or SW RF Kill no longer active, restarting "
6003 "device\n");
6004 if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
6005 queue_work(priv->workqueue, &priv->restart);
6006 } else {
6007 3615
6008 if (!test_bit(STATUS_RF_KILL_HW, &priv->status)) 3616 queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
6009 IWL_DEBUG_RF_KILL("Can not turn radio back on - " 3617 round_jiffies_relative(2 * HZ));
6010 "disabled by SW switch\n");
6011 else
6012 IWL_WARNING("Radio Frequency Kill Switch is On:\n"
6013 "Kill switch must be turned off for "
6014 "wireless networking to work.\n");
6015 }
6016 3618
6017 mutex_unlock(&priv->mutex);
6018 iwl3945_rfkill_set_hw_state(priv);
6019} 3619}
6020 3620
6021#define IWL_SCAN_CHECK_WATCHDOG (7 * HZ) 3621#define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
6022
6023static void iwl3945_bg_scan_check(struct work_struct *data)
6024{
6025 struct iwl3945_priv *priv =
6026 container_of(data, struct iwl3945_priv, scan_check.work);
6027
6028 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
6029 return;
6030
6031 mutex_lock(&priv->mutex);
6032 if (test_bit(STATUS_SCANNING, &priv->status) ||
6033 test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
6034 IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN,
6035 "Scan completion watchdog resetting adapter (%dms)\n",
6036 jiffies_to_msecs(IWL_SCAN_CHECK_WATCHDOG));
6037
6038 if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
6039 iwl3945_send_scan_abort(priv);
6040 }
6041 mutex_unlock(&priv->mutex);
6042}
6043
6044static void iwl3945_bg_request_scan(struct work_struct *data) 3622static void iwl3945_bg_request_scan(struct work_struct *data)
6045{ 3623{
6046 struct iwl3945_priv *priv = 3624 struct iwl_priv *priv =
6047 container_of(data, struct iwl3945_priv, request_scan); 3625 container_of(data, struct iwl_priv, request_scan);
6048 struct iwl3945_host_cmd cmd = { 3626 struct iwl_host_cmd cmd = {
6049 .id = REPLY_SCAN_CMD, 3627 .id = REPLY_SCAN_CMD,
6050 .len = sizeof(struct iwl3945_scan_cmd), 3628 .len = sizeof(struct iwl3945_scan_cmd),
6051 .meta.flags = CMD_SIZE_HUGE, 3629 .meta.flags = CMD_SIZE_HUGE,
@@ -6061,8 +3639,8 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6061 3639
6062 mutex_lock(&priv->mutex); 3640 mutex_lock(&priv->mutex);
6063 3641
6064 if (!iwl3945_is_ready(priv)) { 3642 if (!iwl_is_ready(priv)) {
6065 IWL_WARNING("request scan called when driver not ready.\n"); 3643 IWL_WARN(priv, "request scan called when driver not ready.\n");
6066 goto done; 3644 goto done;
6067 } 3645 }
6068 3646
@@ -6074,34 +3652,36 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6074 /* This should never be called or scheduled if there is currently 3652 /* This should never be called or scheduled if there is currently
6075 * a scan active in the hardware. */ 3653 * a scan active in the hardware. */
6076 if (test_bit(STATUS_SCAN_HW, &priv->status)) { 3654 if (test_bit(STATUS_SCAN_HW, &priv->status)) {
6077 IWL_DEBUG_INFO("Multiple concurrent scan requests in parallel. " 3655 IWL_DEBUG_INFO(priv, "Multiple concurrent scan requests "
6078 "Ignoring second request.\n"); 3656 "Ignoring second request.\n");
6079 rc = -EIO; 3657 rc = -EIO;
6080 goto done; 3658 goto done;
6081 } 3659 }
6082 3660
6083 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) { 3661 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
6084 IWL_DEBUG_SCAN("Aborting scan due to device shutdown\n"); 3662 IWL_DEBUG_SCAN(priv, "Aborting scan due to device shutdown\n");
6085 goto done; 3663 goto done;
6086 } 3664 }
6087 3665
6088 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) { 3666 if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
6089 IWL_DEBUG_HC("Scan request while abort pending. Queuing.\n"); 3667 IWL_DEBUG_HC(priv,
3668 "Scan request while abort pending. Queuing.\n");
6090 goto done; 3669 goto done;
6091 } 3670 }
6092 3671
6093 if (iwl3945_is_rfkill(priv)) { 3672 if (iwl_is_rfkill(priv)) {
6094 IWL_DEBUG_HC("Aborting scan due to RF Kill activation\n"); 3673 IWL_DEBUG_HC(priv, "Aborting scan due to RF Kill activation\n");
6095 goto done; 3674 goto done;
6096 } 3675 }
6097 3676
6098 if (!test_bit(STATUS_READY, &priv->status)) { 3677 if (!test_bit(STATUS_READY, &priv->status)) {
6099 IWL_DEBUG_HC("Scan request while uninitialized. Queuing.\n"); 3678 IWL_DEBUG_HC(priv,
3679 "Scan request while uninitialized. Queuing.\n");
6100 goto done; 3680 goto done;
6101 } 3681 }
6102 3682
6103 if (!priv->scan_bands) { 3683 if (!priv->scan_bands) {
6104 IWL_DEBUG_HC("Aborting scan due to no requested bands\n"); 3684 IWL_DEBUG_HC(priv, "Aborting scan due to no requested bands\n");
6105 goto done; 3685 goto done;
6106 } 3686 }
6107 3687
@@ -6119,14 +3699,14 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6119 scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH; 3699 scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
6120 scan->quiet_time = IWL_ACTIVE_QUIET_TIME; 3700 scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
6121 3701
6122 if (iwl3945_is_associated(priv)) { 3702 if (iwl_is_associated(priv)) {
6123 u16 interval = 0; 3703 u16 interval = 0;
6124 u32 extra; 3704 u32 extra;
6125 u32 suspend_time = 100; 3705 u32 suspend_time = 100;
6126 u32 scan_suspend_time = 100; 3706 u32 scan_suspend_time = 100;
6127 unsigned long flags; 3707 unsigned long flags;
6128 3708
6129 IWL_DEBUG_INFO("Scanning while associated...\n"); 3709 IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
6130 3710
6131 spin_lock_irqsave(&priv->lock, flags); 3711 spin_lock_irqsave(&priv->lock, flags);
6132 interval = priv->beacon_int; 3712 interval = priv->beacon_int;
@@ -6148,15 +3728,14 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6148 (extra | ((suspend_time % interval) * 1024)); 3728 (extra | ((suspend_time % interval) * 1024));
6149 3729
6150 scan->suspend_time = cpu_to_le32(scan_suspend_time); 3730 scan->suspend_time = cpu_to_le32(scan_suspend_time);
6151 IWL_DEBUG_SCAN("suspend_time 0x%X beacon interval %d\n", 3731 IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",
6152 scan_suspend_time, interval); 3732 scan_suspend_time, interval);
6153 } 3733 }
6154 3734
6155 /* We should add the ability for user to lock to PASSIVE ONLY */ 3735 /* We should add the ability for user to lock to PASSIVE ONLY */
6156 if (priv->one_direct_scan) { 3736 if (priv->one_direct_scan) {
6157 IWL_DEBUG_SCAN 3737 IWL_DEBUG_SCAN(priv, "Kicking off one direct scan for '%s'\n",
6158 ("Kicking off one direct scan for '%s'\n", 3738 print_ssid(ssid, priv->direct_ssid,
6159 print_ssid(ssid, priv->direct_ssid,
6160 priv->direct_ssid_len)); 3739 priv->direct_ssid_len));
6161 scan->direct_scan[0].id = WLAN_EID_SSID; 3740 scan->direct_scan[0].id = WLAN_EID_SSID;
6162 scan->direct_scan[0].len = priv->direct_ssid_len; 3741 scan->direct_scan[0].len = priv->direct_ssid_len;
@@ -6164,15 +3743,12 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6164 priv->direct_ssid, priv->direct_ssid_len); 3743 priv->direct_ssid, priv->direct_ssid_len);
6165 n_probes++; 3744 n_probes++;
6166 } else 3745 } else
6167 IWL_DEBUG_SCAN("Kicking off one indirect scan.\n"); 3746 IWL_DEBUG_SCAN(priv, "Kicking off one indirect scan.\n");
6168 3747
6169 /* We don't build a direct scan probe request; the uCode will do 3748 /* We don't build a direct scan probe request; the uCode will do
6170 * that based on the direct_mask added to each channel entry */ 3749 * that based on the direct_mask added to each channel entry */
6171 scan->tx_cmd.len = cpu_to_le16(
6172 iwl3945_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data,
6173 IWL_MAX_SCAN_SIZE - sizeof(*scan)));
6174 scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK; 3750 scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
6175 scan->tx_cmd.sta_id = priv->hw_setting.bcast_sta_id; 3751 scan->tx_cmd.sta_id = priv->hw_params.bcast_sta_id;
6176 scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; 3752 scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
6177 3753
6178 /* flags + rate selection */ 3754 /* flags + rate selection */
@@ -6187,10 +3763,15 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6187 scan->good_CRC_th = IWL_GOOD_CRC_TH; 3763 scan->good_CRC_th = IWL_GOOD_CRC_TH;
6188 band = IEEE80211_BAND_5GHZ; 3764 band = IEEE80211_BAND_5GHZ;
6189 } else { 3765 } else {
6190 IWL_WARNING("Invalid scan band count\n"); 3766 IWL_WARN(priv, "Invalid scan band count\n");
6191 goto done; 3767 goto done;
6192 } 3768 }
6193 3769
3770 scan->tx_cmd.len = cpu_to_le16(
3771 iwl_fill_probe_req(priv, band,
3772 (struct ieee80211_mgmt *)scan->data,
3773 IWL_MAX_SCAN_SIZE - sizeof(*scan)));
3774
6194 /* select Rx antennas */ 3775 /* select Rx antennas */
6195 scan->flags |= iwl3945_get_antenna_flags(priv); 3776 scan->flags |= iwl3945_get_antenna_flags(priv);
6196 3777
@@ -6203,7 +3784,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6203 (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]); 3784 (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
6204 3785
6205 if (scan->channel_count == 0) { 3786 if (scan->channel_count == 0) {
6206 IWL_DEBUG_SCAN("channel count %d\n", scan->channel_count); 3787 IWL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);
6207 goto done; 3788 goto done;
6208 } 3789 }
6209 3790
@@ -6213,7 +3794,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6213 scan->len = cpu_to_le16(cmd.len); 3794 scan->len = cpu_to_le16(cmd.len);
6214 3795
6215 set_bit(STATUS_SCAN_HW, &priv->status); 3796 set_bit(STATUS_SCAN_HW, &priv->status);
6216 rc = iwl3945_send_cmd_sync(priv, &cmd); 3797 rc = iwl_send_cmd_sync(priv, &cmd);
6217 if (rc) 3798 if (rc)
6218 goto done; 3799 goto done;
6219 3800
@@ -6239,7 +3820,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6239 3820
6240static void iwl3945_bg_up(struct work_struct *data) 3821static void iwl3945_bg_up(struct work_struct *data)
6241{ 3822{
6242 struct iwl3945_priv *priv = container_of(data, struct iwl3945_priv, up); 3823 struct iwl_priv *priv = container_of(data, struct iwl_priv, up);
6243 3824
6244 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3825 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
6245 return; 3826 return;
@@ -6247,12 +3828,12 @@ static void iwl3945_bg_up(struct work_struct *data)
6247 mutex_lock(&priv->mutex); 3828 mutex_lock(&priv->mutex);
6248 __iwl3945_up(priv); 3829 __iwl3945_up(priv);
6249 mutex_unlock(&priv->mutex); 3830 mutex_unlock(&priv->mutex);
6250 iwl3945_rfkill_set_hw_state(priv); 3831 iwl_rfkill_set_hw_state(priv);
6251} 3832}
6252 3833
6253static void iwl3945_bg_restart(struct work_struct *data) 3834static void iwl3945_bg_restart(struct work_struct *data)
6254{ 3835{
6255 struct iwl3945_priv *priv = container_of(data, struct iwl3945_priv, restart); 3836 struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);
6256 3837
6257 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3838 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
6258 return; 3839 return;
@@ -6263,8 +3844,8 @@ static void iwl3945_bg_restart(struct work_struct *data)
6263 3844
6264static void iwl3945_bg_rx_replenish(struct work_struct *data) 3845static void iwl3945_bg_rx_replenish(struct work_struct *data)
6265{ 3846{
6266 struct iwl3945_priv *priv = 3847 struct iwl_priv *priv =
6267 container_of(data, struct iwl3945_priv, rx_replenish); 3848 container_of(data, struct iwl_priv, rx_replenish);
6268 3849
6269 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3850 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
6270 return; 3851 return;
@@ -6276,18 +3857,18 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data)
6276 3857
6277#define IWL_DELAY_NEXT_SCAN (HZ*2) 3858#define IWL_DELAY_NEXT_SCAN (HZ*2)
6278 3859
6279static void iwl3945_post_associate(struct iwl3945_priv *priv) 3860static void iwl3945_post_associate(struct iwl_priv *priv)
6280{ 3861{
6281 int rc = 0; 3862 int rc = 0;
6282 struct ieee80211_conf *conf = NULL; 3863 struct ieee80211_conf *conf = NULL;
6283 3864
6284 if (priv->iw_mode == NL80211_IFTYPE_AP) { 3865 if (priv->iw_mode == NL80211_IFTYPE_AP) {
6285 IWL_ERROR("%s Should not be called in AP mode\n", __func__); 3866 IWL_ERR(priv, "%s Should not be called in AP mode\n", __func__);
6286 return; 3867 return;
6287 } 3868 }
6288 3869
6289 3870
6290 IWL_DEBUG_ASSOC("Associated as %d to: %pM\n", 3871 IWL_DEBUG_ASSOC(priv, "Associated as %d to: %pM\n",
6291 priv->assoc_id, priv->active_rxon.bssid_addr); 3872 priv->assoc_id, priv->active_rxon.bssid_addr);
6292 3873
6293 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 3874 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
@@ -6296,26 +3877,26 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
6296 if (!priv->vif || !priv->is_open) 3877 if (!priv->vif || !priv->is_open)
6297 return; 3878 return;
6298 3879
6299 iwl3945_scan_cancel_timeout(priv, 200); 3880 iwl_scan_cancel_timeout(priv, 200);
6300 3881
6301 conf = ieee80211_get_hw_conf(priv->hw); 3882 conf = ieee80211_get_hw_conf(priv->hw);
6302 3883
6303 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 3884 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
6304 iwl3945_commit_rxon(priv); 3885 iwl3945_commit_rxon(priv);
6305 3886
6306 memset(&priv->rxon_timing, 0, sizeof(struct iwl3945_rxon_time_cmd)); 3887 memset(&priv->rxon_timing, 0, sizeof(struct iwl_rxon_time_cmd));
6307 iwl3945_setup_rxon_timing(priv); 3888 iwl3945_setup_rxon_timing(priv);
6308 rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON_TIMING, 3889 rc = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
6309 sizeof(priv->rxon_timing), &priv->rxon_timing); 3890 sizeof(priv->rxon_timing), &priv->rxon_timing);
6310 if (rc) 3891 if (rc)
6311 IWL_WARNING("REPLY_RXON_TIMING failed - " 3892 IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
6312 "Attempting to continue.\n"); 3893 "Attempting to continue.\n");
6313 3894
6314 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK; 3895 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
6315 3896
6316 priv->staging_rxon.assoc_id = cpu_to_le16(priv->assoc_id); 3897 priv->staging_rxon.assoc_id = cpu_to_le16(priv->assoc_id);
6317 3898
6318 IWL_DEBUG_ASSOC("assoc id %d beacon interval %d\n", 3899 IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",
6319 priv->assoc_id, priv->beacon_int); 3900 priv->assoc_id, priv->beacon_int);
6320 3901
6321 if (priv->assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE) 3902 if (priv->assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
@@ -6355,7 +3936,7 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
6355 break; 3936 break;
6356 3937
6357 default: 3938 default:
6358 IWL_ERROR("%s Should not be called in %d mode\n", 3939 IWL_ERR(priv, "%s Should not be called in %d mode\n",
6359 __func__, priv->iw_mode); 3940 __func__, priv->iw_mode);
6360 break; 3941 break;
6361 } 3942 }
@@ -6366,45 +3947,8 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
6366 priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; 3947 priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;
6367} 3948}
6368 3949
6369static void iwl3945_bg_abort_scan(struct work_struct *work)
6370{
6371 struct iwl3945_priv *priv = container_of(work, struct iwl3945_priv, abort_scan);
6372
6373 if (!iwl3945_is_ready(priv))
6374 return;
6375
6376 mutex_lock(&priv->mutex);
6377
6378 set_bit(STATUS_SCAN_ABORTING, &priv->status);
6379 iwl3945_send_scan_abort(priv);
6380
6381 mutex_unlock(&priv->mutex);
6382}
6383
6384static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed); 3950static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed);
6385 3951
6386static void iwl3945_bg_scan_completed(struct work_struct *work)
6387{
6388 struct iwl3945_priv *priv =
6389 container_of(work, struct iwl3945_priv, scan_completed);
6390
6391 IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN, "SCAN complete scan\n");
6392
6393 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
6394 return;
6395
6396 if (test_bit(STATUS_CONF_PENDING, &priv->status))
6397 iwl3945_mac_config(priv->hw, 0);
6398
6399 ieee80211_scan_completed(priv->hw);
6400
6401 /* Since setting the TXPOWER may have been deferred while
6402 * performing the scan, fire one off */
6403 mutex_lock(&priv->mutex);
6404 iwl3945_hw_reg_send_txpower(priv);
6405 mutex_unlock(&priv->mutex);
6406}
6407
6408/***************************************************************************** 3952/*****************************************************************************
6409 * 3953 *
6410 * mac80211 entry point functions 3954 * mac80211 entry point functions
@@ -6415,36 +3959,22 @@ static void iwl3945_bg_scan_completed(struct work_struct *work)
6415 3959
6416static int iwl3945_mac_start(struct ieee80211_hw *hw) 3960static int iwl3945_mac_start(struct ieee80211_hw *hw)
6417{ 3961{
6418 struct iwl3945_priv *priv = hw->priv; 3962 struct iwl_priv *priv = hw->priv;
6419 int ret; 3963 int ret;
6420 3964
6421 IWL_DEBUG_MAC80211("enter\n"); 3965 IWL_DEBUG_MAC80211(priv, "enter\n");
6422
6423 if (pci_enable_device(priv->pci_dev)) {
6424 IWL_ERROR("Fail to pci_enable_device\n");
6425 return -ENODEV;
6426 }
6427 pci_restore_state(priv->pci_dev);
6428 pci_enable_msi(priv->pci_dev);
6429
6430 ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
6431 DRV_NAME, priv);
6432 if (ret) {
6433 IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
6434 goto out_disable_msi;
6435 }
6436 3966
6437 /* we should be verifying the device is ready to be opened */ 3967 /* we should be verifying the device is ready to be opened */
6438 mutex_lock(&priv->mutex); 3968 mutex_lock(&priv->mutex);
6439 3969
6440 memset(&priv->staging_rxon, 0, sizeof(struct iwl3945_rxon_cmd)); 3970 memset(&priv->staging_rxon, 0, sizeof(priv->staging_rxon));
6441 /* fetch ucode file from disk, alloc and copy to bus-master buffers ... 3971 /* fetch ucode file from disk, alloc and copy to bus-master buffers ...
6442 * ucode filename and max sizes are card-specific. */ 3972 * ucode filename and max sizes are card-specific. */
6443 3973
6444 if (!priv->ucode_code.len) { 3974 if (!priv->ucode_code.len) {
6445 ret = iwl3945_read_ucode(priv); 3975 ret = iwl3945_read_ucode(priv);
6446 if (ret) { 3976 if (ret) {
6447 IWL_ERROR("Could not read microcode: %d\n", ret); 3977 IWL_ERR(priv, "Could not read microcode: %d\n", ret);
6448 mutex_unlock(&priv->mutex); 3978 mutex_unlock(&priv->mutex);
6449 goto out_release_irq; 3979 goto out_release_irq;
6450 } 3980 }
@@ -6454,12 +3984,12 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
6454 3984
6455 mutex_unlock(&priv->mutex); 3985 mutex_unlock(&priv->mutex);
6456 3986
6457 iwl3945_rfkill_set_hw_state(priv); 3987 iwl_rfkill_set_hw_state(priv);
6458 3988
6459 if (ret) 3989 if (ret)
6460 goto out_release_irq; 3990 goto out_release_irq;
6461 3991
6462 IWL_DEBUG_INFO("Start UP work.\n"); 3992 IWL_DEBUG_INFO(priv, "Start UP work.\n");
6463 3993
6464 if (test_bit(STATUS_IN_SUSPEND, &priv->status)) 3994 if (test_bit(STATUS_IN_SUSPEND, &priv->status))
6465 return 0; 3995 return 0;
@@ -6471,86 +4001,87 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
6471 UCODE_READY_TIMEOUT); 4001 UCODE_READY_TIMEOUT);
6472 if (!ret) { 4002 if (!ret) {
6473 if (!test_bit(STATUS_READY, &priv->status)) { 4003 if (!test_bit(STATUS_READY, &priv->status)) {
6474 IWL_ERROR("Wait for START_ALIVE timeout after %dms.\n", 4004 IWL_ERR(priv,
6475 jiffies_to_msecs(UCODE_READY_TIMEOUT)); 4005 "Wait for START_ALIVE timeout after %dms.\n",
4006 jiffies_to_msecs(UCODE_READY_TIMEOUT));
6476 ret = -ETIMEDOUT; 4007 ret = -ETIMEDOUT;
6477 goto out_release_irq; 4008 goto out_release_irq;
6478 } 4009 }
6479 } 4010 }
6480 4011
4012 /* ucode is running and will send rfkill notifications,
4013 * no need to poll the killswitch state anymore */
4014 cancel_delayed_work(&priv->rfkill_poll);
4015
6481 priv->is_open = 1; 4016 priv->is_open = 1;
6482 IWL_DEBUG_MAC80211("leave\n"); 4017 IWL_DEBUG_MAC80211(priv, "leave\n");
6483 return 0; 4018 return 0;
6484 4019
6485out_release_irq: 4020out_release_irq:
6486 free_irq(priv->pci_dev->irq, priv);
6487out_disable_msi:
6488 pci_disable_msi(priv->pci_dev);
6489 pci_disable_device(priv->pci_dev);
6490 priv->is_open = 0; 4021 priv->is_open = 0;
6491 IWL_DEBUG_MAC80211("leave - failed\n"); 4022 IWL_DEBUG_MAC80211(priv, "leave - failed\n");
6492 return ret; 4023 return ret;
6493} 4024}
6494 4025
6495static void iwl3945_mac_stop(struct ieee80211_hw *hw) 4026static void iwl3945_mac_stop(struct ieee80211_hw *hw)
6496{ 4027{
6497 struct iwl3945_priv *priv = hw->priv; 4028 struct iwl_priv *priv = hw->priv;
6498 4029
6499 IWL_DEBUG_MAC80211("enter\n"); 4030 IWL_DEBUG_MAC80211(priv, "enter\n");
6500 4031
6501 if (!priv->is_open) { 4032 if (!priv->is_open) {
6502 IWL_DEBUG_MAC80211("leave - skip\n"); 4033 IWL_DEBUG_MAC80211(priv, "leave - skip\n");
6503 return; 4034 return;
6504 } 4035 }
6505 4036
6506 priv->is_open = 0; 4037 priv->is_open = 0;
6507 4038
6508 if (iwl3945_is_ready_rf(priv)) { 4039 if (iwl_is_ready_rf(priv)) {
6509 /* stop mac, cancel any scan request and clear 4040 /* stop mac, cancel any scan request and clear
6510 * RXON_FILTER_ASSOC_MSK BIT 4041 * RXON_FILTER_ASSOC_MSK BIT
6511 */ 4042 */
6512 mutex_lock(&priv->mutex); 4043 mutex_lock(&priv->mutex);
6513 iwl3945_scan_cancel_timeout(priv, 100); 4044 iwl_scan_cancel_timeout(priv, 100);
6514 mutex_unlock(&priv->mutex); 4045 mutex_unlock(&priv->mutex);
6515 } 4046 }
6516 4047
6517 iwl3945_down(priv); 4048 iwl3945_down(priv);
6518 4049
6519 flush_workqueue(priv->workqueue); 4050 flush_workqueue(priv->workqueue);
6520 free_irq(priv->pci_dev->irq, priv);
6521 pci_disable_msi(priv->pci_dev);
6522 pci_save_state(priv->pci_dev);
6523 pci_disable_device(priv->pci_dev);
6524 4051
6525 IWL_DEBUG_MAC80211("leave\n"); 4052 /* start polling the killswitch state again */
4053 queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
4054 round_jiffies_relative(2 * HZ));
4055
4056 IWL_DEBUG_MAC80211(priv, "leave\n");
6526} 4057}
6527 4058
6528static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 4059static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
6529{ 4060{
6530 struct iwl3945_priv *priv = hw->priv; 4061 struct iwl_priv *priv = hw->priv;
6531 4062
6532 IWL_DEBUG_MAC80211("enter\n"); 4063 IWL_DEBUG_MAC80211(priv, "enter\n");
6533 4064
6534 IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, 4065 IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
6535 ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate); 4066 ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
6536 4067
6537 if (iwl3945_tx_skb(priv, skb)) 4068 if (iwl3945_tx_skb(priv, skb))
6538 dev_kfree_skb_any(skb); 4069 dev_kfree_skb_any(skb);
6539 4070
6540 IWL_DEBUG_MAC80211("leave\n"); 4071 IWL_DEBUG_MAC80211(priv, "leave\n");
6541 return NETDEV_TX_OK; 4072 return NETDEV_TX_OK;
6542} 4073}
6543 4074
6544static int iwl3945_mac_add_interface(struct ieee80211_hw *hw, 4075static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
6545 struct ieee80211_if_init_conf *conf) 4076 struct ieee80211_if_init_conf *conf)
6546{ 4077{
6547 struct iwl3945_priv *priv = hw->priv; 4078 struct iwl_priv *priv = hw->priv;
6548 unsigned long flags; 4079 unsigned long flags;
6549 4080
6550 IWL_DEBUG_MAC80211("enter: type %d\n", conf->type); 4081 IWL_DEBUG_MAC80211(priv, "enter: type %d\n", conf->type);
6551 4082
6552 if (priv->vif) { 4083 if (priv->vif) {
6553 IWL_DEBUG_MAC80211("leave - vif != NULL\n"); 4084 IWL_DEBUG_MAC80211(priv, "leave - vif != NULL\n");
6554 return -EOPNOTSUPP; 4085 return -EOPNOTSUPP;
6555 } 4086 }
6556 4087
@@ -6563,16 +4094,16 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
6563 mutex_lock(&priv->mutex); 4094 mutex_lock(&priv->mutex);
6564 4095
6565 if (conf->mac_addr) { 4096 if (conf->mac_addr) {
6566 IWL_DEBUG_MAC80211("Set: %pM\n", conf->mac_addr); 4097 IWL_DEBUG_MAC80211(priv, "Set: %pM\n", conf->mac_addr);
6567 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN); 4098 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
6568 } 4099 }
6569 4100
6570 if (iwl3945_is_ready(priv)) 4101 if (iwl_is_ready(priv))
6571 iwl3945_set_mode(priv, conf->type); 4102 iwl3945_set_mode(priv, conf->type);
6572 4103
6573 mutex_unlock(&priv->mutex); 4104 mutex_unlock(&priv->mutex);
6574 4105
6575 IWL_DEBUG_MAC80211("leave\n"); 4106 IWL_DEBUG_MAC80211(priv, "leave\n");
6576 return 0; 4107 return 0;
6577} 4108}
6578 4109
@@ -6585,24 +4116,25 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
6585 */ 4116 */
6586static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed) 4117static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
6587{ 4118{
6588 struct iwl3945_priv *priv = hw->priv; 4119 struct iwl_priv *priv = hw->priv;
6589 const struct iwl3945_channel_info *ch_info; 4120 const struct iwl_channel_info *ch_info;
6590 struct ieee80211_conf *conf = &hw->conf; 4121 struct ieee80211_conf *conf = &hw->conf;
6591 unsigned long flags; 4122 unsigned long flags;
6592 int ret = 0; 4123 int ret = 0;
6593 4124
6594 mutex_lock(&priv->mutex); 4125 mutex_lock(&priv->mutex);
6595 IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel->hw_value); 4126 IWL_DEBUG_MAC80211(priv, "enter to channel %d\n",
4127 conf->channel->hw_value);
6596 4128
6597 if (!iwl3945_is_ready(priv)) { 4129 if (!iwl_is_ready(priv)) {
6598 IWL_DEBUG_MAC80211("leave - not ready\n"); 4130 IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
6599 ret = -EIO; 4131 ret = -EIO;
6600 goto out; 4132 goto out;
6601 } 4133 }
6602 4134
6603 if (unlikely(!iwl3945_param_disable_hw_scan && 4135 if (unlikely(!iwl3945_mod_params.disable_hw_scan &&
6604 test_bit(STATUS_SCANNING, &priv->status))) { 4136 test_bit(STATUS_SCANNING, &priv->status))) {
6605 IWL_DEBUG_MAC80211("leave - scanning\n"); 4137 IWL_DEBUG_MAC80211(priv, "leave - scanning\n");
6606 set_bit(STATUS_CONF_PENDING, &priv->status); 4138 set_bit(STATUS_CONF_PENDING, &priv->status);
6607 mutex_unlock(&priv->mutex); 4139 mutex_unlock(&priv->mutex);
6608 return 0; 4140 return 0;
@@ -6610,25 +4142,26 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
6610 4142
6611 spin_lock_irqsave(&priv->lock, flags); 4143 spin_lock_irqsave(&priv->lock, flags);
6612 4144
6613 ch_info = iwl3945_get_channel_info(priv, conf->channel->band, 4145 ch_info = iwl_get_channel_info(priv, conf->channel->band,
6614 conf->channel->hw_value); 4146 conf->channel->hw_value);
6615 if (!is_channel_valid(ch_info)) { 4147 if (!is_channel_valid(ch_info)) {
6616 IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this band.\n", 4148 IWL_DEBUG_SCAN(priv,
6617 conf->channel->hw_value, conf->channel->band); 4149 "Channel %d [%d] is INVALID for this band.\n",
6618 IWL_DEBUG_MAC80211("leave - invalid channel\n"); 4150 conf->channel->hw_value, conf->channel->band);
4151 IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
6619 spin_unlock_irqrestore(&priv->lock, flags); 4152 spin_unlock_irqrestore(&priv->lock, flags);
6620 ret = -EINVAL; 4153 ret = -EINVAL;
6621 goto out; 4154 goto out;
6622 } 4155 }
6623 4156
6624 iwl3945_set_rxon_channel(priv, conf->channel->band, conf->channel->hw_value); 4157 iwl_set_rxon_channel(priv, conf->channel);
6625 4158
6626 iwl3945_set_flags_for_phymode(priv, conf->channel->band); 4159 iwl_set_flags_for_band(priv, conf->channel->band);
6627 4160
6628 /* The list of supported rates and rate mask can be different 4161 /* The list of supported rates and rate mask can be different
6629 * for each phymode; since the phymode may have changed, reset 4162 * for each phymode; since the phymode may have changed, reset
6630 * the rate mask to what mac80211 lists */ 4163 * the rate mask to what mac80211 lists */
6631 iwl3945_set_rate(priv); 4164 iwl_set_rate(priv);
6632 4165
6633 spin_unlock_irqrestore(&priv->lock, flags); 4166 spin_unlock_irqrestore(&priv->lock, flags);
6634 4167
@@ -6642,25 +4175,25 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
6642 iwl3945_radio_kill_sw(priv, !conf->radio_enabled); 4175 iwl3945_radio_kill_sw(priv, !conf->radio_enabled);
6643 4176
6644 if (!conf->radio_enabled) { 4177 if (!conf->radio_enabled) {
6645 IWL_DEBUG_MAC80211("leave - radio disabled\n"); 4178 IWL_DEBUG_MAC80211(priv, "leave - radio disabled\n");
6646 goto out; 4179 goto out;
6647 } 4180 }
6648 4181
6649 if (iwl3945_is_rfkill(priv)) { 4182 if (iwl_is_rfkill(priv)) {
6650 IWL_DEBUG_MAC80211("leave - RF kill\n"); 4183 IWL_DEBUG_MAC80211(priv, "leave - RF kill\n");
6651 ret = -EIO; 4184 ret = -EIO;
6652 goto out; 4185 goto out;
6653 } 4186 }
6654 4187
6655 iwl3945_set_rate(priv); 4188 iwl_set_rate(priv);
6656 4189
6657 if (memcmp(&priv->active_rxon, 4190 if (memcmp(&priv->active_rxon,
6658 &priv->staging_rxon, sizeof(priv->staging_rxon))) 4191 &priv->staging_rxon, sizeof(priv->staging_rxon)))
6659 iwl3945_commit_rxon(priv); 4192 iwl3945_commit_rxon(priv);
6660 else 4193 else
6661 IWL_DEBUG_INFO("No re-sending same RXON configuration.\n"); 4194 IWL_DEBUG_INFO(priv, "Not re-sending same RXON configuration\n");
6662 4195
6663 IWL_DEBUG_MAC80211("leave\n"); 4196 IWL_DEBUG_MAC80211(priv, "leave\n");
6664 4197
6665out: 4198out:
6666 clear_bit(STATUS_CONF_PENDING, &priv->status); 4199 clear_bit(STATUS_CONF_PENDING, &priv->status);
@@ -6668,7 +4201,7 @@ out:
6668 return ret; 4201 return ret;
6669} 4202}
6670 4203
6671static void iwl3945_config_ap(struct iwl3945_priv *priv) 4204static void iwl3945_config_ap(struct iwl_priv *priv)
6672{ 4205{
6673 int rc = 0; 4206 int rc = 0;
6674 4207
@@ -6676,19 +4209,20 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
6676 return; 4209 return;
6677 4210
6678 /* The following should be done only at AP bring up */ 4211 /* The following should be done only at AP bring up */
6679 if (!(iwl3945_is_associated(priv))) { 4212 if (!(iwl_is_associated(priv))) {
6680 4213
6681 /* RXON - unassoc (to set timing command) */ 4214 /* RXON - unassoc (to set timing command) */
6682 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 4215 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
6683 iwl3945_commit_rxon(priv); 4216 iwl3945_commit_rxon(priv);
6684 4217
6685 /* RXON Timing */ 4218 /* RXON Timing */
6686 memset(&priv->rxon_timing, 0, sizeof(struct iwl3945_rxon_time_cmd)); 4219 memset(&priv->rxon_timing, 0, sizeof(struct iwl_rxon_time_cmd));
6687 iwl3945_setup_rxon_timing(priv); 4220 iwl3945_setup_rxon_timing(priv);
6688 rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON_TIMING, 4221 rc = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
6689 sizeof(priv->rxon_timing), &priv->rxon_timing); 4222 sizeof(priv->rxon_timing),
4223 &priv->rxon_timing);
6690 if (rc) 4224 if (rc)
6691 IWL_WARNING("REPLY_RXON_TIMING failed - " 4225 IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
6692 "Attempting to continue.\n"); 4226 "Attempting to continue.\n");
6693 4227
6694 /* FIXME: what should be the assoc_id for AP? */ 4228 /* FIXME: what should be the assoc_id for AP? */
@@ -6716,7 +4250,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
6716 /* restore RXON assoc */ 4250 /* restore RXON assoc */
6717 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK; 4251 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
6718 iwl3945_commit_rxon(priv); 4252 iwl3945_commit_rxon(priv);
6719 iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0); 4253 iwl3945_add_station(priv, iwl_bcast_addr, 0, 0);
6720 } 4254 }
6721 iwl3945_send_beacon_cmd(priv); 4255 iwl3945_send_beacon_cmd(priv);
6722 4256
@@ -6727,16 +4261,16 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
6727 4261
6728static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, 4262static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6729 struct ieee80211_vif *vif, 4263 struct ieee80211_vif *vif,
6730 struct ieee80211_if_conf *conf) 4264 struct ieee80211_if_conf *conf)
6731{ 4265{
6732 struct iwl3945_priv *priv = hw->priv; 4266 struct iwl_priv *priv = hw->priv;
6733 int rc; 4267 int rc;
6734 4268
6735 if (conf == NULL) 4269 if (conf == NULL)
6736 return -EIO; 4270 return -EIO;
6737 4271
6738 if (priv->vif != vif) { 4272 if (priv->vif != vif) {
6739 IWL_DEBUG_MAC80211("leave - priv->vif != vif\n"); 4273 IWL_DEBUG_MAC80211(priv, "leave - priv->vif != vif\n");
6740 return 0; 4274 return 0;
6741 } 4275 }
6742 4276
@@ -6753,13 +4287,13 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6753 return rc; 4287 return rc;
6754 } 4288 }
6755 4289
6756 if (!iwl3945_is_alive(priv)) 4290 if (!iwl_is_alive(priv))
6757 return -EAGAIN; 4291 return -EAGAIN;
6758 4292
6759 mutex_lock(&priv->mutex); 4293 mutex_lock(&priv->mutex);
6760 4294
6761 if (conf->bssid) 4295 if (conf->bssid)
6762 IWL_DEBUG_MAC80211("bssid: %pM\n", conf->bssid); 4296 IWL_DEBUG_MAC80211(priv, "bssid: %pM\n", conf->bssid);
6763 4297
6764/* 4298/*
6765 * very dubious code was here; the probe filtering flag is never set: 4299 * very dubious code was here; the probe filtering flag is never set:
@@ -6772,7 +4306,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6772 if (!conf->bssid) { 4306 if (!conf->bssid) {
6773 conf->bssid = priv->mac_addr; 4307 conf->bssid = priv->mac_addr;
6774 memcpy(priv->bssid, priv->mac_addr, ETH_ALEN); 4308 memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
6775 IWL_DEBUG_MAC80211("bssid was set to: %pM\n", 4309 IWL_DEBUG_MAC80211(priv, "bssid was set to: %pM\n",
6776 conf->bssid); 4310 conf->bssid);
6777 } 4311 }
6778 if (priv->ibss_beacon) 4312 if (priv->ibss_beacon)
@@ -6781,17 +4315,17 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6781 priv->ibss_beacon = ieee80211_beacon_get(hw, vif); 4315 priv->ibss_beacon = ieee80211_beacon_get(hw, vif);
6782 } 4316 }
6783 4317
6784 if (iwl3945_is_rfkill(priv)) 4318 if (iwl_is_rfkill(priv))
6785 goto done; 4319 goto done;
6786 4320
6787 if (conf->bssid && !is_zero_ether_addr(conf->bssid) && 4321 if (conf->bssid && !is_zero_ether_addr(conf->bssid) &&
6788 !is_multicast_ether_addr(conf->bssid)) { 4322 !is_multicast_ether_addr(conf->bssid)) {
6789 /* If there is currently a HW scan going on in the background 4323 /* If there is currently a HW scan going on in the background
6790 * then we need to cancel it else the RXON below will fail. */ 4324 * then we need to cancel it else the RXON below will fail. */
6791 if (iwl3945_scan_cancel_timeout(priv, 100)) { 4325 if (iwl_scan_cancel_timeout(priv, 100)) {
6792 IWL_WARNING("Aborted scan still in progress " 4326 IWL_WARN(priv, "Aborted scan still in progress "
6793 "after 100ms\n"); 4327 "after 100ms\n");
6794 IWL_DEBUG_MAC80211("leaving - scan abort failed.\n"); 4328 IWL_DEBUG_MAC80211(priv, "leaving:scan abort failed\n");
6795 mutex_unlock(&priv->mutex); 4329 mutex_unlock(&priv->mutex);
6796 return -EAGAIN; 4330 return -EAGAIN;
6797 } 4331 }
@@ -6813,75 +4347,29 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
6813 } 4347 }
6814 4348
6815 } else { 4349 } else {
6816 iwl3945_scan_cancel_timeout(priv, 100); 4350 iwl_scan_cancel_timeout(priv, 100);
6817 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 4351 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
6818 iwl3945_commit_rxon(priv); 4352 iwl3945_commit_rxon(priv);
6819 } 4353 }
6820 4354
6821 done: 4355 done:
6822 IWL_DEBUG_MAC80211("leave\n"); 4356 IWL_DEBUG_MAC80211(priv, "leave\n");
6823 mutex_unlock(&priv->mutex); 4357 mutex_unlock(&priv->mutex);
6824 4358
6825 return 0; 4359 return 0;
6826} 4360}
6827 4361
6828static void iwl3945_configure_filter(struct ieee80211_hw *hw,
6829 unsigned int changed_flags,
6830 unsigned int *total_flags,
6831 int mc_count, struct dev_addr_list *mc_list)
6832{
6833 struct iwl3945_priv *priv = hw->priv;
6834 __le32 *filter_flags = &priv->staging_rxon.filter_flags;
6835
6836 IWL_DEBUG_MAC80211("Enter: changed: 0x%x, total: 0x%x\n",
6837 changed_flags, *total_flags);
6838
6839 if (changed_flags & (FIF_OTHER_BSS | FIF_PROMISC_IN_BSS)) {
6840 if (*total_flags & (FIF_OTHER_BSS | FIF_PROMISC_IN_BSS))
6841 *filter_flags |= RXON_FILTER_PROMISC_MSK;
6842 else
6843 *filter_flags &= ~RXON_FILTER_PROMISC_MSK;
6844 }
6845 if (changed_flags & FIF_ALLMULTI) {
6846 if (*total_flags & FIF_ALLMULTI)
6847 *filter_flags |= RXON_FILTER_ACCEPT_GRP_MSK;
6848 else
6849 *filter_flags &= ~RXON_FILTER_ACCEPT_GRP_MSK;
6850 }
6851 if (changed_flags & FIF_CONTROL) {
6852 if (*total_flags & FIF_CONTROL)
6853 *filter_flags |= RXON_FILTER_CTL2HOST_MSK;
6854 else
6855 *filter_flags &= ~RXON_FILTER_CTL2HOST_MSK;
6856 }
6857 if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
6858 if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
6859 *filter_flags |= RXON_FILTER_BCON_AWARE_MSK;
6860 else
6861 *filter_flags &= ~RXON_FILTER_BCON_AWARE_MSK;
6862 }
6863
6864 /* We avoid iwl_commit_rxon here to commit the new filter flags
6865 * since mac80211 will call ieee80211_hw_config immediately.
6866 * (mc_list is not supported at this time). Otherwise, we need to
6867 * queue a background iwl_commit_rxon work.
6868 */
6869
6870 *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
6871 FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
6872}
6873
6874static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw, 4362static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
6875 struct ieee80211_if_init_conf *conf) 4363 struct ieee80211_if_init_conf *conf)
6876{ 4364{
6877 struct iwl3945_priv *priv = hw->priv; 4365 struct iwl_priv *priv = hw->priv;
6878 4366
6879 IWL_DEBUG_MAC80211("enter\n"); 4367 IWL_DEBUG_MAC80211(priv, "enter\n");
6880 4368
6881 mutex_lock(&priv->mutex); 4369 mutex_lock(&priv->mutex);
6882 4370
6883 if (iwl3945_is_ready_rf(priv)) { 4371 if (iwl_is_ready_rf(priv)) {
6884 iwl3945_scan_cancel_timeout(priv, 100); 4372 iwl_scan_cancel_timeout(priv, 100);
6885 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 4373 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
6886 iwl3945_commit_rxon(priv); 4374 iwl3945_commit_rxon(priv);
6887 } 4375 }
@@ -6891,7 +4379,7 @@ static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
6891 } 4379 }
6892 mutex_unlock(&priv->mutex); 4380 mutex_unlock(&priv->mutex);
6893 4381
6894 IWL_DEBUG_MAC80211("leave\n"); 4382 IWL_DEBUG_MAC80211(priv, "leave\n");
6895} 4383}
6896 4384
6897#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6) 4385#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
@@ -6901,21 +4389,23 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,
6901 struct ieee80211_bss_conf *bss_conf, 4389 struct ieee80211_bss_conf *bss_conf,
6902 u32 changes) 4390 u32 changes)
6903{ 4391{
6904 struct iwl3945_priv *priv = hw->priv; 4392 struct iwl_priv *priv = hw->priv;
6905 4393
6906 IWL_DEBUG_MAC80211("changes = 0x%X\n", changes); 4394 IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);
6907 4395
6908 if (changes & BSS_CHANGED_ERP_PREAMBLE) { 4396 if (changes & BSS_CHANGED_ERP_PREAMBLE) {
6909 IWL_DEBUG_MAC80211("ERP_PREAMBLE %d\n", 4397 IWL_DEBUG_MAC80211(priv, "ERP_PREAMBLE %d\n",
6910 bss_conf->use_short_preamble); 4398 bss_conf->use_short_preamble);
6911 if (bss_conf->use_short_preamble) 4399 if (bss_conf->use_short_preamble)
6912 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK; 4400 priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
6913 else 4401 else
6914 priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK; 4402 priv->staging_rxon.flags &=
4403 ~RXON_FLG_SHORT_PREAMBLE_MSK;
6915 } 4404 }
6916 4405
6917 if (changes & BSS_CHANGED_ERP_CTS_PROT) { 4406 if (changes & BSS_CHANGED_ERP_CTS_PROT) {
6918 IWL_DEBUG_MAC80211("ERP_CTS %d\n", bss_conf->use_cts_prot); 4407 IWL_DEBUG_MAC80211(priv, "ERP_CTS %d\n",
4408 bss_conf->use_cts_prot);
6919 if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ)) 4409 if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ))
6920 priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK; 4410 priv->staging_rxon.flags |= RXON_FLG_TGG_PROTECT_MSK;
6921 else 4411 else
@@ -6923,7 +4413,7 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,
6923 } 4413 }
6924 4414
6925 if (changes & BSS_CHANGED_ASSOC) { 4415 if (changes & BSS_CHANGED_ASSOC) {
6926 IWL_DEBUG_MAC80211("ASSOC %d\n", bss_conf->assoc); 4416 IWL_DEBUG_MAC80211(priv, "ASSOC %d\n", bss_conf->assoc);
6927 /* This should never happen as this function should 4417 /* This should never happen as this function should
6928 * never be called from interrupt context. */ 4418 * never be called from interrupt context. */
6929 if (WARN_ON_ONCE(in_interrupt())) 4419 if (WARN_ON_ONCE(in_interrupt()))
@@ -6931,10 +4421,9 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,
6931 if (bss_conf->assoc) { 4421 if (bss_conf->assoc) {
6932 priv->assoc_id = bss_conf->aid; 4422 priv->assoc_id = bss_conf->aid;
6933 priv->beacon_int = bss_conf->beacon_int; 4423 priv->beacon_int = bss_conf->beacon_int;
6934 priv->timestamp0 = bss_conf->timestamp & 0xFFFFFFFF; 4424 priv->timestamp = bss_conf->timestamp;
6935 priv->timestamp1 = (bss_conf->timestamp >> 32) &
6936 0xFFFFFFFF;
6937 priv->assoc_capability = bss_conf->assoc_capability; 4425 priv->assoc_capability = bss_conf->assoc_capability;
4426 priv->power_data.dtim_period = bss_conf->dtim_period;
6938 priv->next_scan_jiffies = jiffies + 4427 priv->next_scan_jiffies = jiffies +
6939 IWL_DELAY_NEXT_SCAN_AFTER_ASSOC; 4428 IWL_DELAY_NEXT_SCAN_AFTER_ASSOC;
6940 mutex_lock(&priv->mutex); 4429 mutex_lock(&priv->mutex);
@@ -6942,30 +4431,40 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,
6942 mutex_unlock(&priv->mutex); 4431 mutex_unlock(&priv->mutex);
6943 } else { 4432 } else {
6944 priv->assoc_id = 0; 4433 priv->assoc_id = 0;
6945 IWL_DEBUG_MAC80211("DISASSOC %d\n", bss_conf->assoc); 4434 IWL_DEBUG_MAC80211(priv,
4435 "DISASSOC %d\n", bss_conf->assoc);
6946 } 4436 }
6947 } else if (changes && iwl3945_is_associated(priv) && priv->assoc_id) { 4437 } else if (changes && iwl_is_associated(priv) && priv->assoc_id) {
6948 IWL_DEBUG_MAC80211("Associated Changes %d\n", changes); 4438 IWL_DEBUG_MAC80211(priv,
4439 "Associated Changes %d\n", changes);
6949 iwl3945_send_rxon_assoc(priv); 4440 iwl3945_send_rxon_assoc(priv);
6950 } 4441 }
6951 4442
6952} 4443}
6953 4444
6954static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) 4445static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw,
4446 struct cfg80211_scan_request *req)
6955{ 4447{
6956 int rc = 0; 4448 int rc = 0;
6957 unsigned long flags; 4449 unsigned long flags;
6958 struct iwl3945_priv *priv = hw->priv; 4450 struct iwl_priv *priv = hw->priv;
4451 size_t len = 0;
4452 u8 *ssid = NULL;
6959 DECLARE_SSID_BUF(ssid_buf); 4453 DECLARE_SSID_BUF(ssid_buf);
6960 4454
6961 IWL_DEBUG_MAC80211("enter\n"); 4455 IWL_DEBUG_MAC80211(priv, "enter\n");
4456
4457 if (req->n_ssids) {
4458 ssid = req->ssids[0].ssid;
4459 len = req->ssids[0].ssid_len;
4460 }
6962 4461
6963 mutex_lock(&priv->mutex); 4462 mutex_lock(&priv->mutex);
6964 spin_lock_irqsave(&priv->lock, flags); 4463 spin_lock_irqsave(&priv->lock, flags);
6965 4464
6966 if (!iwl3945_is_ready_rf(priv)) { 4465 if (!iwl_is_ready_rf(priv)) {
6967 rc = -EIO; 4466 rc = -EIO;
6968 IWL_DEBUG_MAC80211("leave - not ready or exit pending\n"); 4467 IWL_DEBUG_MAC80211(priv, "leave - not ready or exit pending\n");
6969 goto out_unlock; 4468 goto out_unlock;
6970 } 4469 }
6971 4470
@@ -6983,19 +4482,18 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
6983 goto out_unlock; 4482 goto out_unlock;
6984 } 4483 }
6985 if (len) { 4484 if (len) {
6986 IWL_DEBUG_SCAN("direct scan for %s [%d]\n ", 4485 IWL_DEBUG_SCAN(priv, "direct scan for %s [%zd]\n ",
6987 print_ssid(ssid_buf, ssid, len), (int)len); 4486 print_ssid(ssid_buf, ssid, len), len);
6988 4487
6989 priv->one_direct_scan = 1; 4488 priv->one_direct_scan = 1;
6990 priv->direct_ssid_len = (u8) 4489 priv->direct_ssid_len = len;
6991 min((u8) len, (u8) IW_ESSID_MAX_SIZE); 4490 memcpy(priv->direct_ssid, ssid, len);
6992 memcpy(priv->direct_ssid, ssid, priv->direct_ssid_len);
6993 } else 4491 } else
6994 priv->one_direct_scan = 0; 4492 priv->one_direct_scan = 0;
6995 4493
6996 rc = iwl3945_scan_initiate(priv); 4494 rc = iwl3945_scan_initiate(priv);
6997 4495
6998 IWL_DEBUG_MAC80211("leave\n"); 4496 IWL_DEBUG_MAC80211(priv, "leave\n");
6999 4497
7000out_unlock: 4498out_unlock:
7001 spin_unlock_irqrestore(&priv->lock, flags); 4499 spin_unlock_irqrestore(&priv->lock, flags);
@@ -7005,80 +4503,80 @@ out_unlock:
7005} 4503}
7006 4504
7007static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 4505static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
7008 const u8 *local_addr, const u8 *addr, 4506 struct ieee80211_vif *vif,
7009 struct ieee80211_key_conf *key) 4507 struct ieee80211_sta *sta,
4508 struct ieee80211_key_conf *key)
7010{ 4509{
7011 struct iwl3945_priv *priv = hw->priv; 4510 struct iwl_priv *priv = hw->priv;
7012 int rc = 0; 4511 const u8 *addr;
4512 int ret;
7013 u8 sta_id; 4513 u8 sta_id;
7014 4514
7015 IWL_DEBUG_MAC80211("enter\n"); 4515 IWL_DEBUG_MAC80211(priv, "enter\n");
7016 4516
7017 if (!iwl3945_param_hwcrypto) { 4517 if (iwl3945_mod_params.sw_crypto) {
7018 IWL_DEBUG_MAC80211("leave - hwcrypto disabled\n"); 4518 IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");
7019 return -EOPNOTSUPP; 4519 return -EOPNOTSUPP;
7020 } 4520 }
7021 4521
7022 if (is_zero_ether_addr(addr)) 4522 addr = sta ? sta->addr : iwl_bcast_addr;
7023 /* only support pairwise keys */
7024 return -EOPNOTSUPP;
7025
7026 sta_id = iwl3945_hw_find_station(priv, addr); 4523 sta_id = iwl3945_hw_find_station(priv, addr);
7027 if (sta_id == IWL_INVALID_STATION) { 4524 if (sta_id == IWL_INVALID_STATION) {
7028 IWL_DEBUG_MAC80211("leave - %pM not in station map.\n", 4525 IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n",
7029 addr); 4526 addr);
7030 return -EINVAL; 4527 return -EINVAL;
7031 } 4528 }
7032 4529
7033 mutex_lock(&priv->mutex); 4530 mutex_lock(&priv->mutex);
7034 4531
7035 iwl3945_scan_cancel_timeout(priv, 100); 4532 iwl_scan_cancel_timeout(priv, 100);
7036 4533
7037 switch (cmd) { 4534 switch (cmd) {
7038 case SET_KEY: 4535 case SET_KEY:
7039 rc = iwl3945_update_sta_key_info(priv, key, sta_id); 4536 ret = iwl3945_update_sta_key_info(priv, key, sta_id);
7040 if (!rc) { 4537 if (!ret) {
7041 iwl3945_set_rxon_hwcrypto(priv, 1); 4538 iwl_set_rxon_hwcrypto(priv, 1);
7042 iwl3945_commit_rxon(priv); 4539 iwl3945_commit_rxon(priv);
7043 key->hw_key_idx = sta_id; 4540 key->hw_key_idx = sta_id;
7044 IWL_DEBUG_MAC80211("set_key success, using hwcrypto\n"); 4541 IWL_DEBUG_MAC80211(priv,
4542 "set_key success, using hwcrypto\n");
7045 key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; 4543 key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
7046 } 4544 }
7047 break; 4545 break;
7048 case DISABLE_KEY: 4546 case DISABLE_KEY:
7049 rc = iwl3945_clear_sta_key_info(priv, sta_id); 4547 ret = iwl3945_clear_sta_key_info(priv, sta_id);
7050 if (!rc) { 4548 if (!ret) {
7051 iwl3945_set_rxon_hwcrypto(priv, 0); 4549 iwl_set_rxon_hwcrypto(priv, 0);
7052 iwl3945_commit_rxon(priv); 4550 iwl3945_commit_rxon(priv);
7053 IWL_DEBUG_MAC80211("disable hwcrypto key\n"); 4551 IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");
7054 } 4552 }
7055 break; 4553 break;
7056 default: 4554 default:
7057 rc = -EINVAL; 4555 ret = -EINVAL;
7058 } 4556 }
7059 4557
7060 IWL_DEBUG_MAC80211("leave\n"); 4558 IWL_DEBUG_MAC80211(priv, "leave\n");
7061 mutex_unlock(&priv->mutex); 4559 mutex_unlock(&priv->mutex);
7062 4560
7063 return rc; 4561 return ret;
7064} 4562}
7065 4563
7066static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, 4564static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
7067 const struct ieee80211_tx_queue_params *params) 4565 const struct ieee80211_tx_queue_params *params)
7068{ 4566{
7069 struct iwl3945_priv *priv = hw->priv; 4567 struct iwl_priv *priv = hw->priv;
7070 unsigned long flags; 4568 unsigned long flags;
7071 int q; 4569 int q;
7072 4570
7073 IWL_DEBUG_MAC80211("enter\n"); 4571 IWL_DEBUG_MAC80211(priv, "enter\n");
7074 4572
7075 if (!iwl3945_is_ready_rf(priv)) { 4573 if (!iwl_is_ready_rf(priv)) {
7076 IWL_DEBUG_MAC80211("leave - RF not ready\n"); 4574 IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
7077 return -EIO; 4575 return -EIO;
7078 } 4576 }
7079 4577
7080 if (queue >= AC_NUM) { 4578 if (queue >= AC_NUM) {
7081 IWL_DEBUG_MAC80211("leave - queue >= AC_NUM %d\n", queue); 4579 IWL_DEBUG_MAC80211(priv, "leave - queue >= AC_NUM %d\n", queue);
7082 return 0; 4580 return 0;
7083 } 4581 }
7084 4582
@@ -7100,28 +4598,28 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
7100 mutex_lock(&priv->mutex); 4598 mutex_lock(&priv->mutex);
7101 if (priv->iw_mode == NL80211_IFTYPE_AP) 4599 if (priv->iw_mode == NL80211_IFTYPE_AP)
7102 iwl3945_activate_qos(priv, 1); 4600 iwl3945_activate_qos(priv, 1);
7103 else if (priv->assoc_id && iwl3945_is_associated(priv)) 4601 else if (priv->assoc_id && iwl_is_associated(priv))
7104 iwl3945_activate_qos(priv, 0); 4602 iwl3945_activate_qos(priv, 0);
7105 4603
7106 mutex_unlock(&priv->mutex); 4604 mutex_unlock(&priv->mutex);
7107 4605
7108 IWL_DEBUG_MAC80211("leave\n"); 4606 IWL_DEBUG_MAC80211(priv, "leave\n");
7109 return 0; 4607 return 0;
7110} 4608}
7111 4609
7112static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw, 4610static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
7113 struct ieee80211_tx_queue_stats *stats) 4611 struct ieee80211_tx_queue_stats *stats)
7114{ 4612{
7115 struct iwl3945_priv *priv = hw->priv; 4613 struct iwl_priv *priv = hw->priv;
7116 int i, avail; 4614 int i, avail;
7117 struct iwl3945_tx_queue *txq; 4615 struct iwl_tx_queue *txq;
7118 struct iwl3945_queue *q; 4616 struct iwl_queue *q;
7119 unsigned long flags; 4617 unsigned long flags;
7120 4618
7121 IWL_DEBUG_MAC80211("enter\n"); 4619 IWL_DEBUG_MAC80211(priv, "enter\n");
7122 4620
7123 if (!iwl3945_is_ready_rf(priv)) { 4621 if (!iwl_is_ready_rf(priv)) {
7124 IWL_DEBUG_MAC80211("leave - RF not ready\n"); 4622 IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
7125 return -EIO; 4623 return -EIO;
7126 } 4624 }
7127 4625
@@ -7130,7 +4628,7 @@ static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
7130 for (i = 0; i < AC_NUM; i++) { 4628 for (i = 0; i < AC_NUM; i++) {
7131 txq = &priv->txq[i]; 4629 txq = &priv->txq[i];
7132 q = &txq->q; 4630 q = &txq->q;
7133 avail = iwl3945_queue_space(q); 4631 avail = iwl_queue_space(q);
7134 4632
7135 stats[i].len = q->n_window - avail; 4633 stats[i].len = q->n_window - avail;
7136 stats[i].limit = q->n_window - q->high_mark; 4634 stats[i].limit = q->n_window - q->high_mark;
@@ -7139,34 +4637,24 @@ static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
7139 } 4637 }
7140 spin_unlock_irqrestore(&priv->lock, flags); 4638 spin_unlock_irqrestore(&priv->lock, flags);
7141 4639
7142 IWL_DEBUG_MAC80211("leave\n"); 4640 IWL_DEBUG_MAC80211(priv, "leave\n");
7143
7144 return 0;
7145}
7146
7147static int iwl3945_mac_get_stats(struct ieee80211_hw *hw,
7148 struct ieee80211_low_level_stats *stats)
7149{
7150 IWL_DEBUG_MAC80211("enter\n");
7151 IWL_DEBUG_MAC80211("leave\n");
7152 4641
7153 return 0; 4642 return 0;
7154} 4643}
7155 4644
7156static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw) 4645static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
7157{ 4646{
7158 struct iwl3945_priv *priv = hw->priv; 4647 struct iwl_priv *priv = hw->priv;
7159 unsigned long flags; 4648 unsigned long flags;
7160 4649
7161 mutex_lock(&priv->mutex); 4650 mutex_lock(&priv->mutex);
7162 IWL_DEBUG_MAC80211("enter\n"); 4651 IWL_DEBUG_MAC80211(priv, "enter\n");
7163 4652
7164 iwl3945_reset_qos(priv); 4653 iwl_reset_qos(priv);
7165 4654
7166 spin_lock_irqsave(&priv->lock, flags); 4655 spin_lock_irqsave(&priv->lock, flags);
7167 priv->assoc_id = 0; 4656 priv->assoc_id = 0;
7168 priv->assoc_capability = 0; 4657 priv->assoc_capability = 0;
7169 priv->call_post_assoc_from_beacon = 0;
7170 4658
7171 /* new association get rid of ibss beacon skb */ 4659 /* new association get rid of ibss beacon skb */
7172 if (priv->ibss_beacon) 4660 if (priv->ibss_beacon)
@@ -7175,15 +4663,14 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
7175 priv->ibss_beacon = NULL; 4663 priv->ibss_beacon = NULL;
7176 4664
7177 priv->beacon_int = priv->hw->conf.beacon_int; 4665 priv->beacon_int = priv->hw->conf.beacon_int;
7178 priv->timestamp1 = 0; 4666 priv->timestamp = 0;
7179 priv->timestamp0 = 0;
7180 if ((priv->iw_mode == NL80211_IFTYPE_STATION)) 4667 if ((priv->iw_mode == NL80211_IFTYPE_STATION))
7181 priv->beacon_int = 0; 4668 priv->beacon_int = 0;
7182 4669
7183 spin_unlock_irqrestore(&priv->lock, flags); 4670 spin_unlock_irqrestore(&priv->lock, flags);
7184 4671
7185 if (!iwl3945_is_ready_rf(priv)) { 4672 if (!iwl_is_ready_rf(priv)) {
7186 IWL_DEBUG_MAC80211("leave - not ready\n"); 4673 IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
7187 mutex_unlock(&priv->mutex); 4674 mutex_unlock(&priv->mutex);
7188 return; 4675 return;
7189 } 4676 }
@@ -7192,7 +4679,7 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
7192 * clear RXON_FILTER_ASSOC_MSK bit 4679 * clear RXON_FILTER_ASSOC_MSK bit
7193 */ 4680 */
7194 if (priv->iw_mode != NL80211_IFTYPE_AP) { 4681 if (priv->iw_mode != NL80211_IFTYPE_AP) {
7195 iwl3945_scan_cancel_timeout(priv, 100); 4682 iwl_scan_cancel_timeout(priv, 100);
7196 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 4683 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
7197 iwl3945_commit_rxon(priv); 4684 iwl3945_commit_rxon(priv);
7198 } 4685 }
@@ -7200,33 +4687,33 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
7200 /* Per mac80211.h: This is only used in IBSS mode... */ 4687 /* Per mac80211.h: This is only used in IBSS mode... */
7201 if (priv->iw_mode != NL80211_IFTYPE_ADHOC) { 4688 if (priv->iw_mode != NL80211_IFTYPE_ADHOC) {
7202 4689
7203 IWL_DEBUG_MAC80211("leave - not in IBSS\n"); 4690 IWL_DEBUG_MAC80211(priv, "leave - not in IBSS\n");
7204 mutex_unlock(&priv->mutex); 4691 mutex_unlock(&priv->mutex);
7205 return; 4692 return;
7206 } 4693 }
7207 4694
7208 iwl3945_set_rate(priv); 4695 iwl_set_rate(priv);
7209 4696
7210 mutex_unlock(&priv->mutex); 4697 mutex_unlock(&priv->mutex);
7211 4698
7212 IWL_DEBUG_MAC80211("leave\n"); 4699 IWL_DEBUG_MAC80211(priv, "leave\n");
7213 4700
7214} 4701}
7215 4702
7216static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) 4703static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
7217{ 4704{
7218 struct iwl3945_priv *priv = hw->priv; 4705 struct iwl_priv *priv = hw->priv;
7219 unsigned long flags; 4706 unsigned long flags;
7220 4707
7221 IWL_DEBUG_MAC80211("enter\n"); 4708 IWL_DEBUG_MAC80211(priv, "enter\n");
7222 4709
7223 if (!iwl3945_is_ready_rf(priv)) { 4710 if (!iwl_is_ready_rf(priv)) {
7224 IWL_DEBUG_MAC80211("leave - RF not ready\n"); 4711 IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
7225 return -EIO; 4712 return -EIO;
7226 } 4713 }
7227 4714
7228 if (priv->iw_mode != NL80211_IFTYPE_ADHOC) { 4715 if (priv->iw_mode != NL80211_IFTYPE_ADHOC) {
7229 IWL_DEBUG_MAC80211("leave - not IBSS\n"); 4716 IWL_DEBUG_MAC80211(priv, "leave - not IBSS\n");
7230 return -EIO; 4717 return -EIO;
7231 } 4718 }
7232 4719
@@ -7239,10 +4726,10 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
7239 4726
7240 priv->assoc_id = 0; 4727 priv->assoc_id = 0;
7241 4728
7242 IWL_DEBUG_MAC80211("leave\n"); 4729 IWL_DEBUG_MAC80211(priv, "leave\n");
7243 spin_unlock_irqrestore(&priv->lock, flags); 4730 spin_unlock_irqrestore(&priv->lock, flags);
7244 4731
7245 iwl3945_reset_qos(priv); 4732 iwl_reset_qos(priv);
7246 4733
7247 iwl3945_post_associate(priv); 4734 iwl3945_post_associate(priv);
7248 4735
@@ -7256,7 +4743,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
7256 * 4743 *
7257 *****************************************************************************/ 4744 *****************************************************************************/
7258 4745
7259#ifdef CONFIG_IWL3945_DEBUG 4746#ifdef CONFIG_IWLWIFI_DEBUG
7260 4747
7261/* 4748/*
7262 * The following adds a new attribute to the sysfs representation 4749 * The following adds a new attribute to the sysfs representation
@@ -7265,38 +4752,41 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
7265 * 4752 *
7266 * See the level definitions in iwl for details. 4753 * See the level definitions in iwl for details.
7267 */ 4754 */
7268 4755static ssize_t show_debug_level(struct device *d,
7269static ssize_t show_debug_level(struct device_driver *d, char *buf) 4756 struct device_attribute *attr, char *buf)
7270{ 4757{
7271 return sprintf(buf, "0x%08X\n", iwl3945_debug_level); 4758 struct iwl_priv *priv = d->driver_data;
4759
4760 return sprintf(buf, "0x%08X\n", priv->debug_level);
7272} 4761}
7273static ssize_t store_debug_level(struct device_driver *d, 4762static ssize_t store_debug_level(struct device *d,
4763 struct device_attribute *attr,
7274 const char *buf, size_t count) 4764 const char *buf, size_t count)
7275{ 4765{
7276 char *p = (char *)buf; 4766 struct iwl_priv *priv = d->driver_data;
7277 u32 val; 4767 unsigned long val;
4768 int ret;
7278 4769
7279 val = simple_strtoul(p, &p, 0); 4770 ret = strict_strtoul(buf, 0, &val);
7280 if (p == buf) 4771 if (ret)
7281 printk(KERN_INFO DRV_NAME 4772 IWL_INFO(priv, "%s is not in hex or decimal form.\n", buf);
7282 ": %s is not in hex or decimal form.\n", buf);
7283 else 4773 else
7284 iwl3945_debug_level = val; 4774 priv->debug_level = val;
7285 4775
7286 return strnlen(buf, count); 4776 return strnlen(buf, count);
7287} 4777}
7288 4778
7289static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, 4779static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
7290 show_debug_level, store_debug_level); 4780 show_debug_level, store_debug_level);
7291 4781
7292#endif /* CONFIG_IWL3945_DEBUG */ 4782#endif /* CONFIG_IWLWIFI_DEBUG */
7293 4783
7294static ssize_t show_temperature(struct device *d, 4784static ssize_t show_temperature(struct device *d,
7295 struct device_attribute *attr, char *buf) 4785 struct device_attribute *attr, char *buf)
7296{ 4786{
7297 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4787 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7298 4788
7299 if (!iwl3945_is_alive(priv)) 4789 if (!iwl_is_alive(priv))
7300 return -EAGAIN; 4790 return -EAGAIN;
7301 4791
7302 return sprintf(buf, "%d\n", iwl3945_hw_get_temperature(priv)); 4792 return sprintf(buf, "%d\n", iwl3945_hw_get_temperature(priv));
@@ -7307,22 +4797,21 @@ static DEVICE_ATTR(temperature, S_IRUGO, show_temperature, NULL);
7307static ssize_t show_tx_power(struct device *d, 4797static ssize_t show_tx_power(struct device *d,
7308 struct device_attribute *attr, char *buf) 4798 struct device_attribute *attr, char *buf)
7309{ 4799{
7310 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4800 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7311 return sprintf(buf, "%d\n", priv->user_txpower_limit); 4801 return sprintf(buf, "%d\n", priv->tx_power_user_lmt);
7312} 4802}
7313 4803
7314static ssize_t store_tx_power(struct device *d, 4804static ssize_t store_tx_power(struct device *d,
7315 struct device_attribute *attr, 4805 struct device_attribute *attr,
7316 const char *buf, size_t count) 4806 const char *buf, size_t count)
7317{ 4807{
7318 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4808 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7319 char *p = (char *)buf; 4809 char *p = (char *)buf;
7320 u32 val; 4810 u32 val;
7321 4811
7322 val = simple_strtoul(p, &p, 10); 4812 val = simple_strtoul(p, &p, 10);
7323 if (p == buf) 4813 if (p == buf)
7324 printk(KERN_INFO DRV_NAME 4814 IWL_INFO(priv, ": %s is not in decimal form.\n", buf);
7325 ": %s is not in decimal form.\n", buf);
7326 else 4815 else
7327 iwl3945_hw_reg_set_txpower(priv, val); 4816 iwl3945_hw_reg_set_txpower(priv, val);
7328 4817
@@ -7334,7 +4823,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);
7334static ssize_t show_flags(struct device *d, 4823static ssize_t show_flags(struct device *d,
7335 struct device_attribute *attr, char *buf) 4824 struct device_attribute *attr, char *buf)
7336{ 4825{
7337 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4826 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7338 4827
7339 return sprintf(buf, "0x%04X\n", priv->active_rxon.flags); 4828 return sprintf(buf, "0x%04X\n", priv->active_rxon.flags);
7340} 4829}
@@ -7343,16 +4832,16 @@ static ssize_t store_flags(struct device *d,
7343 struct device_attribute *attr, 4832 struct device_attribute *attr,
7344 const char *buf, size_t count) 4833 const char *buf, size_t count)
7345{ 4834{
7346 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4835 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7347 u32 flags = simple_strtoul(buf, NULL, 0); 4836 u32 flags = simple_strtoul(buf, NULL, 0);
7348 4837
7349 mutex_lock(&priv->mutex); 4838 mutex_lock(&priv->mutex);
7350 if (le32_to_cpu(priv->staging_rxon.flags) != flags) { 4839 if (le32_to_cpu(priv->staging_rxon.flags) != flags) {
7351 /* Cancel any currently running scans... */ 4840 /* Cancel any currently running scans... */
7352 if (iwl3945_scan_cancel_timeout(priv, 100)) 4841 if (iwl_scan_cancel_timeout(priv, 100))
7353 IWL_WARNING("Could not cancel scan.\n"); 4842 IWL_WARN(priv, "Could not cancel scan.\n");
7354 else { 4843 else {
7355 IWL_DEBUG_INFO("Committing rxon.flags = 0x%04X\n", 4844 IWL_DEBUG_INFO(priv, "Committing rxon.flags = 0x%04X\n",
7356 flags); 4845 flags);
7357 priv->staging_rxon.flags = cpu_to_le32(flags); 4846 priv->staging_rxon.flags = cpu_to_le32(flags);
7358 iwl3945_commit_rxon(priv); 4847 iwl3945_commit_rxon(priv);
@@ -7368,7 +4857,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, show_flags, store_flags);
7368static ssize_t show_filter_flags(struct device *d, 4857static ssize_t show_filter_flags(struct device *d,
7369 struct device_attribute *attr, char *buf) 4858 struct device_attribute *attr, char *buf)
7370{ 4859{
7371 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4860 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7372 4861
7373 return sprintf(buf, "0x%04X\n", 4862 return sprintf(buf, "0x%04X\n",
7374 le32_to_cpu(priv->active_rxon.filter_flags)); 4863 le32_to_cpu(priv->active_rxon.filter_flags));
@@ -7378,16 +4867,16 @@ static ssize_t store_filter_flags(struct device *d,
7378 struct device_attribute *attr, 4867 struct device_attribute *attr,
7379 const char *buf, size_t count) 4868 const char *buf, size_t count)
7380{ 4869{
7381 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 4870 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7382 u32 filter_flags = simple_strtoul(buf, NULL, 0); 4871 u32 filter_flags = simple_strtoul(buf, NULL, 0);
7383 4872
7384 mutex_lock(&priv->mutex); 4873 mutex_lock(&priv->mutex);
7385 if (le32_to_cpu(priv->staging_rxon.filter_flags) != filter_flags) { 4874 if (le32_to_cpu(priv->staging_rxon.filter_flags) != filter_flags) {
7386 /* Cancel any currently running scans... */ 4875 /* Cancel any currently running scans... */
7387 if (iwl3945_scan_cancel_timeout(priv, 100)) 4876 if (iwl_scan_cancel_timeout(priv, 100))
7388 IWL_WARNING("Could not cancel scan.\n"); 4877 IWL_WARN(priv, "Could not cancel scan.\n");
7389 else { 4878 else {
7390 IWL_DEBUG_INFO("Committing rxon.filter_flags = " 4879 IWL_DEBUG_INFO(priv, "Committing rxon.filter_flags = "
7391 "0x%04X\n", filter_flags); 4880 "0x%04X\n", filter_flags);
7392 priv->staging_rxon.filter_flags = 4881 priv->staging_rxon.filter_flags =
7393 cpu_to_le32(filter_flags); 4882 cpu_to_le32(filter_flags);
@@ -7407,8 +4896,8 @@ static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,
7407static ssize_t show_measurement(struct device *d, 4896static ssize_t show_measurement(struct device *d,
7408 struct device_attribute *attr, char *buf) 4897 struct device_attribute *attr, char *buf)
7409{ 4898{
7410 struct iwl3945_priv *priv = dev_get_drvdata(d); 4899 struct iwl_priv *priv = dev_get_drvdata(d);
7411 struct iwl3945_spectrum_notification measure_report; 4900 struct iwl_spectrum_notification measure_report;
7412 u32 size = sizeof(measure_report), len = 0, ofs = 0; 4901 u32 size = sizeof(measure_report), len = 0, ofs = 0;
7413 u8 *data = (u8 *)&measure_report; 4902 u8 *data = (u8 *)&measure_report;
7414 unsigned long flags; 4903 unsigned long flags;
@@ -7440,7 +4929,7 @@ static ssize_t store_measurement(struct device *d,
7440 struct device_attribute *attr, 4929 struct device_attribute *attr,
7441 const char *buf, size_t count) 4930 const char *buf, size_t count)
7442{ 4931{
7443 struct iwl3945_priv *priv = dev_get_drvdata(d); 4932 struct iwl_priv *priv = dev_get_drvdata(d);
7444 struct ieee80211_measurement_params params = { 4933 struct ieee80211_measurement_params params = {
7445 .channel = le16_to_cpu(priv->active_rxon.channel), 4934 .channel = le16_to_cpu(priv->active_rxon.channel),
7446 .start_time = cpu_to_le64(priv->last_tsf), 4935 .start_time = cpu_to_le64(priv->last_tsf),
@@ -7464,7 +4953,7 @@ static ssize_t store_measurement(struct device *d,
7464 type = simple_strtoul(p + 1, NULL, 0); 4953 type = simple_strtoul(p + 1, NULL, 0);
7465 } 4954 }
7466 4955
7467 IWL_DEBUG_INFO("Invoking measurement of type %d on " 4956 IWL_DEBUG_INFO(priv, "Invoking measurement of type %d on "
7468 "channel %d (for '%s')\n", type, params.channel, buf); 4957 "channel %d (for '%s')\n", type, params.channel, buf);
7469 iwl3945_get_measurement(priv, &params, type); 4958 iwl3945_get_measurement(priv, &params, type);
7470 4959
@@ -7479,7 +4968,7 @@ static ssize_t store_retry_rate(struct device *d,
7479 struct device_attribute *attr, 4968 struct device_attribute *attr,
7480 const char *buf, size_t count) 4969 const char *buf, size_t count)
7481{ 4970{
7482 struct iwl3945_priv *priv = dev_get_drvdata(d); 4971 struct iwl_priv *priv = dev_get_drvdata(d);
7483 4972
7484 priv->retry_rate = simple_strtoul(buf, NULL, 0); 4973 priv->retry_rate = simple_strtoul(buf, NULL, 0);
7485 if (priv->retry_rate <= 0) 4974 if (priv->retry_rate <= 0)
@@ -7491,50 +4980,77 @@ static ssize_t store_retry_rate(struct device *d,
7491static ssize_t show_retry_rate(struct device *d, 4980static ssize_t show_retry_rate(struct device *d,
7492 struct device_attribute *attr, char *buf) 4981 struct device_attribute *attr, char *buf)
7493{ 4982{
7494 struct iwl3945_priv *priv = dev_get_drvdata(d); 4983 struct iwl_priv *priv = dev_get_drvdata(d);
7495 return sprintf(buf, "%d", priv->retry_rate); 4984 return sprintf(buf, "%d", priv->retry_rate);
7496} 4985}
7497 4986
7498static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, show_retry_rate, 4987static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, show_retry_rate,
7499 store_retry_rate); 4988 store_retry_rate);
7500 4989
4990
7501static ssize_t store_power_level(struct device *d, 4991static ssize_t store_power_level(struct device *d,
7502 struct device_attribute *attr, 4992 struct device_attribute *attr,
7503 const char *buf, size_t count) 4993 const char *buf, size_t count)
7504{ 4994{
7505 struct iwl3945_priv *priv = dev_get_drvdata(d); 4995 struct iwl_priv *priv = dev_get_drvdata(d);
7506 int rc; 4996 int ret;
7507 int mode; 4997 unsigned long mode;
4998
7508 4999
7509 mode = simple_strtoul(buf, NULL, 0);
7510 mutex_lock(&priv->mutex); 5000 mutex_lock(&priv->mutex);
7511 5001
7512 if (!iwl3945_is_ready(priv)) { 5002 if (!iwl_is_ready(priv)) {
7513 rc = -EAGAIN; 5003 ret = -EAGAIN;
7514 goto out; 5004 goto out;
7515 } 5005 }
7516 5006
7517 if ((mode < 1) || (mode > IWL_POWER_LIMIT) || (mode == IWL_POWER_AC)) 5007 ret = strict_strtoul(buf, 10, &mode);
7518 mode = IWL_POWER_AC; 5008 if (ret)
7519 else 5009 goto out;
7520 mode |= IWL_POWER_ENABLED;
7521 5010
7522 if (mode != priv->power_mode) { 5011 ret = iwl_power_set_user_mode(priv, mode);
7523 rc = iwl3945_send_power_mode(priv, IWL_POWER_LEVEL(mode)); 5012 if (ret) {
7524 if (rc) { 5013 IWL_DEBUG_MAC80211(priv, "failed setting power mode.\n");
7525 IWL_DEBUG_MAC80211("failed setting power mode.\n"); 5014 goto out;
7526 goto out;
7527 }
7528 priv->power_mode = mode;
7529 } 5015 }
7530 5016 ret = count;
7531 rc = count;
7532 5017
7533 out: 5018 out:
7534 mutex_unlock(&priv->mutex); 5019 mutex_unlock(&priv->mutex);
7535 return rc; 5020 return ret;
5021}
5022
5023static ssize_t show_power_level(struct device *d,
5024 struct device_attribute *attr, char *buf)
5025{
5026 struct iwl_priv *priv = dev_get_drvdata(d);
5027 int mode = priv->power_data.user_power_setting;
5028 int system = priv->power_data.system_power_setting;
5029 int level = priv->power_data.power_mode;
5030 char *p = buf;
5031
5032 switch (system) {
5033 case IWL_POWER_SYS_AUTO:
5034 p += sprintf(p, "SYSTEM:auto");
5035 break;
5036 case IWL_POWER_SYS_AC:
5037 p += sprintf(p, "SYSTEM:ac");
5038 break;
5039 case IWL_POWER_SYS_BATTERY:
5040 p += sprintf(p, "SYSTEM:battery");
5041 break;
5042 }
5043
5044 p += sprintf(p, "\tMODE:%s", (mode < IWL_POWER_AUTO) ?
5045 "fixed" : "auto");
5046 p += sprintf(p, "\tINDEX:%d", level);
5047 p += sprintf(p, "\n");
5048 return p - buf + 1;
7536} 5049}
7537 5050
5051static DEVICE_ATTR(power_level, S_IWUSR | S_IRUSR,
5052 show_power_level, store_power_level);
5053
7538#define MAX_WX_STRING 80 5054#define MAX_WX_STRING 80
7539 5055
7540/* Values are in microsecond */ 5056/* Values are in microsecond */
@@ -7553,41 +5069,6 @@ static const s32 period_duration[] = {
7553 1000000 5069 1000000
7554}; 5070};
7555 5071
7556static ssize_t show_power_level(struct device *d,
7557 struct device_attribute *attr, char *buf)
7558{
7559 struct iwl3945_priv *priv = dev_get_drvdata(d);
7560 int level = IWL_POWER_LEVEL(priv->power_mode);
7561 char *p = buf;
7562
7563 p += sprintf(p, "%d ", level);
7564 switch (level) {
7565 case IWL_POWER_MODE_CAM:
7566 case IWL_POWER_AC:
7567 p += sprintf(p, "(AC)");
7568 break;
7569 case IWL_POWER_BATTERY:
7570 p += sprintf(p, "(BATTERY)");
7571 break;
7572 default:
7573 p += sprintf(p,
7574 "(Timeout %dms, Period %dms)",
7575 timeout_duration[level - 1] / 1000,
7576 period_duration[level - 1] / 1000);
7577 }
7578
7579 if (!(priv->power_mode & IWL_POWER_ENABLED))
7580 p += sprintf(p, " OFF\n");
7581 else
7582 p += sprintf(p, " \n");
7583
7584 return p - buf + 1;
7585
7586}
7587
7588static DEVICE_ATTR(power_level, S_IWUSR | S_IRUSR, show_power_level,
7589 store_power_level);
7590
7591static ssize_t show_channels(struct device *d, 5072static ssize_t show_channels(struct device *d,
7592 struct device_attribute *attr, char *buf) 5073 struct device_attribute *attr, char *buf)
7593{ 5074{
@@ -7600,17 +5081,17 @@ static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
7600static ssize_t show_statistics(struct device *d, 5081static ssize_t show_statistics(struct device *d,
7601 struct device_attribute *attr, char *buf) 5082 struct device_attribute *attr, char *buf)
7602{ 5083{
7603 struct iwl3945_priv *priv = dev_get_drvdata(d); 5084 struct iwl_priv *priv = dev_get_drvdata(d);
7604 u32 size = sizeof(struct iwl3945_notif_statistics); 5085 u32 size = sizeof(struct iwl3945_notif_statistics);
7605 u32 len = 0, ofs = 0; 5086 u32 len = 0, ofs = 0;
7606 u8 *data = (u8 *)&priv->statistics; 5087 u8 *data = (u8 *)&priv->statistics_39;
7607 int rc = 0; 5088 int rc = 0;
7608 5089
7609 if (!iwl3945_is_alive(priv)) 5090 if (!iwl_is_alive(priv))
7610 return -EAGAIN; 5091 return -EAGAIN;
7611 5092
7612 mutex_lock(&priv->mutex); 5093 mutex_lock(&priv->mutex);
7613 rc = iwl3945_send_statistics_request(priv); 5094 rc = iwl_send_statistics_request(priv, 0);
7614 mutex_unlock(&priv->mutex); 5095 mutex_unlock(&priv->mutex);
7615 5096
7616 if (rc) { 5097 if (rc) {
@@ -7638,34 +5119,34 @@ static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);
7638static ssize_t show_antenna(struct device *d, 5119static ssize_t show_antenna(struct device *d,
7639 struct device_attribute *attr, char *buf) 5120 struct device_attribute *attr, char *buf)
7640{ 5121{
7641 struct iwl3945_priv *priv = dev_get_drvdata(d); 5122 struct iwl_priv *priv = dev_get_drvdata(d);
7642 5123
7643 if (!iwl3945_is_alive(priv)) 5124 if (!iwl_is_alive(priv))
7644 return -EAGAIN; 5125 return -EAGAIN;
7645 5126
7646 return sprintf(buf, "%d\n", priv->antenna); 5127 return sprintf(buf, "%d\n", iwl3945_mod_params.antenna);
7647} 5128}
7648 5129
7649static ssize_t store_antenna(struct device *d, 5130static ssize_t store_antenna(struct device *d,
7650 struct device_attribute *attr, 5131 struct device_attribute *attr,
7651 const char *buf, size_t count) 5132 const char *buf, size_t count)
7652{ 5133{
5134 struct iwl_priv *priv __maybe_unused = dev_get_drvdata(d);
7653 int ant; 5135 int ant;
7654 struct iwl3945_priv *priv = dev_get_drvdata(d);
7655 5136
7656 if (count == 0) 5137 if (count == 0)
7657 return 0; 5138 return 0;
7658 5139
7659 if (sscanf(buf, "%1i", &ant) != 1) { 5140 if (sscanf(buf, "%1i", &ant) != 1) {
7660 IWL_DEBUG_INFO("not in hex or decimal form.\n"); 5141 IWL_DEBUG_INFO(priv, "not in hex or decimal form.\n");
7661 return count; 5142 return count;
7662 } 5143 }
7663 5144
7664 if ((ant >= 0) && (ant <= 2)) { 5145 if ((ant >= 0) && (ant <= 2)) {
7665 IWL_DEBUG_INFO("Setting antenna select to %d.\n", ant); 5146 IWL_DEBUG_INFO(priv, "Setting antenna select to %d.\n", ant);
7666 priv->antenna = (enum iwl3945_antenna)ant; 5147 iwl3945_mod_params.antenna = (enum iwl3945_antenna)ant;
7667 } else 5148 } else
7668 IWL_DEBUG_INFO("Bad antenna select value %d.\n", ant); 5149 IWL_DEBUG_INFO(priv, "Bad antenna select value %d.\n", ant);
7669 5150
7670 5151
7671 return count; 5152 return count;
@@ -7676,8 +5157,8 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, show_antenna, store_antenna);
7676static ssize_t show_status(struct device *d, 5157static ssize_t show_status(struct device *d,
7677 struct device_attribute *attr, char *buf) 5158 struct device_attribute *attr, char *buf)
7678{ 5159{
7679 struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; 5160 struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
7680 if (!iwl3945_is_alive(priv)) 5161 if (!iwl_is_alive(priv))
7681 return -EAGAIN; 5162 return -EAGAIN;
7682 return sprintf(buf, "0x%08x\n", (int)priv->status); 5163 return sprintf(buf, "0x%08x\n", (int)priv->status);
7683} 5164}
@@ -7691,7 +5172,7 @@ static ssize_t dump_error_log(struct device *d,
7691 char *p = (char *)buf; 5172 char *p = (char *)buf;
7692 5173
7693 if (p[0] == '1') 5174 if (p[0] == '1')
7694 iwl3945_dump_nic_error_log((struct iwl3945_priv *)d->driver_data); 5175 iwl3945_dump_nic_error_log((struct iwl_priv *)d->driver_data);
7695 5176
7696 return strnlen(buf, count); 5177 return strnlen(buf, count);
7697} 5178}
@@ -7705,7 +5186,7 @@ static ssize_t dump_event_log(struct device *d,
7705 char *p = (char *)buf; 5186 char *p = (char *)buf;
7706 5187
7707 if (p[0] == '1') 5188 if (p[0] == '1')
7708 iwl3945_dump_nic_event_log((struct iwl3945_priv *)d->driver_data); 5189 iwl3945_dump_nic_event_log((struct iwl_priv *)d->driver_data);
7709 5190
7710 return strnlen(buf, count); 5191 return strnlen(buf, count);
7711} 5192}
@@ -7718,7 +5199,7 @@ static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
7718 * 5199 *
7719 *****************************************************************************/ 5200 *****************************************************************************/
7720 5201
7721static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv) 5202static void iwl3945_setup_deferred_work(struct iwl_priv *priv)
7722{ 5203{
7723 priv->workqueue = create_workqueue(DRV_NAME); 5204 priv->workqueue = create_workqueue(DRV_NAME);
7724 5205
@@ -7727,14 +5208,15 @@ static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv)
7727 INIT_WORK(&priv->up, iwl3945_bg_up); 5208 INIT_WORK(&priv->up, iwl3945_bg_up);
7728 INIT_WORK(&priv->restart, iwl3945_bg_restart); 5209 INIT_WORK(&priv->restart, iwl3945_bg_restart);
7729 INIT_WORK(&priv->rx_replenish, iwl3945_bg_rx_replenish); 5210 INIT_WORK(&priv->rx_replenish, iwl3945_bg_rx_replenish);
7730 INIT_WORK(&priv->scan_completed, iwl3945_bg_scan_completed); 5211 INIT_WORK(&priv->rf_kill, iwl_bg_rf_kill);
7731 INIT_WORK(&priv->request_scan, iwl3945_bg_request_scan);
7732 INIT_WORK(&priv->abort_scan, iwl3945_bg_abort_scan);
7733 INIT_WORK(&priv->rf_kill, iwl3945_bg_rf_kill);
7734 INIT_WORK(&priv->beacon_update, iwl3945_bg_beacon_update); 5212 INIT_WORK(&priv->beacon_update, iwl3945_bg_beacon_update);
7735 INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start); 5213 INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start);
7736 INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start); 5214 INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start);
7737 INIT_DELAYED_WORK(&priv->scan_check, iwl3945_bg_scan_check); 5215 INIT_DELAYED_WORK(&priv->rfkill_poll, iwl3945_rfkill_poll);
5216 INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed);
5217 INIT_WORK(&priv->request_scan, iwl3945_bg_request_scan);
5218 INIT_WORK(&priv->abort_scan, iwl_bg_abort_scan);
5219 INIT_DELAYED_WORK(&priv->scan_check, iwl_bg_scan_check);
7738 5220
7739 iwl3945_hw_setup_deferred_work(priv); 5221 iwl3945_hw_setup_deferred_work(priv);
7740 5222
@@ -7742,7 +5224,7 @@ static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv)
7742 iwl3945_irq_tasklet, (unsigned long)priv); 5224 iwl3945_irq_tasklet, (unsigned long)priv);
7743} 5225}
7744 5226
7745static void iwl3945_cancel_deferred_work(struct iwl3945_priv *priv) 5227static void iwl3945_cancel_deferred_work(struct iwl_priv *priv)
7746{ 5228{
7747 iwl3945_hw_cancel_deferred_work(priv); 5229 iwl3945_hw_cancel_deferred_work(priv);
7748 5230
@@ -7768,7 +5250,9 @@ static struct attribute *iwl3945_sysfs_entries[] = {
7768 &dev_attr_status.attr, 5250 &dev_attr_status.attr,
7769 &dev_attr_temperature.attr, 5251 &dev_attr_temperature.attr,
7770 &dev_attr_tx_power.attr, 5252 &dev_attr_tx_power.attr,
7771 5253#ifdef CONFIG_IWLWIFI_DEBUG
5254 &dev_attr_debug_level.attr,
5255#endif
7772 NULL 5256 NULL
7773}; 5257};
7774 5258
@@ -7785,9 +5269,8 @@ static struct ieee80211_ops iwl3945_hw_ops = {
7785 .remove_interface = iwl3945_mac_remove_interface, 5269 .remove_interface = iwl3945_mac_remove_interface,
7786 .config = iwl3945_mac_config, 5270 .config = iwl3945_mac_config,
7787 .config_interface = iwl3945_mac_config_interface, 5271 .config_interface = iwl3945_mac_config_interface,
7788 .configure_filter = iwl3945_configure_filter, 5272 .configure_filter = iwl_configure_filter,
7789 .set_key = iwl3945_mac_set_key, 5273 .set_key = iwl3945_mac_set_key,
7790 .get_stats = iwl3945_mac_get_stats,
7791 .get_tx_stats = iwl3945_mac_get_tx_stats, 5274 .get_tx_stats = iwl3945_mac_get_tx_stats,
7792 .conf_tx = iwl3945_mac_conf_tx, 5275 .conf_tx = iwl3945_mac_conf_tx,
7793 .reset_tsf = iwl3945_mac_reset_tsf, 5276 .reset_tsf = iwl3945_mac_reset_tsf,
@@ -7795,59 +5278,136 @@ static struct ieee80211_ops iwl3945_hw_ops = {
7795 .hw_scan = iwl3945_mac_hw_scan 5278 .hw_scan = iwl3945_mac_hw_scan
7796}; 5279};
7797 5280
5281static int iwl3945_init_drv(struct iwl_priv *priv)
5282{
5283 int ret;
5284 struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
5285
5286 priv->retry_rate = 1;
5287 priv->ibss_beacon = NULL;
5288
5289 spin_lock_init(&priv->lock);
5290 spin_lock_init(&priv->power_data.lock);
5291 spin_lock_init(&priv->sta_lock);
5292 spin_lock_init(&priv->hcmd_lock);
5293
5294 INIT_LIST_HEAD(&priv->free_frames);
5295
5296 mutex_init(&priv->mutex);
5297
5298 /* Clear the driver's (not device's) station table */
5299 iwl3945_clear_stations_table(priv);
5300
5301 priv->data_retry_limit = -1;
5302 priv->ieee_channels = NULL;
5303 priv->ieee_rates = NULL;
5304 priv->band = IEEE80211_BAND_2GHZ;
5305
5306 priv->iw_mode = NL80211_IFTYPE_STATION;
5307
5308 iwl_reset_qos(priv);
5309
5310 priv->qos_data.qos_active = 0;
5311 priv->qos_data.qos_cap.val = 0;
5312
5313 priv->rates_mask = IWL_RATES_MASK;
5314 /* If power management is turned on, default to CAM mode */
5315 priv->power_mode = IWL_POWER_MODE_CAM;
5316 priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;
5317
5318 if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
5319 IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",
5320 eeprom->version);
5321 ret = -EINVAL;
5322 goto err;
5323 }
5324 ret = iwl_init_channel_map(priv);
5325 if (ret) {
5326 IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
5327 goto err;
5328 }
5329
5330 /* Set up txpower settings in driver for all channels */
5331 if (iwl3945_txpower_set_from_eeprom(priv)) {
5332 ret = -EIO;
5333 goto err_free_channel_map;
5334 }
5335
5336 ret = iwlcore_init_geos(priv);
5337 if (ret) {
5338 IWL_ERR(priv, "initializing geos failed: %d\n", ret);
5339 goto err_free_channel_map;
5340 }
5341 iwl3945_init_hw_rates(priv, priv->ieee_rates);
5342
5343 if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
5344 priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
5345 &priv->bands[IEEE80211_BAND_2GHZ];
5346 if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
5347 priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
5348 &priv->bands[IEEE80211_BAND_5GHZ];
5349
5350 return 0;
5351
5352err_free_channel_map:
5353 iwl_free_channel_map(priv);
5354err:
5355 return ret;
5356}
5357
7798static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 5358static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
7799{ 5359{
7800 int err = 0; 5360 int err = 0;
7801 struct iwl3945_priv *priv; 5361 struct iwl_priv *priv;
7802 struct ieee80211_hw *hw; 5362 struct ieee80211_hw *hw;
7803 struct iwl_3945_cfg *cfg = (struct iwl_3945_cfg *)(ent->driver_data); 5363 struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
5364 struct iwl3945_eeprom *eeprom;
7804 unsigned long flags; 5365 unsigned long flags;
7805 5366
7806 /*********************** 5367 /***********************
7807 * 1. Allocating HW data 5368 * 1. Allocating HW data
7808 * ********************/ 5369 * ********************/
7809 5370
7810 /* Disabling hardware scan means that mac80211 will perform scans 5371 /* mac80211 allocates memory for this device instance, including
7811 * "the hard way", rather than using device's scan. */ 5372 * space for this driver's private structure */
7812 if (iwl3945_param_disable_hw_scan) { 5373 hw = iwl_alloc_all(cfg, &iwl3945_hw_ops);
7813 IWL_DEBUG_INFO("Disabling hw_scan\n"); 5374 if (hw == NULL) {
7814 iwl3945_hw_ops.hw_scan = NULL; 5375 printk(KERN_ERR DRV_NAME "Can not allocate network device\n");
5376 err = -ENOMEM;
5377 goto out;
7815 } 5378 }
5379 priv = hw->priv;
5380 SET_IEEE80211_DEV(hw, &pdev->dev);
7816 5381
7817 if ((iwl3945_param_queues_num > IWL39_MAX_NUM_QUEUES) || 5382 if ((iwl3945_mod_params.num_of_queues > IWL39_MAX_NUM_QUEUES) ||
7818 (iwl3945_param_queues_num < IWL_MIN_NUM_QUEUES)) { 5383 (iwl3945_mod_params.num_of_queues < IWL_MIN_NUM_QUEUES)) {
7819 IWL_ERROR("invalid queues_num, should be between %d and %d\n", 5384 IWL_ERR(priv,
7820 IWL_MIN_NUM_QUEUES, IWL39_MAX_NUM_QUEUES); 5385 "invalid queues_num, should be between %d and %d\n",
5386 IWL_MIN_NUM_QUEUES, IWL39_MAX_NUM_QUEUES);
7821 err = -EINVAL; 5387 err = -EINVAL;
7822 goto out; 5388 goto out;
7823 } 5389 }
7824 5390
7825 /* mac80211 allocates memory for this device instance, including 5391 /*
7826 * space for this driver's private structure */ 5392 * Disabling hardware scan means that mac80211 will perform scans
7827 hw = ieee80211_alloc_hw(sizeof(struct iwl3945_priv), &iwl3945_hw_ops); 5393 * "the hard way", rather than using device's scan.
7828 if (hw == NULL) { 5394 */
7829 IWL_ERROR("Can not allocate network device\n"); 5395 if (iwl3945_mod_params.disable_hw_scan) {
7830 err = -ENOMEM; 5396 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
7831 goto out; 5397 iwl3945_hw_ops.hw_scan = NULL;
7832 } 5398 }
7833 5399
7834 SET_IEEE80211_DEV(hw, &pdev->dev);
7835 5400
7836 priv = hw->priv; 5401 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
7837 priv->hw = hw;
7838 priv->pci_dev = pdev;
7839 priv->cfg = cfg; 5402 priv->cfg = cfg;
5403 priv->pci_dev = pdev;
7840 5404
7841 IWL_DEBUG_INFO("*** LOAD DRIVER ***\n"); 5405#ifdef CONFIG_IWLWIFI_DEBUG
7842 hw->rate_control_algorithm = "iwl-3945-rs"; 5406 priv->debug_level = iwl3945_mod_params.debug;
7843 hw->sta_data_size = sizeof(struct iwl3945_sta_priv);
7844
7845 /* Select antenna (may be helpful if only one antenna is connected) */
7846 priv->antenna = (enum iwl3945_antenna)iwl3945_param_antenna;
7847#ifdef CONFIG_IWL3945_DEBUG
7848 iwl3945_debug_level = iwl3945_param_debug;
7849 atomic_set(&priv->restrict_refcnt, 0); 5407 atomic_set(&priv->restrict_refcnt, 0);
7850#endif 5408#endif
5409 hw->rate_control_algorithm = "iwl-3945-rs";
5410 hw->sta_data_size = sizeof(struct iwl3945_sta_priv);
7851 5411
7852 /* Tell mac80211 our characteristics */ 5412 /* Tell mac80211 our characteristics */
7853 hw->flags = IEEE80211_HW_SIGNAL_DBM | 5413 hw->flags = IEEE80211_HW_SIGNAL_DBM |
@@ -7857,7 +5417,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
7857 BIT(NL80211_IFTYPE_STATION) | 5417 BIT(NL80211_IFTYPE_STATION) |
7858 BIT(NL80211_IFTYPE_ADHOC); 5418 BIT(NL80211_IFTYPE_ADHOC);
7859 5419
7860 hw->wiphy->fw_handles_regulatory = true; 5420 hw->wiphy->custom_regulatory = true;
5421
5422 hw->wiphy->max_scan_ssids = 1;
7861 5423
7862 /* 4 EDCA QOS priorities */ 5424 /* 4 EDCA QOS priorities */
7863 hw->queues = 4; 5425 hw->queues = 4;
@@ -7876,7 +5438,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
7876 if (!err) 5438 if (!err)
7877 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 5439 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
7878 if (err) { 5440 if (err) {
7879 printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n"); 5441 IWL_WARN(priv, "No suitable DMA available.\n");
7880 goto out_pci_disable_device; 5442 goto out_pci_disable_device;
7881 } 5443 }
7882 5444
@@ -7894,98 +5456,58 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
7894 goto out_pci_release_regions; 5456 goto out_pci_release_regions;
7895 } 5457 }
7896 5458
7897 IWL_DEBUG_INFO("pci_resource_len = 0x%08llx\n", 5459 IWL_DEBUG_INFO(priv, "pci_resource_len = 0x%08llx\n",
7898 (unsigned long long) pci_resource_len(pdev, 0)); 5460 (unsigned long long) pci_resource_len(pdev, 0));
7899 IWL_DEBUG_INFO("pci_resource_base = %p\n", priv->hw_base); 5461 IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv->hw_base);
7900 5462
7901 /* We disable the RETRY_TIMEOUT register (0x41) to keep 5463 /* We disable the RETRY_TIMEOUT register (0x41) to keep
7902 * PCI Tx retries from interfering with C3 CPU state */ 5464 * PCI Tx retries from interfering with C3 CPU state */
7903 pci_write_config_byte(pdev, 0x41, 0x00); 5465 pci_write_config_byte(pdev, 0x41, 0x00);
7904 5466
7905 /* nic init */ 5467 /* amp init */
7906 iwl3945_set_bit(priv, CSR_GIO_CHICKEN_BITS, 5468 err = priv->cfg->ops->lib->apm_ops.init(priv);
7907 CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
7908
7909 iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
7910 err = iwl3945_poll_direct_bit(priv, CSR_GP_CNTRL,
7911 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
7912 if (err < 0) { 5469 if (err < 0) {
7913 IWL_DEBUG_INFO("Failed to init the card\n"); 5470 IWL_DEBUG_INFO(priv, "Failed to init APMG\n");
7914 goto out_remove_sysfs; 5471 goto out_iounmap;
7915 } 5472 }
7916 5473
7917 /*********************** 5474 /***********************
7918 * 4. Read EEPROM 5475 * 4. Read EEPROM
7919 * ********************/ 5476 * ********************/
5477
7920 /* Read the EEPROM */ 5478 /* Read the EEPROM */
7921 err = iwl3945_eeprom_init(priv); 5479 err = iwl_eeprom_init(priv);
7922 if (err) { 5480 if (err) {
7923 IWL_ERROR("Unable to init EEPROM\n"); 5481 IWL_ERR(priv, "Unable to init EEPROM\n");
7924 goto out_remove_sysfs; 5482 goto out_remove_sysfs;
7925 } 5483 }
7926 /* MAC Address location in EEPROM same for 3945/4965 */ 5484 /* MAC Address location in EEPROM same for 3945/4965 */
7927 get_eeprom_mac(priv, priv->mac_addr); 5485 eeprom = (struct iwl3945_eeprom *)priv->eeprom;
7928 IWL_DEBUG_INFO("MAC address: %pM\n", priv->mac_addr); 5486 memcpy(priv->mac_addr, eeprom->mac_address, ETH_ALEN);
5487 IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->mac_addr);
7929 SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr); 5488 SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
7930 5489
7931 /*********************** 5490 /***********************
7932 * 5. Setup HW Constants 5491 * 5. Setup HW Constants
7933 * ********************/ 5492 * ********************/
7934 /* Device-specific setup */ 5493 /* Device-specific setup */
7935 if (iwl3945_hw_set_hw_setting(priv)) { 5494 if (iwl3945_hw_set_hw_params(priv)) {
7936 IWL_ERROR("failed to set hw settings\n"); 5495 IWL_ERR(priv, "failed to set hw settings\n");
7937 goto out_iounmap; 5496 goto out_iounmap;
7938 } 5497 }
7939 5498
7940 /*********************** 5499 /***********************
7941 * 6. Setup priv 5500 * 6. Setup priv
7942 * ********************/ 5501 * ********************/
7943 priv->retry_rate = 1;
7944 priv->ibss_beacon = NULL;
7945
7946 spin_lock_init(&priv->lock);
7947 spin_lock_init(&priv->power_data.lock);
7948 spin_lock_init(&priv->sta_lock);
7949 spin_lock_init(&priv->hcmd_lock);
7950 5502
7951 INIT_LIST_HEAD(&priv->free_frames); 5503 err = iwl3945_init_drv(priv);
7952 mutex_init(&priv->mutex);
7953
7954 /* Clear the driver's (not device's) station table */
7955 iwl3945_clear_stations_table(priv);
7956
7957 priv->data_retry_limit = -1;
7958 priv->ieee_channels = NULL;
7959 priv->ieee_rates = NULL;
7960 priv->band = IEEE80211_BAND_2GHZ;
7961
7962 priv->iw_mode = NL80211_IFTYPE_STATION;
7963
7964 iwl3945_reset_qos(priv);
7965
7966 priv->qos_data.qos_active = 0;
7967 priv->qos_data.qos_cap.val = 0;
7968
7969
7970 priv->rates_mask = IWL_RATES_MASK;
7971 /* If power management is turned on, default to AC mode */
7972 priv->power_mode = IWL_POWER_AC;
7973 priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
7974
7975 err = iwl3945_init_channel_map(priv);
7976 if (err) { 5504 if (err) {
7977 IWL_ERROR("initializing regulatory failed: %d\n", err); 5505 IWL_ERR(priv, "initializing driver failed\n");
7978 goto out_release_irq; 5506 goto out_free_geos;
7979 }
7980
7981 err = iwl3945_init_geos(priv);
7982 if (err) {
7983 IWL_ERROR("initializing geos failed: %d\n", err);
7984 goto out_free_channel_map;
7985 } 5507 }
7986 5508
7987 printk(KERN_INFO DRV_NAME 5509 IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s\n",
7988 ": Detected Intel Wireless WiFi Link %s\n", priv->cfg->name); 5510 priv->cfg->name);
7989 5511
7990 /*********************************** 5512 /***********************************
7991 * 7. Initialize Module Parameters 5513 * 7. Initialize Module Parameters
@@ -7993,9 +5515,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
7993 5515
7994 /* Initialize module parameter values here */ 5516 /* Initialize module parameter values here */
7995 /* Disable radio (SW RF KILL) via parameter when loading driver */ 5517 /* Disable radio (SW RF KILL) via parameter when loading driver */
7996 if (iwl3945_param_disable) { 5518 if (iwl3945_mod_params.disable) {
7997 set_bit(STATUS_RF_KILL_SW, &priv->status); 5519 set_bit(STATUS_RF_KILL_SW, &priv->status);
7998 IWL_DEBUG_INFO("Radio disabled.\n"); 5520 IWL_DEBUG_INFO(priv, "Radio disabled.\n");
7999 } 5521 }
8000 5522
8001 5523
@@ -8007,56 +5529,62 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
8007 iwl3945_disable_interrupts(priv); 5529 iwl3945_disable_interrupts(priv);
8008 spin_unlock_irqrestore(&priv->lock, flags); 5530 spin_unlock_irqrestore(&priv->lock, flags);
8009 5531
5532 pci_enable_msi(priv->pci_dev);
5533
5534 err = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
5535 DRV_NAME, priv);
5536 if (err) {
5537 IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
5538 goto out_disable_msi;
5539 }
5540
8010 err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group); 5541 err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
8011 if (err) { 5542 if (err) {
8012 IWL_ERROR("failed to create sysfs device attributes\n"); 5543 IWL_ERR(priv, "failed to create sysfs device attributes\n");
8013 goto out_free_geos; 5544 goto out_release_irq;
8014 } 5545 }
8015 5546
8016 iwl3945_set_rxon_channel(priv, IEEE80211_BAND_2GHZ, 6); 5547 iwl_set_rxon_channel(priv,
5548 &priv->bands[IEEE80211_BAND_2GHZ].channels[5]);
8017 iwl3945_setup_deferred_work(priv); 5549 iwl3945_setup_deferred_work(priv);
8018 iwl3945_setup_rx_handlers(priv); 5550 iwl3945_setup_rx_handlers(priv);
8019 5551
8020 /***********************
8021 * 9. Conclude
8022 * ********************/
8023 pci_save_state(pdev);
8024 pci_disable_device(pdev);
8025
8026 /********************************* 5552 /*********************************
8027 * 10. Setup and Register mac80211 5553 * 9. Setup and Register mac80211
8028 * *******************************/ 5554 * *******************************/
8029 5555
8030 err = ieee80211_register_hw(priv->hw); 5556 err = ieee80211_register_hw(priv->hw);
8031 if (err) { 5557 if (err) {
8032 IWL_ERROR("Failed to register network device (error %d)\n", err); 5558 IWL_ERR(priv, "Failed to register network device: %d\n", err);
8033 goto out_remove_sysfs; 5559 goto out_remove_sysfs;
8034 } 5560 }
8035 5561
8036 priv->hw->conf.beacon_int = 100; 5562 priv->hw->conf.beacon_int = 100;
8037 priv->mac80211_registered = 1; 5563 priv->mac80211_registered = 1;
8038 5564
8039 5565 err = iwl_rfkill_init(priv);
8040 err = iwl3945_rfkill_init(priv);
8041 if (err) 5566 if (err)
8042 IWL_ERROR("Unable to initialize RFKILL system. " 5567 IWL_ERR(priv, "Unable to initialize RFKILL system. "
8043 "Ignoring error: %d\n", err); 5568 "Ignoring error: %d\n", err);
8044 5569
5570 /* Start monitoring the killswitch */
5571 queue_delayed_work(priv->workqueue, &priv->rfkill_poll,
5572 2 * HZ);
5573
8045 return 0; 5574 return 0;
8046 5575
8047 out_remove_sysfs: 5576 out_remove_sysfs:
8048 sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group); 5577 sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
8049 out_free_geos: 5578 out_free_geos:
8050 iwl3945_free_geos(priv); 5579 iwlcore_free_geos(priv);
8051 out_free_channel_map:
8052 iwl3945_free_channel_map(priv);
8053
8054 5580
8055 out_release_irq: 5581 out_release_irq:
5582 free_irq(priv->pci_dev->irq, priv);
8056 destroy_workqueue(priv->workqueue); 5583 destroy_workqueue(priv->workqueue);
8057 priv->workqueue = NULL; 5584 priv->workqueue = NULL;
8058 iwl3945_unset_hw_setting(priv); 5585 iwl3945_unset_hw_params(priv);
8059 5586 out_disable_msi:
5587 pci_disable_msi(priv->pci_dev);
8060 out_iounmap: 5588 out_iounmap:
8061 pci_iounmap(pdev, priv->hw_base); 5589 pci_iounmap(pdev, priv->hw_base);
8062 out_pci_release_regions: 5590 out_pci_release_regions:
@@ -8072,17 +5600,22 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
8072 5600
8073static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) 5601static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
8074{ 5602{
8075 struct iwl3945_priv *priv = pci_get_drvdata(pdev); 5603 struct iwl_priv *priv = pci_get_drvdata(pdev);
8076 unsigned long flags; 5604 unsigned long flags;
8077 5605
8078 if (!priv) 5606 if (!priv)
8079 return; 5607 return;
8080 5608
8081 IWL_DEBUG_INFO("*** UNLOAD DRIVER ***\n"); 5609 IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
8082 5610
8083 set_bit(STATUS_EXIT_PENDING, &priv->status); 5611 set_bit(STATUS_EXIT_PENDING, &priv->status);
8084 5612
8085 iwl3945_down(priv); 5613 if (priv->mac80211_registered) {
5614 ieee80211_unregister_hw(priv->hw);
5615 priv->mac80211_registered = 0;
5616 } else {
5617 iwl3945_down(priv);
5618 }
8086 5619
8087 /* make sure we flush any pending irq or 5620 /* make sure we flush any pending irq or
8088 * tasklet for the driver 5621 * tasklet for the driver
@@ -8095,19 +5628,18 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
8095 5628
8096 sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group); 5629 sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
8097 5630
8098 iwl3945_rfkill_unregister(priv); 5631 iwl_rfkill_unregister(priv);
5632 cancel_delayed_work(&priv->rfkill_poll);
5633
8099 iwl3945_dealloc_ucode_pci(priv); 5634 iwl3945_dealloc_ucode_pci(priv);
8100 5635
8101 if (priv->rxq.bd) 5636 if (priv->rxq.bd)
8102 iwl3945_rx_queue_free(priv, &priv->rxq); 5637 iwl_rx_queue_free(priv, &priv->rxq);
8103 iwl3945_hw_txq_ctx_free(priv); 5638 iwl3945_hw_txq_ctx_free(priv);
8104 5639
8105 iwl3945_unset_hw_setting(priv); 5640 iwl3945_unset_hw_params(priv);
8106 iwl3945_clear_stations_table(priv); 5641 iwl3945_clear_stations_table(priv);
8107 5642
8108 if (priv->mac80211_registered)
8109 ieee80211_unregister_hw(priv->hw);
8110
8111 /*netif_stop_queue(dev); */ 5643 /*netif_stop_queue(dev); */
8112 flush_workqueue(priv->workqueue); 5644 flush_workqueue(priv->workqueue);
8113 5645
@@ -8117,13 +5649,16 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
8117 destroy_workqueue(priv->workqueue); 5649 destroy_workqueue(priv->workqueue);
8118 priv->workqueue = NULL; 5650 priv->workqueue = NULL;
8119 5651
5652 free_irq(pdev->irq, priv);
5653 pci_disable_msi(pdev);
5654
8120 pci_iounmap(pdev, priv->hw_base); 5655 pci_iounmap(pdev, priv->hw_base);
8121 pci_release_regions(pdev); 5656 pci_release_regions(pdev);
8122 pci_disable_device(pdev); 5657 pci_disable_device(pdev);
8123 pci_set_drvdata(pdev, NULL); 5658 pci_set_drvdata(pdev, NULL);
8124 5659
8125 iwl3945_free_channel_map(priv); 5660 iwl_free_channel_map(priv);
8126 iwl3945_free_geos(priv); 5661 iwlcore_free_geos(priv);
8127 kfree(priv->scan); 5662 kfree(priv->scan);
8128 if (priv->ibss_beacon) 5663 if (priv->ibss_beacon)
8129 dev_kfree_skb(priv->ibss_beacon); 5664 dev_kfree_skb(priv->ibss_beacon);
@@ -8135,27 +5670,15 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
8135 5670
8136static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state) 5671static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
8137{ 5672{
8138 struct iwl3945_priv *priv = pci_get_drvdata(pdev); 5673 struct iwl_priv *priv = pci_get_drvdata(pdev);
8139 5674
8140 if (priv->is_open) { 5675 if (priv->is_open) {
8141 set_bit(STATUS_IN_SUSPEND, &priv->status); 5676 set_bit(STATUS_IN_SUSPEND, &priv->status);
8142 iwl3945_mac_stop(priv->hw); 5677 iwl3945_mac_stop(priv->hw);
8143 priv->is_open = 1; 5678 priv->is_open = 1;
8144 } 5679 }
8145 5680 pci_save_state(pdev);
8146 /* pci driver assumes state will be saved in this function. 5681 pci_disable_device(pdev);
8147 * pci state is saved and device disabled when interface is
8148 * stopped, so at this time pci device will always be disabled -
8149 * whether interface was started or not. saving pci state now will
8150 * cause saved state be that of a disabled device, which will cause
8151 * problems during resume in that we will end up with a disabled device.
8152 *
8153 * indicate that the current saved state (from when interface was
8154 * stopped) is valid. if interface was never up at time of suspend
8155 * then the saved state will still be valid as it was saved during
8156 * .probe. */
8157 pdev->state_saved = true;
8158
8159 pci_set_power_state(pdev, PCI_D3hot); 5682 pci_set_power_state(pdev, PCI_D3hot);
8160 5683
8161 return 0; 5684 return 0;
@@ -8163,9 +5686,14 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
8163 5686
8164static int iwl3945_pci_resume(struct pci_dev *pdev) 5687static int iwl3945_pci_resume(struct pci_dev *pdev)
8165{ 5688{
8166 struct iwl3945_priv *priv = pci_get_drvdata(pdev); 5689 struct iwl_priv *priv = pci_get_drvdata(pdev);
5690 int ret;
8167 5691
8168 pci_set_power_state(pdev, PCI_D0); 5692 pci_set_power_state(pdev, PCI_D0);
5693 ret = pci_enable_device(pdev);
5694 if (ret)
5695 return ret;
5696 pci_restore_state(pdev);
8169 5697
8170 if (priv->is_open) 5698 if (priv->is_open)
8171 iwl3945_mac_start(priv->hw); 5699 iwl3945_mac_start(priv->hw);
@@ -8176,114 +5704,6 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
8176 5704
8177#endif /* CONFIG_PM */ 5705#endif /* CONFIG_PM */
8178 5706
8179/*************** RFKILL FUNCTIONS **********/
8180#ifdef CONFIG_IWL3945_RFKILL
8181/* software rf-kill from user */
8182static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
8183{
8184 struct iwl3945_priv *priv = data;
8185 int err = 0;
8186
8187 if (!priv->rfkill)
8188 return 0;
8189
8190 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
8191 return 0;
8192
8193 IWL_DEBUG_RF_KILL("we received soft RFKILL set to state %d\n", state);
8194 mutex_lock(&priv->mutex);
8195
8196 switch (state) {
8197 case RFKILL_STATE_UNBLOCKED:
8198 if (iwl3945_is_rfkill_hw(priv)) {
8199 err = -EBUSY;
8200 goto out_unlock;
8201 }
8202 iwl3945_radio_kill_sw(priv, 0);
8203 break;
8204 case RFKILL_STATE_SOFT_BLOCKED:
8205 iwl3945_radio_kill_sw(priv, 1);
8206 break;
8207 default:
8208 IWL_WARNING("we received unexpected RFKILL state %d\n", state);
8209 break;
8210 }
8211out_unlock:
8212 mutex_unlock(&priv->mutex);
8213
8214 return err;
8215}
8216
8217int iwl3945_rfkill_init(struct iwl3945_priv *priv)
8218{
8219 struct device *device = wiphy_dev(priv->hw->wiphy);
8220 int ret = 0;
8221
8222 BUG_ON(device == NULL);
8223
8224 IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
8225 priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
8226 if (!priv->rfkill) {
8227 IWL_ERROR("Unable to allocate rfkill device.\n");
8228 ret = -ENOMEM;
8229 goto error;
8230 }
8231
8232 priv->rfkill->name = priv->cfg->name;
8233 priv->rfkill->data = priv;
8234 priv->rfkill->state = RFKILL_STATE_UNBLOCKED;
8235 priv->rfkill->toggle_radio = iwl3945_rfkill_soft_rf_kill;
8236 priv->rfkill->user_claim_unsupported = 1;
8237
8238 priv->rfkill->dev.class->suspend = NULL;
8239 priv->rfkill->dev.class->resume = NULL;
8240
8241 ret = rfkill_register(priv->rfkill);
8242 if (ret) {
8243 IWL_ERROR("Unable to register rfkill: %d\n", ret);
8244 goto freed_rfkill;
8245 }
8246
8247 IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
8248 return ret;
8249
8250freed_rfkill:
8251 if (priv->rfkill != NULL)
8252 rfkill_free(priv->rfkill);
8253 priv->rfkill = NULL;
8254
8255error:
8256 IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
8257 return ret;
8258}
8259
8260void iwl3945_rfkill_unregister(struct iwl3945_priv *priv)
8261{
8262 if (priv->rfkill)
8263 rfkill_unregister(priv->rfkill);
8264
8265 priv->rfkill = NULL;
8266}
8267
8268/* set rf-kill to the right state. */
8269void iwl3945_rfkill_set_hw_state(struct iwl3945_priv *priv)
8270{
8271
8272 if (!priv->rfkill)
8273 return;
8274
8275 if (iwl3945_is_rfkill_hw(priv)) {
8276 rfkill_force_state(priv->rfkill, RFKILL_STATE_HARD_BLOCKED);
8277 return;
8278 }
8279
8280 if (!iwl3945_is_rfkill_sw(priv))
8281 rfkill_force_state(priv->rfkill, RFKILL_STATE_UNBLOCKED);
8282 else
8283 rfkill_force_state(priv->rfkill, RFKILL_STATE_SOFT_BLOCKED);
8284}
8285#endif
8286
8287/***************************************************************************** 5707/*****************************************************************************
8288 * 5708 *
8289 * driver and module entry point 5709 * driver and module entry point
@@ -8310,29 +5730,19 @@ static int __init iwl3945_init(void)
8310 5730
8311 ret = iwl3945_rate_control_register(); 5731 ret = iwl3945_rate_control_register();
8312 if (ret) { 5732 if (ret) {
8313 IWL_ERROR("Unable to register rate control algorithm: %d\n", ret); 5733 printk(KERN_ERR DRV_NAME
5734 "Unable to register rate control algorithm: %d\n", ret);
8314 return ret; 5735 return ret;
8315 } 5736 }
8316 5737
8317 ret = pci_register_driver(&iwl3945_driver); 5738 ret = pci_register_driver(&iwl3945_driver);
8318 if (ret) { 5739 if (ret) {
8319 IWL_ERROR("Unable to initialize PCI module\n"); 5740 printk(KERN_ERR DRV_NAME "Unable to initialize PCI module\n");
8320 goto error_register; 5741 goto error_register;
8321 } 5742 }
8322#ifdef CONFIG_IWL3945_DEBUG
8323 ret = driver_create_file(&iwl3945_driver.driver, &driver_attr_debug_level);
8324 if (ret) {
8325 IWL_ERROR("Unable to create driver sysfs file\n");
8326 goto error_debug;
8327 }
8328#endif
8329 5743
8330 return ret; 5744 return ret;
8331 5745
8332#ifdef CONFIG_IWL3945_DEBUG
8333error_debug:
8334 pci_unregister_driver(&iwl3945_driver);
8335#endif
8336error_register: 5746error_register:
8337 iwl3945_rate_control_unregister(); 5747 iwl3945_rate_control_unregister();
8338 return ret; 5748 return ret;
@@ -8340,29 +5750,29 @@ error_register:
8340 5750
8341static void __exit iwl3945_exit(void) 5751static void __exit iwl3945_exit(void)
8342{ 5752{
8343#ifdef CONFIG_IWL3945_DEBUG
8344 driver_remove_file(&iwl3945_driver.driver, &driver_attr_debug_level);
8345#endif
8346 pci_unregister_driver(&iwl3945_driver); 5753 pci_unregister_driver(&iwl3945_driver);
8347 iwl3945_rate_control_unregister(); 5754 iwl3945_rate_control_unregister();
8348} 5755}
8349 5756
8350MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX)); 5757MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX));
8351 5758
8352module_param_named(antenna, iwl3945_param_antenna, int, 0444); 5759module_param_named(antenna, iwl3945_mod_params.antenna, int, 0444);
8353MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); 5760MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
8354module_param_named(disable, iwl3945_param_disable, int, 0444); 5761module_param_named(disable, iwl3945_mod_params.disable, int, 0444);
8355MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])"); 5762MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
8356module_param_named(hwcrypto, iwl3945_param_hwcrypto, int, 0444); 5763module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, 0444);
8357MODULE_PARM_DESC(hwcrypto, 5764MODULE_PARM_DESC(swcrypto,
8358 "using hardware crypto engine (default 0 [software])\n"); 5765 "using software crypto (default 1 [software])\n");
8359module_param_named(debug, iwl3945_param_debug, uint, 0444); 5766module_param_named(debug, iwl3945_mod_params.debug, uint, 0444);
8360MODULE_PARM_DESC(debug, "debug output mask"); 5767MODULE_PARM_DESC(debug, "debug output mask");
8361module_param_named(disable_hw_scan, iwl3945_param_disable_hw_scan, int, 0444); 5768module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, int, 0444);
8362MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); 5769MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
8363 5770
8364module_param_named(queues_num, iwl3945_param_queues_num, int, 0444); 5771module_param_named(queues_num, iwl3945_mod_params.num_of_queues, int, 0444);
8365MODULE_PARM_DESC(queues_num, "number of hw queues."); 5772MODULE_PARM_DESC(queues_num, "number of hw queues.");
8366 5773
5774module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, 0444);
5775MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
5776
8367module_exit(iwl3945_exit); 5777module_exit(iwl3945_exit);
8368module_init(iwl3945_init); 5778module_init(iwl3945_init);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-18 21:43:42 -0400