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: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

7 files changed, 21 insertions, 29 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
index d930c1f78721..ce4da9d79fbd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
@@ -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;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index f5ee67cda73a..0aca6f47487c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -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;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index a1be5a68edfb..587b8c505a76 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -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;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 575980b88658..9bae5a92e30f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -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;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
index e77c3a46c94a..3a81cdba8ca3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
@@ -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;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
index 342678d2ed42..b57cfd965196 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
@@ -1068,20 +1068,18 @@ static void rtl8812ae_dm_check_txpower_tracking_thermalmeter(
                 struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E,
                               BIT(17) | BIT(16), 0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 8812 Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         }
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                  "Schedule TxPowerTracking direct call!!\n");
         rtl8812ae_dm_txpower_tracking_callback_thermalmeter(hw);
-        tm_trigger = 0;
 }
 
 static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
@@ -2519,21 +2517,19 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
 void rtl8821ae_dm_check_txpower_tracking_thermalmeter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
-
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E, BIT(17)|BIT(16),
                               0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 8821ae Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
 
                 rtl8821ae_dm_txpower_tracking_callback_thermalmeter(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 51572912c53d..2b770b5e2620 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1665,6 +1665,7 @@ struct rtl_dm {
         u8 last_dtp_lvl;
         u8 thermalvalue_avg[AVG_THERMAL_NUM];
         u8 thermalvalue_avg_index;
+        u8 tm_trigger;
         bool done_txpower;
         u8 dynamic_txhighpower_lvl;     /*Tx high power level */
         u8 dm_flag;             /*Indicate each dynamic mechanism's status. */