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

Commit d4d59e88 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: Logic to control how frequent radio should be reset if needed 



Add additional logic for internal scan routine to control how
frequent this function should be performed.

The intent of this function is to reset/re-tune the radio and bring the
RF/PHY back to normal state, it does not make sense calling it too
frequent,
if reset the radio can not bring it back to normal state, it indicate
there are other reason to cause the radio not operate correctly.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 220575f7

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

+1 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ struct iwl_priv { 
	unsigned long scan_start;

	unsigned long scan_pass_start;

	unsigned long scan_start_tsf;

	unsigned long last_internal_scan_jiffies;

	void *scan;

	int scan_bands;

	struct cfg80211_scan_request *scan_request;

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

+16 −2
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ static void iwl_rx_scan_results_notif(struct iwl_priv *priv, 
		       le32_to_cpu(notif->tsf_low) - priv->scan_start_tsf);

#endif



	if (!priv->is_internal_short_scan)

		priv->next_scan_jiffies = 0;

}
@@ -247,7 +248,11 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv, 
			goto reschedule;

	}



	if (!priv->is_internal_short_scan)

		priv->next_scan_jiffies = 0;

	else

		priv->last_internal_scan_jiffies = jiffies;



	IWL_DEBUG_INFO(priv, "Setting scan to off\n");



	clear_bit(STATUS_SCANNING, &priv->status);
@@ -546,6 +551,8 @@ EXPORT_SYMBOL(iwl_mac_hw_scan); 
 * internal short scan, this function should only been called while associated.

 * It will reset and tune the radio to prevent possible RF related problem

 */

#define IWL_DELAY_NEXT_INTERNAL_SCAN (HZ*1)



int iwl_internal_short_hw_scan(struct iwl_priv *priv)

{

	int ret = 0;
@@ -565,6 +572,13 @@ int iwl_internal_short_hw_scan(struct iwl_priv *priv) 
		ret = -EAGAIN;

		goto out;

	}

	if (priv->last_internal_scan_jiffies &&

	    time_after(priv->last_internal_scan_jiffies +

		       IWL_DELAY_NEXT_INTERNAL_SCAN, jiffies)) {

		IWL_DEBUG_SCAN(priv, "internal scan rejected\n");

		goto out;

	}



	priv->scan_bands = 0;

	if (priv->band == IEEE80211_BAND_5GHZ)

		priv->scan_bands |= BIT(IEEE80211_BAND_5GHZ);