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

Commit d4578ea8 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: trans: allow skipping scheduler hardware config 



In a later patch, the hardware configuration will be moved to
firmware. Prepare for this by allowing hardware configuration
in the transport to be skipped by not passing a configuration
on enable and passing configure_scd=false on disable.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 0ade579c

drivers/net/wireless/iwlwifi/dvm/tx.c

+3 −3
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		 * time, or we hadn't time to drain the AC queues.

		 */

		if (agg_state == IWL_AGG_ON)

			iwl_trans_txq_disable(priv->trans, txq_id);

			iwl_trans_txq_disable(priv->trans, txq_id, true);

		else

			IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",

					    agg_state);
@@ -686,7 +686,7 @@ int iwlagn_tx_agg_flush(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		 * time, or we hadn't time to drain the AC queues.

		 */

		if (agg_state == IWL_AGG_ON)

			iwl_trans_txq_disable(priv->trans, txq_id);

			iwl_trans_txq_disable(priv->trans, txq_id, true);

		else

			IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",

					    agg_state);
@@ -781,7 +781,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid) 
				"Can continue DELBA flow ssn = next_recl = %d\n",

				tid_data->next_reclaimed);

			iwl_trans_txq_disable(priv->trans,

					      tid_data->agg.txq_id);

					      tid_data->agg.txq_id, true);

			iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);

			tid_data->agg.state = IWL_AGG_OFF;

			ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);

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

+35 −12
Original line number Diff line number Diff line
@@ -444,7 +444,9 @@ struct iwl_trans_txq_scd_cfg { 
 *	Must be atomic

 * @txq_enable: setup a queue. To setup an AC queue, use the

 *	iwl_trans_ac_txq_enable wrapper. fw_alive must have been called before

 *	this one. The op_mode must not configure the HCMD queue. May sleep.

 *	this one. The op_mode must not configure the HCMD queue. The scheduler

 *	configuration may be %NULL, in which case the hardware will not be

 *	configured. May sleep.

 * @txq_disable: de-configure a Tx queue to send AMPDUs

 *	Must be atomic

 * @wait_tx_queue_empty: wait until tx queues are empty. May sleep.
@@ -501,7 +503,8 @@ struct iwl_trans_ops { 


	void (*txq_enable)(struct iwl_trans *trans, int queue, u16 ssn,

			   const struct iwl_trans_txq_scd_cfg *cfg);

	void (*txq_disable)(struct iwl_trans *trans, int queue);

	void (*txq_disable)(struct iwl_trans *trans, int queue,

			    bool configure_scd);



	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);

	int (*wait_tx_queue_empty)(struct iwl_trans *trans, u32 txq_bm);
@@ -773,9 +776,22 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue, 
	trans->ops->reclaim(trans, queue, ssn, skbs);

}



static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)

static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue,

					 bool configure_scd)

{

	trans->ops->txq_disable(trans, queue);

	trans->ops->txq_disable(trans, queue, configure_scd);

}



static inline void

iwl_trans_txq_enable_cfg(struct iwl_trans *trans, int queue, u16 ssn,

			 const struct iwl_trans_txq_scd_cfg *cfg)

{

	might_sleep();



	if (unlikely((trans->state != IWL_TRANS_FW_ALIVE)))

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);



	trans->ops->txq_enable(trans, queue, ssn, cfg);

}



static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,
@@ -789,19 +805,26 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue, 
		.frame_limit = frame_limit,

	};



	might_sleep();



	if (unlikely((trans->state != IWL_TRANS_FW_ALIVE)))

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);



	trans->ops->txq_enable(trans, queue, ssn, &cfg);

	iwl_trans_txq_enable_cfg(trans, queue, ssn, &cfg);

}



static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue,

					   int fifo)

{

	iwl_trans_txq_enable(trans, queue, fifo, -1,

			     IWL_MAX_TID_COUNT, IWL_FRAME_LIMIT, 0);

	struct iwl_trans_txq_scd_cfg cfg = {

		.fifo = fifo,

		.sta_id = -1,

		.tid = IWL_MAX_TID_COUNT,

		.frame_limit = IWL_FRAME_LIMIT,

	};



	iwl_trans_txq_enable_cfg(trans, queue, 0, &cfg);

}



static inline void

iwl_trans_txq_enable_no_scd(struct iwl_trans *trans, int queue, u16 ssn)

{

	iwl_trans_txq_enable_cfg(trans, queue, ssn, NULL);

}



static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans,

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+5 −3
Original line number Diff line number Diff line
@@ -452,14 +452,16 @@ void iwl_mvm_mac_ctxt_release(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 


	switch (vif->type) {

	case NL80211_IFTYPE_P2P_DEVICE:

		iwl_trans_txq_disable(mvm->trans, IWL_MVM_OFFCHANNEL_QUEUE);

		iwl_trans_txq_disable(mvm->trans, IWL_MVM_OFFCHANNEL_QUEUE,

				      true);

		break;

	case NL80211_IFTYPE_AP:

		iwl_trans_txq_disable(mvm->trans, vif->cab_queue);

		iwl_trans_txq_disable(mvm->trans, vif->cab_queue, true);

		/* fall through */

	default:

		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)

			iwl_trans_txq_disable(mvm->trans, vif->hw_queue[ac]);

			iwl_trans_txq_disable(mvm->trans, vif->hw_queue[ac],

					      true);

	}

}

drivers/net/wireless/iwlwifi/mvm/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		}



		tid_data->ssn = 0xffff;

		iwl_trans_txq_disable(mvm->trans, txq_id);

		iwl_trans_txq_disable(mvm->trans, txq_id, true);

		/* fall through */

	case IWL_AGG_STARTING:

	case IWL_EMPTYING_HW_QUEUE_ADDBA:
@@ -965,7 +965,7 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), true))

			IWL_ERR(mvm, "Couldn't flush the AGG queue\n");



		iwl_trans_txq_disable(mvm->trans, tid_data->txq_id);

		iwl_trans_txq_disable(mvm->trans, tid_data->txq_id, true);

	}



	mvm->queue_to_mac80211[tid_data->txq_id] =

drivers/net/wireless/iwlwifi/mvm/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm, 
		IWL_DEBUG_TX_QUEUES(mvm,

				    "Can continue DELBA flow ssn = next_recl = %d\n",

				    tid_data->next_reclaimed);

		iwl_trans_txq_disable(mvm->trans, tid_data->txq_id);

		iwl_trans_txq_disable(mvm->trans, tid_data->txq_id, true);

		tid_data->state = IWL_AGG_OFF;

		/*

		 * we can't hold the mutex - but since we are after a sequence