diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-3945.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c index 628adf59ce7b..a1e2a4218968 100644 --- a/drivers/net/wireless/iwlegacy/iwl-3945.c +++ b/drivers/net/wireless/iwlegacy/iwl-3945.c | |||
@@ -174,7 +174,7 @@ void il3945_disable_events(struct il_priv *il) | |||
174 | array_size = il_read_targ_mem(il, base + (5 * sizeof(u32))); | 174 | array_size = il_read_targ_mem(il, base + (5 * sizeof(u32))); |
175 | 175 | ||
176 | if (IL_EVT_DISABLE && (array_size == IL_EVT_DISABLE_SIZE)) { | 176 | if (IL_EVT_DISABLE && (array_size == IL_EVT_DISABLE_SIZE)) { |
177 | IL_DEBUG_INFO(il, "Disabling selected uCode log events at 0x%x\n", | 177 | D_INFO("Disabling selected uCode log events at 0x%x\n", |
178 | disable_ptr); | 178 | disable_ptr); |
179 | for (i = 0; i < IL_EVT_DISABLE_SIZE; i++) | 179 | for (i = 0; i < IL_EVT_DISABLE_SIZE; i++) |
180 | il_write_targ_mem(il, | 180 | il_write_targ_mem(il, |
@@ -182,9 +182,9 @@ void il3945_disable_events(struct il_priv *il) | |||
182 | evt_disable[i]); | 182 | evt_disable[i]); |
183 | 183 | ||
184 | } else { | 184 | } else { |
185 | IL_DEBUG_INFO(il, "Selected uCode log events may be disabled\n"); | 185 | D_INFO("Selected uCode log events may be disabled\n"); |
186 | IL_DEBUG_INFO(il, " by writing \"1\"s into disable bitmap\n"); | 186 | D_INFO(" by writing \"1\"s into disable bitmap\n"); |
187 | IL_DEBUG_INFO(il, " in SRAM at 0x%x, size %d u32s\n", | 187 | D_INFO(" in SRAM at 0x%x, size %d u32s\n", |
188 | disable_ptr, array_size); | 188 | disable_ptr, array_size); |
189 | } | 189 | } |
190 | 190 | ||
@@ -342,11 +342,11 @@ static void il3945_rx_reply_tx(struct il_priv *il, | |||
342 | info->flags |= ((status & TX_STATUS_MSK) == TX_STATUS_SUCCESS) ? | 342 | info->flags |= ((status & TX_STATUS_MSK) == TX_STATUS_SUCCESS) ? |
343 | IEEE80211_TX_STAT_ACK : 0; | 343 | IEEE80211_TX_STAT_ACK : 0; |
344 | 344 | ||
345 | IL_DEBUG_TX(il, "Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n", | 345 | D_TX("Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n", |
346 | txq_id, il3945_get_tx_fail_reason(status), status, | 346 | txq_id, il3945_get_tx_fail_reason(status), status, |
347 | tx_resp->rate, tx_resp->failure_frame); | 347 | tx_resp->rate, tx_resp->failure_frame); |
348 | 348 | ||
349 | IL_DEBUG_TX_REPLY(il, "Tx queue reclaim %d\n", index); | 349 | D_TX_REPLY("Tx queue reclaim %d\n", index); |
350 | il3945_tx_queue_reclaim(il, txq_id, index); | 350 | il3945_tx_queue_reclaim(il, txq_id, index); |
351 | 351 | ||
352 | if (status & TX_ABORT_REQUIRED_MSK) | 352 | if (status & TX_ABORT_REQUIRED_MSK) |
@@ -401,7 +401,7 @@ void il3945_hw_rx_statistics(struct il_priv *il, | |||
401 | { | 401 | { |
402 | struct il_rx_packet *pkt = rxb_addr(rxb); | 402 | struct il_rx_packet *pkt = rxb_addr(rxb); |
403 | 403 | ||
404 | IL_DEBUG_RX(il, "Statistics notification received (%d vs %d).\n", | 404 | D_RX("Statistics notification received (%d vs %d).\n", |
405 | (int)sizeof(struct il3945_notif_statistics), | 405 | (int)sizeof(struct il3945_notif_statistics), |
406 | le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); | 406 | le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); |
407 | #ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS | 407 | #ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS |
@@ -426,7 +426,7 @@ void il3945_reply_statistics(struct il_priv *il, | |||
426 | memset(&il->_3945.max_delta, 0, | 426 | memset(&il->_3945.max_delta, 0, |
427 | sizeof(struct il3945_notif_statistics)); | 427 | sizeof(struct il3945_notif_statistics)); |
428 | #endif | 428 | #endif |
429 | IL_DEBUG_RX(il, "Statistics have been cleared\n"); | 429 | D_RX("Statistics have been cleared\n"); |
430 | } | 430 | } |
431 | il3945_hw_rx_statistics(il, rxb); | 431 | il3945_hw_rx_statistics(il, rxb); |
432 | } | 432 | } |
@@ -471,13 +471,13 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il, | |||
471 | /* We received data from the HW, so stop the watchdog */ | 471 | /* We received data from the HW, so stop the watchdog */ |
472 | if (unlikely(len + IWL39_RX_FRAME_SIZE > | 472 | if (unlikely(len + IWL39_RX_FRAME_SIZE > |
473 | PAGE_SIZE << il->hw_params.rx_page_order)) { | 473 | PAGE_SIZE << il->hw_params.rx_page_order)) { |
474 | IL_DEBUG_DROP(il, "Corruption detected!\n"); | 474 | D_DROP("Corruption detected!\n"); |
475 | return; | 475 | return; |
476 | } | 476 | } |
477 | 477 | ||
478 | /* We only process data packets if the interface is open */ | 478 | /* We only process data packets if the interface is open */ |
479 | if (unlikely(!il->is_open)) { | 479 | if (unlikely(!il->is_open)) { |
480 | IL_DEBUG_DROP(il, | 480 | D_DROP( |
481 | "Dropping packet while interface is not open.\n"); | 481 | "Dropping packet while interface is not open.\n"); |
482 | return; | 482 | return; |
483 | } | 483 | } |
@@ -539,14 +539,14 @@ static void il3945_rx_reply_rx(struct il_priv *il, | |||
539 | rx_status.flag |= RX_FLAG_SHORTPRE; | 539 | rx_status.flag |= RX_FLAG_SHORTPRE; |
540 | 540 | ||
541 | if ((unlikely(rx_stats->phy_count > 20))) { | 541 | if ((unlikely(rx_stats->phy_count > 20))) { |
542 | IL_DEBUG_DROP(il, "dsp size out of range [0,20]: %d/n", | 542 | D_DROP("dsp size out of range [0,20]: %d/n", |
543 | rx_stats->phy_count); | 543 | rx_stats->phy_count); |
544 | return; | 544 | return; |
545 | } | 545 | } |
546 | 546 | ||
547 | if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR) | 547 | if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR) |
548 | || !(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) { | 548 | || !(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) { |
549 | IL_DEBUG_RX(il, "Bad CRC or FIFO: 0x%08X.\n", rx_end->status); | 549 | D_RX("Bad CRC or FIFO: 0x%08X.\n", rx_end->status); |
550 | return; | 550 | return; |
551 | } | 551 | } |
552 | 552 | ||
@@ -555,7 +555,7 @@ static void il3945_rx_reply_rx(struct il_priv *il, | |||
555 | /* Convert 3945's rssi indicator to dBm */ | 555 | /* Convert 3945's rssi indicator to dBm */ |
556 | rx_status.signal = rx_stats->rssi - IWL39_RSSI_OFFSET; | 556 | rx_status.signal = rx_stats->rssi - IWL39_RSSI_OFFSET; |
557 | 557 | ||
558 | IL_DEBUG_STATS(il, "Rssi %d sig_avg %d noise_diff %d\n", | 558 | D_STATS("Rssi %d sig_avg %d noise_diff %d\n", |
559 | rx_status.signal, rx_stats_sig_avg, | 559 | rx_status.signal, rx_stats_sig_avg, |
560 | rx_stats_noise_diff); | 560 | rx_stats_noise_diff); |
561 | 561 | ||
@@ -563,7 +563,7 @@ static void il3945_rx_reply_rx(struct il_priv *il, | |||
563 | 563 | ||
564 | network_packet = il3945_is_network_packet(il, header); | 564 | network_packet = il3945_is_network_packet(il, header); |
565 | 565 | ||
566 | IL_DEBUG_STATS(il, "[%c] %d RSSI:%d Signal:%u, Rate:%u\n", | 566 | D_STATS("[%c] %d RSSI:%d Signal:%u, Rate:%u\n", |
567 | network_packet ? '*' : ' ', | 567 | network_packet ? '*' : ' ', |
568 | le16_to_cpu(rx_hdr->channel), | 568 | le16_to_cpu(rx_hdr->channel), |
569 | rx_status.signal, rx_status.signal, | 569 | rx_status.signal, rx_status.signal, |
@@ -718,7 +718,7 @@ void il3945_hw_build_tx_cmd_rate(struct il_priv *il, | |||
718 | /* CCK */ | 718 | /* CCK */ |
719 | tx_cmd->supp_rates[1] = (rate_mask & 0xF); | 719 | tx_cmd->supp_rates[1] = (rate_mask & 0xF); |
720 | 720 | ||
721 | IL_DEBUG_RATE(il, "Tx sta id: %d, rate: %d (plcp), flags: 0x%4X " | 721 | D_RATE("Tx sta id: %d, rate: %d (plcp), flags: 0x%4X " |
722 | "cck/ofdm mask: 0x%x/0x%x\n", sta_id, | 722 | "cck/ofdm mask: 0x%x/0x%x\n", sta_id, |
723 | tx_cmd->rate, le32_to_cpu(tx_cmd->tx_flags), | 723 | tx_cmd->rate, le32_to_cpu(tx_cmd->tx_flags), |
724 | tx_cmd->supp_rates[1], tx_cmd->supp_rates[0]); | 724 | tx_cmd->supp_rates[1], tx_cmd->supp_rates[0]); |
@@ -741,7 +741,7 @@ static u8 il3945_sync_sta(struct il_priv *il, int sta_id, u16 tx_rate) | |||
741 | il_send_add_sta(il, &station->sta, CMD_ASYNC); | 741 | il_send_add_sta(il, &station->sta, CMD_ASYNC); |
742 | spin_unlock_irqrestore(&il->sta_lock, flags_spin); | 742 | spin_unlock_irqrestore(&il->sta_lock, flags_spin); |
743 | 743 | ||
744 | IL_DEBUG_RATE(il, "SCALE sync station %d to rate %d\n", | 744 | D_RATE("SCALE sync station %d to rate %d\n", |
745 | sta_id, tx_rate); | 745 | sta_id, tx_rate); |
746 | return sta_id; | 746 | return sta_id; |
747 | } | 747 | } |
@@ -900,34 +900,34 @@ static void il3945_nic_config(struct il_priv *il) | |||
900 | spin_lock_irqsave(&il->lock, flags); | 900 | spin_lock_irqsave(&il->lock, flags); |
901 | 901 | ||
902 | /* Determine HW type */ | 902 | /* Determine HW type */ |
903 | IL_DEBUG_INFO(il, "HW Revision ID = 0x%X\n", rev_id); | 903 | D_INFO("HW Revision ID = 0x%X\n", rev_id); |
904 | 904 | ||
905 | if (rev_id & PCI_CFG_REV_ID_BIT_RTP) | 905 | if (rev_id & PCI_CFG_REV_ID_BIT_RTP) |
906 | IL_DEBUG_INFO(il, "RTP type\n"); | 906 | D_INFO("RTP type\n"); |
907 | else if (rev_id & PCI_CFG_REV_ID_BIT_BASIC_SKU) { | 907 | else if (rev_id & PCI_CFG_REV_ID_BIT_BASIC_SKU) { |
908 | IL_DEBUG_INFO(il, "3945 RADIO-MB type\n"); | 908 | D_INFO("3945 RADIO-MB type\n"); |
909 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 909 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
910 | CSR39_HW_IF_CONFIG_REG_BIT_3945_MB); | 910 | CSR39_HW_IF_CONFIG_REG_BIT_3945_MB); |
911 | } else { | 911 | } else { |
912 | IL_DEBUG_INFO(il, "3945 RADIO-MM type\n"); | 912 | D_INFO("3945 RADIO-MM type\n"); |
913 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 913 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
914 | CSR39_HW_IF_CONFIG_REG_BIT_3945_MM); | 914 | CSR39_HW_IF_CONFIG_REG_BIT_3945_MM); |
915 | } | 915 | } |
916 | 916 | ||
917 | if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom->sku_cap) { | 917 | if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom->sku_cap) { |
918 | IL_DEBUG_INFO(il, "SKU OP mode is mrc\n"); | 918 | D_INFO("SKU OP mode is mrc\n"); |
919 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 919 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
920 | CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC); | 920 | CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC); |
921 | } else | 921 | } else |
922 | IL_DEBUG_INFO(il, "SKU OP mode is basic\n"); | 922 | D_INFO("SKU OP mode is basic\n"); |
923 | 923 | ||
924 | if ((eeprom->board_revision & 0xF0) == 0xD0) { | 924 | if ((eeprom->board_revision & 0xF0) == 0xD0) { |
925 | IL_DEBUG_INFO(il, "3945ABG revision is 0x%X\n", | 925 | D_INFO("3945ABG revision is 0x%X\n", |
926 | eeprom->board_revision); | 926 | eeprom->board_revision); |
927 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 927 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
928 | CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE); | 928 | CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE); |
929 | } else { | 929 | } else { |
930 | IL_DEBUG_INFO(il, "3945ABG revision is 0x%X\n", | 930 | D_INFO("3945ABG revision is 0x%X\n", |
931 | eeprom->board_revision); | 931 | eeprom->board_revision); |
932 | il_clear_bit(il, CSR_HW_IF_CONFIG_REG, | 932 | il_clear_bit(il, CSR_HW_IF_CONFIG_REG, |
933 | CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE); | 933 | CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE); |
@@ -936,10 +936,10 @@ static void il3945_nic_config(struct il_priv *il) | |||
936 | if (eeprom->almgor_m_version <= 1) { | 936 | if (eeprom->almgor_m_version <= 1) { |
937 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 937 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
938 | CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A); | 938 | CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A); |
939 | IL_DEBUG_INFO(il, "Card M type A version is 0x%X\n", | 939 | D_INFO("Card M type A version is 0x%X\n", |
940 | eeprom->almgor_m_version); | 940 | eeprom->almgor_m_version); |
941 | } else { | 941 | } else { |
942 | IL_DEBUG_INFO(il, "Card M type B version is 0x%X\n", | 942 | D_INFO("Card M type B version is 0x%X\n", |
943 | eeprom->almgor_m_version); | 943 | eeprom->almgor_m_version); |
944 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, | 944 | il_set_bit(il, CSR_HW_IF_CONFIG_REG, |
945 | CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B); | 945 | CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B); |
@@ -947,10 +947,10 @@ static void il3945_nic_config(struct il_priv *il) | |||
947 | spin_unlock_irqrestore(&il->lock, flags); | 947 | spin_unlock_irqrestore(&il->lock, flags); |
948 | 948 | ||
949 | if (eeprom->sku_cap & EEPROM_SKU_CAP_SW_RF_KILL_ENABLE) | 949 | if (eeprom->sku_cap & EEPROM_SKU_CAP_SW_RF_KILL_ENABLE) |
950 | IL_DEBUG_RF_KILL(il, "SW RF KILL supported in EEPROM.\n"); | 950 | D_RF_KILL("SW RF KILL supported in EEPROM.\n"); |
951 | 951 | ||
952 | if (eeprom->sku_cap & EEPROM_SKU_CAP_HW_RF_KILL_ENABLE) | 952 | if (eeprom->sku_cap & EEPROM_SKU_CAP_HW_RF_KILL_ENABLE) |
953 | IL_DEBUG_RF_KILL(il, "HW RF KILL supported in EEPROM.\n"); | 953 | D_RF_KILL("HW RF KILL supported in EEPROM.\n"); |
954 | } | 954 | } |
955 | 955 | ||
956 | int il3945_hw_nic_init(struct il_priv *il) | 956 | int il3945_hw_nic_init(struct il_priv *il) |
@@ -1074,7 +1074,7 @@ static int il3945_hw_reg_txpower_get_temperature(struct il_priv *il) | |||
1074 | 1074 | ||
1075 | /* driver's okay range is -260 to +25. | 1075 | /* driver's okay range is -260 to +25. |
1076 | * human readable okay range is 0 to +285 */ | 1076 | * human readable okay range is 0 to +285 */ |
1077 | IL_DEBUG_INFO(il, "Temperature: %d\n", temperature + IL_TEMP_CONVERT); | 1077 | D_INFO("Temperature: %d\n", temperature + IL_TEMP_CONVERT); |
1078 | 1078 | ||
1079 | /* handle insane temp reading */ | 1079 | /* handle insane temp reading */ |
1080 | if (il3945_hw_reg_temp_out_of_range(temperature)) { | 1080 | if (il3945_hw_reg_temp_out_of_range(temperature)) { |
@@ -1111,20 +1111,20 @@ static int il3945_is_temp_calib_needed(struct il_priv *il) | |||
1111 | 1111 | ||
1112 | /* get absolute value */ | 1112 | /* get absolute value */ |
1113 | if (temp_diff < 0) { | 1113 | if (temp_diff < 0) { |
1114 | IL_DEBUG_POWER(il, "Getting cooler, delta %d,\n", temp_diff); | 1114 | D_POWER("Getting cooler, delta %d,\n", temp_diff); |
1115 | temp_diff = -temp_diff; | 1115 | temp_diff = -temp_diff; |
1116 | } else if (temp_diff == 0) | 1116 | } else if (temp_diff == 0) |
1117 | IL_DEBUG_POWER(il, "Same temp,\n"); | 1117 | D_POWER("Same temp,\n"); |
1118 | else | 1118 | else |
1119 | IL_DEBUG_POWER(il, "Getting warmer, delta %d,\n", temp_diff); | 1119 | D_POWER("Getting warmer, delta %d,\n", temp_diff); |
1120 | 1120 | ||
1121 | /* if we don't need calibration, *don't* update last_temperature */ | 1121 | /* if we don't need calibration, *don't* update last_temperature */ |
1122 | if (temp_diff < IL_TEMPERATURE_LIMIT_TIMER) { | 1122 | if (temp_diff < IL_TEMPERATURE_LIMIT_TIMER) { |
1123 | IL_DEBUG_POWER(il, "Timed thermal calib not needed\n"); | 1123 | D_POWER("Timed thermal calib not needed\n"); |
1124 | return 0; | 1124 | return 0; |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | IL_DEBUG_POWER(il, "Timed thermal calib needed\n"); | 1127 | D_POWER("Timed thermal calib needed\n"); |
1128 | 1128 | ||
1129 | /* assume that caller will actually do calib ... | 1129 | /* assume that caller will actually do calib ... |
1130 | * update the "last temperature" value */ | 1130 | * update the "last temperature" value */ |
@@ -1395,7 +1395,7 @@ static int il3945_send_tx_power(struct il_priv *il) | |||
1395 | } | 1395 | } |
1396 | 1396 | ||
1397 | if (!il_is_channel_valid(ch_info)) { | 1397 | if (!il_is_channel_valid(ch_info)) { |
1398 | IL_DEBUG_POWER(il, "Not calling TX_PWR_TABLE_CMD on " | 1398 | D_POWER("Not calling TX_PWR_TABLE_CMD on " |
1399 | "non-Tx channel.\n"); | 1399 | "non-Tx channel.\n"); |
1400 | return 0; | 1400 | return 0; |
1401 | } | 1401 | } |
@@ -1408,7 +1408,7 @@ static int il3945_send_tx_power(struct il_priv *il) | |||
1408 | txpower.power[i].tpc = ch_info->power_info[i].tpc; | 1408 | txpower.power[i].tpc = ch_info->power_info[i].tpc; |
1409 | txpower.power[i].rate = il3945_rates[rate_idx].plcp; | 1409 | txpower.power[i].rate = il3945_rates[rate_idx].plcp; |
1410 | 1410 | ||
1411 | IL_DEBUG_POWER(il, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n", | 1411 | D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n", |
1412 | le16_to_cpu(txpower.channel), | 1412 | le16_to_cpu(txpower.channel), |
1413 | txpower.band, | 1413 | txpower.band, |
1414 | txpower.power[i].tpc.tx_gain, | 1414 | txpower.power[i].tpc.tx_gain, |
@@ -1421,7 +1421,7 @@ static int il3945_send_tx_power(struct il_priv *il) | |||
1421 | txpower.power[i].tpc = ch_info->power_info[i].tpc; | 1421 | txpower.power[i].tpc = ch_info->power_info[i].tpc; |
1422 | txpower.power[i].rate = il3945_rates[rate_idx].plcp; | 1422 | txpower.power[i].rate = il3945_rates[rate_idx].plcp; |
1423 | 1423 | ||
1424 | IL_DEBUG_POWER(il, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n", | 1424 | D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n", |
1425 | le16_to_cpu(txpower.channel), | 1425 | le16_to_cpu(txpower.channel), |
1426 | txpower.band, | 1426 | txpower.band, |
1427 | txpower.power[i].tpc.tx_gain, | 1427 | txpower.power[i].tpc.tx_gain, |
@@ -1617,12 +1617,12 @@ int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power) | |||
1617 | u8 i; | 1617 | u8 i; |
1618 | 1618 | ||
1619 | if (il->tx_power_user_lmt == power) { | 1619 | if (il->tx_power_user_lmt == power) { |
1620 | IL_DEBUG_POWER(il, "Requested Tx power same as current " | 1620 | D_POWER("Requested Tx power same as current " |
1621 | "limit: %ddBm.\n", power); | 1621 | "limit: %ddBm.\n", power); |
1622 | return 0; | 1622 | return 0; |
1623 | } | 1623 | } |
1624 | 1624 | ||
1625 | IL_DEBUG_POWER(il, "Setting upper limit clamp to %ddBm.\n", power); | 1625 | D_POWER("Setting upper limit clamp to %ddBm.\n", power); |
1626 | il->tx_power_user_lmt = power; | 1626 | il->tx_power_user_lmt = power; |
1627 | 1627 | ||
1628 | /* set up new Tx powers for each and every channel, 2.4 and 5.x */ | 1628 | /* set up new Tx powers for each and every channel, 2.4 and 5.x */ |
@@ -1670,7 +1670,7 @@ static int il3945_send_rxon_assoc(struct il_priv *il, | |||
1670 | (rxon1->filter_flags == rxon2->filter_flags) && | 1670 | (rxon1->filter_flags == rxon2->filter_flags) && |
1671 | (rxon1->cck_basic_rates == rxon2->cck_basic_rates) && | 1671 | (rxon1->cck_basic_rates == rxon2->cck_basic_rates) && |
1672 | (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) { | 1672 | (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) { |
1673 | IL_DEBUG_INFO(il, "Using current RXON_ASSOC. Not resending.\n"); | 1673 | D_INFO("Using current RXON_ASSOC. Not resending.\n"); |
1674 | return 0; | 1674 | return 0; |
1675 | } | 1675 | } |
1676 | 1676 | ||
@@ -1758,7 +1758,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) | |||
1758 | * we must clear the associated from the active configuration | 1758 | * we must clear the associated from the active configuration |
1759 | * before we apply the new config */ | 1759 | * before we apply the new config */ |
1760 | if (il_is_associated(il, IL_RXON_CTX_BSS) && new_assoc) { | 1760 | if (il_is_associated(il, IL_RXON_CTX_BSS) && new_assoc) { |
1761 | IL_DEBUG_INFO(il, "Toggling associated bit on current RXON\n"); | 1761 | D_INFO("Toggling associated bit on current RXON\n"); |
1762 | active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; | 1762 | active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; |
1763 | 1763 | ||
1764 | /* | 1764 | /* |
@@ -1785,7 +1785,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) | |||
1785 | &il->contexts[IL_RXON_CTX_BSS]); | 1785 | &il->contexts[IL_RXON_CTX_BSS]); |
1786 | } | 1786 | } |
1787 | 1787 | ||
1788 | IL_DEBUG_INFO(il, "Sending RXON\n" | 1788 | D_INFO("Sending RXON\n" |
1789 | "* with%s RXON_FILTER_ASSOC_MSK\n" | 1789 | "* with%s RXON_FILTER_ASSOC_MSK\n" |
1790 | "* channel = %d\n" | 1790 | "* channel = %d\n" |
1791 | "* bssid = %pM\n", | 1791 | "* bssid = %pM\n", |
@@ -1913,7 +1913,7 @@ static u16 il3945_hw_reg_get_ch_grp_index(struct il_priv *il, | |||
1913 | } else | 1913 | } else |
1914 | group_index = 0; /* 2.4 GHz, group 0 */ | 1914 | group_index = 0; /* 2.4 GHz, group 0 */ |
1915 | 1915 | ||
1916 | IL_DEBUG_POWER(il, "Chnl %d mapped to grp %d\n", ch_info->channel, | 1916 | D_POWER("Chnl %d mapped to grp %d\n", ch_info->channel, |
1917 | group_index); | 1917 | group_index); |
1918 | return group_index; | 1918 | return group_index; |
1919 | } | 1919 | } |
@@ -1980,7 +1980,7 @@ static void il3945_hw_reg_init_channel_groups(struct il_priv *il) | |||
1980 | struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom; | 1980 | struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom; |
1981 | const struct il3945_eeprom_txpower_group *group; | 1981 | const struct il3945_eeprom_txpower_group *group; |
1982 | 1982 | ||
1983 | IL_DEBUG_POWER(il, "Initializing factory calib info from EEPROM\n"); | 1983 | D_POWER("Initializing factory calib info from EEPROM\n"); |
1984 | 1984 | ||
1985 | for (i = 0; i < IL_NUM_TX_CALIB_GROUPS; i++) { | 1985 | for (i = 0; i < IL_NUM_TX_CALIB_GROUPS; i++) { |
1986 | s8 *clip_pwrs; /* table of power levels for each rate */ | 1986 | s8 *clip_pwrs; /* table of power levels for each rate */ |
@@ -2096,7 +2096,7 @@ int il3945_txpower_set_from_eeprom(struct il_priv *il) | |||
2096 | eeprom->groups[ch_info->group_index]. | 2096 | eeprom->groups[ch_info->group_index]. |
2097 | temperature); | 2097 | temperature); |
2098 | 2098 | ||
2099 | IL_DEBUG_POWER(il, "Delta index for channel %d: %d [%d]\n", | 2099 | D_POWER("Delta index for channel %d: %d [%d]\n", |
2100 | ch_info->channel, delta_index, temperature + | 2100 | ch_info->channel, delta_index, temperature + |
2101 | IL_TEMP_CONVERT); | 2101 | IL_TEMP_CONVERT); |
2102 | 2102 | ||
@@ -2324,7 +2324,7 @@ int il3945_init_hw_rate_table(struct il_priv *il) | |||
2324 | 2324 | ||
2325 | switch (il->band) { | 2325 | switch (il->band) { |
2326 | case IEEE80211_BAND_5GHZ: | 2326 | case IEEE80211_BAND_5GHZ: |
2327 | IL_DEBUG_RATE(il, "Select A mode rate scale\n"); | 2327 | D_RATE("Select A mode rate scale\n"); |
2328 | /* If one of the following CCK rates is used, | 2328 | /* If one of the following CCK rates is used, |
2329 | * have it fall back to the 6M OFDM rate */ | 2329 | * have it fall back to the 6M OFDM rate */ |
2330 | for (i = IL_RATE_1M_INDEX_TABLE; | 2330 | for (i = IL_RATE_1M_INDEX_TABLE; |
@@ -2342,7 +2342,7 @@ int il3945_init_hw_rate_table(struct il_priv *il) | |||
2342 | break; | 2342 | break; |
2343 | 2343 | ||
2344 | case IEEE80211_BAND_2GHZ: | 2344 | case IEEE80211_BAND_2GHZ: |
2345 | IL_DEBUG_RATE(il, "Select B/G mode rate scale\n"); | 2345 | D_RATE("Select B/G mode rate scale\n"); |
2346 | /* If an OFDM rate is used, have it fall back to the | 2346 | /* If an OFDM rate is used, have it fall back to the |
2347 | * 1M CCK rates */ | 2347 | * 1M CCK rates */ |
2348 | 2348 | ||
@@ -2472,7 +2472,7 @@ static int il3945_verify_bsm(struct il_priv *il) | |||
2472 | u32 reg; | 2472 | u32 reg; |
2473 | u32 val; | 2473 | u32 val; |
2474 | 2474 | ||
2475 | IL_DEBUG_INFO(il, "Begin verify bsm\n"); | 2475 | D_INFO("Begin verify bsm\n"); |
2476 | 2476 | ||
2477 | /* verify BSM SRAM contents */ | 2477 | /* verify BSM SRAM contents */ |
2478 | val = il_read_prph(il, BSM_WR_DWCOUNT_REG); | 2478 | val = il_read_prph(il, BSM_WR_DWCOUNT_REG); |
@@ -2490,7 +2490,7 @@ static int il3945_verify_bsm(struct il_priv *il) | |||
2490 | } | 2490 | } |
2491 | } | 2491 | } |
2492 | 2492 | ||
2493 | IL_DEBUG_INFO(il, "BSM bootstrap uCode image OK\n"); | 2493 | D_INFO("BSM bootstrap uCode image OK\n"); |
2494 | 2494 | ||
2495 | return 0; | 2495 | return 0; |
2496 | } | 2496 | } |
@@ -2567,7 +2567,7 @@ static int il3945_load_bsm(struct il_priv *il) | |||
2567 | u32 done; | 2567 | u32 done; |
2568 | u32 reg_offset; | 2568 | u32 reg_offset; |
2569 | 2569 | ||
2570 | IL_DEBUG_INFO(il, "Begin load bsm\n"); | 2570 | D_INFO("Begin load bsm\n"); |
2571 | 2571 | ||
2572 | /* make sure bootstrap program is no larger than BSM's SRAM size */ | 2572 | /* make sure bootstrap program is no larger than BSM's SRAM size */ |
2573 | if (len > IWL39_MAX_BSM_SIZE) | 2573 | if (len > IWL39_MAX_BSM_SIZE) |
@@ -2618,7 +2618,7 @@ static int il3945_load_bsm(struct il_priv *il) | |||
2618 | udelay(10); | 2618 | udelay(10); |
2619 | } | 2619 | } |
2620 | if (i < 100) | 2620 | if (i < 100) |
2621 | IL_DEBUG_INFO(il, "BSM write complete, poll %d iterations\n", i); | 2621 | D_INFO("BSM write complete, poll %d iterations\n", i); |
2622 | else { | 2622 | else { |
2623 | IL_ERR(il, "BSM write did not complete!\n"); | 2623 | IL_ERR(il, "BSM write did not complete!\n"); |
2624 | return -EIO; | 2624 | return -EIO; |