Commit ba7136f3 authored by Alex Malamud's avatar Alex Malamud Committed by Luca Coelho
Browse files

iwlwifi: Set w-pointer upon resume according to SN 



During D3 state, FW may send packets.
As a result, "write" queue pointer will be incremented by FW.
Upon resume from D3, driver should adjust its shadows of "write" and "read"
pointers to the value reported by FW.

1. Keep TID used during wowlan configuration.
2. Upon resume, set driver's "write" and "read" queue pointers
	to the value reported by FW.

Signed-off-by: default avatarAlex Malamud <alex.malamud@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 242d9c8b

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

+13 −0
Original line number Diff line number Diff line
@@ -562,6 +562,8 @@ struct iwl_trans_ops { 
	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,

			struct sk_buff_head *skbs);



	void (*set_q_ptrs)(struct iwl_trans *trans, int queue, int ptr);



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

			   const struct iwl_trans_txq_scd_cfg *cfg,

			   unsigned int queue_wdg_timeout);
@@ -999,6 +1001,17 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue, 
	trans->ops->reclaim(trans, queue, ssn, skbs);

}



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

					int ptr)

{

	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {

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

		return;

	}



	trans->ops->set_q_ptrs(trans, queue, ptr);

}



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

					 bool configure_scd)

{

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+9 −0
Original line number Diff line number Diff line
@@ -831,6 +831,8 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm, 
	bool unified_image = fw_has_capa(&mvm->fw->ucode_capa,

					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);



	mvm->offload_tid = wowlan_config_cmd->offloading_tid;



	if (!unified_image) {

		ret = iwl_mvm_switch_to_d3(mvm);

		if (ret)
@@ -1656,6 +1658,13 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
		mvm_ap_sta->tid_data[i].seq_number = seq;

	}



	if (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22000) {

		i = mvm->offload_tid;

		iwl_trans_set_q_ptrs(mvm->trans,

				     mvm_ap_sta->tid_data[i].txq_id,

				     mvm_ap_sta->tid_data[i].seq_number >> 4);

	}



	/* now we have all the data we need, unlock to avoid mac80211 issues */

	mutex_unlock(&mvm->mutex);

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,7 @@ struct iwl_mvm { 
	struct ieee80211_channel **nd_channels;

	int n_nd_channels;

	bool net_detect;

	u8 offload_tid;

#ifdef CONFIG_IWLWIFI_DEBUGFS

	bool d3_wake_sysassert;

	bool d3_test_active;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans, 
			    struct iwl_rx_cmd_buffer *rxb);

void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,

			    struct sk_buff_head *skbs);

void iwl_trans_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);

void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);

void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,

				   struct iwl_txq *txq, u16 byte_cnt,

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −0
Original line number Diff line number Diff line
@@ -3397,6 +3397,8 @@ static const struct iwl_trans_ops trans_ops_pcie_gen2 = { 
	.tx = iwl_trans_pcie_gen2_tx,

	.reclaim = iwl_trans_pcie_reclaim,



	.set_q_ptrs = iwl_trans_pcie_set_q_ptrs,



	.txq_alloc = iwl_trans_pcie_dyn_txq_alloc,

	.txq_free = iwl_trans_pcie_dyn_txq_free,

	.wait_txq_empty = iwl_trans_pcie_wait_txq_empty,