Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 70 insertions, 32 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index c4b565a2de94..8b516c5ff0bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2009 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2009 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2010 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
+#include <linux/slab.h>
 #include <net/mac80211.h>
 
 #include "iwl-dev.h"
@@ -132,6 +133,7 @@ void iwl_calib_free_results(struct iwl_priv *priv)
                 priv->calib_results[i].buf_len = 0;
         }
 }
+EXPORT_SYMBOL(iwl_calib_free_results);
 
 /*****************************************************************************
  * RUNTIME calibrations framework
@@ -413,7 +415,6 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv,
 /* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
 static int iwl_sensitivity_write(struct iwl_priv *priv)
 {
-        int ret = 0;
         struct iwl_sensitivity_cmd cmd ;
         struct iwl_sensitivity_data *data = NULL;
         struct iwl_host_cmd cmd_out = {
@@ -447,11 +448,11 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
                                 cpu_to_le16((u16)data->nrg_th_ofdm);
 
         cmd.table[HD_BARKER_CORR_TH_ADD_MIN_INDEX] =
-                                cpu_to_le16(190);
+                                cpu_to_le16(data->barker_corr_th_min);
         cmd.table[HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX] =
-                                cpu_to_le16(390);
+                                cpu_to_le16(data->barker_corr_th_min_mrc);
         cmd.table[HD_OFDM_ENERGY_TH_IN_INDEX] =
-                                cpu_to_le16(62);
+                                cpu_to_le16(data->nrg_th_cca);
 
         IWL_DEBUG_CALIB(priv, "ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",
                         data->auto_corr_ofdm, data->auto_corr_ofdm_mrc,
@@ -476,11 +477,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         memcpy(&(priv->sensitivity_tbl[0]), &(cmd.table[0]),
                sizeof(u16)*HD_TABLE_SIZE);
 
-        ret = iwl_send_cmd(priv, &cmd_out);
-        if (ret)
-                IWL_ERR(priv, "SENSITIVITY_CMD failed\n");
-
-        return ret;
+        return iwl_send_cmd(priv, &cmd_out);
 }
 
 void iwl_init_sensitivity(struct iwl_priv *priv)
@@ -516,7 +513,7 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         for (i = 0; i < NRG_NUM_PREV_STAT_L; i++)
                 data->nrg_silence_rssi[i] = 0;
 
-        data->auto_corr_ofdm = 90;
+        data->auto_corr_ofdm =  ranges->auto_corr_min_ofdm;
         data->auto_corr_ofdm_mrc = ranges->auto_corr_min_ofdm_mrc;
         data->auto_corr_ofdm_x1  = ranges->auto_corr_min_ofdm_x1;
         data->auto_corr_ofdm_mrc_x1 = ranges->auto_corr_min_ofdm_mrc_x1;
@@ -524,6 +521,9 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
         data->auto_corr_cck_mrc = ranges->auto_corr_min_cck_mrc;
         data->nrg_th_cck = ranges->nrg_th_cck;
         data->nrg_th_ofdm = ranges->nrg_th_ofdm;
+        data->barker_corr_th_min = ranges->barker_corr_th_min;
+        data->barker_corr_th_min_mrc = ranges->barker_corr_th_min_mrc;
+        data->nrg_th_cca = ranges->nrg_th_cca;
 
         data->last_bad_plcp_cnt_ofdm = 0;
         data->last_fa_cnt_ofdm = 0;
@@ -643,6 +643,15 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
 }
 EXPORT_SYMBOL(iwl_sensitivity_calibration);
 
+static inline u8 find_first_chain(u8 mask)
+{
+        if (mask & ANT_A)
+                return CHAIN_A;
+        if (mask & ANT_B)
+                return CHAIN_B;
+        return CHAIN_C;
+}
+
 /*
  * Accumulate 20 beacons of signal and noise statistics for each of
  *   3 receivers/antennas/rx-chains, then figure out:
@@ -675,14 +684,17 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         u8 num_tx_chains;
         unsigned long flags;
         struct statistics_rx_non_phy *rx_info = &(stat_resp->rx.general);
+        u8 first_chain;
 
         if (priv->disable_chain_noise_cal)
                 return;
 
         data = &(priv->chain_noise_data);
 
-        /* Accumulate just the first 20 beacons after the first association,
-         *   then we're done forever. */
+        /*
+         * Accumulate just the first "chain_noise_num_beacons" after
+         * the first association, then we're done forever.
+         */
         if (data->state != IWL_CHAIN_NOISE_ACCUMULATE) {
                 if (data->state == IWL_CHAIN_NOISE_ALIVE)
                         IWL_DEBUG_CALIB(priv, "Wait for noise calib reset\n");
@@ -710,7 +722,10 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 return;
         }
 
