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

Commit 3198c68c authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: use long monitor timer to avoid un-necessary reload 



For 5000 and 6000g2b series of devices, use long monitor timer to check
stuck tx queues.

.6000g2b series device, it is WiFi/BT combo device, there are some cases,
tx queues are not move for a period of time because the WiFi/BT coex.

.5000 series device, it is being reported firmware got reload more
often than necessary, so extend the timer to avoid un-necessary reload.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent ce60659a

drivers/net/wireless/iwlwifi/iwl-5000.c

+5 −5
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -541,7 +541,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -570,7 +570,7 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -601,7 +601,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -632,7 +632,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

drivers/net/wireless/iwlwifi/iwl-6000.c

+6 −6
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,
@@ -532,7 +532,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,
@@ -570,7 +570,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,
@@ -606,7 +606,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,
@@ -644,7 +644,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,
@@ -680,7 +680,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,