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

Commit 5d42e7b2 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: allow to configure the timeout for the Tx queues 



Sometimes we will want to configure the timeouts for the
Tx queues based on the vif type. Allow to do that using the
trigger mechanism.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5dd9c68a

drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h

+3 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data) 
 * @FW_DBG_TRIGGER_STATS: trigger log collection upon statistics threshold.

 * @FW_DBG_TRIGGER_RSSI: trigger log collection when the rssi of the beacon

 *	goes below a threshold.

 * @FW_DBG_TRIGGER_TXQ_TIMERS: configures the timers for the Tx queue hang

 *	detection.

 */

enum iwl_fw_dbg_trigger {

	FW_DBG_TRIGGER_INVALID = 0,
@@ -261,6 +263,7 @@ enum iwl_fw_dbg_trigger { 
	FW_DB_TRIGGER_RESERVED,

	FW_DBG_TRIGGER_STATS,

	FW_DBG_TRIGGER_RSSI,

	FW_DBG_TRIGGER_TXQ_TIMERS,



	/* must be last */

	FW_DBG_TRIGGER_MAX,

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+23 −0
Original line number Diff line number Diff line
@@ -578,6 +578,29 @@ struct iwl_fw_dbg_trigger_low_rssi { 
	__le32 rssi;

} __packed;



/**

 * struct iwl_fw_dbg_trigger_txq_timer - configures the Tx queue's timer

 * @command_queue: timeout for the command queue in ms

 * @bss: timeout for the queues of a BSS (except for TDLS queues) in ms

 * @softap: timeout for the queues of a softAP in ms

 * @p2p_go: timeout for the queues of a P2P GO in ms

 * @p2p_client: timeout for the queues of a P2P client in ms

 * @p2p_device: timeout for the queues of a P2P device in ms

 * @ibss: timeout for the queues of an IBSS in ms

 * @tdls: timeout for the queues of a TDLS station in ms

 */

struct iwl_fw_dbg_trigger_txq_timer {

	__le32 command_queue;

	__le32 bss;

	__le32 softap;

	__le32 p2p_go;

	__le32 p2p_client;

	__le32 p2p_device;

	__le32 ibss;

	__le32 tdls;

	__le32 reserved[4];

} __packed;



/**

 * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration.

 * @id: conf id

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

+2 −3
Original line number Diff line number Diff line
@@ -470,9 +470,8 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm, 


int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

{

	unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?

					mvm->cfg->base_params->wd_timeout :

					IWL_WATCHDOG_DISABLED;

	unsigned int wdg_timeout =

		iwl_mvm_get_wd_timeout(mvm, vif, false, false);

	u32 ac;

	int ret;

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

+3 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,9 @@ void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm); 
int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,

				struct iwl_fw_dbg_trigger_tlv *trigger,

				const char *str, size_t len);



unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif,

				    bool tdls, bool cmd_q);

static inline bool

iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig,

			     struct ieee80211_vif *vif)

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

+1 −2
Original line number Diff line number Diff line
@@ -488,8 +488,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 


	/* Set a short watchdog for the command queue */

	trans_cfg.cmd_q_wdg_timeout =

		iwlmvm_mod_params.tfd_q_hang_detect ? IWL_DEF_WD_TIMEOUT :

						      IWL_WATCHDOG_DISABLED;

		iwl_mvm_get_wd_timeout(mvm, NULL, false, true);



	snprintf(mvm->hw->wiphy->fw_version,

		 sizeof(mvm->hw->wiphy->fw_version),