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

Commit a25a66ac authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlwifi: fix set_tx_power vs scan 



According to comment in iwl_bg_scan_completed, setting tx power should
be deferred during pending scan, but we are not doing this.

This patch change code to really defer setting tx power after scan
complete. Additionally refactor iwl_set_tx_power code and call
lib->send_tx_power() directly from iwlagn_commit_rxon.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4cbf1b12

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

+4 −6
Original line number Diff line number Diff line
@@ -245,15 +245,12 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 


	/* If we issue a new RXON command which required a tune then we must

	 * send a new TXPOWER command or we won't be able to Tx any frames */

	ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	if (ret) {

	ret = priv->cfg->ops->lib->send_tx_power(priv);

	if (ret)

		IWL_ERR(priv, "Error sending TX power (%d)\n", ret);

	return ret;

}



	return 0;

}



void iwl_update_chain_flags(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx;
@@ -4179,6 +4176,7 @@ static int iwl_init_drv(struct iwl_priv *priv) 
	 * this value will get overwritten by channel max power avg

	 * from eeprom */

	priv->tx_power_user_lmt = IWLAGN_TX_POWER_TARGET_POWER_MIN;

	priv->tx_power_next = IWLAGN_TX_POWER_TARGET_POWER_MIN;



	ret = iwl_init_channel_map(priv);

	if (ret) {

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

+30 −24
Original line number Diff line number Diff line
@@ -1206,8 +1206,16 @@ EXPORT_SYMBOL(iwl_apm_init); 


int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)

{

	int ret = 0;

	s8 prev_tx_power = priv->tx_power_user_lmt;

	int ret;

	s8 prev_tx_power;



	lockdep_assert_held(&priv->mutex);



	if (priv->tx_power_user_lmt == tx_power && !force)

		return 0;



	if (!priv->cfg->ops->lib->send_tx_power)

		return -EOPNOTSUPP;



	if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) {

		IWL_WARN(priv,
@@ -1224,30 +1232,26 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) 
		return -EINVAL;

	}



	if (priv->tx_power_user_lmt != tx_power)

		force = true;

	if (!iwl_is_ready_rf(priv))

		return -EIO;



	/* scan complete use tx_power_next, need to be updated */

	priv->tx_power_next = tx_power;

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

		IWL_DEBUG_INFO(priv, "Deferring tx power set while scanning\n");

		return 0;

	}



	/* if nic is not up don't send command */

	if (iwl_is_ready_rf(priv)) {

	prev_tx_power = priv->tx_power_user_lmt;

	priv->tx_power_user_lmt = tx_power;

		if (force && priv->cfg->ops->lib->send_tx_power)



	ret = priv->cfg->ops->lib->send_tx_power(priv);

		else if (!priv->cfg->ops->lib->send_tx_power)

			ret = -EOPNOTSUPP;

		/*

		 * if fail to set tx_power, restore the orig. tx power

		 */

		if (ret)



	/* if fail to set tx_power, restore the orig. tx power */

	if (ret) {

		priv->tx_power_user_lmt = prev_tx_power;

		priv->tx_power_next = prev_tx_power;

	}



	/*

	 * Even this is an async host command, the command

	 * will always report success from uCode

	 * So once driver can placing the command into the queue

	 * successfully, driver can use priv->tx_power_user_lmt

	 * to reflect the current tx power

	 */

	return ret;

}

EXPORT_SYMBOL(iwl_set_tx_power);
@@ -2016,7 +2020,9 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) 
		IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",

			priv->tx_power_user_lmt, conf->power_level);



		iwl_set_tx_power(priv, conf->power_level, false);

		ret = iwl_set_tx_power(priv, conf->power_level, false);

		if (ret)

			IWL_ERR(priv, "Error sending TX power (%d)\n", ret);

	}



	if (!iwl_is_ready(priv)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -1517,6 +1517,7 @@ struct iwl_priv { 
	s8 tx_power_user_lmt;

	s8 tx_power_device_lmt;

	s8 tx_power_lmt_in_half_dbm; /* max tx power in half-dBm format */

	s8 tx_power_next;





#ifdef CONFIG_IWLWIFI_DEBUG

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

+6 −4
Original line number Diff line number Diff line
@@ -603,9 +603,11 @@ static void iwl_bg_scan_completed(struct work_struct *work) 
	if (!iwl_is_ready_rf(priv))

		goto out;



	/* Since setting the TXPOWER may have been deferred while

	 * performing the scan, fire one off */

	iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	/*

	 * We do not commit power settings while scan is pending,

	 * do it now if the settings changed.

	 */

	iwl_set_tx_power(priv, priv->tx_power_next, false);



	priv->cfg->ops->utils->post_scan(priv);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −0
Original line number Diff line number Diff line
@@ -3866,6 +3866,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv) 
	priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;



	priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;

	priv->tx_power_next = IWL_DEFAULT_TX_POWER;



	if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {

		IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",