iwlwifi: split force_reset debugfs file (48dffd39) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -307,7 +307,7 @@ static void iwlagn_recover_from_statistics(struct iwl_priv *priv,

	if (iwlagn_mod_params.plcp_check &&		if (iwlagn_mod_params.plcp_check &&
	!iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))		!iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
	iwl_force_reset(priv, IWL_RF_RESET, false);		iwl_force_rf_reset(priv, false);
	}		}

	/* Calculate noise level, based on measurements during network silence just		/* Calculate noise level, based on measurements during network silence just

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

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1332,12 +1332,6 @@ static int iwl_init_drv(struct iwl_priv *priv)

	priv->ucode_owner = IWL_OWNERSHIP_DRIVER;		priv->ucode_owner = IWL_OWNERSHIP_DRIVER;

	/* initialize force reset */
	priv->force_reset[IWL_RF_RESET].reset_duration =
	IWL_DELAY_NEXT_FORCE_RF_RESET;
	priv->force_reset[IWL_FW_RESET].reset_duration =
	IWL_DELAY_NEXT_FORCE_FW_RELOAD;

	priv->rx_statistics_jiffies = jiffies;		priv->rx_statistics_jiffies = jiffies;

	/* Choose which receivers/antennas to use */		/* Choose which receivers/antennas to use */

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -195,6 +195,7 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);
	/* scan */		/* scan */
	void iwlagn_post_scan(struct iwl_priv *priv);		void iwlagn_post_scan(struct iwl_priv *priv);
	void iwlagn_disable_roc(struct iwl_priv *priv);		void iwlagn_disable_roc(struct iwl_priv *priv);
			int iwl_force_rf_reset(struct iwl_priv *priv, bool external);

	/* bt coex */		/* bt coex */
	void iwlagn_send_advance_bt_config(struct iwl_priv *priv);		void iwlagn_send_advance_bt_config(struct iwl_priv *priv);

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

+18 −53

Original line number	Original line	Diff line number	Diff line
	@@ -746,15 +746,30 @@ void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len)
	}		}
	#endif		#endif

	static void iwl_force_rf_reset(struct iwl_priv *priv)		int iwl_force_rf_reset(struct iwl_priv *priv, bool external)
	{		{
			struct iwl_rf_reset *rf_reset;

	if (test_bit(STATUS_EXIT_PENDING, &priv->status))		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
	return;		return -EAGAIN;

	if (!iwl_is_any_associated(priv)) {		if (!iwl_is_any_associated(priv)) {
	IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");		IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");
	return;		return -ENOLINK;
			}

			rf_reset = &priv->rf_reset;
			rf_reset->reset_request_count++;
			if (!external && rf_reset->last_reset_jiffies &&
			time_after(rf_reset->last_reset_jiffies +
			IWL_DELAY_NEXT_FORCE_RF_RESET, jiffies)) {
			IWL_DEBUG_INFO(priv, "RF reset rejected\n");
			rf_reset->reset_reject_count++;
			return -EAGAIN;
	}		}
			rf_reset->reset_success_count++;
			rf_reset->last_reset_jiffies = jiffies;

	/*		/*
	* There is no easy and better way to force reset the radio,		* There is no easy and better way to force reset the radio,
	* the only known method is switching channel which will force to		* the only known method is switching channel which will force to
	@@ -766,56 +781,6 @@ static void iwl_force_rf_reset(struct iwl_priv *priv)
	*/		*/
	IWL_DEBUG_INFO(priv, "perform radio reset.\n");		IWL_DEBUG_INFO(priv, "perform radio reset.\n");
	iwl_internal_short_hw_scan(priv);		iwl_internal_short_hw_scan(priv);
	}


	int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)
	{
	struct iwl_force_reset *force_reset;

	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
	return -EINVAL;

	if (mode >= IWL_MAX_FORCE_RESET) {
	IWL_DEBUG_INFO(priv, "invalid reset request.\n");
	return -EINVAL;
	}
	force_reset = &priv->force_reset[mode];
	force_reset->reset_request_count++;
	if (!external) {
	if (force_reset->last_force_reset_jiffies &&
	time_after(force_reset->last_force_reset_jiffies +
	force_reset->reset_duration, jiffies)) {
	IWL_DEBUG_INFO(priv, "force reset rejected\n");
	force_reset->reset_reject_count++;
	return -EAGAIN;
	}
	}
	force_reset->reset_success_count++;
	force_reset->last_force_reset_jiffies = jiffies;
	IWL_DEBUG_INFO(priv, "perform force reset (%d)\n", mode);
	switch (mode) {
	case IWL_RF_RESET:
	iwl_force_rf_reset(priv);
	break;
	case IWL_FW_RESET:
	/*
	* if the request is from external(ex: debugfs),
	* then always perform the request in regardless the module
	* parameter setting
	* if the request is from internal (uCode error or driver
	* detect failure), then fw_restart module parameter
	* need to be check before performing firmware reload
	*/
	if (!external && !iwlagn_mod_params.restart_fw) {
	IWL_DEBUG_INFO(priv, "Cancel firmware reload based on "
	"module parameter setting\n");
	break;
	}
	IWL_ERR(priv, "On demand firmware reload\n");
	iwlagn_fw_error(priv, true);
	break;
	}
	return 0;		return 0;
	}		}

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -164,7 +164,6 @@ int iwl_scan_cancel(struct iwl_priv *priv);
	void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);		void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);
	void iwl_force_scan_end(struct iwl_priv *priv);		void iwl_force_scan_end(struct iwl_priv *priv);
	void iwl_internal_short_hw_scan(struct iwl_priv *priv);		void iwl_internal_short_hw_scan(struct iwl_priv *priv);
	int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);
	void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);		void iwl_setup_rx_scan_handlers(struct iwl_priv *priv);
	void iwl_setup_scan_deferred_work(struct iwl_priv *priv);		void iwl_setup_scan_deferred_work(struct iwl_priv *priv);
	void iwl_cancel_scan_deferred_work(struct iwl_priv *priv);		void iwl_cancel_scan_deferred_work(struct iwl_priv *priv);