rtw88: coex: 8723d: handle BT inquiry cases

Coex mechanism used to make BT have higher priority and more time to
transfer data when BT inquiry-page, which leads to poor WiFi performance.
Should take WiFi traffic into consideration. If the WiFi is having heavy
traffic, use another parameter to make sure WiFi has more chance to TX/RX,
while guarantee the priority of BT for inquiry. If the WiFi isn't busy
(connected or not), set proper parameter to fix originals.

Fixes: fda8a5ded852 ("rtw88: 8723d: Add 8723DE to Kconfig and Makefile")
Tested-by: You-Sheng Yang <vicamo.yang@canonical.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200529025009.2468-3-yhchuang@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index aa1f726d0966ae032cd1d086ac93d7eeef75f461..cbf3d503df1c90404fd1b49e19a5eeded275f9f9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -1354,12 +1354,15 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)
                                tdma_case = 108;
                        else
                                tdma_case = 109;
+               } else if (coex_stat->wl_gl_busy) {
+                       table_case = 114;
+                       tdma_case = 121;
                } else if (coex_stat->wl_connected) {
-                       table_case = 101;
-                       tdma_case = 110;
-               } else {
                        table_case = 100;
                        tdma_case = 100;
+               } else {
+                       table_case = 101;
+                       tdma_case = 100;
                }
        }
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 4d88ba8406c7d1f98561edfdf31abdba49962051..4700195c8eef4afe37c601e2db646d7f2f0c8ff1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -2040,7 +2040,7 @@ static const struct coex_tdma_para tdma_sant_8723d[] = {
 
 /* Non-Shared-Antenna TDMA */
 static const struct coex_tdma_para tdma_nsant_8723d[] = {
-       { {0x00, 0x00, 0x00, 0x40, 0x00} }, /* case-100 */
+       { {0x00, 0x00, 0x00, 0x40, 0x01} }, /* case-100 */
        { {0x61, 0x45, 0x03, 0x11, 0x11} }, /* case-101 */
        { {0x61, 0x3a, 0x03, 0x11, 0x11} },
        { {0x61, 0x30, 0x03, 0x11, 0x11} },
@@ -2060,7 +2060,8 @@ static const struct coex_tdma_para tdma_nsant_8723d[] = {
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
-       { {0x51, 0x10, 0x03, 0x10, 0x50} }
+       { {0x51, 0x10, 0x03, 0x10, 0x50} }, /* case-120 */
+       { {0x51, 0x08, 0x03, 0x10, 0x50} },
 };
 
 /* rssi in percentage % (dbm = % - 100) */