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

Commit 193219cf authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwlagn_fw_error to iwl-agn.c 



Move this as part of iwl-core.c cleanup.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent bedec3a6

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

+59 −0
Original line number Diff line number Diff line
@@ -2119,6 +2119,65 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
	return pos;

}



static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)

{

	unsigned int reload_msec;

	unsigned long reload_jiffies;



#ifdef CONFIG_IWLWIFI_DEBUG

	if (iwl_have_debug_level(IWL_DL_FW_ERRORS))

		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);

#endif



	/* uCode is no longer loaded. */

	priv->ucode_loaded = false;



	/* Set the FW error flag -- cleared on iwl_down */

	set_bit(STATUS_FW_ERROR, &priv->status);



	/* Cancel currently queued command. */

	clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);



	iwl_abort_notification_waits(&priv->notif_wait);



	/* Keep the restart process from trying to send host

	 * commands by clearing the ready bit */

	clear_bit(STATUS_READY, &priv->status);



	wake_up(&trans(priv)->wait_command_queue);



	if (!ondemand) {

		/*

		 * If firmware keep reloading, then it indicate something

		 * serious wrong and firmware having problem to recover

		 * from it. Instead of keep trying which will fill the syslog

		 * and hang the system, let's just stop it

		 */

		reload_jiffies = jiffies;

		reload_msec = jiffies_to_msecs((long) reload_jiffies -

					(long) priv->reload_jiffies);

		priv->reload_jiffies = reload_jiffies;

		if (reload_msec <= IWL_MIN_RELOAD_DURATION) {

			priv->reload_count++;

			if (priv->reload_count >= IWL_MAX_CONTINUE_RELOAD_CNT) {

				IWL_ERR(priv, "BUG_ON, Stop restarting\n");

				return;

			}

		} else

			priv->reload_count = 0;

	}



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

		if (iwlagn_mod_params.restart_fw) {

			IWL_DEBUG_FW_ERRORS(priv,

				  "Restarting adapter due to uCode error.\n");

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

		} else

			IWL_DEBUG_FW_ERRORS(priv,

				  "Detected FW error, but not restarting\n");

	}

}



static void iwl_nic_error(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

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

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ int iwl_send_calib_results(struct iwl_priv *priv); 
int iwl_calib_set(struct iwl_priv *priv,

		  const struct iwl_calib_hdr *cmd, int len);

void iwl_calib_free_results(struct iwl_priv *priv);

void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand);

int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,

			    char **buf, bool display);

int iwlagn_hw_valid_rtc_data_addr(u32 addr);

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

+0 −59
Original line number Diff line number Diff line
@@ -66,65 +66,6 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

#endif



void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)

{

	unsigned int reload_msec;

	unsigned long reload_jiffies;



#ifdef CONFIG_IWLWIFI_DEBUG

	if (iwl_have_debug_level(IWL_DL_FW_ERRORS))

		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);

#endif



	/* uCode is no longer loaded. */

	priv->ucode_loaded = false;



	/* Set the FW error flag -- cleared on iwl_down */

	set_bit(STATUS_FW_ERROR, &priv->status);



	/* Cancel currently queued command. */

	clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);



	iwl_abort_notification_waits(&priv->notif_wait);



	/* Keep the restart process from trying to send host

	 * commands by clearing the ready bit */

	clear_bit(STATUS_READY, &priv->status);



	wake_up(&trans(priv)->wait_command_queue);



	if (!ondemand) {

		/*

		 * If firmware keep reloading, then it indicate something

		 * serious wrong and firmware having problem to recover

		 * from it. Instead of keep trying which will fill the syslog

		 * and hang the system, let's just stop it

		 */

		reload_jiffies = jiffies;

		reload_msec = jiffies_to_msecs((long) reload_jiffies -

					(long) priv->reload_jiffies);

		priv->reload_jiffies = reload_jiffies;

		if (reload_msec <= IWL_MIN_RELOAD_DURATION) {

			priv->reload_count++;

			if (priv->reload_count >= IWL_MAX_CONTINUE_RELOAD_CNT) {

				IWL_ERR(priv, "BUG_ON, Stop restarting\n");

				return;

			}

		} else

			priv->reload_count = 0;

	}



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

		if (iwlagn_mod_params.restart_fw) {

			IWL_DEBUG_FW_ERRORS(priv,

				  "Restarting adapter due to uCode error.\n");

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

		} else

			IWL_DEBUG_FW_ERRORS(priv,

				  "Detected FW error, but not restarting\n");

	}

}



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

{

	int ret;