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

Commit 135f4fbd authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: Fix a2dp choppy while BT RSSI stays on threshold. 



In this case, BTC asks to enter/leave PS mode frequently to cause A2DP
choppy.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3e3d8aa6

drivers/net/wireless/realtek/rtlwifi/ps.c

+8 −6
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode) 
	if (mac->link_state != MAC80211_LINKED)

		return;



	if (ppsc->dot11_psmode == rt_psmode)

	if (ppsc->dot11_psmode == rt_psmode && rt_psmode == EACTIVE)

		return;



	/* Update power save mode configured. */
@@ -438,11 +438,13 @@ static void rtl_lps_enter_core(struct ieee80211_hw *hw) 


	spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);



	if (ppsc->dot11_psmode == EACTIVE) {

	/* Don't need to check (ppsc->dot11_psmode == EACTIVE), because

	 * bt_ccoexist may ask to enter lps.

	 * In normal case, this constraint move to rtl_lps_set_psmode().

	 */

	RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		 "Enter 802.11 power save mode...\n");

	rtl_lps_set_psmode(hw, EAUTOPS);

	}



	spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);

}

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c

+8 −2
Original line number Diff line number Diff line
@@ -427,6 +427,11 @@ void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	bool bt_ctrl_lps = (rtlpriv->cfg->ops->get_btc_status() ?

			    btc_ops->btc_is_bt_ctrl_lps(rtlpriv) : false);

	bool bt_lps_on = (rtlpriv->cfg->ops->get_btc_status() ?

			  btc_ops->btc_is_bt_lps_on(rtlpriv) : false);



	if (bt_ctrl_lps)

		mode = (bt_lps_on ? FW_PS_MIN_MODE : FW_PS_ACTIVE_MODE);



	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",

		 mode, bt_ctrl_lps);
@@ -482,8 +487,9 @@ void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));

	SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);

	SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,

					 (rtlpriv->mac80211.p2p) ?

					 ppsc->smart_ps : 1);

					 bt_ctrl_lps ? 0 :

					 ((rtlpriv->mac80211.p2p) ?

					  ppsc->smart_ps : 1));

	SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,

					       awake_intvl);

	SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c

+6 −2
Original line number Diff line number Diff line
@@ -245,6 +245,11 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	bool bt_ctrl_lps = (rtlpriv->cfg->ops->get_btc_status() ?

			    btc_ops->btc_is_bt_ctrl_lps(rtlpriv) : false);

	bool bt_lps_on = (rtlpriv->cfg->ops->get_btc_status() ?

			  btc_ops->btc_is_bt_lps_on(rtlpriv) : false);



	if (bt_ctrl_lps)

		mode = (bt_lps_on ? FW_PS_MIN_MODE : FW_PS_ACTIVE_MODE);



	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",

		 mode, bt_ctrl_lps);
@@ -300,8 +305,7 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));

	SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);

	SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,

					 (rtlpriv->mac80211.p2p) ?

					  ppsc->smart_ps : 1);

					 bt_ctrl_lps ? 0 : ppsc->smart_ps);

	SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,

					       awake_intvl);

	SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c

+8 −2
Original line number Diff line number Diff line
@@ -494,6 +494,11 @@ void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	bool bt_ctrl_lps = (rtlpriv->cfg->ops->get_btc_status() ?

			    btc_ops->btc_is_bt_ctrl_lps(rtlpriv) : false);

	bool bt_lps_on = (rtlpriv->cfg->ops->get_btc_status() ?

			  btc_ops->btc_is_bt_lps_on(rtlpriv) : false);



	if (bt_ctrl_lps)

		mode = (bt_lps_on ? FW_PS_MIN_MODE : FW_PS_ACTIVE_MODE);



	RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "FW LPS mode = %d (coex:%d)\n",

		 mode, bt_ctrl_lps);
@@ -549,8 +554,9 @@ void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
	SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));

	SET_H2CCMD_PWRMODE_PARM_RLBM(u1_h2c_set_pwrmode, rlbm);

	SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode,

					 (rtlpriv->mac80211.p2p) ?

					 ppsc->smart_ps : 1);

					 bt_ctrl_lps ? 0 :

					 ((rtlpriv->mac80211.p2p) ?

					  ppsc->smart_ps : 1));

	SET_H2CCMD_PWRMODE_PARM_AWAKE_INTERVAL(u1_h2c_set_pwrmode,

					       awake_intvl);

	SET_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(u1_h2c_set_pwrmode, 0);