rtlwifi: Add btcoex record_pwr_mode

Add btcoex record pwr mode to control LPS's parameters and share time
with BT.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry 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: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
index 9635c1478875a6acbcdf5415f19ed0e09032d85c..3b976dab712fcb6f78754ea7b5bd8773db044190 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -45,8 +45,21 @@ static struct rtl_btc_ops rtl_btc_operation = {
        .btc_is_disable_edca_turbo = rtl_btc_is_disable_edca_turbo,
        .btc_is_bt_disabled = rtl_btc_is_bt_disabled,
        .btc_special_packet_notify = rtl_btc_special_packet_notify,
+       .btc_record_pwr_mode = rtl_btc_record_pwr_mode,
 };
 
+void rtl_btc_record_pwr_mode(struct rtl_priv *rtlpriv, u8 *buf, u8 len)
+{
+       u8 safe_len;
+
+       safe_len = sizeof(gl_bt_coexist.pwr_mode_val);
+
+       if (safe_len > len)
+               safe_len = len;
+
+       memcpy(gl_bt_coexist.pwr_mode_val, buf, safe_len);
+}
+
 void rtl_btc_init_variables(struct rtl_priv *rtlpriv)
 {
        exhalbtc_initlize_variables();

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
index fff5117e1c4e5aa23b734a93e6d7532b4995be8c..9eeb4fdeaec1b28a35c17944dc243ccafc824e0c 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
@@ -43,6 +43,7 @@ bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv);
 bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv);
 bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);
 void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type);
+void rtl_btc_record_pwr_mode(struct rtl_priv *rtlpriv, u8 *buf, u8 len);
 
 struct rtl_btc_ops *rtl_btc_get_ops_pointer(void);
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
index c6c9c66abe1f29758f46bbb309645233274fa96b..c11f1c04f871f355983d169582c3eead9496aee3 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
@@ -422,7 +422,8 @@ void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u8 u1_h2c_set_pwrmode[H2C_92E_PWEMODE_LENGTH] = { 0 };
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       u8 rlbm , power_state = 0;
+       u8 rlbm, power_state = 0, byte5 = 0x40;
+       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
 
        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD , "FW LPS mode = %d\n", mode);
 
@@ -440,10 +441,14 @@ void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
        else
                power_state |= FW_PWR_STATE_RF_OFF;
        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+       SET_H2CCMD_PWRMODE_PARM_BYTE5(u1_h2c_set_pwrmode, byte5);
 
        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
                      u1_h2c_set_pwrmode, H2C_92E_PWEMODE_LENGTH);
+       if (rtlpriv->cfg->ops->get_btc_status())
+               btc_ops->btc_record_pwr_mode(rtlpriv, u1_h2c_set_pwrmode,
+                                            H2C_92E_PWEMODE_LENGTH);
        rtl92ee_fill_h2c_cmd(hw, H2C_92E_SETPWRMODE, H2C_92E_PWEMODE_LENGTH,
                             u1_h2c_set_pwrmode);
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
index af8271967a880bab1c2f9f5c050c0478c6777d3c..b770f722daa6dc138c93340af31b09509ebc5bd2 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
@@ -37,7 +37,7 @@
 #define USE_OLD_WOWLAN_DEBUG_FW 0
 
 #define H2C_92E_RSVDPAGE_LOC_LEN               5
-#define H2C_92E_PWEMODE_LENGTH                 5
+#define H2C_92E_PWEMODE_LENGTH                 7
 #define H2C_92E_JOINBSSRPT_LENGTH              1
 #define H2C_92E_AP_OFFLOAD_LENGTH              3
 #define H2C_92E_WOWLAN_LENGTH                  3
@@ -154,6 +154,8 @@ enum rtl8192e_c2h_evt {
        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __val)
 #define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__cmd, __val)                \
        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_BYTE5(__cmd, __val)            \
+       SET_BITS_TO_LE_1BYTE((__cmd) + 5, 0, 8, __val)
 #define GET_92E_H2CCMD_PWRMODE_PARM_MODE(__cmd)                        \
        LE_BITS_TO_1BYTE(__cmd, 0, 8)
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
index a7e31af2b5de77ab4c5eb0f83c8b1b13c6fa3054..488376becdcbbce1a9ee59ec8624c3532455e671 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
@@ -240,7 +240,9 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u8 u1_h2c_set_pwrmode[H2C_PWEMODE_LENGTH] = { 0 };
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       u8 rlbm, power_state = 0;
+       u8 rlbm, power_state = 0, byte5 = 0x40;
+       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
+
        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
        SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, ((mode) ? 1 : 0));
@@ -257,10 +259,14 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
        else
                power_state |= FW_PWR_STATE_RF_OFF;
        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+       SET_H2CCMD_PWRMODE_PARM_BYTE5(u1_h2c_set_pwrmode, byte5);
 
        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
                      u1_h2c_set_pwrmode, H2C_PWEMODE_LENGTH);
