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

Commit 1637c1b7 authored by Hans Ulli Kroll's avatar Hans Ulli Kroll Committed by Kalle Valo
Browse files

rtlwifi: fix tm_trigger usage 



While working on getting my rtl8821au driver in pretty shape for
inclusion, it is dicosvered that the tm_trigger flag is used only for
the first device using this driver.
This flag handles the thermal power management in the hardware.

To change this add a entry in sttruct rtl_dm, so each device can handle
is separately.

Signed-off-by: default avatarHans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent fbcaee1c

drivers/net/wireless/rtlwifi/rtl8188ee/dm.c

+3 −4
Original line number Diff line number Diff line
@@ -1123,23 +1123,22 @@ static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw) 
void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	static u8 tm_trigger;



	if (!rtlpriv->dm.txpower_tracking)

		return;



	if (!tm_trigger) {

	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17)|BIT(16),

			      0x03);

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Trigger 88E Thermal Meter!!\n");

		tm_trigger = 1;

		rtlpriv->dm.tm_trigger = 1;

		return;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Schedule TxPowerTracking !!\n");

				dm_txpower_track_cb_therm(hw);

		tm_trigger = 0;

		rtlpriv->dm.tm_trigger = 0;

	}

}

drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

+3 −4
Original line number Diff line number Diff line
@@ -1169,23 +1169,22 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter( 
						struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	static u8 tm_trigger;



	if (!rtlpriv->dm.txpower_tracking)

		return;



	if (!tm_trigger) {

	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, RFREG_OFFSET_MASK,

			      0x60);

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Trigger 92S Thermal Meter!!\n");

		tm_trigger = 1;

		rtlpriv->dm.tm_trigger = 1;

		return;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Schedule TxPowerTracking direct call!!\n");

		rtl92c_dm_txpower_tracking_directcall(hw);

		tm_trigger = 0;

		rtlpriv->dm.tm_trigger = 0;

	}

}

drivers/net/wireless/rtlwifi/rtl8192de/dm.c

+3 −4
Original line number Diff line number Diff line
@@ -1240,23 +1240,22 @@ static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw) 
void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	static u8 tm_trigger;



	if (!rtlpriv->dm.txpower_tracking)

		return;



	if (!tm_trigger) {

	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) |

			      BIT(16), 0x03);

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Trigger 92S Thermal Meter!!\n");

		tm_trigger = 1;

		rtlpriv->dm.tm_trigger = 1;

		return;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Schedule TxPowerTracking direct call!!\n");

		rtl92d_dm_txpower_tracking_callback_thermalmeter(hw);

		tm_trigger = 0;

		rtlpriv->dm.tm_trigger = 0;

	}

}

drivers/net/wireless/rtlwifi/rtl8192se/dm.c

+3 −4
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ static void _rtl92s_dm_check_txpowertracking_thermalmeter( 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_phy *rtlphy = &(rtlpriv->phy);

	static u8 tm_trigger;

	u8 tx_power_checkcnt = 5;



	/* 2T2R TP issue */
@@ -215,13 +214,13 @@ static void _rtl92s_dm_check_txpowertracking_thermalmeter( 
		return;

	}



	if (!tm_trigger) {

	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER,

			      RFREG_OFFSET_MASK, 0x60);

		tm_trigger = 1;

		rtlpriv->dm.tm_trigger = 1;

	} else {

		_rtl92s_dm_txpowertracking_callback_thermalmeter(hw);

		tm_trigger = 0;

		rtlpriv->dm.tm_trigger = 0;

	}

}

drivers/net/wireless/rtlwifi/rtl8723be/dm.c

+3 −4
Original line number Diff line number Diff line
@@ -909,23 +909,22 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter( 
void rtl8723be_dm_check_txpower_tracking(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	static u8 tm_trigger;



	if (!rtlpriv->dm.txpower_tracking)

		return;



	if (!tm_trigger) {

	if (!rtlpriv->dm.tm_trigger) {

		rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) | BIT(16),

			      0x03);

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Trigger 8723be Thermal Meter!!\n");

		tm_trigger = 1;

		rtlpriv->dm.tm_trigger = 1;

		return;

	} else {

		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			 "Schedule TxPowerTracking !!\n");

		rtl8723be_dm_txpower_tracking_callback_thermalmeter(hw);

		tm_trigger = 0;

		rtlpriv->dm.tm_trigger = 0;

	}

}