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

Commit 9a716863 authored by Don Fry's avatar Don Fry Committed by John W. Linville
Browse files

iwlwifi: separate status to priv and trans 



The shared status bits are a mixture of transport and op mode bits.
Some are used just by one or the other, some are shared.  Begin the
de-tangling of these bits.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 18c57d3c

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

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) 


int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	if (iwl_is_rfkill(priv->shrd) || iwl_is_ctkill(priv->shrd)) {

	if (iwl_is_rfkill(priv->shrd) || iwl_is_ctkill(priv)) {

		IWL_WARN(priv, "Not sending command - %s KILL\n",

			 iwl_is_rfkill(priv->shrd) ? "RF" : "CT");

		return -EIO;

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

+7 −9
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void iwl_tt_ready_for_ct_kill(unsigned long data) 
		IWL_DEBUG_TEMP(priv, "entering CT_KILL state when "

				"temperature timer expired\n");

		tt->state = IWL_TI_CT_KILL;

		set_bit(STATUS_CT_KILL, &priv->shrd->status);

		set_bit(STATUS_CT_KILL, &priv->status);

		iwl_perform_ct_kill_task(priv, true);

	}

}
@@ -313,22 +313,21 @@ static void iwl_legacy_tt_handler(struct iwl_priv *priv, s32 temp, bool force) 
		}

		mutex_lock(&priv->mutex);

		if (old_state == IWL_TI_CT_KILL)

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

			clear_bit(STATUS_CT_KILL, &priv->status);

		if (tt->state != IWL_TI_CT_KILL &&

		    iwl_power_update_mode(priv, true)) {

			/* TT state not updated

			 * try again during next temperature read

			 */

			if (old_state == IWL_TI_CT_KILL)

				set_bit(STATUS_CT_KILL, &priv->shrd->status);

				set_bit(STATUS_CT_KILL, &priv->status);

			tt->state = old_state;

			IWL_ERR(priv, "Cannot update power mode, "

					"TT state not updated\n");

		} else {

			if (tt->state == IWL_TI_CT_KILL) {

				if (force) {

					set_bit(STATUS_CT_KILL,

						&priv->shrd->status);

					set_bit(STATUS_CT_KILL, &priv->status);

					iwl_perform_ct_kill_task(priv, true);

				} else {

					iwl_prepare_ct_kill_task(priv);
@@ -454,7 +453,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force) 
		}

		mutex_lock(&priv->mutex);

		if (old_state == IWL_TI_CT_KILL)

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

			clear_bit(STATUS_CT_KILL, &priv->status);

		if (tt->state != IWL_TI_CT_KILL &&

		    iwl_power_update_mode(priv, true)) {

			/* TT state not updated
@@ -463,7 +462,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force) 
			IWL_ERR(priv, "Cannot update power mode, "

					"TT state not updated\n");

			if (old_state == IWL_TI_CT_KILL)

				set_bit(STATUS_CT_KILL, &priv->shrd->status);

				set_bit(STATUS_CT_KILL, &priv->status);

			tt->state = old_state;

		} else {

			IWL_DEBUG_TEMP(priv,
@@ -474,8 +473,7 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force) 
				if (force) {

					IWL_DEBUG_TEMP(priv,

						"Enter IWL_TI_CT_KILL\n");

					set_bit(STATUS_CT_KILL,

						&priv->shrd->status);

					set_bit(STATUS_CT_KILL, &priv->status);

					iwl_perform_ct_kill_task(priv, true);

				} else {

					iwl_prepare_ct_kill_task(priv);

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

+2 −7
Original line number Diff line number Diff line
@@ -367,11 +367,6 @@ static inline int iwl_is_alive(struct iwl_shared *shrd) 
	return test_bit(STATUS_ALIVE, &shrd->status);

}



static inline int iwl_is_init(struct iwl_shared *shrd)

{

	return test_bit(STATUS_INIT, &shrd->status);

}



static inline int iwl_is_rfkill_hw(struct iwl_shared *shrd)

{

	return test_bit(STATUS_RF_KILL_HW, &shrd->status);
@@ -382,9 +377,9 @@ static inline int iwl_is_rfkill(struct iwl_shared *shrd) 
	return iwl_is_rfkill_hw(shrd);

}



static inline int iwl_is_ctkill(struct iwl_shared *shrd)

static inline int iwl_is_ctkill(struct iwl_priv *priv)

{

	return test_bit(STATUS_CT_KILL, &shrd->status);

	return test_bit(STATUS_CT_KILL, &priv->status);

}



static inline int iwl_is_ready_rf(struct iwl_shared *shrd)

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

+1 −5
Original line number Diff line number Diff line
@@ -530,15 +530,11 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, 
	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_RF_KILL_HW:\t %d\n",

		test_bit(STATUS_RF_KILL_HW, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_CT_KILL:\t\t %d\n",

		test_bit(STATUS_CT_KILL, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INIT:\t\t %d\n",

		test_bit(STATUS_INIT, &priv->shrd->status));

		test_bit(STATUS_CT_KILL, &priv->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_ALIVE:\t\t %d\n",

		test_bit(STATUS_ALIVE, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_READY:\t\t %d\n",

		test_bit(STATUS_READY, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_TEMPERATURE:\t %d\n",

		test_bit(STATUS_TEMPERATURE, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_GEO_CONFIGURED:\t %d\n",

		test_bit(STATUS_GEO_CONFIGURED, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_EXIT_PENDING:\t %d\n",

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

+1 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ struct iwl_priv { 
	/*data shared among all the driver's layers */

	struct iwl_shared *shrd;

	const struct iwl_fw *fw;

	unsigned long status;



	spinlock_t sta_lock;

	struct mutex mutex;