+       if (rtlpriv->cfg->ops->get_btc_status())
+               btc_ops->btc_record_pwr_mode(rtlpriv, u1_h2c_set_pwrmode,
+                                            H2C_PWEMODE_LENGTH);
        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_SETPWRMODE, H2C_PWEMODE_LENGTH,
                               u1_h2c_set_pwrmode);
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
index 2482b3bc2bfaa890a0711402029ed285e5093929..2de4edb62bca136befb76b0a9f2265edf3aaa49e 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
@@ -33,7 +33,7 @@
 
 #define USE_OLD_WOWLAN_DEBUG_FW                        0
 
-#define H2C_PWEMODE_LENGTH                     5
+#define H2C_PWEMODE_LENGTH                     7
 
 /* Fw PS state for RPWM.
 *BIT[2:0] = HW state
@@ -125,6 +125,8 @@ enum rtl8723b_c2h_evt {
        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+3, 0, 8, __val)
 #define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__ph2ccmd, __val)            \
        SET_BITS_TO_LE_1BYTE((__ph2ccmd)+4, 0, 8, __val)
+#define SET_H2CCMD_PWRMODE_PARM_BYTE5(__ph2ccmd, __val)                        \
+       SET_BITS_TO_LE_1BYTE((__ph2ccmd) + 5, 0, 8, __val)
 #define GET_88E_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd)                    \
        LE_BITS_TO_1BYTE(__ph2ccmd, 0, 8)
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
index 5eeb0b1cafa42ec810cbfa4172ec04a2156f8aa8..96b8a9bdaf55106fbe72e03ff26477523632076c 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
@@ -489,7 +489,8 @@ void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u8 u1_h2c_set_pwrmode[H2C_8821AE_PWEMODE_LENGTH] = { 0 };
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       u8 rlbm, power_state = 0;
+       u8 rlbm, power_state = 0, byte5 = 0x40;
+       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
 
        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
@@ -508,10 +509,14 @@ void rtl8821ae_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
                power_state |= FW_PWR_STATE_RF_OFF;
 
        SET_H2CCMD_PWRMODE_PARM_PWR_STATE(u1_h2c_set_pwrmode, power_state);
+       SET_H2CCMD_PWRMODE_PARM_BYTE5(u1_h2c_set_pwrmode, byte5);
 
        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                      "rtl92c_set_fw_pwrmode(): u1_h2c_set_pwrmode\n",
                      u1_h2c_set_pwrmode, H2C_8821AE_PWEMODE_LENGTH);
+       if (rtlpriv->cfg->ops->get_btc_status())
+               btc_ops->btc_record_pwr_mode(rtlpriv, u1_h2c_set_pwrmode,
+                                            H2C_8821AE_PWEMODE_LENGTH);
        rtl8821ae_fill_h2c_cmd(hw, H2C_8821AE_SETPWRMODE,
                               H2C_8821AE_PWEMODE_LENGTH,
                               u1_h2c_set_pwrmode);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
index 98d871afd92ab4c0c1555f3bf4ac5612ae001b35..32d46d7128f5d0b64f721fd52b3236d60d4f2b8b 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
@@ -42,7 +42,7 @@
 #define USE_OLD_WOWLAN_DEBUG_FW 0
 
 #define H2C_8821AE_RSVDPAGE_LOC_LEN            5
-#define H2C_8821AE_PWEMODE_LENGTH                      5
+#define H2C_8821AE_PWEMODE_LENGTH                      7
 #define H2C_8821AE_JOINBSSRPT_LENGTH           1
 #define H2C_8821AE_AP_OFFLOAD_LENGTH           3
 #define H2C_8821AE_WOWLAN_LENGTH                       3
@@ -218,6 +218,8 @@ enum rtl8821a_h2c_cmd {
        SET_BITS_TO_LE_1BYTE((__cmd)+3, 0, 8, __value)
 #define SET_H2CCMD_PWRMODE_PARM_PWR_STATE(__cmd, __value)      \
        SET_BITS_TO_LE_1BYTE((__cmd)+4, 0, 8, __value)
+#define SET_H2CCMD_PWRMODE_PARM_BYTE5(__cmd, __value)          \
+       SET_BITS_TO_LE_1BYTE((__cmd) + 5, 0, 8, __value)
 #define GET_8821AE_H2CCMD_PWRMODE_PARM_MODE(__cmd)             \
        LE_BITS_TO_1BYTE(__cmd, 0, 8)
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 8f3035b41e6fcd4f9d6f39bcbf08c28a713c4488..41ebdb9d3627fffe44b193740f94a7dd93d8ccfb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2560,6 +2560,7 @@ struct rtl_btc_ops {
        bool (*btc_is_bt_disabled) (struct rtl_priv *rtlpriv);
        void (*btc_special_packet_notify)(struct rtl_priv *rtlpriv,
                                          u8 pkt_type);
+       void (*btc_record_pwr_mode)(struct rtl_priv *rtlpriv, u8 *buf, u8 len);
 };
 
 struct proxim {