Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4308449 authored by Shanyu Zhao's avatar Shanyu Zhao Committed by Reinette Chatre
Browse files

iwlwifi: do not clear data after chain noise calib 



Chain noise calibration data are cleared after the calibration is done
in iwlagn_gain_computation() and iwl4965_gain_computation(). This cause
the debugfs entries for those data useless. To provide valid debugging
info, clear those data right before starting the calibration instead.

Signed-off-by: default avatarShanyu Zhao <shanyu.zhao@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 86cc652d

drivers/net/wireless/iwlwifi/iwl-4965.c

+11 −8
Original line number Diff line number Diff line
@@ -346,9 +346,19 @@ static void iwl4965_chain_noise_reset(struct iwl_priv *priv) 
{

	struct iwl_chain_noise_data *data = &(priv->chain_noise_data);



	if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl_is_associated(priv)) {

	if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&

	     iwl_is_associated(priv)) {

		struct iwl_calib_diff_gain_cmd cmd;



		/* clear data for chain noise calibration algorithm */

		data->chain_noise_a = 0;

		data->chain_noise_b = 0;

		data->chain_noise_c = 0;

		data->chain_signal_a = 0;

		data->chain_signal_b = 0;

		data->chain_signal_c = 0;

		data->beacon_count = 0;



		memset(&cmd, 0, sizeof(cmd));

		cmd.hdr.op_code = IWL_PHY_CALIBRATE_DIFF_GAIN_CMD;

		cmd.diff_gain_a = 0;
@@ -419,13 +429,6 @@ static void iwl4965_gain_computation(struct iwl_priv *priv, 
		/* Mark so we run this algo only once! */

		data->state = IWL_CHAIN_NOISE_CALIBRATED;

	}

	data->chain_noise_a = 0;

	data->chain_noise_b = 0;

	data->chain_noise_c = 0;

	data->chain_signal_a = 0;

	data->chain_signal_b = 0;

	data->chain_signal_c = 0;

	data->beacon_count = 0;

}



static void iwl4965_bg_txpower_work(struct work_struct *work)

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+12 −10
Original line number Diff line number Diff line
@@ -176,7 +176,18 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, 
		data->radio_write = 1;

		data->state = IWL_CHAIN_NOISE_CALIBRATED;

	}

}



static void iwlagn_chain_noise_reset(struct iwl_priv *priv)

{

	struct iwl_chain_noise_data *data = &priv->chain_noise_data;

	int ret;



	if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&

	     iwl_is_associated(priv)) {

		struct iwl_calib_chain_noise_reset_cmd cmd;



		/* clear data for chain noise calibration algorithm */

		data->chain_noise_a = 0;

		data->chain_noise_b = 0;

		data->chain_noise_c = 0;
@@ -184,17 +195,8 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, 
		data->chain_signal_b = 0;

		data->chain_signal_c = 0;

		data->beacon_count = 0;

}



static void iwlagn_chain_noise_reset(struct iwl_priv *priv)

{

	struct iwl_chain_noise_data *data = &priv->chain_noise_data;

	int ret;



	if ((data->state == IWL_CHAIN_NOISE_ALIVE) && iwl_is_associated(priv)) {

		struct iwl_calib_chain_noise_reset_cmd cmd;

		memset(&cmd, 0, sizeof(cmd));



		cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD;

		cmd.hdr.first_group = 0;

		cmd.hdr.groups_num = 1;