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

Commit 203566f3 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: add possibility to disable tx_power calibration 



This patch adds the possibility to disable the tx_power calibration.
In 5000 HW, this calibration is implemented in uCode, hence, it is
disabled in driver by default.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4e39317d

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

+3 −2
Original line number Diff line number Diff line
@@ -2103,7 +2103,8 @@ void iwl4965_hw_rx_statistics(struct iwl_priv *priv, 
	priv->temperature = temp;

	set_bit(STATUS_TEMPERATURE, &priv->status);



	if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&

	if (!priv->disable_tx_power_cal &&

	     unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&

	     iwl4965_is_temp_calib_needed(priv))

		queue_work(priv->workqueue, &priv->txpower_work);

}

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

+7 −0
Original line number Diff line number Diff line
@@ -1229,6 +1229,12 @@ static u16 iwl5000_get_hcmd_size(u8 cmd_id, u16 len) 
	return len;

}



static void iwl5000_setup_deferred_work(struct iwl_priv *priv)

{

	/* in 5000 the tx power calibration is done in uCode */

	priv->disable_tx_power_cal = 1;

}



static void iwl5000_rx_handler_setup(struct iwl_priv *priv)

{

	/* init calibration handlers */
@@ -1313,6 +1319,7 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwl5000_txq_set_sched,

	.rx_handler_setup = iwl5000_rx_handler_setup,

	.setup_deferred_work = iwl5000_setup_deferred_work,

	.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,

	.load_ucode = iwl5000_load_ucode,

	.init_alive_start = iwl5000_init_alive_start,

drivers/net/wireless/iwlwifi/iwl-debug.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct iwl_debugfs { 
	struct dir_rf_files {

		struct dentry *file_disable_sensitivity;

		struct dentry *file_disable_chain_noise;

		struct dentry *file_disable_tx_power;

	} dbgfs_rf_files;

	u32 sram_offset;

	u32 sram_len;

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

+2 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) 
	DEBUGFS_ADD_BOOL(disable_sensitivity, rf, &priv->disable_sens_cal);

	DEBUGFS_ADD_BOOL(disable_chain_noise, rf,

			 &priv->disable_chain_noise_cal);

	DEBUGFS_ADD_BOOL(disable_tx_power, rf, &priv->disable_tx_power_cal);

	return 0;



err:
@@ -415,6 +416,7 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv) 
	DEBUGFS_REMOVE(priv->dbgfs->dir_data);

	DEBUGFS_REMOVE(priv->dbgfs->dbgfs_rf_files.file_disable_sensitivity);

	DEBUGFS_REMOVE(priv->dbgfs->dbgfs_rf_files.file_disable_chain_noise);

	DEBUGFS_REMOVE(priv->dbgfs->dbgfs_rf_files.file_disable_tx_power);

	DEBUGFS_REMOVE(priv->dbgfs->dir_rf);

	DEBUGFS_REMOVE(priv->dbgfs->dir_drv);

	kfree(priv->dbgfs);

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ struct iwl_priv { 
	struct work_struct txpower_work;

	u32 disable_sens_cal;

	u32 disable_chain_noise_cal;

	u32 disable_tx_power_cal;

	struct work_struct run_time_calib_work;

	struct timer_list statistics_periodic;

}; /*iwl_priv */