iwlagn: separate init calib and rt calib
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Tue, 4 Oct 2011 14:10:19 +0000 (07:10 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 20:41:07 +0000 (16:41 -0400)
My previous patch for init calib cfg disable a set of calibration for both
init and runtime which cause performance issue, Fix it

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-commands.h

index d0fd6f063bf8af8ae215bd23b23fa50a2057e1e8..3af49ae6297989b7f1cb89623fff74bf72cf6eff 100644 (file)
@@ -1222,7 +1222,7 @@ static int iwlagn_send_calib_cfg_rt(struct iwl_priv *priv, u32 cfg)
        };
 
        memset(&calib_cfg_cmd, 0, sizeof(calib_cfg_cmd));
-       calib_cfg_cmd.ucd_calib_cfg.once.is_enable = IWL_CALIB_INIT_CFG_ALL;
+       calib_cfg_cmd.ucd_calib_cfg.once.is_enable = IWL_CALIB_RT_CFG_ALL;
        calib_cfg_cmd.ucd_calib_cfg.once.start = cpu_to_le32(cfg);
 
        return iwl_trans_send_cmd(trans(priv), &cmd);
index 64593aa03ad6892b0ff5ce10374beeecce233c6f..bc0bc12f699065dcbdd5fa932e1231182ee35f1f 100644 (file)
@@ -3215,6 +3215,16 @@ enum iwl_ucode_calib_cfg {
                                        IWL_CALIB_CFG_RX_IQ_IDX |       \
                                        IWL_CALIB_CFG_CRYSTAL_IDX)
 
+#define IWL_CALIB_RT_CFG_ALL   cpu_to_le32(IWL_CALIB_CFG_RX_BB_IDX |   \
+                                       IWL_CALIB_CFG_DC_IDX |          \
+                                       IWL_CALIB_CFG_LO_IDX |          \
+                                       IWL_CALIB_CFG_TX_IQ_IDX |       \
+                                       IWL_CALIB_CFG_RX_IQ_IDX |       \
+                                       IWL_CALIB_CFG_TEMPERATURE_IDX | \
+                                       IWL_CALIB_CFG_PAPD_IDX |        \
+                                       IWL_CALIB_CFG_TX_PWR_IDX |      \
+                                       IWL_CALIB_CFG_CRYSTAL_IDX)
+
 #define IWL_CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_MSK      cpu_to_le32(BIT(0))
 
 struct iwl_calib_cfg_elmnt_s {