diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 1493 |
1 files changed, 187 insertions, 1306 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index e476acb53aa7..a28af7eb67eb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -19,6 +19,7 @@ | |||
19 | * file called LICENSE. | 19 | * file called LICENSE. |
20 | * | 20 | * |
21 | * Contact Information: | 21 | * Contact Information: |
22 | * Intel Linux Wireless <ilw@linux.intel.com> | ||
22 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 23 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
23 | * | 24 | * |
24 | *****************************************************************************/ | 25 | *****************************************************************************/ |
@@ -43,9 +44,11 @@ | |||
43 | #include "iwl-io.h" | 44 | #include "iwl-io.h" |
44 | #include "iwl-sta.h" | 45 | #include "iwl-sta.h" |
45 | #include "iwl-helpers.h" | 46 | #include "iwl-helpers.h" |
47 | #include "iwl-agn.h" | ||
46 | #include "iwl-agn-led.h" | 48 | #include "iwl-agn-led.h" |
49 | #include "iwl-agn-hw.h" | ||
47 | #include "iwl-5000-hw.h" | 50 | #include "iwl-5000-hw.h" |
48 | #include "iwl-6000-hw.h" | 51 | #include "iwl-agn-debugfs.h" |
49 | 52 | ||
50 | /* Highest firmware API version supported */ | 53 | /* Highest firmware API version supported */ |
51 | #define IWL5000_UCODE_API_MAX 2 | 54 | #define IWL5000_UCODE_API_MAX 2 |
@@ -63,18 +66,8 @@ | |||
63 | #define _IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" | 66 | #define _IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode" |
64 | #define IWL5150_MODULE_FIRMWARE(api) _IWL5150_MODULE_FIRMWARE(api) | 67 | #define IWL5150_MODULE_FIRMWARE(api) _IWL5150_MODULE_FIRMWARE(api) |
65 | 68 | ||
66 | static const u16 iwl5000_default_queue_to_tx_fifo[] = { | ||
67 | IWL_TX_FIFO_AC3, | ||
68 | IWL_TX_FIFO_AC2, | ||
69 | IWL_TX_FIFO_AC1, | ||
70 | IWL_TX_FIFO_AC0, | ||
71 | IWL50_CMD_FIFO_NUM, | ||
72 | IWL_TX_FIFO_HCCA_1, | ||
73 | IWL_TX_FIFO_HCCA_2 | ||
74 | }; | ||
75 | |||
76 | /* NIC configuration for 5000 series */ | 69 | /* NIC configuration for 5000 series */ |
77 | void iwl5000_nic_config(struct iwl_priv *priv) | 70 | static void iwl5000_nic_config(struct iwl_priv *priv) |
78 | { | 71 | { |
79 | unsigned long flags; | 72 | unsigned long flags; |
80 | u16 radio_cfg; | 73 | u16 radio_cfg; |
@@ -107,162 +100,6 @@ void iwl5000_nic_config(struct iwl_priv *priv) | |||
107 | spin_unlock_irqrestore(&priv->lock, flags); | 100 | spin_unlock_irqrestore(&priv->lock, flags); |
108 | } | 101 | } |
109 | 102 | ||
110 | |||
111 | /* | ||
112 | * EEPROM | ||
113 | */ | ||
114 | static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address) | ||
115 | { | ||
116 | u16 offset = 0; | ||
117 | |||
118 | if ((address & INDIRECT_ADDRESS) == 0) | ||
119 | return address; | ||
120 | |||
121 | switch (address & INDIRECT_TYPE_MSK) { | ||
122 | case INDIRECT_HOST: | ||
123 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_HOST); | ||
124 | break; | ||
125 | case INDIRECT_GENERAL: | ||
126 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_GENERAL); | ||
127 | break; | ||
128 | case INDIRECT_REGULATORY: | ||
129 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_REGULATORY); | ||
130 | break; | ||
131 | case INDIRECT_CALIBRATION: | ||
132 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_CALIBRATION); | ||
133 | break; | ||
134 | case INDIRECT_PROCESS_ADJST: | ||
135 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_PROCESS_ADJST); | ||
136 | break; | ||
137 | case INDIRECT_OTHERS: | ||
138 | offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_OTHERS); | ||
139 | break; | ||
140 | default: | ||
141 | IWL_ERR(priv, "illegal indirect type: 0x%X\n", | ||
142 | address & INDIRECT_TYPE_MSK); | ||
143 | break; | ||
144 | } | ||
145 | |||
146 | /* translate the offset from words to byte */ | ||
147 | return (address & ADDRESS_MSK) + (offset << 1); | ||
148 | } | ||
149 | |||
150 | u16 iwl5000_eeprom_calib_version(struct iwl_priv *priv) | ||
151 | { | ||
152 | struct iwl_eeprom_calib_hdr { | ||
153 | u8 version; | ||
154 | u8 pa_type; | ||
155 | u16 voltage; | ||
156 | } *hdr; | ||
157 | |||
158 | hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv, | ||
159 | EEPROM_5000_CALIB_ALL); | ||
160 | return hdr->version; | ||
161 | |||
162 | } | ||
163 | |||
164 | static void iwl5000_gain_computation(struct iwl_priv *priv, | ||
165 | u32 average_noise[NUM_RX_CHAINS], | ||
166 | u16 min_average_noise_antenna_i, | ||
167 | u32 min_average_noise, | ||
168 | u8 default_chain) | ||
169 | { | ||
170 | int i; | ||
171 | s32 delta_g; | ||
172 | struct iwl_chain_noise_data *data = &priv->chain_noise_data; | ||
173 | |||
174 | /* | ||
175 | * Find Gain Code for the chains based on "default chain" | ||
176 | */ | ||
177 | for (i = default_chain + 1; i < NUM_RX_CHAINS; i++) { | ||
178 | if ((data->disconn_array[i])) { | ||
179 | data->delta_gain_code[i] = 0; | ||
180 | continue; | ||
181 | } | ||
182 | |||
183 | delta_g = (priv->cfg->chain_noise_scale * | ||
184 | ((s32)average_noise[default_chain] - | ||
185 | (s32)average_noise[i])) / 1500; | ||
186 | |||
187 | /* bound gain by 2 bits value max, 3rd bit is sign */ | ||
188 | data->delta_gain_code[i] = | ||
189 | min(abs(delta_g), (long) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); | ||
190 | |||
191 | if (delta_g < 0) | ||
192 | /* | ||
193 | * set negative sign ... | ||
194 | * note to Intel developers: This is uCode API format, | ||
195 | * not the format of any internal device registers. | ||
196 | * Do not change this format for e.g. 6050 or similar | ||
197 | * devices. Change format only if more resolution | ||
198 | * (i.e. more than 2 bits magnitude) is needed. | ||
199 | */ | ||
200 | data->delta_gain_code[i] |= (1 << 2); | ||
201 | } | ||
202 | |||
203 | IWL_DEBUG_CALIB(priv, "Delta gains: ANT_B = %d ANT_C = %d\n", | ||
204 | data->delta_gain_code[1], data->delta_gain_code[2]); | ||
205 | |||
206 | if (!data->radio_write) { | ||
207 | struct iwl_calib_chain_noise_gain_cmd cmd; | ||
208 | |||
209 | memset(&cmd, 0, sizeof(cmd)); | ||
210 | |||
211 | cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD; | ||
212 | cmd.hdr.first_group = 0; | ||
213 | cmd.hdr.groups_num = 1; | ||
214 | cmd.hdr.data_valid = 1; | ||
215 | cmd.delta_gain_1 = data->delta_gain_code[1]; | ||
216 | cmd.delta_gain_2 = data->delta_gain_code[2]; | ||
217 | iwl_send_cmd_pdu_async(priv, REPLY_PHY_CALIBRATION_CMD, | ||
218 | sizeof(cmd), &cmd, NULL); | ||
219 | |||
220 | data->radio_write = 1; | ||
221 | data->state = IWL_CHAIN_NOISE_CALIBRATED; | ||
222 | } | ||
223 | |||
224 | data->chain_noise_a = 0; | ||
225 | data->chain_noise_b = 0; | ||
226 | data->chain_noise_c = 0; | ||
227 | data->chain_signal_a = 0; | ||
228 | data->chain_signal_b = 0; | ||
229 | data->chain_signal_c = 0; | ||
230 | data->beacon_count = 0; | ||
231 | } | ||
232 | |||
233 | static void iwl5000_chain_noise_reset(struct iwl_priv *priv) | ||
234 | { | ||
235 | struct iwl_chain_noise_data *data = &priv->chain_noise_data; | ||
236 | int ret; | ||
237 | |||
238 | if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl_is_associated(priv)) { | ||
239 | struct iwl_calib_chain_noise_reset_cmd cmd; | ||
240 | memset(&cmd, 0, sizeof(cmd)); | ||
241 | |||
242 | cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD; | ||
243 | cmd.hdr.first_group = 0; | ||
244 | cmd.hdr.groups_num = 1; | ||
245 | cmd.hdr.data_valid = 1; | ||
246 | ret = iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD, | ||
247 | sizeof(cmd), &cmd); | ||
248 | if (ret) | ||
249 | IWL_ERR(priv, | ||
250 | "Could not send REPLY_PHY_CALIBRATION_CMD\n"); | ||
251 | data->state = IWL_CHAIN_NOISE_ACCUMULATE; | ||
252 | IWL_DEBUG_CALIB(priv, "Run chain_noise_calibrate\n"); | ||
253 | } | ||
254 | } | ||
255 | |||
256 | void iwl5000_rts_tx_cmd_flag(struct ieee80211_tx_info *info, | ||
257 | __le32 *tx_flags) | ||
258 | { | ||
259 | if ((info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) || | ||
260 | (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)) | ||
261 | *tx_flags |= TX_CMD_FLG_RTS_CTS_MSK; | ||
262 | else | ||
263 | *tx_flags &= ~TX_CMD_FLG_RTS_CTS_MSK; | ||
264 | } | ||
265 | |||
266 | static struct iwl_sensitivity_ranges iwl5000_sensitivity = { | 103 | static struct iwl_sensitivity_ranges iwl5000_sensitivity = { |
267 | .min_nrg_cck = 95, | 104 | .min_nrg_cck = 95, |
268 | .max_nrg_cck = 0, /* not used, set to 0 */ | 105 | .max_nrg_cck = 0, /* not used, set to 0 */ |
@@ -314,14 +151,6 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = { | |||
314 | .nrg_th_cca = 62, | 151 | .nrg_th_cca = 62, |
315 | }; | 152 | }; |
316 | 153 | ||
317 | const u8 *iwl5000_eeprom_query_addr(const struct iwl_priv *priv, | ||
318 | size_t offset) | ||
319 | { | ||
320 | u32 address = eeprom_indirect_address(priv, offset); | ||
321 | BUG_ON(address >= priv->cfg->eeprom_size); | ||
322 | return &priv->eeprom[address]; | ||
323 | } | ||
324 | |||
325 | static void iwl5150_set_ct_threshold(struct iwl_priv *priv) | 154 | static void iwl5150_set_ct_threshold(struct iwl_priv *priv) |
326 | { | 155 | { |
327 | const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF; | 156 | const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF; |
@@ -337,356 +166,10 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) | |||
337 | priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY; | 166 | priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY; |
338 | } | 167 | } |
339 | 168 | ||
340 | /* | 169 | static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) |
341 | * Calibration | ||
342 | */ | ||
343 | static int iwl5000_set_Xtal_calib(struct iwl_priv *priv) | ||
344 | { | ||
345 | struct iwl_calib_xtal_freq_cmd cmd; | ||
346 | __le16 *xtal_calib = | ||
347 | (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_5000_XTAL); | ||
348 | |||
349 | cmd.hdr.op_code = IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD; | ||
350 | cmd.hdr.first_group = 0; | ||
351 | cmd.hdr.groups_num = 1; | ||
352 | cmd.hdr.data_valid = 1; | ||
353 | cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]); | ||
354 | cmd.cap_pin2 = le16_to_cpu(xtal_calib[1]); | ||
355 | return iwl_calib_set(&priv->calib_results[IWL_CALIB_XTAL], | ||
356 | (u8 *)&cmd, sizeof(cmd)); | ||
357 | } | ||
358 | |||
359 | static int iwl5000_send_calib_cfg(struct iwl_priv *priv) | ||
360 | { | ||
361 | struct iwl_calib_cfg_cmd calib_cfg_cmd; | ||
362 | struct iwl_host_cmd cmd = { | ||
363 | .id = CALIBRATION_CFG_CMD, | ||
364 | .len = sizeof(struct iwl_calib_cfg_cmd), | ||
365 | .data = &calib_cfg_cmd, | ||
366 | }; | ||
367 | |||
368 | memset(&calib_cfg_cmd, 0, sizeof(calib_cfg_cmd)); | ||
369 | calib_cfg_cmd.ucd_calib_cfg.once.is_enable = IWL_CALIB_INIT_CFG_ALL; | ||
370 | calib_cfg_cmd.ucd_calib_cfg.once.start = IWL_CALIB_INIT_CFG_ALL; | ||
371 | calib_cfg_cmd.ucd_calib_cfg.once.send_res = IWL_CALIB_INIT_CFG_ALL; | ||
372 | calib_cfg_cmd.ucd_calib_cfg.flags = IWL_CALIB_INIT_CFG_ALL; | ||
373 | |||
374 | return iwl_send_cmd(priv, &cmd); | ||
375 | } | ||
376 | |||
377 | static void iwl5000_rx_calib_result(struct iwl_priv *priv, | ||
378 | struct iwl_rx_mem_buffer *rxb) | ||
379 | { | ||
380 | struct iwl_rx_packet *pkt = rxb_addr(rxb); | ||
381 | struct iwl_calib_hdr *hdr = (struct iwl_calib_hdr *)pkt->u.raw; | ||
382 | int len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; | ||
383 | int index; | ||
384 | |||
385 | /* reduce the size of the length field itself */ | ||
386 | len -= 4; | ||
387 | |||
388 | /* Define the order in which the results will be sent to the runtime | ||
389 | * uCode. iwl_send_calib_results sends them in a row according to their | ||
390 | * index. We sort them here */ | ||
391 | switch (hdr->op_code) { | ||
392 | case IWL_PHY_CALIBRATE_DC_CMD: | ||
393 | index = IWL_CALIB_DC; | ||
394 | break; | ||
395 | case IWL_PHY_CALIBRATE_LO_CMD: | ||
396 | index = IWL_CALIB_LO; | ||
397 | break; | ||
398 | case IWL_PHY_CALIBRATE_TX_IQ_CMD: | ||
399 | index = IWL_CALIB_TX_IQ; | ||
400 | break; | ||
401 | case IWL_PHY_CALIBRATE_TX_IQ_PERD_CMD: | ||
402 | index = IWL_CALIB_TX_IQ_PERD; | ||
403 | break; | ||
404 | case IWL_PHY_CALIBRATE_BASE_BAND_CMD: | ||
405 | index = IWL_CALIB_BASE_BAND; | ||
406 | break; | ||
407 | default: | ||
408 | IWL_ERR(priv, "Unknown calibration notification %d\n", | ||
409 | hdr->op_code); | ||
410 | return; | ||
411 | } | ||
412 | iwl_calib_set(&priv->calib_results[index], pkt->u.raw, len); | ||
413 | } | ||
414 | |||
415 | static void iwl5000_rx_calib_complete(struct iwl_priv *priv, | ||
416 | struct iwl_rx_mem_buffer *rxb) | ||
417 | { | ||
418 | IWL_DEBUG_INFO(priv, "Init. calibration is completed, restarting fw.\n"); | ||
419 | queue_work(priv->workqueue, &priv->restart); | ||
420 | } | ||
421 | |||
422 | /* | ||
423 | * ucode | ||
424 | */ | ||
425 | static int iwl5000_load_section(struct iwl_priv *priv, const char *name, | ||
426 | struct fw_desc *image, u32 dst_addr) | ||
427 | { | ||
428 | dma_addr_t phy_addr = image->p_addr; | ||
429 | u32 byte_cnt = image->len; | ||
430 | int ret; | ||
431 | |||
432 | priv->ucode_write_complete = 0; | ||
433 | |||
434 | iwl_write_direct32(priv, | ||
435 | FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL), | ||
436 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE); | ||
437 | |||
438 | iwl_write_direct32(priv, | ||
439 | FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL), dst_addr); | ||
440 | |||
441 | iwl_write_direct32(priv, | ||
442 | FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL), | ||
443 | phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK); | ||
444 | |||
445 | iwl_write_direct32(priv, | ||
446 | FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), | ||
447 | (iwl_get_dma_hi_addr(phy_addr) | ||
448 | << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt); | ||
449 | |||
450 | iwl_write_direct32(priv, | ||
451 | FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL), | ||
452 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM | | ||
453 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX | | ||
454 | FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID); | ||
455 | |||
456 | iwl_write_direct32(priv, | ||
457 | FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL), | ||
458 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE | | ||
459 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE | | ||
460 | FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD); | ||
461 | |||
462 | IWL_DEBUG_INFO(priv, "%s uCode section being loaded...\n", name); | ||
463 | ret = wait_event_interruptible_timeout(priv->wait_command_queue, | ||
464 | priv->ucode_write_complete, 5 * HZ); | ||
465 | if (ret == -ERESTARTSYS) { | ||
466 | IWL_ERR(priv, "Could not load the %s uCode section due " | ||
467 | "to interrupt\n", name); | ||
468 | return ret; | ||
469 | } | ||
470 | if (!ret) { | ||
471 | IWL_ERR(priv, "Could not load the %s uCode section\n", | ||
472 | name); | ||
473 | return -ETIMEDOUT; | ||
474 | } | ||
475 | |||
476 | return 0; | ||
477 | } | ||
478 | |||
479 | static int iwl5000_load_given_ucode(struct iwl_priv *priv, | ||
480 | struct fw_desc *inst_image, | ||
481 | struct fw_desc *data_image) | ||
482 | { | ||
483 | int ret = 0; | ||
484 | |||
485 | ret = iwl5000_load_section(priv, "INST", inst_image, | ||
486 | IWL50_RTC_INST_LOWER_BOUND); | ||
487 | if (ret) | ||
488 | return ret; | ||
489 | |||
490 | return iwl5000_load_section(priv, "DATA", data_image, | ||
491 | IWL50_RTC_DATA_LOWER_BOUND); | ||
492 | } | ||
493 | |||
494 | int iwl5000_load_ucode(struct iwl_priv *priv) | ||
495 | { | ||
496 | int ret = 0; | ||
497 | |||
498 | /* check whether init ucode should be loaded, or rather runtime ucode */ | ||
499 | if (priv->ucode_init.len && (priv->ucode_type == UCODE_NONE)) { | ||
500 | IWL_DEBUG_INFO(priv, "Init ucode found. Loading init ucode...\n"); | ||
501 | ret = iwl5000_load_given_ucode(priv, | ||
502 | &priv->ucode_init, &priv->ucode_init_data); | ||
503 | if (!ret) { | ||
504 | IWL_DEBUG_INFO(priv, "Init ucode load complete.\n"); | ||
505 | priv->ucode_type = UCODE_INIT; | ||
506 | } | ||
507 | } else { | ||
508 | IWL_DEBUG_INFO(priv, "Init ucode not found, or already loaded. " | ||
509 | "Loading runtime ucode...\n"); | ||
510 | ret = iwl5000_load_given_ucode(priv, | ||
511 | &priv->ucode_code, &priv->ucode_data); | ||
512 | if (!ret) { | ||
513 | IWL_DEBUG_INFO(priv, "Runtime ucode load complete.\n"); | ||
514 | priv->ucode_type = UCODE_RT; | ||
515 | } | ||
516 | } | ||
517 | |||
518 | return ret; | ||
519 | } | ||
520 | |||
521 | void iwl5000_init_alive_start(struct iwl_priv *priv) | ||
522 | { | ||
523 | int ret = 0; | ||
524 | |||
525 | /* Check alive response for "valid" sign from uCode */ | ||
526 | if (priv->card_alive_init.is_valid != UCODE_VALID_OK) { | ||
527 | /* We had an error bringing up the hardware, so take it | ||
528 | * all the way back down so we can try again */ | ||
529 | IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n"); | ||
530 | goto restart; | ||
531 | } | ||
532 | |||
533 | /* initialize uCode was loaded... verify inst image. | ||
534 | * This is a paranoid check, because we would not have gotten the | ||
535 | * "initialize" alive if code weren't properly loaded. */ | ||
536 | if (iwl_verify_ucode(priv)) { | ||
537 | /* Runtime instruction load was bad; | ||
538 | * take it all the way back down so we can try again */ | ||
539 | IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n"); | ||
540 | goto restart; | ||
541 | } | ||
542 | |||
543 | iwl_clear_stations_table(priv); | ||
544 | ret = priv->cfg->ops->lib->alive_notify(priv); | ||
545 | if (ret) { | ||
546 | IWL_WARN(priv, | ||
547 | "Could not complete ALIVE transition: %d\n", ret); | ||
548 | goto restart; | ||
549 | } | ||
550 | |||
551 | iwl5000_send_calib_cfg(priv); | ||
552 | return; | ||
553 | |||
554 | restart: | ||
555 | /* real restart (first load init_ucode) */ | ||
556 | queue_work(priv->workqueue, &priv->restart); | ||
557 | } | ||
558 | |||
559 | static void iwl5000_set_wr_ptrs(struct iwl_priv *priv, | ||
560 | int txq_id, u32 index) | ||
561 | { | ||
562 | iwl_write_direct32(priv, HBUS_TARG_WRPTR, | ||
563 | (index & 0xff) | (txq_id << 8)); | ||
564 | iwl_write_prph(priv, IWL50_SCD_QUEUE_RDPTR(txq_id), index); | ||
565 | } | ||
566 | |||
567 | static void iwl5000_tx_queue_set_status(struct iwl_priv *priv, | ||
568 | struct iwl_tx_queue *txq, | ||
569 | int tx_fifo_id, int scd_retry) | ||
570 | { | ||
571 | int txq_id = txq->q.id; | ||
572 | int active = test_bit(txq_id, &priv->txq_ctx_active_msk) ? 1 : 0; | ||
573 | |||
574 | iwl_write_prph(priv, IWL50_SCD_QUEUE_STATUS_BITS(txq_id), | ||
575 | (active << IWL50_SCD_QUEUE_STTS_REG_POS_ACTIVE) | | ||
576 | (tx_fifo_id << IWL50_SCD_QUEUE_STTS_REG_POS_TXF) | | ||
577 | (1 << IWL50_SCD_QUEUE_STTS_REG_POS_WSL) | | ||
578 | IWL50_SCD_QUEUE_STTS_REG_MSK); | ||
579 | |||
580 | txq->sched_retry = scd_retry; | ||
581 | |||
582 | IWL_DEBUG_INFO(priv, "%s %s Queue %d on AC %d\n", | ||
583 | active ? "Activate" : "Deactivate", | ||
584 | scd_retry ? "BA" : "AC", txq_id, tx_fifo_id); | ||
585 | } | ||
586 | |||
587 | int iwl5000_alive_notify(struct iwl_priv *priv) | ||
588 | { | ||
589 | u32 a; | ||
590 | unsigned long flags; | ||
591 | int i, chan; | ||
592 | u32 reg_val; | ||
593 | |||
594 | spin_lock_irqsave(&priv->lock, flags); | ||
595 | |||
596 | priv->scd_base_addr = iwl_read_prph(priv, IWL50_SCD_SRAM_BASE_ADDR); | ||
597 | a = priv->scd_base_addr + IWL50_SCD_CONTEXT_DATA_OFFSET; | ||
598 | for (; a < priv->scd_base_addr + IWL50_SCD_TX_STTS_BITMAP_OFFSET; | ||
599 | a += 4) | ||
600 | iwl_write_targ_mem(priv, a, 0); | ||
601 | for (; a < priv->scd_base_addr + IWL50_SCD_TRANSLATE_TBL_OFFSET; | ||
602 | a += 4) | ||
603 | iwl_write_targ_mem(priv, a, 0); | ||
604 | for (; a < priv->scd_base_addr + | ||
605 | IWL50_SCD_TRANSLATE_TBL_OFFSET_QUEUE(priv->hw_params.max_txq_num); a += 4) | ||
606 | iwl_write_targ_mem(priv, a, 0); | ||
607 | |||
608 | iwl_write_prph(priv, IWL50_SCD_DRAM_BASE_ADDR, | ||
609 | priv->scd_bc_tbls.dma >> 10); | ||
610 | |||
611 | /* Enable DMA channel */ | ||
612 | for (chan = 0; chan < FH50_TCSR_CHNL_NUM ; chan++) | ||
613 | iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(chan), | ||
614 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE | | ||
615 | FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE); | ||
616 | |||
617 | /* Update FH chicken bits */ | ||
618 | reg_val = iwl_read_direct32(priv, FH_TX_CHICKEN_BITS_REG); | ||
619 | iwl_write_direct32(priv, FH_TX_CHICKEN_BITS_REG, | ||
620 | reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN); | ||
621 | |||
622 | iwl_write_prph(priv, IWL50_SCD_QUEUECHAIN_SEL, | ||
623 | IWL50_SCD_QUEUECHAIN_SEL_ALL(priv->hw_params.max_txq_num)); | ||
624 | iwl_write_prph(priv, IWL50_SCD_AGGR_SEL, 0); | ||
625 | |||
626 | /* initiate the queues */ | ||
627 | for (i = 0; i < priv->hw_params.max_txq_num; i++) { | ||
628 | iwl_write_prph(priv, IWL50_SCD_QUEUE_RDPTR(i), 0); | ||
629 | iwl_write_direct32(priv, HBUS_TARG_WRPTR, 0 | (i << 8)); | ||
630 | iwl_write_targ_mem(priv, priv->scd_base_addr + | ||
631 | IWL50_SCD_CONTEXT_QUEUE_OFFSET(i), 0); | ||
632 | iwl_write_targ_mem(priv, priv->scd_base_addr + | ||
633 | IWL50_SCD_CONTEXT_QUEUE_OFFSET(i) + | ||
634 | sizeof(u32), | ||
635 | ((SCD_WIN_SIZE << | ||
636 | IWL50_SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) & | ||
637 | IWL50_SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) | | ||
638 | ((SCD_FRAME_LIMIT << | ||
639 | IWL50_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) & | ||
640 | IWL50_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK)); | ||
641 | } | ||
642 | |||
643 | iwl_write_prph(priv, IWL50_SCD_INTERRUPT_MASK, | ||
644 | IWL_MASK(0, priv->hw_params.max_txq_num)); | ||
645 | |||
646 | /* Activate all Tx DMA/FIFO channels */ | ||
647 | priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 7)); | ||
648 | |||
649 | iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0); | ||
650 | |||
651 | /* make sure all queue are not stopped */ | ||
652 | memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped)); | ||
653 | for (i = 0; i < 4; i++) | ||
654 | atomic_set(&priv->queue_stop_count[i], 0); | ||
655 | |||
656 | /* reset to 0 to enable all the queue first */ | ||
657 | priv->txq_ctx_active_msk = 0; | ||
658 | /* map qos queues to fifos one-to-one */ | ||
659 | for (i = 0; i < ARRAY_SIZE(iwl5000_default_queue_to_tx_fifo); i++) { | ||
660 | int ac = iwl5000_default_queue_to_tx_fifo[i]; | ||
661 | iwl_txq_ctx_activate(priv, i); | ||
662 | iwl5000_tx_queue_set_status(priv, &priv->txq[i], ac, 0); | ||
663 | } | ||
664 | |||
665 | /* | ||
666 | * TODO - need to initialize these queues and map them to FIFOs | ||
667 | * in the loop above, not only mark them as active. We do this | ||
668 | * because we want the first aggregation queue to be queue #10, | ||
669 | * but do not use 8 or 9 otherwise yet. | ||
670 | */ | ||
671 | iwl_txq_ctx_activate(priv, 7); | ||
672 | iwl_txq_ctx_activate(priv, 8); | ||
673 | iwl_txq_ctx_activate(priv, 9); | ||
674 | |||
675 | spin_unlock_irqrestore(&priv->lock, flags); | ||
676 | |||
677 | |||
678 | iwl_send_wimax_coex(priv); | ||
679 | |||
680 | iwl5000_set_Xtal_calib(priv); | ||
681 | iwl_send_calib_results(priv); | ||
682 | |||
683 | return 0; | ||
684 | } | ||
685 | |||
686 | int iwl5000_hw_set_hw_params(struct iwl_priv *priv) | ||
687 | { | 170 | { |
688 | if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES && | 171 | if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES && |
689 | priv->cfg->mod_params->num_of_queues <= IWL50_NUM_QUEUES) | 172 | priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES) |
690 | priv->cfg->num_of_queues = | 173 | priv->cfg->num_of_queues = |
691 | priv->cfg->mod_params->num_of_queues; | 174 | priv->cfg->mod_params->num_of_queues; |
692 | 175 | ||
@@ -694,13 +177,13 @@ int iwl5000_hw_set_hw_params(struct iwl_priv *priv) | |||
694 | priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; | 177 | priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; |
695 | priv->hw_params.scd_bc_tbls_size = | 178 | priv->hw_params.scd_bc_tbls_size = |
696 | priv->cfg->num_of_queues * | 179 | priv->cfg->num_of_queues * |
697 | sizeof(struct iwl5000_scd_bc_tbl); | 180 | sizeof(struct iwlagn_scd_bc_tbl); |
698 | priv->hw_params.tfd_size = sizeof(struct iwl_tfd); | 181 | priv->hw_params.tfd_size = sizeof(struct iwl_tfd); |
699 | priv->hw_params.max_stations = IWL5000_STATION_COUNT; | 182 | priv->hw_params.max_stations = IWL5000_STATION_COUNT; |
700 | priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID; | 183 | priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID; |
701 | 184 | ||
702 | priv->hw_params.max_data_size = IWL50_RTC_DATA_SIZE; | 185 | priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE; |
703 | priv->hw_params.max_inst_size = IWL50_RTC_INST_SIZE; | 186 | priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE; |
704 | 187 | ||
705 | priv->hw_params.max_bsm_size = 0; | 188 | priv->hw_params.max_bsm_size = 0; |
706 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | | 189 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | |
@@ -717,571 +200,61 @@ int iwl5000_hw_set_hw_params(struct iwl_priv *priv) | |||
717 | 200 | ||
718 | /* Set initial sensitivity parameters */ | 201 | /* Set initial sensitivity parameters */ |
719 | /* Set initial calibration set */ | 202 | /* Set initial calibration set */ |
720 | switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) { | 203 | priv->hw_params.sens = &iwl5000_sensitivity; |
721 | case CSR_HW_REV_TYPE_5150: | 204 | priv->hw_params.calib_init_cfg = |
722 | priv->hw_params.sens = &iwl5150_sensitivity; | 205 | BIT(IWL_CALIB_XTAL) | |
723 | priv->hw_params.calib_init_cfg = | 206 | BIT(IWL_CALIB_LO) | |
724 | BIT(IWL_CALIB_DC) | | 207 | BIT(IWL_CALIB_TX_IQ) | |
725 | BIT(IWL_CALIB_LO) | | 208 | BIT(IWL_CALIB_TX_IQ_PERD) | |
726 | BIT(IWL_CALIB_TX_IQ) | | 209 | BIT(IWL_CALIB_BASE_BAND); |
727 | BIT(IWL_CALIB_BASE_BAND); | ||
728 | |||
729 | break; | ||
730 | default: | ||
731 | priv->hw_params.sens = &iwl5000_sensitivity; | ||
732 | priv->hw_params.calib_init_cfg = | ||
733 | BIT(IWL_CALIB_XTAL) | | ||
734 | BIT(IWL_CALIB_LO) | | ||
735 | BIT(IWL_CALIB_TX_IQ) | | ||
736 | BIT(IWL_CALIB_TX_IQ_PERD) | | ||
737 | BIT(IWL_CALIB_BASE_BAND); | ||
738 | break; | ||
739 | } | ||
740 | |||
741 | return 0; | ||
742 | } | ||
743 | |||
744 | /** | ||
745 | * iwl5000_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array | ||
746 | */ | ||
747 | void iwl5000_txq_update_byte_cnt_tbl(struct iwl_priv *priv, | ||
748 | struct iwl_tx_queue *txq, | ||
749 | u16 byte_cnt) | ||
750 | { | ||
751 | struct iwl5000_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr; | ||
752 | int write_ptr = txq->q.write_ptr; | ||
753 | int txq_id = txq->q.id; | ||
754 | u8 sec_ctl = 0; | ||
755 | u8 sta_id = 0; | ||
756 | u16 len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE; | ||
757 | __le16 bc_ent; | ||
758 | |||
759 | WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX); | ||
760 | |||
761 | if (txq_id != IWL_CMD_QUEUE_NUM) { | ||
762 | sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id; | ||
763 | sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl; | ||
764 | |||
765 | switch (sec_ctl & TX_CMD_SEC_MSK) { | ||
766 | case TX_CMD_SEC_CCM: | ||
767 | len += CCMP_MIC_LEN; | ||
768 | break; | ||
769 | case TX_CMD_SEC_TKIP: | ||
770 | len += TKIP_ICV_LEN; | ||
771 | break; | ||
772 | case TX_CMD_SEC_WEP: | ||
773 | len += WEP_IV_LEN + WEP_ICV_LEN; | ||
774 | break; | ||
775 | } | ||
776 | } | ||
777 | |||
778 | bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12)); | ||
779 | |||
780 | scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent; | ||
781 | |||
782 | if (write_ptr < TFD_QUEUE_SIZE_BC_DUP) | ||
783 | scd_bc_tbl[txq_id]. | ||
784 | tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent; | ||
785 | } | ||
786 | |||
787 | void iwl5000_txq_inval_byte_cnt_tbl(struct iwl_priv *priv, | ||
788 | struct iwl_tx_queue *txq) | ||
789 | { | ||
790 | struct iwl5000_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr; | ||
791 | int txq_id = txq->q.id; | ||
792 | int read_ptr = txq->q.read_ptr; | ||
793 | u8 sta_id = 0; | ||
794 | __le16 bc_ent; | ||
795 | |||
796 | WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX); | ||
797 | |||
798 | if (txq_id != IWL_CMD_QUEUE_NUM) | ||
799 | sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id; | ||
800 | |||
801 | bc_ent = cpu_to_le16(1 | (sta_id << 12)); | ||
802 | scd_bc_tbl[txq_id].tfd_offset[read_ptr] = bc_ent; | ||
803 | |||
804 | if (read_ptr < TFD_QUEUE_SIZE_BC_DUP) | ||
805 | scd_bc_tbl[txq_id]. | ||
806 | tfd_offset[TFD_QUEUE_SIZE_MAX + read_ptr] = bc_ent; | ||
807 | } | ||
808 | |||
809 | static int iwl5000_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid, | ||
810 | u16 txq_id) | ||
811 | { | ||
812 | u32 tbl_dw_addr; | ||
813 | u32 tbl_dw; | ||
814 | u16 scd_q2ratid; | ||
815 | |||
816 | scd_q2ratid = ra_tid & IWL_SCD_QUEUE_RA_TID_MAP_RATID_MSK; | ||
817 | |||
818 | tbl_dw_addr = priv->scd_base_addr + | ||
819 | IWL50_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id); | ||
820 | |||
821 | tbl_dw = iwl_read_targ_mem(priv, tbl_dw_addr); | ||
822 | |||
823 | if (txq_id & 0x1) | ||
824 | tbl_dw = (scd_q2ratid << 16) | (tbl_dw & 0x0000FFFF); | ||
825 | else | ||
826 | tbl_dw = scd_q2ratid | (tbl_dw & 0xFFFF0000); | ||
827 | |||
828 | iwl_write_targ_mem(priv, tbl_dw_addr, tbl_dw); | ||
829 | |||
830 | return 0; | ||
831 | } | ||
832 | static void iwl5000_tx_queue_stop_scheduler(struct iwl_priv *priv, u16 txq_id) | ||
833 | { | ||
834 | /* Simply stop the queue, but don't change any configuration; | ||
835 | * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */ | ||
836 | iwl_write_prph(priv, | ||
837 | IWL50_SCD_QUEUE_STATUS_BITS(txq_id), | ||
838 | (0 << IWL50_SCD_QUEUE_STTS_REG_POS_ACTIVE)| | ||
839 | (1 << IWL50_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN)); | ||
840 | } | ||
841 | |||
842 | int iwl5000_txq_agg_enable(struct iwl_priv *priv, int txq_id, | ||
843 | int tx_fifo, int sta_id, int tid, u16 ssn_idx) | ||
844 | { | ||
845 | unsigned long flags; | ||
846 | u16 ra_tid; | ||
847 | |||
848 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || | ||
849 | (IWL50_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues | ||
850 | <= txq_id)) { | ||
851 | IWL_WARN(priv, | ||
852 | "queue number out of range: %d, must be %d to %d\n", | ||
853 | txq_id, IWL50_FIRST_AMPDU_QUEUE, | ||
854 | IWL50_FIRST_AMPDU_QUEUE + | ||
855 | priv->cfg->num_of_ampdu_queues - 1); | ||
856 | return -EINVAL; | ||
857 | } | ||
858 | |||
859 | ra_tid = BUILD_RAxTID(sta_id, tid); | ||
860 | |||
861 | /* Modify device's station table to Tx this TID */ | ||
862 | iwl_sta_tx_modify_enable_tid(priv, sta_id, tid); | ||
863 | |||
864 | spin_lock_irqsave(&priv->lock, flags); | ||
865 | |||
866 | /* Stop this Tx queue before configuring it */ | ||
867 | iwl5000_tx_queue_stop_scheduler(priv, txq_id); | ||
868 | |||
869 | /* Map receiver-address / traffic-ID to this queue */ | ||
870 | iwl5000_tx_queue_set_q2ratid(priv, ra_tid, txq_id); | ||
871 | |||
872 | /* Set this queue as a chain-building queue */ | ||
873 | iwl_set_bits_prph(priv, IWL50_SCD_QUEUECHAIN_SEL, (1<<txq_id)); | ||
874 | |||
875 | /* enable aggregations for the queue */ | ||
876 | iwl_set_bits_prph(priv, IWL50_SCD_AGGR_SEL, (1<<txq_id)); | ||
877 | |||
878 | /* Place first TFD at index corresponding to start sequence number. | ||
879 | * Assumes that ssn_idx is valid (!= 0xFFF) */ | ||
880 | priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff); | ||
881 | priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff); | ||
882 | iwl5000_set_wr_ptrs(priv, txq_id, ssn_idx); | ||
883 | |||
884 | /* Set up Tx window size and frame limit for this queue */ | ||
885 | iwl_write_targ_mem(priv, priv->scd_base_addr + | ||
886 | IWL50_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + | ||
887 | sizeof(u32), | ||
888 | ((SCD_WIN_SIZE << | ||
889 | IWL50_SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) & | ||
890 | IWL50_SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) | | ||
891 | ((SCD_FRAME_LIMIT << | ||
892 | IWL50_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) & | ||
893 | IWL50_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK)); | ||
894 | |||
895 | iwl_set_bits_prph(priv, IWL50_SCD_INTERRUPT_MASK, (1 << txq_id)); | ||
896 | |||
897 | /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */ | ||
898 | iwl5000_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 1); | ||
899 | |||
900 | spin_unlock_irqrestore(&priv->lock, flags); | ||
901 | 210 | ||
902 | return 0; | 211 | return 0; |
903 | } | 212 | } |
904 | 213 | ||
905 | int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, | 214 | static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) |
906 | u16 ssn_idx, u8 tx_fifo) | ||
907 | { | 215 | { |
908 | if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) || | 216 | if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES && |
909 | (IWL50_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues | 217 | priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES) |
910 | <= txq_id)) { | 218 | priv->cfg->num_of_queues = |
911 | IWL_ERR(priv, | 219 | priv->cfg->mod_params->num_of_queues; |
912 | "queue number out of range: %d, must be %d to %d\n", | ||
913 | txq_id, IWL50_FIRST_AMPDU_QUEUE, | ||
914 | IWL50_FIRST_AMPDU_QUEUE + | ||
915 | priv->cfg->num_of_ampdu_queues - 1); | ||
916 | return -EINVAL; | ||
917 | } | ||
918 | |||
919 | iwl5000_tx_queue_stop_scheduler(priv, txq_id); | ||
920 | |||
921 | iwl_clear_bits_prph(priv, IWL50_SCD_AGGR_SEL, (1 << txq_id)); | ||
922 | |||
923 | priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff); | ||
924 | priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff); | ||
925 | /* supposes that ssn_idx is valid (!= 0xFFF) */ | ||
926 | iwl5000_set_wr_ptrs(priv, txq_id, ssn_idx); | ||
927 | |||
928 | iwl_clear_bits_prph(priv, IWL50_SCD_INTERRUPT_MASK, (1 << txq_id)); | ||
929 | iwl_txq_ctx_deactivate(priv, txq_id); | ||
930 | iwl5000_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 0); | ||
931 | |||
932 | return 0; | ||
933 | } | ||
934 | |||
935 | u16 iwl5000_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) | ||
936 | { | ||
937 | u16 size = (u16)sizeof(struct iwl_addsta_cmd); | ||
938 | struct iwl_addsta_cmd *addsta = (struct iwl_addsta_cmd *)data; | ||
939 | memcpy(addsta, cmd, size); | ||
940 | /* resrved in 5000 */ | ||
941 | addsta->rate_n_flags = cpu_to_le16(0); | ||
942 | return size; | ||
943 | } | ||
944 | |||
945 | |||
946 | /* | ||
947 | * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask | ||
948 | * must be called under priv->lock and mac access | ||
949 | */ | ||
950 | void iwl5000_txq_set_sched(struct iwl_priv *priv, u32 mask) | ||
951 | { | ||
952 | iwl_write_prph(priv, IWL50_SCD_TXFACT, mask); | ||
953 | } | ||
954 | |||
955 | |||
956 | static inline u32 iwl5000_get_scd_ssn(struct iwl5000_tx_resp *tx_resp) | ||
957 | { | ||
958 | return le32_to_cpup((__le32 *)&tx_resp->status + | ||
959 | tx_resp->frame_count) & MAX_SN; | ||
960 | } | ||
961 | |||
962 | static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, | ||
963 | struct iwl_ht_agg *agg, | ||
964 | struct iwl5000_tx_resp *tx_resp, | ||
965 | int txq_id, u16 start_idx) | ||
966 | { | ||
967 | u16 status; | ||
968 | struct agg_tx_status *frame_status = &tx_resp->status; | ||
969 | struct ieee80211_tx_info *info = NULL; | ||
970 | struct ieee80211_hdr *hdr = NULL; | ||
971 | u32 rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags); | ||
972 | int i, sh, idx; | ||
973 | u16 seq; | ||
974 | |||
975 | if (agg->wait_for_ba) | ||
976 | IWL_DEBUG_TX_REPLY(priv, "got tx response w/o block-ack\n"); | ||
977 | |||
978 | agg->frame_count = tx_resp->frame_count; | ||
979 | agg->start_idx = start_idx; | ||
980 | agg->rate_n_flags = rate_n_flags; | ||
981 | agg->bitmap = 0; | ||
982 | |||
983 | /* # frames attempted by Tx command */ | ||
984 | if (agg->frame_count == 1) { | ||
985 | /* Only one frame was attempted; no block-ack will arrive */ | ||
986 | status = le16_to_cpu(frame_status[0].status); | ||
987 | idx = start_idx; | ||
988 | |||
989 | /* FIXME: code repetition */ | ||
990 | IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, StartIdx=%d idx=%d\n", | ||
991 | agg->frame_count, agg->start_idx, idx); | ||
992 | |||
993 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); | ||
994 | info->status.rates[0].count = tx_resp->failure_frame + 1; | ||
995 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | ||
996 | info->flags |= iwl_tx_status_to_mac80211(status); | ||
997 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | ||
998 | |||
999 | /* FIXME: code repetition end */ | ||
1000 | |||
1001 | IWL_DEBUG_TX_REPLY(priv, "1 Frame 0x%x failure :%d\n", | ||
1002 | status & 0xff, tx_resp->failure_frame); | ||
1003 | IWL_DEBUG_TX_REPLY(priv, "Rate Info rate_n_flags=%x\n", rate_n_flags); | ||
1004 | |||
1005 | agg->wait_for_ba = 0; | ||
1006 | } else { | ||
1007 | /* Two or more frames were attempted; expect block-ack */ | ||
1008 | u64 bitmap = 0; | ||
1009 | int start = agg->start_idx; | ||
1010 | |||
1011 | /* Construct bit-map of pending frames within Tx window */ | ||
1012 | for (i = 0; i < agg->frame_count; i++) { | ||
1013 | u16 sc; | ||
1014 | status = le16_to_cpu(frame_status[i].status); | ||
1015 | seq = le16_to_cpu(frame_status[i].sequence); | ||
1016 | idx = SEQ_TO_INDEX(seq); | ||
1017 | txq_id = SEQ_TO_QUEUE(seq); | ||
1018 | |||
1019 | if (status & (AGG_TX_STATE_FEW_BYTES_MSK | | ||
1020 | AGG_TX_STATE_ABORT_MSK)) | ||
1021 | continue; | ||
1022 | 220 | ||
1023 | IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, txq_id=%d idx=%d\n", | 221 | priv->hw_params.max_txq_num = priv->cfg->num_of_queues; |
1024 | agg->frame_count, txq_id, idx); | 222 | priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM; |
223 | priv->hw_params.scd_bc_tbls_size = | ||
224 | priv->cfg->num_of_queues * | ||
225 | sizeof(struct iwlagn_scd_bc_tbl); | ||
226 | priv->hw_params.tfd_size = sizeof(struct iwl_tfd); | ||
227 | priv->hw_params.max_stations = IWL5000_STATION_COUNT; | ||
228 | priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID; | ||
1025 | 229 | ||
1026 | hdr = iwl_tx_queue_get_hdr(priv, txq_id, idx); | 230 | priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE; |
1027 | if (!hdr) { | 231 | priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE; |
1028 | IWL_ERR(priv, | ||
1029 | "BUG_ON idx doesn't point to valid skb" | ||
1030 | " idx=%d, txq_id=%d\n", idx, txq_id); | ||
1031 | return -1; | ||
1032 | } | ||
1033 | 232 | ||
1034 | sc = le16_to_cpu(hdr->seq_ctrl); | 233 | priv->hw_params.max_bsm_size = 0; |
1035 | if (idx != (SEQ_TO_SN(sc) & 0xff)) { | 234 | priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | |
1036 | IWL_ERR(priv, | 235 | BIT(IEEE80211_BAND_5GHZ); |
1037 | "BUG_ON idx doesn't match seq control" | 236 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; |
1038 | " idx=%d, seq_idx=%d, seq=%d\n", | ||
1039 | idx, SEQ_TO_SN(sc), | ||
1040 | hdr->seq_ctrl); | ||
1041 | return -1; | ||
1042 | } | ||
1043 | 237 | ||
1044 | IWL_DEBUG_TX_REPLY(priv, "AGG Frame i=%d idx %d seq=%d\n", | 238 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); |
1045 | i, idx, SEQ_TO_SN(sc)); | 239 | priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant); |
240 | priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; | ||
241 | priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; | ||
1046 | 242 | ||
1047 | sh = idx - start; | 243 | if (priv->cfg->ops->lib->temp_ops.set_ct_kill) |
1048 | if (sh > 64) { | 244 | priv->cfg->ops->lib->temp_ops.set_ct_kill(priv); |
1049 | sh = (start - idx) + 0xff; | ||
1050 | bitmap = bitmap << sh; | ||
1051 | sh = 0; | ||
1052 | start = idx; | ||
1053 | } else if (sh < -64) | ||
1054 | sh = 0xff - (start - idx); | ||
1055 | else if (sh < 0) { | ||
1056 | sh = start - idx; | ||
1057 | start = idx; | ||
1058 | bitmap = bitmap << sh; | ||
1059 | sh = 0; | ||
1060 | } | ||
1061 | bitmap |= 1ULL << sh; | ||
1062 | IWL_DEBUG_TX_REPLY(priv, "start=%d bitmap=0x%llx\n", | ||
1063 | start, (unsigned long long)bitmap); | ||
1064 | } | ||
1065 | 245 | ||
1066 | agg->bitmap = bitmap; | 246 | /* Set initial sensitivity parameters */ |
1067 | agg->start_idx = start; | 247 | /* Set initial calibration set */ |
1068 | IWL_DEBUG_TX_REPLY(priv, "Frames %d start_idx=%d bitmap=0x%llx\n", | 248 | priv->hw_params.sens = &iwl5150_sensitivity; |
1069 | agg->frame_count, agg->start_idx, | 249 | priv->hw_params.calib_init_cfg = |
1070 | (unsigned long long)agg->bitmap); | 250 | BIT(IWL_CALIB_DC) | |
251 | BIT(IWL_CALIB_LO) | | ||
252 | BIT(IWL_CALIB_TX_IQ) | | ||
253 | BIT(IWL_CALIB_BASE_BAND); | ||
1071 | 254 | ||
1072 | if (bitmap) | ||
1073 | agg->wait_for_ba = 1; | ||
1074 | } | ||
1075 | return 0; | 255 | return 0; |
1076 | } | 256 | } |
1077 | 257 | ||
1078 | static void iwl5000_rx_reply_tx(struct iwl_priv *priv, | ||
1079 | struct iwl_rx_mem_buffer *rxb) | ||
1080 | { | ||
1081 | struct iwl_rx_packet *pkt = rxb_addr(rxb); | ||
1082 | u16 sequence = le16_to_cpu(pkt->hdr.sequence); | ||
1083 | int txq_id = SEQ_TO_QUEUE(sequence); | ||
1084 | int index = SEQ_TO_INDEX(sequence); | ||
1085 | struct iwl_tx_queue *txq = &priv->txq[txq_id]; | ||
1086 | struct ieee80211_tx_info *info; | ||
1087 | struct iwl5000_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; | ||
1088 | u32 status = le16_to_cpu(tx_resp->status.status); | ||
1089 | int tid; | ||
1090 | int sta_id; | ||
1091 | int freed; | ||
1092 | |||
1093 | if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) { | ||
1094 | IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d " | ||
1095 | "is out of range [0-%d] %d %d\n", txq_id, | ||
1096 | index, txq->q.n_bd, txq->q.write_ptr, | ||
1097 | txq->q.read_ptr); | ||
1098 | return; | ||
1099 | } | ||
1100 | |||
1101 | info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb[0]); | ||
1102 | memset(&info->status, 0, sizeof(info->status)); | ||
1103 | |||
1104 | tid = (tx_resp->ra_tid & IWL50_TX_RES_TID_MSK) >> IWL50_TX_RES_TID_POS; | ||
1105 | sta_id = (tx_resp->ra_tid & IWL50_TX_RES_RA_MSK) >> IWL50_TX_RES_RA_POS; | ||
1106 | |||
1107 | if (txq->sched_retry) { | ||
1108 | const u32 scd_ssn = iwl5000_get_scd_ssn(tx_resp); | ||
1109 | struct iwl_ht_agg *agg = NULL; | ||
1110 | |||
1111 | agg = &priv->stations[sta_id].tid[tid].agg; | ||
1112 | |||
1113 | iwl5000_tx_status_reply_tx(priv, agg, tx_resp, txq_id, index); | ||
1114 | |||
1115 | /* check if BAR is needed */ | ||
1116 | if ((tx_resp->frame_count == 1) && !iwl_is_tx_success(status)) | ||
1117 | info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; | ||
1118 | |||
1119 | if (txq->q.read_ptr != (scd_ssn & 0xff)) { | ||
1120 | index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd); | ||
1121 | IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim " | ||
1122 | "scd_ssn=%d idx=%d txq=%d swq=%d\n", | ||
1123 | scd_ssn , index, txq_id, txq->swq_id); | ||
1124 | |||
1125 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); | ||
1126 | iwl_free_tfds_in_queue(priv, sta_id, tid, freed); | ||
1127 | |||
1128 | if (priv->mac80211_registered && | ||
1129 | (iwl_queue_space(&txq->q) > txq->q.low_mark) && | ||
1130 | (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) { | ||
1131 | if (agg->state == IWL_AGG_OFF) | ||
1132 | iwl_wake_queue(priv, txq_id); | ||
1133 | else | ||
1134 | iwl_wake_queue(priv, txq->swq_id); | ||
1135 | } | ||
1136 | } | ||
1137 | } else { | ||
1138 | BUG_ON(txq_id != txq->swq_id); | ||
1139 | |||
1140 | info->status.rates[0].count = tx_resp->failure_frame + 1; | ||
1141 | info->flags |= iwl_tx_status_to_mac80211(status); | ||
1142 | iwl_hwrate_to_tx_control(priv, | ||
1143 | le32_to_cpu(tx_resp->rate_n_flags), | ||
1144 | info); | ||
1145 | |||
1146 | IWL_DEBUG_TX_REPLY(priv, "TXQ %d status %s (0x%08x) rate_n_flags " | ||
1147 | "0x%x retries %d\n", | ||
1148 | txq_id, | ||
1149 | iwl_get_tx_fail_reason(status), status, | ||
1150 | le32_to_cpu(tx_resp->rate_n_flags), | ||
1151 | tx_resp->failure_frame); | ||
1152 | |||
1153 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); | ||
1154 | iwl_free_tfds_in_queue(priv, sta_id, tid, freed); | ||
1155 | |||
1156 | if (priv->mac80211_registered && | ||
1157 | (iwl_queue_space(&txq->q) > txq->q.low_mark)) | ||
1158 | iwl_wake_queue(priv, txq_id); | ||
1159 | } | ||
1160 | |||
1161 | iwl_txq_check_empty(priv, sta_id, tid, txq_id); | ||
1162 | |||
1163 | if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) | ||
1164 | IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); | ||
1165 | } | ||
1166 | |||
1167 | /* Currently 5000 is the superset of everything */ | ||
1168 | u16 iwl5000_get_hcmd_size(u8 cmd_id, u16 len) | ||
1169 | { | ||
1170 | return len; | ||
1171 | } | ||
1172 | |||
1173 | void iwl5000_setup_deferred_work(struct iwl_priv *priv) | ||
1174 | { | ||
1175 | /* in 5000 the tx power calibration is done in uCode */ | ||
1176 | priv->disable_tx_power_cal = 1; | ||
1177 | } | ||
1178 | |||
1179 | void iwl5000_rx_handler_setup(struct iwl_priv *priv) | ||
1180 | { | ||
1181 | /* init calibration handlers */ | ||
1182 | priv->rx_handlers[CALIBRATION_RES_NOTIFICATION] = | ||
1183 | iwl5000_rx_calib_result; | ||
1184 | priv->rx_handlers[CALIBRATION_COMPLETE_NOTIFICATION] = | ||
1185 | iwl5000_rx_calib_complete; | ||
1186 | priv->rx_handlers[REPLY_TX] = iwl5000_rx_reply_tx; | ||
1187 | } | ||
1188 | |||
1189 | |||
1190 | int iwl5000_hw_valid_rtc_data_addr(u32 addr) | ||
1191 | { | ||
1192 | return (addr >= IWL50_RTC_DATA_LOWER_BOUND) && | ||
1193 | (addr < IWL50_RTC_DATA_UPPER_BOUND); | ||
1194 | } | ||
1195 | |||
1196 | static int iwl5000_send_rxon_assoc(struct iwl_priv *priv) | ||
1197 | { | ||
1198 | int ret = 0; | ||
1199 | struct iwl5000_rxon_assoc_cmd rxon_assoc; | ||
1200 | const struct iwl_rxon_cmd *rxon1 = &priv->staging_rxon; | ||
1201 | const struct iwl_rxon_cmd *rxon2 = &priv->active_rxon; | ||
1202 | |||
1203 | if ((rxon1->flags == rxon2->flags) && | ||
1204 | (rxon1->filter_flags == rxon2->filter_flags) && | ||
1205 | (rxon1->cck_basic_rates == rxon2->cck_basic_rates) && | ||
1206 | (rxon1->ofdm_ht_single_stream_basic_rates == | ||
1207 | rxon2->ofdm_ht_single_stream_basic_rates) && | ||
1208 | (rxon1->ofdm_ht_dual_stream_basic_rates == | ||
1209 | rxon2->ofdm_ht_dual_stream_basic_rates) && | ||
1210 | (rxon1->ofdm_ht_triple_stream_basic_rates == | ||
1211 | rxon2->ofdm_ht_triple_stream_basic_rates) && | ||
1212 | (rxon1->acquisition_data == rxon2->acquisition_data) && | ||
1213 | (rxon1->rx_chain == rxon2->rx_chain) && | ||
1214 | (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) { | ||
1215 | IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC. Not resending.\n"); | ||
1216 | return 0; | ||
1217 | } | ||
1218 | |||
1219 | rxon_assoc.flags = priv->staging_rxon.flags; | ||
1220 | rxon_assoc.filter_flags = priv->staging_rxon.filter_flags; | ||
1221 | rxon_assoc.ofdm_basic_rates = priv->staging_rxon.ofdm_basic_rates; | ||
1222 | rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates; | ||
1223 | rxon_assoc.reserved1 = 0; | ||
1224 | rxon_assoc.reserved2 = 0; | ||
1225 | rxon_assoc.reserved3 = 0; | ||
1226 | rxon_assoc.ofdm_ht_single_stream_basic_rates = | ||
1227 | priv->staging_rxon.ofdm_ht_single_stream_basic_rates; | ||
1228 | rxon_assoc.ofdm_ht_dual_stream_basic_rates = | ||
1229 | priv->staging_rxon.ofdm_ht_dual_stream_basic_rates; | ||
1230 | rxon_assoc.rx_chain_select_flags = priv->staging_rxon.rx_chain; | ||
1231 | rxon_assoc.ofdm_ht_triple_stream_basic_rates = | ||
1232 | priv->staging_rxon.ofdm_ht_triple_stream_basic_rates; | ||
1233 | rxon_assoc.acquisition_data = priv->staging_rxon.acquisition_data; | ||
1234 | |||
1235 | ret = iwl_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC, | ||
1236 | sizeof(rxon_assoc), &rxon_assoc, NULL); | ||
1237 | if (ret) | ||
1238 | return ret; | ||
1239 | |||
1240 | return ret; | ||
1241 | } | ||
1242 | int iwl5000_send_tx_power(struct iwl_priv *priv) | ||
1243 | { | ||
1244 | struct iwl5000_tx_power_dbm_cmd tx_power_cmd; | ||
1245 | u8 tx_ant_cfg_cmd; | ||
1246 | |||
1247 | /* half dBm need to multiply */ | ||
1248 | tx_power_cmd.global_lmt = (s8)(2 * priv->tx_power_user_lmt); | ||
1249 | |||
1250 | if (priv->tx_power_lmt_in_half_dbm && | ||
1251 | priv->tx_power_lmt_in_half_dbm < tx_power_cmd.global_lmt) { | ||
1252 | /* | ||
1253 | * For the newer devices which using enhanced/extend tx power | ||
1254 | * table in EEPROM, the format is in half dBm. driver need to | ||
1255 | * convert to dBm format before report to mac80211. | ||
1256 | * By doing so, there is a possibility of 1/2 dBm resolution | ||
1257 | * lost. driver will perform "round-up" operation before | ||
1258 | * reporting, but it will cause 1/2 dBm tx power over the | ||
1259 | * regulatory limit. Perform the checking here, if the | ||
1260 | * "tx_power_user_lmt" is higher than EEPROM value (in | ||
1261 | * half-dBm format), lower the tx power based on EEPROM | ||
1262 | */ | ||
1263 | tx_power_cmd.global_lmt = priv->tx_power_lmt_in_half_dbm; | ||
1264 | } | ||
1265 | tx_power_cmd.flags = IWL50_TX_POWER_NO_CLOSED; | ||
1266 | tx_power_cmd.srv_chan_lmt = IWL50_TX_POWER_AUTO; | ||
1267 | |||
1268 | if (IWL_UCODE_API(priv->ucode_ver) == 1) | ||
1269 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD_V1; | ||
1270 | else | ||
1271 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD; | ||
1272 | |||
1273 | return iwl_send_cmd_pdu_async(priv, tx_ant_cfg_cmd, | ||
1274 | sizeof(tx_power_cmd), &tx_power_cmd, | ||
1275 | NULL); | ||
1276 | } | ||
1277 | |||
1278 | void iwl5000_temperature(struct iwl_priv *priv) | ||
1279 | { | ||
1280 | /* store temperature from statistics (in Celsius) */ | ||
1281 | priv->temperature = le32_to_cpu(priv->statistics.general.temperature); | ||
1282 | iwl_tt_handler(priv); | ||
1283 | } | ||
1284 | |||
1285 | static void iwl5150_temperature(struct iwl_priv *priv) | 258 | static void iwl5150_temperature(struct iwl_priv *priv) |
1286 | { | 259 | { |
1287 | u32 vt = 0; | 260 | u32 vt = 0; |
@@ -1294,100 +267,6 @@ static void iwl5150_temperature(struct iwl_priv *priv) | |||
1294 | iwl_tt_handler(priv); | 267 | iwl_tt_handler(priv); |
1295 | } | 268 | } |
1296 | 269 | ||
1297 | /* Calc max signal level (dBm) among 3 possible receivers */ | ||
1298 | int iwl5000_calc_rssi(struct iwl_priv *priv, | ||
1299 | struct iwl_rx_phy_res *rx_resp) | ||
1300 | { | ||
1301 | /* data from PHY/DSP regarding signal strength, etc., | ||
1302 | * contents are always there, not configurable by host | ||
1303 | */ | ||
1304 | struct iwl5000_non_cfg_phy *ncphy = | ||
1305 | (struct iwl5000_non_cfg_phy *)rx_resp->non_cfg_phy_buf; | ||
1306 | u32 val, rssi_a, rssi_b, rssi_c, max_rssi; | ||
1307 | u8 agc; | ||
1308 | |||
1309 | val = le32_to_cpu(ncphy->non_cfg_phy[IWL50_RX_RES_AGC_IDX]); | ||
1310 | agc = (val & IWL50_OFDM_AGC_MSK) >> IWL50_OFDM_AGC_BIT_POS; | ||
1311 | |||
1312 | /* Find max rssi among 3 possible receivers. | ||
1313 | * These values are measured by the digital signal processor (DSP). | ||
1314 | * They should stay fairly constant even as the signal strength varies, | ||
1315 | * if the radio's automatic gain control (AGC) is working right. | ||
1316 | * AGC value (see below) will provide the "interesting" info. | ||
1317 | */ | ||
1318 | val = le32_to_cpu(ncphy->non_cfg_phy[IWL50_RX_RES_RSSI_AB_IDX]); | ||
1319 | rssi_a = (val & IWL50_OFDM_RSSI_A_MSK) >> IWL50_OFDM_RSSI_A_BIT_POS; | ||
1320 | rssi_b = (val & IWL50_OFDM_RSSI_B_MSK) >> IWL50_OFDM_RSSI_B_BIT_POS; | ||
1321 | val = le32_to_cpu(ncphy->non_cfg_phy[IWL50_RX_RES_RSSI_C_IDX]); | ||
1322 | rssi_c = (val & IWL50_OFDM_RSSI_C_MSK) >> IWL50_OFDM_RSSI_C_BIT_POS; | ||
1323 | |||
1324 | max_rssi = max_t(u32, rssi_a, rssi_b); | ||
1325 | max_rssi = max_t(u32, max_rssi, rssi_c); | ||
1326 | |||
1327 | IWL_DEBUG_STATS(priv, "Rssi In A %d B %d C %d Max %d AGC dB %d\n", | ||
1328 | rssi_a, rssi_b, rssi_c, max_rssi, agc); | ||
1329 | |||
1330 | /* dBm = max_rssi dB - agc dB - constant. | ||
1331 | * Higher AGC (higher radio gain) means lower signal. */ | ||
1332 | return max_rssi - agc - IWL49_RSSI_OFFSET; | ||
1333 | } | ||
1334 | |||
1335 | static int iwl5000_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) | ||
1336 | { | ||
1337 | struct iwl_tx_ant_config_cmd tx_ant_cmd = { | ||
1338 | .valid = cpu_to_le32(valid_tx_ant), | ||
1339 | }; | ||
1340 | |||
1341 | if (IWL_UCODE_API(priv->ucode_ver) > 1) { | ||
1342 | IWL_DEBUG_HC(priv, "select valid tx ant: %u\n", valid_tx_ant); | ||
1343 | return iwl_send_cmd_pdu(priv, TX_ANT_CONFIGURATION_CMD, | ||
1344 | sizeof(struct iwl_tx_ant_config_cmd), | ||
1345 | &tx_ant_cmd); | ||
1346 | } else { | ||
1347 | IWL_DEBUG_HC(priv, "TX_ANT_CONFIGURATION_CMD not supported\n"); | ||
1348 | return -EOPNOTSUPP; | ||
1349 | } | ||
1350 | } | ||
1351 | |||
1352 | |||
1353 | #define IWL5000_UCODE_GET(item) \ | ||
1354 | static u32 iwl5000_ucode_get_##item(const struct iwl_ucode_header *ucode,\ | ||
1355 | u32 api_ver) \ | ||
1356 | { \ | ||
1357 | if (api_ver <= 2) \ | ||
1358 | return le32_to_cpu(ucode->u.v1.item); \ | ||
1359 | return le32_to_cpu(ucode->u.v2.item); \ | ||
1360 | } | ||
1361 | |||
1362 | static u32 iwl5000_ucode_get_header_size(u32 api_ver) | ||
1363 | { | ||
1364 | if (api_ver <= 2) | ||
1365 | return UCODE_HEADER_SIZE(1); | ||
1366 | return UCODE_HEADER_SIZE(2); | ||
1367 | } | ||
1368 | |||
1369 | static u32 iwl5000_ucode_get_build(const struct iwl_ucode_header *ucode, | ||
1370 | u32 api_ver) | ||
1371 | { | ||
1372 | if (api_ver <= 2) | ||
1373 | return 0; | ||
1374 | return le32_to_cpu(ucode->u.v2.build); | ||
1375 | } | ||
1376 | |||
1377 | static u8 *iwl5000_ucode_get_data(const struct iwl_ucode_header *ucode, | ||
1378 | u32 api_ver) | ||
1379 | { | ||
1380 | if (api_ver <= 2) | ||
1381 | return (u8 *) ucode->u.v1.data; | ||
1382 | return (u8 *) ucode->u.v2.data; | ||
1383 | } | ||
1384 | |||
1385 | IWL5000_UCODE_GET(inst_size); | ||
1386 | IWL5000_UCODE_GET(data_size); | ||
1387 | IWL5000_UCODE_GET(init_size); | ||
1388 | IWL5000_UCODE_GET(init_data_size); | ||
1389 | IWL5000_UCODE_GET(boot_size); | ||
1390 | |||
1391 | static int iwl5000_hw_channel_switch(struct iwl_priv *priv, u16 channel) | 270 | static int iwl5000_hw_channel_switch(struct iwl_priv *priv, u16 channel) |
1392 | { | 271 | { |
1393 | struct iwl5000_channel_switch_cmd cmd; | 272 | struct iwl5000_channel_switch_cmd cmd; |
@@ -1420,54 +299,27 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, u16 channel) | |||
1420 | return iwl_send_cmd_sync(priv, &hcmd); | 299 | return iwl_send_cmd_sync(priv, &hcmd); |
1421 | } | 300 | } |
1422 | 301 | ||
1423 | struct iwl_hcmd_ops iwl5000_hcmd = { | 302 | static struct iwl_lib_ops iwl5000_lib = { |
1424 | .rxon_assoc = iwl5000_send_rxon_assoc, | ||
1425 | .commit_rxon = iwl_commit_rxon, | ||
1426 | .set_rxon_chain = iwl_set_rxon_chain, | ||
1427 | .set_tx_ant = iwl5000_send_tx_ant_config, | ||
1428 | }; | ||
1429 | |||
1430 | struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = { | ||
1431 | .get_hcmd_size = iwl5000_get_hcmd_size, | ||
1432 | .build_addsta_hcmd = iwl5000_build_addsta_hcmd, | ||
1433 | .gain_computation = iwl5000_gain_computation, | ||
1434 | .chain_noise_reset = iwl5000_chain_noise_reset, | ||
1435 | .rts_tx_cmd_flag = iwl5000_rts_tx_cmd_flag, | ||
1436 | .calc_rssi = iwl5000_calc_rssi, | ||
1437 | }; | ||
1438 | |||
1439 | struct iwl_ucode_ops iwl5000_ucode = { | ||
1440 | .get_header_size = iwl5000_ucode_get_header_size, | ||
1441 | .get_build = iwl5000_ucode_get_build, | ||
1442 | .get_inst_size = iwl5000_ucode_get_inst_size, | ||
1443 | .get_data_size = iwl5000_ucode_get_data_size, | ||
1444 | .get_init_size = iwl5000_ucode_get_init_size, | ||
1445 | .get_init_data_size = iwl5000_ucode_get_init_data_size, | ||
1446 | .get_boot_size = iwl5000_ucode_get_boot_size, | ||
1447 | .get_data = iwl5000_ucode_get_data, | ||
1448 | }; | ||
1449 | |||
1450 | struct iwl_lib_ops iwl5000_lib = { | ||
1451 | .set_hw_params = iwl5000_hw_set_hw_params, | 303 | .set_hw_params = iwl5000_hw_set_hw_params, |
1452 | .txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl, | 304 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, |
1453 | .txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl, | 305 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, |
1454 | .txq_set_sched = iwl5000_txq_set_sched, | 306 | .txq_set_sched = iwlagn_txq_set_sched, |
1455 | .txq_agg_enable = iwl5000_txq_agg_enable, | 307 | .txq_agg_enable = iwlagn_txq_agg_enable, |
1456 | .txq_agg_disable = iwl5000_txq_agg_disable, | 308 | .txq_agg_disable = iwlagn_txq_agg_disable, |
1457 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, | 309 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, |
1458 | .txq_free_tfd = iwl_hw_txq_free_tfd, | 310 | .txq_free_tfd = iwl_hw_txq_free_tfd, |
1459 | .txq_init = iwl_hw_tx_queue_init, | 311 | .txq_init = iwl_hw_tx_queue_init, |
1460 | .rx_handler_setup = iwl5000_rx_handler_setup, | 312 | .rx_handler_setup = iwlagn_rx_handler_setup, |
1461 | .setup_deferred_work = iwl5000_setup_deferred_work, | 313 | .setup_deferred_work = iwlagn_setup_deferred_work, |
1462 | .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, | 314 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
1463 | .dump_nic_event_log = iwl_dump_nic_event_log, | 315 | .dump_nic_event_log = iwl_dump_nic_event_log, |
1464 | .dump_nic_error_log = iwl_dump_nic_error_log, | 316 | .dump_nic_error_log = iwl_dump_nic_error_log, |
1465 | .dump_csr = iwl_dump_csr, | 317 | .dump_csr = iwl_dump_csr, |
1466 | .dump_fh = iwl_dump_fh, | 318 | .dump_fh = iwl_dump_fh, |
1467 | .load_ucode = iwl5000_load_ucode, | 319 | .load_ucode = iwlagn_load_ucode, |
1468 | .init_alive_start = iwl5000_init_alive_start, | 320 | .init_alive_start = iwlagn_init_alive_start, |
1469 | .alive_notify = iwl5000_alive_notify, | 321 | .alive_notify = iwlagn_alive_notify, |
1470 | .send_tx_power = iwl5000_send_tx_power, | 322 | .send_tx_power = iwlagn_send_tx_power, |
1471 | .update_chain_flags = iwl_update_chain_flags, | 323 | .update_chain_flags = iwl_update_chain_flags, |
1472 | .set_channel_switch = iwl5000_hw_channel_switch, | 324 | .set_channel_switch = iwl5000_hw_channel_switch, |
1473 | .apm_ops = { | 325 | .apm_ops = { |
@@ -1478,50 +330,58 @@ struct iwl_lib_ops iwl5000_lib = { | |||
1478 | }, | 330 | }, |
1479 | .eeprom_ops = { | 331 | .eeprom_ops = { |
1480 | .regulatory_bands = { | 332 | .regulatory_bands = { |
1481 | EEPROM_5000_REG_BAND_1_CHANNELS, | 333 | EEPROM_REG_BAND_1_CHANNELS, |
1482 | EEPROM_5000_REG_BAND_2_CHANNELS, | 334 | EEPROM_REG_BAND_2_CHANNELS, |
1483 | EEPROM_5000_REG_BAND_3_CHANNELS, | 335 | EEPROM_REG_BAND_3_CHANNELS, |
1484 | EEPROM_5000_REG_BAND_4_CHANNELS, | 336 | EEPROM_REG_BAND_4_CHANNELS, |
1485 | EEPROM_5000_REG_BAND_5_CHANNELS, | 337 | EEPROM_REG_BAND_5_CHANNELS, |
1486 | EEPROM_5000_REG_BAND_24_HT40_CHANNELS, | 338 | EEPROM_REG_BAND_24_HT40_CHANNELS, |
1487 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS | 339 | EEPROM_REG_BAND_52_HT40_CHANNELS |
1488 | }, | 340 | }, |
1489 | .verify_signature = iwlcore_eeprom_verify_signature, | 341 | .verify_signature = iwlcore_eeprom_verify_signature, |
1490 | .acquire_semaphore = iwlcore_eeprom_acquire_semaphore, | 342 | .acquire_semaphore = iwlcore_eeprom_acquire_semaphore, |
1491 | .release_semaphore = iwlcore_eeprom_release_semaphore, | 343 | .release_semaphore = iwlcore_eeprom_release_semaphore, |
1492 | .calib_version = iwl5000_eeprom_calib_version, | 344 | .calib_version = iwlagn_eeprom_calib_version, |
1493 | .query_addr = iwl5000_eeprom_query_addr, | 345 | .query_addr = iwlagn_eeprom_query_addr, |
1494 | }, | 346 | }, |
1495 | .post_associate = iwl_post_associate, | 347 | .post_associate = iwl_post_associate, |
1496 | .isr = iwl_isr_ict, | 348 | .isr = iwl_isr_ict, |
1497 | .config_ap = iwl_config_ap, | 349 | .config_ap = iwl_config_ap, |
1498 | .temp_ops = { | 350 | .temp_ops = { |
1499 | .temperature = iwl5000_temperature, | 351 | .temperature = iwlagn_temperature, |
1500 | .set_ct_kill = iwl5000_set_ct_threshold, | 352 | .set_ct_kill = iwl5000_set_ct_threshold, |
1501 | }, | 353 | }, |
1502 | .add_bcast_station = iwl_add_bcast_station, | 354 | .manage_ibss_station = iwlagn_manage_ibss_station, |
355 | .debugfs_ops = { | ||
356 | .rx_stats_read = iwl_ucode_rx_stats_read, | ||
357 | .tx_stats_read = iwl_ucode_tx_stats_read, | ||
358 | .general_stats_read = iwl_ucode_general_stats_read, | ||
359 | }, | ||
360 | .recover_from_tx_stall = iwl_bg_monitor_recover, | ||
361 | .check_plcp_health = iwl_good_plcp_health, | ||
362 | .check_ack_health = iwl_good_ack_health, | ||
1503 | }; | 363 | }; |
1504 | 364 | ||
1505 | static struct iwl_lib_ops iwl5150_lib = { | 365 | static struct iwl_lib_ops iwl5150_lib = { |
1506 | .set_hw_params = iwl5000_hw_set_hw_params, | 366 | .set_hw_params = iwl5150_hw_set_hw_params, |
1507 | .txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl, | 367 | .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, |
1508 | .txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl, | 368 | .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, |
1509 | .txq_set_sched = iwl5000_txq_set_sched, | 369 | .txq_set_sched = iwlagn_txq_set_sched, |
1510 | .txq_agg_enable = iwl5000_txq_agg_enable, | 370 | .txq_agg_enable = iwlagn_txq_agg_enable, |
1511 | .txq_agg_disable = iwl5000_txq_agg_disable, | 371 | .txq_agg_disable = iwlagn_txq_agg_disable, |
1512 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, | 372 | .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, |
1513 | .txq_free_tfd = iwl_hw_txq_free_tfd, | 373 | .txq_free_tfd = iwl_hw_txq_free_tfd, |
1514 | .txq_init = iwl_hw_tx_queue_init, | 374 | .txq_init = iwl_hw_tx_queue_init, |
1515 | .rx_handler_setup = iwl5000_rx_handler_setup, | 375 | .rx_handler_setup = iwlagn_rx_handler_setup, |
1516 | .setup_deferred_work = iwl5000_setup_deferred_work, | 376 | .setup_deferred_work = iwlagn_setup_deferred_work, |
1517 | .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, | 377 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
1518 | .dump_nic_event_log = iwl_dump_nic_event_log, | 378 | .dump_nic_event_log = iwl_dump_nic_event_log, |
1519 | .dump_nic_error_log = iwl_dump_nic_error_log, | 379 | .dump_nic_error_log = iwl_dump_nic_error_log, |
1520 | .dump_csr = iwl_dump_csr, | 380 | .dump_csr = iwl_dump_csr, |
1521 | .load_ucode = iwl5000_load_ucode, | 381 | .load_ucode = iwlagn_load_ucode, |
1522 | .init_alive_start = iwl5000_init_alive_start, | 382 | .init_alive_start = iwlagn_init_alive_start, |
1523 | .alive_notify = iwl5000_alive_notify, | 383 | .alive_notify = iwlagn_alive_notify, |
1524 | .send_tx_power = iwl5000_send_tx_power, | 384 | .send_tx_power = iwlagn_send_tx_power, |
1525 | .update_chain_flags = iwl_update_chain_flags, | 385 | .update_chain_flags = iwl_update_chain_flags, |
1526 | .set_channel_switch = iwl5000_hw_channel_switch, | 386 | .set_channel_switch = iwl5000_hw_channel_switch, |
1527 | .apm_ops = { | 387 | .apm_ops = { |
@@ -1532,19 +392,19 @@ static struct iwl_lib_ops iwl5150_lib = { | |||
1532 | }, | 392 | }, |
1533 | .eeprom_ops = { | 393 | .eeprom_ops = { |
1534 | .regulatory_bands = { | 394 | .regulatory_bands = { |
1535 | EEPROM_5000_REG_BAND_1_CHANNELS, | 395 | EEPROM_REG_BAND_1_CHANNELS, |
1536 | EEPROM_5000_REG_BAND_2_CHANNELS, | 396 | EEPROM_REG_BAND_2_CHANNELS, |
1537 | EEPROM_5000_REG_BAND_3_CHANNELS, | 397 | EEPROM_REG_BAND_3_CHANNELS, |
1538 | EEPROM_5000_REG_BAND_4_CHANNELS, | 398 | EEPROM_REG_BAND_4_CHANNELS, |
1539 | EEPROM_5000_REG_BAND_5_CHANNELS, | 399 | EEPROM_REG_BAND_5_CHANNELS, |
1540 | EEPROM_5000_REG_BAND_24_HT40_CHANNELS, | 400 | EEPROM_REG_BAND_24_HT40_CHANNELS, |
1541 | EEPROM_5000_REG_BAND_52_HT40_CHANNELS | 401 | EEPROM_REG_BAND_52_HT40_CHANNELS |
1542 | }, | 402 | }, |
1543 | .verify_signature = iwlcore_eeprom_verify_signature, | 403 | .verify_signature = iwlcore_eeprom_verify_signature, |
1544 | .acquire_semaphore = iwlcore_eeprom_acquire_semaphore, | 404 | .acquire_semaphore = iwlcore_eeprom_acquire_semaphore, |
1545 | .release_semaphore = iwlcore_eeprom_release_semaphore, | 405 | .release_semaphore = iwlcore_eeprom_release_semaphore, |
1546 | .calib_version = iwl5000_eeprom_calib_version, | 406 | .calib_version = iwlagn_eeprom_calib_version, |
1547 | .query_addr = iwl5000_eeprom_query_addr, | 407 | .query_addr = iwlagn_eeprom_query_addr, |
1548 | }, | 408 | }, |
1549 | .post_associate = iwl_post_associate, | 409 | .post_associate = iwl_post_associate, |
1550 | .isr = iwl_isr_ict, | 410 | .isr = iwl_isr_ict, |
@@ -1553,45 +413,44 @@ static struct iwl_lib_ops iwl5150_lib = { | |||
1553 | .temperature = iwl5150_temperature, | 413 | .temperature = iwl5150_temperature, |
1554 | .set_ct_kill = iwl5150_set_ct_threshold, | 414 | .set_ct_kill = iwl5150_set_ct_threshold, |
1555 | }, | 415 | }, |
1556 | .add_bcast_station = iwl_add_bcast_station, | 416 | .manage_ibss_station = iwlagn_manage_ibss_station, |
417 | .debugfs_ops = { | ||
418 | .rx_stats_read = iwl_ucode_rx_stats_read, | ||
419 | .tx_stats_read = iwl_ucode_tx_stats_read, | ||
420 | .general_stats_read = iwl_ucode_general_stats_read, | ||
421 | }, | ||
422 | .recover_from_tx_stall = iwl_bg_monitor_recover, | ||
423 | .check_plcp_health = iwl_good_plcp_health, | ||
424 | .check_ack_health = iwl_good_ack_health, | ||
1557 | }; | 425 | }; |
1558 | 426 | ||
1559 | static const struct iwl_ops iwl5000_ops = { | 427 | static const struct iwl_ops iwl5000_ops = { |
1560 | .ucode = &iwl5000_ucode, | ||
1561 | .lib = &iwl5000_lib, | 428 | .lib = &iwl5000_lib, |
1562 | .hcmd = &iwl5000_hcmd, | 429 | .hcmd = &iwlagn_hcmd, |
1563 | .utils = &iwl5000_hcmd_utils, | 430 | .utils = &iwlagn_hcmd_utils, |
1564 | .led = &iwlagn_led_ops, | 431 | .led = &iwlagn_led_ops, |
1565 | }; | 432 | }; |
1566 | 433 | ||
1567 | static const struct iwl_ops iwl5150_ops = { | 434 | static const struct iwl_ops iwl5150_ops = { |
1568 | .ucode = &iwl5000_ucode, | ||
1569 | .lib = &iwl5150_lib, | 435 | .lib = &iwl5150_lib, |
1570 | .hcmd = &iwl5000_hcmd, | 436 | .hcmd = &iwlagn_hcmd, |
1571 | .utils = &iwl5000_hcmd_utils, | 437 | .utils = &iwlagn_hcmd_utils, |
1572 | .led = &iwlagn_led_ops, | 438 | .led = &iwlagn_led_ops, |
1573 | }; | 439 | }; |
1574 | 440 | ||
1575 | struct iwl_mod_params iwl50_mod_params = { | ||
1576 | .amsdu_size_8K = 1, | ||
1577 | .restart_fw = 1, | ||
1578 | /* the rest are 0 by default */ | ||
1579 | }; | ||
1580 | |||
1581 | |||
1582 | struct iwl_cfg iwl5300_agn_cfg = { | 441 | struct iwl_cfg iwl5300_agn_cfg = { |
1583 | .name = "5300AGN", | 442 | .name = "Intel(R) Ultimate N WiFi Link 5300 AGN", |
1584 | .fw_name_pre = IWL5000_FW_PRE, | 443 | .fw_name_pre = IWL5000_FW_PRE, |
1585 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 444 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1586 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 445 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1587 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 446 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
1588 | .ops = &iwl5000_ops, | 447 | .ops = &iwl5000_ops, |
1589 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 448 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1590 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, | 449 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, |
1591 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 450 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
1592 | .num_of_queues = IWL50_NUM_QUEUES, | 451 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1593 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 452 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1594 | .mod_params = &iwl50_mod_params, | 453 | .mod_params = &iwlagn_mod_params, |
1595 | .valid_tx_ant = ANT_ABC, | 454 | .valid_tx_ant = ANT_ABC, |
1596 | .valid_rx_ant = ANT_ABC, | 455 | .valid_rx_ant = ANT_ABC, |
1597 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 456 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1603,21 +462,26 @@ struct iwl_cfg iwl5300_agn_cfg = { | |||
1603 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 462 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1604 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 463 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1605 | .chain_noise_scale = 1000, | 464 | .chain_noise_scale = 1000, |
465 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
466 | .max_event_log_size = 512, | ||
467 | .ucode_tracing = true, | ||
468 | .sensitivity_calib_by_driver = true, | ||
469 | .chain_noise_calib_by_driver = true, | ||
1606 | }; | 470 | }; |
1607 | 471 | ||
1608 | struct iwl_cfg iwl5100_bgn_cfg = { | 472 | struct iwl_cfg iwl5100_bgn_cfg = { |
1609 | .name = "5100BGN", | 473 | .name = "Intel(R) WiFi Link 5100 BGN", |
1610 | .fw_name_pre = IWL5000_FW_PRE, | 474 | .fw_name_pre = IWL5000_FW_PRE, |
1611 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 475 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1612 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 476 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1613 | .sku = IWL_SKU_G|IWL_SKU_N, | 477 | .sku = IWL_SKU_G|IWL_SKU_N, |
1614 | .ops = &iwl5000_ops, | 478 | .ops = &iwl5000_ops, |
1615 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 479 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1616 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, | 480 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, |
1617 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 481 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
1618 | .num_of_queues = IWL50_NUM_QUEUES, | 482 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1619 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 483 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1620 | .mod_params = &iwl50_mod_params, | 484 | .mod_params = &iwlagn_mod_params, |
1621 | .valid_tx_ant = ANT_B, | 485 | .valid_tx_ant = ANT_B, |
1622 | .valid_rx_ant = ANT_AB, | 486 | .valid_rx_ant = ANT_AB, |
1623 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 487 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1629,21 +493,26 @@ struct iwl_cfg iwl5100_bgn_cfg = { | |||
1629 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 493 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1630 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 494 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1631 | .chain_noise_scale = 1000, | 495 | .chain_noise_scale = 1000, |
496 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
497 | .max_event_log_size = 512, | ||
498 | .ucode_tracing = true, | ||
499 | .sensitivity_calib_by_driver = true, | ||
500 | .chain_noise_calib_by_driver = true, | ||
1632 | }; | 501 | }; |
1633 | 502 | ||
1634 | struct iwl_cfg iwl5100_abg_cfg = { | 503 | struct iwl_cfg iwl5100_abg_cfg = { |
1635 | .name = "5100ABG", | 504 | .name = "Intel(R) WiFi Link 5100 ABG", |
1636 | .fw_name_pre = IWL5000_FW_PRE, | 505 | .fw_name_pre = IWL5000_FW_PRE, |
1637 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 506 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1638 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 507 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1639 | .sku = IWL_SKU_A|IWL_SKU_G, | 508 | .sku = IWL_SKU_A|IWL_SKU_G, |
1640 | .ops = &iwl5000_ops, | 509 | .ops = &iwl5000_ops, |
1641 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 510 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1642 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, | 511 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, |
1643 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 512 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
1644 | .num_of_queues = IWL50_NUM_QUEUES, | 513 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1645 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 514 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1646 | .mod_params = &iwl50_mod_params, | 515 | .mod_params = &iwlagn_mod_params, |
1647 | .valid_tx_ant = ANT_B, | 516 | .valid_tx_ant = ANT_B, |
1648 | .valid_rx_ant = ANT_AB, | 517 | .valid_rx_ant = ANT_AB, |
1649 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 518 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1653,21 +522,26 @@ struct iwl_cfg iwl5100_abg_cfg = { | |||
1653 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 522 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1654 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 523 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1655 | .chain_noise_scale = 1000, | 524 | .chain_noise_scale = 1000, |
525 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
526 | .max_event_log_size = 512, | ||
527 | .ucode_tracing = true, | ||
528 | .sensitivity_calib_by_driver = true, | ||
529 | .chain_noise_calib_by_driver = true, | ||
1656 | }; | 530 | }; |
1657 | 531 | ||
1658 | struct iwl_cfg iwl5100_agn_cfg = { | 532 | struct iwl_cfg iwl5100_agn_cfg = { |
1659 | .name = "5100AGN", | 533 | .name = "Intel(R) WiFi Link 5100 AGN", |
1660 | .fw_name_pre = IWL5000_FW_PRE, | 534 | .fw_name_pre = IWL5000_FW_PRE, |
1661 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 535 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1662 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 536 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1663 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 537 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
1664 | .ops = &iwl5000_ops, | 538 | .ops = &iwl5000_ops, |
1665 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 539 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1666 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, | 540 | .eeprom_ver = EEPROM_5000_EEPROM_VERSION, |
1667 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, | 541 | .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, |
1668 | .num_of_queues = IWL50_NUM_QUEUES, | 542 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1669 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 543 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1670 | .mod_params = &iwl50_mod_params, | 544 | .mod_params = &iwlagn_mod_params, |
1671 | .valid_tx_ant = ANT_B, | 545 | .valid_tx_ant = ANT_B, |
1672 | .valid_rx_ant = ANT_AB, | 546 | .valid_rx_ant = ANT_AB, |
1673 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 547 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1679,21 +553,26 @@ struct iwl_cfg iwl5100_agn_cfg = { | |||
1679 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 553 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1680 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 554 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1681 | .chain_noise_scale = 1000, | 555 | .chain_noise_scale = 1000, |
556 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
557 | .max_event_log_size = 512, | ||
558 | .ucode_tracing = true, | ||
559 | .sensitivity_calib_by_driver = true, | ||
560 | .chain_noise_calib_by_driver = true, | ||
1682 | }; | 561 | }; |
1683 | 562 | ||
1684 | struct iwl_cfg iwl5350_agn_cfg = { | 563 | struct iwl_cfg iwl5350_agn_cfg = { |
1685 | .name = "5350AGN", | 564 | .name = "Intel(R) WiMAX/WiFi Link 5350 AGN", |
1686 | .fw_name_pre = IWL5000_FW_PRE, | 565 | .fw_name_pre = IWL5000_FW_PRE, |
1687 | .ucode_api_max = IWL5000_UCODE_API_MAX, | 566 | .ucode_api_max = IWL5000_UCODE_API_MAX, |
1688 | .ucode_api_min = IWL5000_UCODE_API_MIN, | 567 | .ucode_api_min = IWL5000_UCODE_API_MIN, |
1689 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 568 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
1690 | .ops = &iwl5000_ops, | 569 | .ops = &iwl5000_ops, |
1691 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 570 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1692 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, | 571 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, |
1693 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 572 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
1694 | .num_of_queues = IWL50_NUM_QUEUES, | 573 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1695 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 574 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1696 | .mod_params = &iwl50_mod_params, | 575 | .mod_params = &iwlagn_mod_params, |
1697 | .valid_tx_ant = ANT_ABC, | 576 | .valid_tx_ant = ANT_ABC, |
1698 | .valid_rx_ant = ANT_ABC, | 577 | .valid_rx_ant = ANT_ABC, |
1699 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 578 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1705,21 +584,26 @@ struct iwl_cfg iwl5350_agn_cfg = { | |||
1705 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 584 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1706 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 585 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1707 | .chain_noise_scale = 1000, | 586 | .chain_noise_scale = 1000, |
587 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
588 | .max_event_log_size = 512, | ||
589 | .ucode_tracing = true, | ||
590 | .sensitivity_calib_by_driver = true, | ||
591 | .chain_noise_calib_by_driver = true, | ||
1708 | }; | 592 | }; |
1709 | 593 | ||
1710 | struct iwl_cfg iwl5150_agn_cfg = { | 594 | struct iwl_cfg iwl5150_agn_cfg = { |
1711 | .name = "5150AGN", | 595 | .name = "Intel(R) WiMAX/WiFi Link 5150 AGN", |
1712 | .fw_name_pre = IWL5150_FW_PRE, | 596 | .fw_name_pre = IWL5150_FW_PRE, |
1713 | .ucode_api_max = IWL5150_UCODE_API_MAX, | 597 | .ucode_api_max = IWL5150_UCODE_API_MAX, |
1714 | .ucode_api_min = IWL5150_UCODE_API_MIN, | 598 | .ucode_api_min = IWL5150_UCODE_API_MIN, |
1715 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 599 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
1716 | .ops = &iwl5150_ops, | 600 | .ops = &iwl5150_ops, |
1717 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 601 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1718 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, | 602 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, |
1719 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 603 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
1720 | .num_of_queues = IWL50_NUM_QUEUES, | 604 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1721 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 605 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1722 | .mod_params = &iwl50_mod_params, | 606 | .mod_params = &iwlagn_mod_params, |
1723 | .valid_tx_ant = ANT_A, | 607 | .valid_tx_ant = ANT_A, |
1724 | .valid_rx_ant = ANT_AB, | 608 | .valid_rx_ant = ANT_AB, |
1725 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 609 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1731,21 +615,26 @@ struct iwl_cfg iwl5150_agn_cfg = { | |||
1731 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 615 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1732 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 616 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1733 | .chain_noise_scale = 1000, | 617 | .chain_noise_scale = 1000, |
618 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
619 | .max_event_log_size = 512, | ||
620 | .ucode_tracing = true, | ||
621 | .sensitivity_calib_by_driver = true, | ||
622 | .chain_noise_calib_by_driver = true, | ||
1734 | }; | 623 | }; |
1735 | 624 | ||
1736 | struct iwl_cfg iwl5150_abg_cfg = { | 625 | struct iwl_cfg iwl5150_abg_cfg = { |
1737 | .name = "5150ABG", | 626 | .name = "Intel(R) WiMAX/WiFi Link 5150 ABG", |
1738 | .fw_name_pre = IWL5150_FW_PRE, | 627 | .fw_name_pre = IWL5150_FW_PRE, |
1739 | .ucode_api_max = IWL5150_UCODE_API_MAX, | 628 | .ucode_api_max = IWL5150_UCODE_API_MAX, |
1740 | .ucode_api_min = IWL5150_UCODE_API_MIN, | 629 | .ucode_api_min = IWL5150_UCODE_API_MIN, |
1741 | .sku = IWL_SKU_A|IWL_SKU_G, | 630 | .sku = IWL_SKU_A|IWL_SKU_G, |
1742 | .ops = &iwl5150_ops, | 631 | .ops = &iwl5150_ops, |
1743 | .eeprom_size = IWL_5000_EEPROM_IMG_SIZE, | 632 | .eeprom_size = IWLAGN_EEPROM_IMG_SIZE, |
1744 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, | 633 | .eeprom_ver = EEPROM_5050_EEPROM_VERSION, |
1745 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, | 634 | .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, |
1746 | .num_of_queues = IWL50_NUM_QUEUES, | 635 | .num_of_queues = IWLAGN_NUM_QUEUES, |
1747 | .num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES, | 636 | .num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES, |
1748 | .mod_params = &iwl50_mod_params, | 637 | .mod_params = &iwlagn_mod_params, |
1749 | .valid_tx_ant = ANT_A, | 638 | .valid_tx_ant = ANT_A, |
1750 | .valid_rx_ant = ANT_AB, | 639 | .valid_rx_ant = ANT_AB, |
1751 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, | 640 | .pll_cfg_val = CSR50_ANA_PLL_CFG_VAL, |
@@ -1755,20 +644,12 @@ struct iwl_cfg iwl5150_abg_cfg = { | |||
1755 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, | 644 | .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, |
1756 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 645 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
1757 | .chain_noise_scale = 1000, | 646 | .chain_noise_scale = 1000, |
647 | .monitor_recover_period = IWL_MONITORING_PERIOD, | ||
648 | .max_event_log_size = 512, | ||
649 | .ucode_tracing = true, | ||
650 | .sensitivity_calib_by_driver = true, | ||
651 | .chain_noise_calib_by_driver = true, | ||
1758 | }; | 652 | }; |
1759 | 653 | ||
1760 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); | 654 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); |
1761 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); | 655 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); |
1762 | |||
1763 | module_param_named(swcrypto50, iwl50_mod_params.sw_crypto, bool, S_IRUGO); | ||
1764 | MODULE_PARM_DESC(swcrypto50, | ||
1765 | "using software crypto engine (default 0 [hardware])\n"); | ||
1766 | module_param_named(queues_num50, iwl50_mod_params.num_of_queues, int, S_IRUGO); | ||
1767 | MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); | ||
1768 | module_param_named(11n_disable50, iwl50_mod_params.disable_11n, int, S_IRUGO); | ||
1769 | MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); | ||
1770 | module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, | ||
1771 | int, S_IRUGO); | ||
1772 | MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); | ||
1773 | module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, S_IRUGO); | ||
1774 | MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); | ||