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

Commit e366176e authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: consider BT for power management 



Check the BT PSPoll flag when fill PM command to uCode

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 97badb0e

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

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ static struct iwl_bt_params iwl6000_bt_params = { 
	.agg_time_limit = BT_AGG_THRESHOLD_DEF,

	.bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,

	.bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT,

	.bt_sco_disable = true,

};



struct iwl_cfg iwl6000g2a_2agn_cfg = {

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+4 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,10 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) 
	} else {

		bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_3W <<

					IWLAGN_BT_FLAG_COEX_MODE_SHIFT;

		if (priv->cfg->bt_params &&

		    priv->cfg->bt_params->bt_sco_disable)

			bt_cmd.flags |= IWLAGN_BT_FLAG_SYNC_2_BT_DISABLE;



		if (priv->bt_ch_announce)

			bt_cmd.flags |= IWLAGN_BT_FLAG_CHANNEL_INHIBITION;

		IWL_DEBUG_INFO(priv, "BT coex flag: 0X%x\n", bt_cmd.flags);

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

+2 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ struct iwl_base_params { 
 * @agg_time_limit: maximum number of uSec in aggregation

 * @ampdu_factor: Maximum A-MPDU length factor

 * @ampdu_density: Minimum A-MPDU spacing

 * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode

*/

struct iwl_bt_params {

	bool advanced_bt_coexist;
@@ -343,6 +344,7 @@ struct iwl_bt_params { 
	u16 agg_time_limit;

	u8 ampdu_factor;

	u8 ampdu_density;

	bool bt_sco_disable;

};

/*

 * @use_rts_for_aggregation: use rts/cts protection for HT traffic

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

+17 −0
Original line number Diff line number Diff line
@@ -163,6 +163,15 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, 
	else

		cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;



	if (priv->cfg->bt_params &&

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

		if (!priv->cfg->bt_params->bt_sco_disable)

			cmd->flags |= IWL_POWER_BT_SCO_ENA;

		else

			cmd->flags &= ~IWL_POWER_BT_SCO_ENA;

	}





	slp_itrvl = le32_to_cpu(cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1]);

	if (slp_itrvl > IWL_CONN_MAX_LISTEN_INTERVAL)

		cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1] =
@@ -236,6 +245,14 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv, 
	if (priv->power_data.pci_pm)

		cmd->flags |= IWL_POWER_PCI_PM_MSK;



	if (priv->cfg->bt_params &&

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

		if (!priv->cfg->bt_params->bt_sco_disable)

			cmd->flags |= IWL_POWER_BT_SCO_ENA;

		else

			cmd->flags &= ~IWL_POWER_BT_SCO_ENA;

	}



	cmd->rx_data_timeout = cpu_to_le32(1000 * dynps_ms);

	cmd->tx_data_timeout = cpu_to_le32(1000 * dynps_ms);