-        /* Accumulate beacon statistics values across 20 beacons */
+        /*
+         *  Accumulate beacon statistics values across
+         * "chain_noise_num_beacons"
+         */
         chain_noise_a = le32_to_cpu(rx_info->beacon_silence_rssi_a) &
                                 IN_BAND_FILTER;
         chain_noise_b = le32_to_cpu(rx_info->beacon_silence_rssi_b) &
@@ -741,16 +756,19 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
         IWL_DEBUG_CALIB(priv, "chain_noise: a %d b %d c %d\n",
                         chain_noise_a, chain_noise_b, chain_noise_c);
 
-        /* If this is the 20th beacon, determine:
+        /* If this is the "chain_noise_num_beacons", determine:
          * 1)  Disconnected antennas (using signal strengths)
          * 2)  Differential gain (using silence noise) to balance receivers */
-        if (data->beacon_count != CAL_NUM_OF_BEACONS)
+        if (data->beacon_count != priv->cfg->chain_noise_num_beacons)
                 return;
 
         /* Analyze signal for disconnected antenna */
-        average_sig[0] = (data->chain_signal_a) / CAL_NUM_OF_BEACONS;
-        average_sig[1] = (data->chain_signal_b) / CAL_NUM_OF_BEACONS;
-        average_sig[2] = (data->chain_signal_c) / CAL_NUM_OF_BEACONS;
+        average_sig[0] =
+                (data->chain_signal_a) / priv->cfg->chain_noise_num_beacons;
+        average_sig[1] =
+                (data->chain_signal_b) / priv->cfg->chain_noise_num_beacons;
+        average_sig[2] =
+                (data->chain_signal_c) / priv->cfg->chain_noise_num_beacons;
 
         if (average_sig[0] >= average_sig[1]) {
                 max_average_sig = average_sig[0];
@@ -790,6 +808,18 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                 }
         }
 
+        /*
+         * The above algorithm sometimes fails when the ucode
+         * reports 0 for all chains. It's not clear why that
+         * happens to start with, but it is then causing trouble
+         * because this can make us enable more chains than the
+         * hardware really has.
+         *
+         * To be safe, simply mask out any chains that we know
+         * are not on the device.
+         */
+        active_chains &= priv->hw_params.valid_rx_ant;
+
         num_tx_chains = 0;
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 /* loops on all the bits of
@@ -803,13 +833,17 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                         /* there is a Tx antenna connected */
                         break;
                 if (num_tx_chains == priv->hw_params.tx_chains_num &&
-                data->disconn_array[i]) {
-                        /* This is the last TX antenna and is also
-                         * disconnected connect it anyway */
-                        data->disconn_array[i] = 0;
-                        active_chains |= ant_msk;
-                        IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected W/A - "
-                                "declare %d as connected\n", i);
+                    data->disconn_array[i]) {
+                        /*
+                         * If all chains are disconnected
+                         * connect the first valid tx chain
+                         */
+                        first_chain =
+                                find_first_chain(priv->cfg->valid_tx_ant);
+                        data->disconn_array[first_chain] = 0;
+                        active_chains |= BIT(first_chain);
+                        IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected W/A - declare %d as connected\n",
+                                        first_chain);
                         break;
                 }
         }
@@ -820,9 +854,12 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
                         active_chains);
 
         /* Analyze noise for rx balance */
-        average_noise[0] = ((data->chain_noise_a)/CAL_NUM_OF_BEACONS);
-        average_noise[1] = ((data->chain_noise_b)/CAL_NUM_OF_BEACONS);
-        average_noise[2] = ((data->chain_noise_c)/CAL_NUM_OF_BEACONS);
+        average_noise[0] =
+                ((data->chain_noise_a) / priv->cfg->chain_noise_num_beacons);
+        average_noise[1] =
+                ((data->chain_noise_b) / priv->cfg->chain_noise_num_beacons);
+        average_noise[2] =
+                ((data->chain_noise_c) / priv->cfg->chain_noise_num_beacons);
 
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 if (!(data->disconn_array[i]) &&
@@ -843,7 +880,8 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
 
         if (priv->cfg->ops->utils->gain_computation)
                 priv->cfg->ops->utils->gain_computation(priv, average_noise,
-                        min_average_noise_antenna_i, min_average_noise);
+                                min_average_noise_antenna_i, min_average_noise,
+                                find_first_chain(priv->cfg->valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON
@@ -870,7 +908,7 @@ void iwl_reset_run_time_calib(struct iwl_priv *priv)
 
         /* Ask for statistics now, the uCode will send notification
          * periodically after association */
-        iwl_send_statistics_request(priv, CMD_ASYNC);
+        iwl_send_statistics_request(priv, CMD_ASYNC, true);
 }
 EXPORT_SYMBOL(iwl_reset_run_time_calib);