Commit 9617040e authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove iwlmvm's tfd_q_hang_detect module parameter 



This should be controlled by the firmware debugging mechanism
and not by a module parameter. This has always been true.
Remove it and assume it is set.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200424182644.b6e4982e62ae.I7f7352f79c40ada2f221bd4b41449a40821e833f@changeid
parent f4bfdc5e

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

+2 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -134,12 +132,10 @@ extern const struct ieee80211_ops iwl_mvm_hw_ops; 
 *	We will register to mac80211 to have testmode working. The NIC must not

 *	be up'ed after the INIT fw asserted. This is useful to be able to use

 *	proprietary tools over testmode to debug the INIT fw.

 * @tfd_q_hang_detect: enabled the detection of hung transmit queues

 * @power_scheme: one of enum iwl_power_scheme

 */

struct iwl_mvm_mod_params {

	bool init_dbg;

	bool tfd_q_hang_detect;

	int power_scheme;

};

extern struct iwl_mvm_mod_params iwlmvm_mod_params;

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

+2 −9
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -94,7 +92,6 @@ static const struct iwl_op_mode_ops iwl_mvm_ops_mq; 


struct iwl_mvm_mod_params iwlmvm_mod_params = {

	.power_scheme = IWL_POWER_SCHEME_BPS,

	.tfd_q_hang_detect = true

	/* rest of fields are 0 by default */

};
@@ -104,10 +101,6 @@ MODULE_PARM_DESC(init_dbg, 
module_param_named(power_scheme, iwlmvm_mod_params.power_scheme, int, 0444);

MODULE_PARM_DESC(power_scheme,

		 "power management scheme: 1-active, 2-balanced, 3-low power, default: 2");

module_param_named(tfd_q_hang_detect, iwlmvm_mod_params.tfd_q_hang_detect,

		   bool, 0444);

MODULE_PARM_DESC(tfd_q_hang_detect,

		 "TFD queues hang detection (default: true");



/*

 * module init and exit functions

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

+6 −10
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2015, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2015, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1965,9 +1963,8 @@ void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta) 
static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 queue,

					  u8 sta_id, u8 fifo)

{

	unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?

		mvm->trans->trans_cfg->base_params->wd_timeout :

		IWL_WATCHDOG_DISABLED;

	unsigned int wdg_timeout =

		mvm->trans->trans_cfg->base_params->wd_timeout;

	struct iwl_trans_txq_scd_cfg cfg = {

		.fifo = fifo,

		.sta_id = sta_id,
@@ -1983,9 +1980,8 @@ static void iwl_mvm_enable_aux_snif_queue(struct iwl_mvm *mvm, u16 queue, 


static int iwl_mvm_enable_aux_snif_queue_tvqm(struct iwl_mvm *mvm, u8 sta_id)

{

	unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ?

		mvm->trans->trans_cfg->base_params->wd_timeout :

		IWL_WATCHDOG_DISABLED;

	unsigned int wdg_timeout =

		mvm->trans->trans_cfg->base_params->wd_timeout;



	WARN_ON(!iwl_mvm_has_new_tx_api(mvm));

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

+3 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (C) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (C) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -952,8 +950,7 @@ unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm, 
				IWL_UCODE_TLV_CAPA_STA_PM_NOTIF) &&

		    vif && vif->type == NL80211_IFTYPE_AP)

			return IWL_WATCHDOG_DISABLED;

		return iwlmvm_mod_params.tfd_q_hang_detect ?

			default_timeout : IWL_WATCHDOG_DISABLED;

		return default_timeout;

	}



	trigger = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_TXQ_TIMERS);