Commit 22de94de authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlwifi: jiffies based tx queues watchdog 



This patch replace monitor/recover timer by watchdog based on time
stamp. New code allow to discover hangs more precisely.

Timeout values are currently doubled monitoring period values of
previous timer. This have to be tuned based of firmware timing
capabilities.

Tested on 3945, 4965, 5300, 6300.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent abc471dc

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

+1 −2
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,
@@ -262,7 +261,7 @@ static struct iwl_base_params iwl1000_base_params = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

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

+2 −2
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, 
		return;

	}



	txq->time_stamp = jiffies;

	info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);

	ieee80211_tx_info_clear_status(info);
@@ -2733,7 +2734,6 @@ static struct iwl_lib_ops iwl3945_lib = { 
	.isr_ops = {

		.isr = iwl_isr_legacy,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl3945_good_plcp_health,



	.debugfs_ops = {
@@ -2776,7 +2776,7 @@ static struct iwl_base_params iwl3945_base_params = { 
	.led_compensation = 64,

	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.tx_power_by_driver = true,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -2198,6 +2198,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
		return;

	}



	txq->time_stamp = jiffies;

	info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);

	memset(&info->status, 0, sizeof(info->status));
@@ -2554,7 +2555,6 @@ static struct iwl_lib_ops iwl4965_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

};
@@ -2609,7 +2609,7 @@ static struct iwl_base_params iwl4965_base_params = { 
	.led_compensation = 61,

	.chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.temperature_kelvin = true,

	.max_event_log_size = 512,

	.tx_power_by_driver = true,

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

+1 −3
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,
@@ -472,7 +471,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,
@@ -511,7 +509,7 @@ static struct iwl_base_params iwl5000_base_params = { 
	.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_LONG_MONITORING_PERIOD,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

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

+3 −5
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,
@@ -412,7 +411,6 @@ static struct iwl_lib_ops iwl6000g2b_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,
@@ -482,7 +480,7 @@ static struct iwl_base_params iwl6000_base_params = { 
	.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,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -506,7 +504,7 @@ static struct iwl_base_params iwl6050_base_params = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1500,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -529,7 +527,7 @@ static struct iwl_base_params iwl6000_coex_base_params = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

CRA Git | Maintained and supported by SUSTech CRA and CCSE