Commit d4e3a341 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: mvm: add support for new flush queue response 



In the new api all the flush in the FW is done before we
get the response and in the response we only get the updated
read pointer and all queued packets don't get anymore rx_tx
per packet to free the queued packet, so driver needs to free
all queued packets on flushed queue at once after flush response.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210117130510.4bd0eca8c0ef.I1601aad2eb2cc83f6f73b8ca52be57bb9fd626ab@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f7d6ef33

drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

+26 −0
Original line number Diff line number Diff line
@@ -855,6 +855,32 @@ struct iwl_tx_path_flush_cmd { 
	__le16 reserved;

} __packed; /* TX_PATH_FLUSH_CMD_API_S_VER_2 */



#define IWL_TX_FLUSH_QUEUE_RSP 16



/**

 * struct iwl_flush_queue_info - virtual flush queue info

 * @queue_num: virtual queue id

 * @read_before_flush: read pointer before flush

 * @read_after_flush: read pointer after flush

 */

struct iwl_flush_queue_info {

	__le16 tid;

	__le16 queue_num;

	__le16 read_before_flush;

	__le16 read_after_flush;

} __packed; /* TFDQ_FLUSH_INFO_API_S_VER_1 */



/**

 * struct iwl_tx_path_flush_cmd_rsp -- queue/FIFO flush command response

 * @num_flushed_queues: number of queues in queues array

 * @queues: all flushed queues

 */

struct iwl_tx_path_flush_cmd_rsp {

	__le16 sta_id;

	__le16 num_flushed_queues;

	struct iwl_flush_queue_info queues[IWL_TX_FLUSH_QUEUE_RSP];

} __packed; /* TX_PATH_FLUSH_CMD_RSP_API_S_VER_1 */



/* Available options for the SCD_QUEUE_CFG HCMD */

enum iwl_scd_cfg_actions {

	SCD_CFG_DISABLE_QUEUE		= 0x0,

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

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static ssize_t iwl_dbgfs_tx_flush_write(struct iwl_mvm *mvm, char *buf, 
				    "FLUSHING all tids queues on sta_id = %d\n",

				    flush_arg);

		mutex_lock(&mvm->mutex);

		ret = iwl_mvm_flush_sta_tids(mvm, flush_arg, 0xFFFF, 0)

		ret = iwl_mvm_flush_sta_tids(mvm, flush_arg, 0xFFFF)

			? : count;

		mutex_unlock(&mvm->mutex);

		return ret;
@@ -101,7 +101,7 @@ static ssize_t iwl_dbgfs_tx_flush_write(struct iwl_mvm *mvm, char *buf, 
			    flush_arg);



	mutex_lock(&mvm->mutex);

	ret =  iwl_mvm_flush_tx_path(mvm, flush_arg, 0) ? : count;

	ret =  iwl_mvm_flush_tx_path(mvm, flush_arg) ? : count;

	mutex_unlock(&mvm->mutex);



	return ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -4684,7 +4684,7 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) 
		if (drop) {

			mutex_lock(&mvm->mutex);

			iwl_mvm_flush_tx_path(mvm,

				iwl_mvm_flushable_queues(mvm) & queues, 0);

				iwl_mvm_flushable_queues(mvm) & queues);

			mutex_unlock(&mvm->mutex);

		} else {

			iwl_trans_wait_tx_queues_empty(mvm->trans, queues);
@@ -4702,7 +4702,7 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) 
			continue;



		if (drop)

			iwl_mvm_flush_sta_tids(mvm, i, 0xFFFF, 0);

			iwl_mvm_flush_sta_tids(mvm, i, 0xFFFF);

		else

			iwl_mvm_wait_sta_queues_empty(mvm,

					iwl_mvm_sta_from_mac80211(sta));

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

+2 −3
Original line number Diff line number Diff line
@@ -1473,10 +1473,9 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status); 
#else

static inline const char *iwl_mvm_get_tx_fail_reason(u32 status) { return ""; }

#endif

int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, u32 flags);

int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk);

int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal);

int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id,

			   u16 tids, u32 flags);

int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids);



void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm);

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

+2 −2
Original line number Diff line number Diff line
@@ -3105,11 +3105,11 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


		if (iwl_mvm_has_new_tx_api(mvm)) {

			if (iwl_mvm_flush_sta_tids(mvm, mvmsta->sta_id,

						   BIT(tid), 0))

						   BIT(tid)))

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

			iwl_trans_wait_txq_empty(mvm->trans, txq_id);

		} else {

			if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), 0))

			if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id)))

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

			iwl_trans_wait_tx_queues_empty(mvm->trans, BIT(txq_id));

		}