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

iwlgn: need longer tx queue stuck timer for coex devices 



For BT/WiFi combo devices, need longer tx stuck queue
timer, so those devices won't reload firmware too often.

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

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

+30 −8
Original line number Diff line number Diff line
@@ -509,6 +509,28 @@ static struct iwl_base_params iwl6050_base_params = { 
	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};

static struct iwl_base_params iwl6000_coex_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,

	.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,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



static struct iwl_ht_params iwl6000_ht_params = {

	.ht_greenfield_support = true,
@@ -587,7 +609,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,
@@ -608,7 +630,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,
@@ -628,7 +650,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,
@@ -649,7 +671,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,
@@ -669,7 +691,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,
@@ -690,7 +712,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,
@@ -829,7 +851,7 @@ struct iwl_cfg iwl130_bgn_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,
@@ -849,7 +871,7 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,

	.ops = &iwl6000g2b_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

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

+4 −7
Original line number Diff line number Diff line
@@ -2483,14 +2483,11 @@ static int iwl_check_stuck_queue(struct iwl_priv *priv, int cnt) 
					"queue %d, not read %d time\n",

					q->id,

					q->repeat_same_read_ptr);

			if (priv->cfg->bt_params &&

			    !priv->cfg->bt_params->advanced_bt_coexist) {

			mod_timer(&priv->monitor_recover,

				jiffies + msecs_to_jiffies(

				IWL_ONE_HUNDRED_MSECS));

			return 1;

		}

		}

	} else {

		q->last_read_ptr = q->read_ptr;

		q->repeat_same_read_ptr = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE