rtw88: coex: update coex parameter to improve A2DP quality

Update COEX parameters and logic to enhance WL/BT performance
while WL_Busy + A2DP in a less interference environment.
It can avoid the interference comes cross from each other
and earned more performance.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201109085909.9143-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index 51eef8d..6dedc38 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -1523,7 +1523,7 @@ static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev)
                slot_type = TDMA_4SLOT;
 
                if (coex_stat->wl_gl_busy && coex_stat->wl_noisy_level == 0)
-                       table_case = 10;
+                       table_case = 11;
                else
                        table_case = 9;
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 84d66b5..4ed3868 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -1949,19 +1949,19 @@ static struct rtw_chip_ops rtw8723d_ops = {
 static const struct coex_table_para table_sant_8723d[] = {
        {0xffffffff, 0xffffffff}, /* case-0 */
        {0x55555555, 0x55555555},
-       {0x65555555, 0x65555555},
+       {0x66555555, 0x66555555},
        {0xaaaaaaaa, 0xaaaaaaaa},
        {0x5a5a5a5a, 0x5a5a5a5a},
        {0xfafafafa, 0xfafafafa}, /* case-5 */
-       {0xa5555555, 0xaaaa5aaa},
-       {0x6a5a5a5a, 0x5a5a5a5a},
+       {0x6a5a5555, 0xaaaaaaaa},
+       {0x6a5a56aa, 0x6a5a56aa},
        {0x6a5a5a5a, 0x6a5a5a5a},
        {0x66555555, 0x5a5a5a5a},
-       {0x65555555, 0x6a5a5a5a}, /* case-10 */
-       {0x65555555, 0xfafafafa},
+       {0x66555555, 0x6a5a5a5a}, /* case-10 */
+       {0x66555555, 0x6a5a5aaa},
        {0x66555555, 0x5a5a5aaa},
-       {0x65555555, 0x5aaa5aaa},
-       {0x65555555, 0xaaaa5aaa},
+       {0x66555555, 0x6aaa5aaa},
+       {0x66555555, 0xaaaa5aaa},
        {0x66555555, 0xaaaaaaaa}, /* case-15 */
        {0xffff55ff, 0xfafafafa},
        {0xffff55ff, 0x6afa5afa},
@@ -1970,13 +1970,13 @@ static const struct coex_table_para table_sant_8723d[] = {
        {0xaa5555aa, 0x6a5a5a5a}, /* case-20 */
        {0xaa5555aa, 0xaaaaaaaa},
        {0xffffffff, 0x5a5a5a5a},
-       {0xffffffff, 0x6a5a5a5a},
+       {0xffffffff, 0x5a5a5a5a},
        {0xffffffff, 0x55555555},
-       {0xffffffff, 0x6a5a5aaa}, /* case-25 */
+       {0xffffffff, 0x5a5a5aaa}, /* case-25 */
        {0x55555555, 0x5a5a5a5a},
        {0x55555555, 0xaaaaaaaa},
-       {0x55555555, 0x6a6a6a6a},
-       {0x656a656a, 0x656a656a},
+       {0x55555555, 0x6a5a6a5a},
+       {0x66556655, 0x66556655},
        {0x66556aaa, 0x6a5a6aaa}, /* case-30 */
        {0xffffffff, 0x5aaa5aaa},
        {0x56555555, 0x5a5a5aaa},
@@ -1986,25 +1986,25 @@ static const struct coex_table_para table_sant_8723d[] = {
 static const struct coex_table_para table_nsant_8723d[] = {
        {0xffffffff, 0xffffffff}, /* case-100 */
        {0x55555555, 0x55555555},
-       {0x65555555, 0x65555555},
+       {0x66555555, 0x66555555},
        {0xaaaaaaaa, 0xaaaaaaaa},
        {0x5a5a5a5a, 0x5a5a5a5a},
        {0xfafafafa, 0xfafafafa}, /* case-105 */
        {0x5afa5afa, 0x5afa5afa},
        {0x55555555, 0xfafafafa},
-       {0x65555555, 0xfafafafa},
-       {0x65555555, 0x5a5a5a5a},
-       {0x65555555, 0x6a5a5a5a}, /* case-110 */
-       {0x65555555, 0xaaaaaaaa},
+       {0x66555555, 0xfafafafa},
+       {0x66555555, 0x5a5a5a5a},
+       {0x66555555, 0x6a5a5a5a}, /* case-110 */
+       {0x66555555, 0xaaaaaaaa},
        {0xffff55ff, 0xfafafafa},
        {0xffff55ff, 0x5afa5afa},
        {0xffff55ff, 0xaaaaaaaa},
-       {0xaaffffaa, 0xfafafafa}, /* case-115 */
+       {0xffff55ff, 0xffff55ff}, /* case-115 */
        {0xaaffffaa, 0x5afa5afa},
        {0xaaffffaa, 0xaaaaaaaa},
        {0xffffffff, 0xfafafafa},
        {0xffffffff, 0x5afa5afa},
-       {0xffffffff, 0xaaaaaaaa},/* case-120 */
+       {0xffffffff, 0xaaaaaaaa}, /* case-120 */
        {0x55ff55ff, 0x5afa5afa},
        {0x55ff55ff, 0xaaaaaaaa},
        {0x55ff55ff, 0x55ff55ff}
@@ -2012,31 +2012,31 @@ static const struct coex_table_para table_nsant_8723d[] = {
 
 /* Shared-Antenna TDMA */
 static const struct coex_tdma_para tdma_sant_8723d[] = {
-       { {0x08, 0x00, 0x00, 0x00, 0x00} }, /* case-0 */
+       { {0x00, 0x00, 0x00, 0x00, 0x00} }, /* case-0 */
        { {0x61, 0x45, 0x03, 0x11, 0x11} }, /* case-1 */
        { {0x61, 0x3a, 0x03, 0x11, 0x11} },
-       { {0x61, 0x20, 0x03, 0x11, 0x11} },
        { {0x61, 0x30, 0x03, 0x11, 0x11} },
+       { {0x61, 0x20, 0x03, 0x11, 0x11} },
        { {0x61, 0x10, 0x03, 0x11, 0x11} }, /* case-5 */
-       { {0x61, 0x48, 0x03, 0x11, 0x10} },
+       { {0x61, 0x45, 0x03, 0x11, 0x10} },
        { {0x61, 0x3a, 0x03, 0x11, 0x10} },
        { {0x61, 0x30, 0x03, 0x11, 0x10} },
        { {0x61, 0x20, 0x03, 0x11, 0x10} },
        { {0x61, 0x10, 0x03, 0x11, 0x10} }, /* case-10 */
-       { {0x61, 0x10, 0x03, 0x11, 0x14} },
+       { {0x61, 0x08, 0x03, 0x11, 0x14} },
        { {0x61, 0x08, 0x03, 0x10, 0x14} },
-       { {0x51, 0x10, 0x03, 0x10, 0x54} },
-       { {0x51, 0x10, 0x03, 0x10, 0x55} },
-       { {0x51, 0x10, 0x07, 0x10, 0x54} }, /* case-15 */
+       { {0x51, 0x08, 0x03, 0x10, 0x54} },
+       { {0x51, 0x08, 0x03, 0x10, 0x55} },
+       { {0x51, 0x08, 0x07, 0x10, 0x54} }, /* case-15 */
        { {0x51, 0x45, 0x03, 0x10, 0x50} },
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
-       { {0x51, 0x15, 0x03, 0x10, 0x50} }, /* case-20 */
+       { {0x51, 0x10, 0x03, 0x10, 0x50} }, /* case-20 */
        { {0x51, 0x4a, 0x03, 0x10, 0x50} },
        { {0x51, 0x0c, 0x03, 0x10, 0x54} },
        { {0x55, 0x08, 0x03, 0x10, 0x54} },
-       { {0x65, 0x10, 0x03, 0x11, 0x11} },
+       { {0x65, 0x10, 0x03, 0x11, 0x10} },
        { {0x51, 0x10, 0x03, 0x10, 0x51} }, /* case-25 */
        { {0x51, 0x08, 0x03, 0x10, 0x50} },
        { {0x61, 0x08, 0x03, 0x11, 0x11} }
@@ -2044,7 +2044,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, 0x01} }, /* case-100 */
+       { {0x00, 0x00, 0x00, 0x00, 0x01} }, /* case-100 */
        { {0x61, 0x45, 0x03, 0x11, 0x11} }, /* case-101 */
        { {0x61, 0x3a, 0x03, 0x11, 0x11} },
        { {0x61, 0x30, 0x03, 0x11, 0x11} },
@@ -2065,7 +2065,7 @@ static const struct coex_tdma_para tdma_nsant_8723d[] = {
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
        { {0x51, 0x10, 0x03, 0x10, 0x50} }, /* case-120 */
-       { {0x51, 0x08, 0x03, 0x10, 0x50} },
+       { {0x51, 0x08, 0x03, 0x10, 0x50} }
 };
 
 /* rssi in percentage % (dbm = % - 100) */

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index d562f73..c1a96c7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2141,14 +2141,14 @@ static const struct coex_table_para table_sant_8822b[] = {
        {0xaaaaaaaa, 0xaaaaaaaa},
        {0x5a5a5a5a, 0x5a5a5a5a},
        {0xfafafafa, 0xfafafafa}, /* case-5 */
-       {0x6a5a6a5a, 0xaaaaaaaa},
+       {0x6a5a5555, 0xaaaaaaaa},
        {0x6a5a56aa, 0x6a5a56aa},
        {0x6a5a5a5a, 0x6a5a5a5a},
        {0x66555555, 0x5a5a5a5a},
        {0x66555555, 0x6a5a5a5a}, /* case-10 */
        {0x66555555, 0xfafafafa},
        {0x66555555, 0x5a5a5aaa},
-       {0x66555555, 0x5aaa5aaa},
+       {0x66555555, 0x6aaa5aaa},
        {0x66555555, 0xaaaa5aaa},
        {0x66555555, 0xaaaaaaaa}, /* case-15 */
        {0xffff55ff, 0xfafafafa},
@@ -2158,7 +2158,7 @@ static const struct coex_table_para table_sant_8822b[] = {
        {0xaa5555aa, 0x6a5a5a5a}, /* case-20 */
        {0xaa5555aa, 0xaaaaaaaa},
        {0xffffffff, 0x5a5a5a5a},
-       {0xffffffff, 0x6a5a5a5a},
+       {0xffffffff, 0x5a5a5a5a},
        {0xffffffff, 0x55555555},
        {0xffffffff, 0x6a5a5aaa}, /* case-25 */
        {0x55555555, 0x5a5a5a5a},
@@ -2187,7 +2187,7 @@ static const struct coex_table_para table_nsant_8822b[] = {
        {0xffff55ff, 0xfafafafa},
        {0xffff55ff, 0x5afa5afa},
        {0xffff55ff, 0xaaaaaaaa},
-       {0xaaffffaa, 0xfafafafa}, /* case-115 */
+       {0xffff55ff, 0xffff55ff}, /* case-115 */
        {0xaaffffaa, 0x5afa5afa},
        {0xaaffffaa, 0xaaaaaaaa},
        {0xffffffff, 0xfafafafa},
@@ -2216,7 +2216,7 @@ static const struct coex_tdma_para tdma_sant_8822b[] = {
        { {0x51, 0x08, 0x03, 0x10, 0x54} },
        { {0x51, 0x08, 0x03, 0x10, 0x55} },
        { {0x51, 0x08, 0x07, 0x10, 0x54} }, /* case-15 */
-       { {0x51, 0x45, 0x03, 0x10, 0x10} },
+       { {0x51, 0x45, 0x03, 0x10, 0x50} },
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
@@ -2224,7 +2224,7 @@ static const struct coex_tdma_para tdma_sant_8822b[] = {
        { {0x51, 0x4a, 0x03, 0x10, 0x50} },
        { {0x51, 0x0c, 0x03, 0x10, 0x54} },
        { {0x55, 0x08, 0x03, 0x10, 0x54} },
-       { {0x65, 0x10, 0x03, 0x11, 0x11} },
+       { {0x65, 0x10, 0x03, 0x11, 0x10} },
        { {0x51, 0x10, 0x03, 0x10, 0x51} }, /* case-25 */
        { {0x51, 0x08, 0x03, 0x10, 0x50} },
        { {0x61, 0x08, 0x03, 0x11, 0x11} }
@@ -2233,7 +2233,7 @@ static const struct coex_tdma_para tdma_sant_8822b[] = {
 /* Non-Shared-Antenna TDMA */
 static const struct coex_tdma_para tdma_nsant_8822b[] = {
        { {0x00, 0x00, 0x00, 0x00, 0x00} }, /* case-100 */
-       { {0x61, 0x45, 0x03, 0x11, 0x11} },
+       { {0x61, 0x45, 0x03, 0x11, 0x11} }, /* case-101 */
        { {0x61, 0x3a, 0x03, 0x11, 0x11} },
        { {0x61, 0x30, 0x03, 0x11, 0x11} },
        { {0x61, 0x20, 0x03, 0x11, 0x11} },
@@ -2252,7 +2252,8 @@ static const struct coex_tdma_para tdma_nsant_8822b[] = {
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
-       { {0x51, 0x10, 0x03, 0x10, 0x50} }  /* case-120 */
+       { {0x51, 0x10, 0x03, 0x10, 0x50} }, /* case-120 */
+       { {0x51, 0x08, 0x03, 0x10, 0x50} }
 };
 
 /* rssi in percentage % (dbm = % - 100) */

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 56c403d..db80682 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -3983,14 +3983,14 @@ static const struct coex_table_para table_sant_8822c[] = {
        {0xaaaaaaaa, 0xaaaaaaaa},
        {0x5a5a5a5a, 0x5a5a5a5a},
        {0xfafafafa, 0xfafafafa}, /* case-5 */
-       {0x6a5a6a5a, 0xaaaaaaaa},
+       {0x6a5a5555, 0xaaaaaaaa},
        {0x6a5a56aa, 0x6a5a56aa},
        {0x6a5a5a5a, 0x6a5a5a5a},
        {0x66555555, 0x5a5a5a5a},
        {0x66555555, 0x6a5a5a5a}, /* case-10 */
-       {0x66555555, 0xfafafafa},
+       {0x66555555, 0x6a5a5aaa},
        {0x66555555, 0x5a5a5aaa},
-       {0x66555555, 0x5aaa5aaa},
+       {0x66555555, 0x6aaa5aaa},
        {0x66555555, 0xaaaa5aaa},
        {0x66555555, 0xaaaaaaaa}, /* case-15 */
        {0xffff55ff, 0xfafafafa},
@@ -4000,14 +4000,14 @@ static const struct coex_table_para table_sant_8822c[] = {
        {0xaa5555aa, 0x6a5a5a5a}, /* case-20 */
        {0xaa5555aa, 0xaaaaaaaa},
        {0xffffffff, 0x5a5a5a5a},
-       {0xffffffff, 0x6a5a5a5a},
+       {0xffffffff, 0x5a5a5a5a},
        {0xffffffff, 0x55555555},
-       {0xffffffff, 0x6a5a5aaa}, /* case-25 */
+       {0xffffffff, 0x5a5a5aaa}, /* case-25 */
        {0x55555555, 0x5a5a5a5a},
        {0x55555555, 0xaaaaaaaa},
        {0x55555555, 0x6a5a6a5a},
        {0x66556655, 0x66556655},
-       {0x66556aaa, 0x6a5a6aaa}, /* case-30 */
+       {0x66556aaa, 0x6a5a6aaa}, /*case-30*/
        {0xffffffff, 0x5aaa5aaa},
        {0x56555555, 0x5a5a5aaa},
 };
@@ -4029,12 +4029,12 @@ static const struct coex_table_para table_nsant_8822c[] = {
        {0xffff55ff, 0xfafafafa},
        {0xffff55ff, 0x5afa5afa},
        {0xffff55ff, 0xaaaaaaaa},
-       {0xaaffffaa, 0xfafafafa}, /* case-115 */
+       {0xffff55ff, 0xffff55ff}, /* case-115 */
        {0xaaffffaa, 0x5afa5afa},
        {0xaaffffaa, 0xaaaaaaaa},
        {0xffffffff, 0xfafafafa},
        {0xffffffff, 0x5afa5afa},
-       {0xffffffff, 0xaaaaaaaa},/* case-120 */
+       {0xffffffff, 0xaaaaaaaa}, /* case-120 */
        {0x55ff55ff, 0x5afa5afa},
        {0x55ff55ff, 0xaaaaaaaa},
        {0x55ff55ff, 0x55ff55ff}
@@ -4043,7 +4043,7 @@ static const struct coex_table_para table_nsant_8822c[] = {
 /* Shared-Antenna TDMA */
 static const struct coex_tdma_para tdma_sant_8822c[] = {
        { {0x00, 0x00, 0x00, 0x00, 0x00} }, /* case-0 */
-       { {0x61, 0x45, 0x03, 0x11, 0x11} },
+       { {0x61, 0x45, 0x03, 0x11, 0x11} }, /* case-1 */
        { {0x61, 0x3a, 0x03, 0x11, 0x11} },
        { {0x61, 0x30, 0x03, 0x11, 0x11} },
        { {0x61, 0x20, 0x03, 0x11, 0x11} },
@@ -4058,7 +4058,7 @@ static const struct coex_tdma_para tdma_sant_8822c[] = {
        { {0x51, 0x08, 0x03, 0x10, 0x54} },
        { {0x51, 0x08, 0x03, 0x10, 0x55} },
        { {0x51, 0x08, 0x07, 0x10, 0x54} }, /* case-15 */
-       { {0x51, 0x45, 0x03, 0x10, 0x10} },
+       { {0x51, 0x45, 0x03, 0x10, 0x50} },
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
@@ -4066,7 +4066,7 @@ static const struct coex_tdma_para tdma_sant_8822c[] = {
        { {0x51, 0x4a, 0x03, 0x10, 0x50} },
        { {0x51, 0x0c, 0x03, 0x10, 0x54} },
        { {0x55, 0x08, 0x03, 0x10, 0x54} },
-       { {0x65, 0x10, 0x03, 0x11, 0x11} },
+       { {0x65, 0x10, 0x03, 0x11, 0x10} },
        { {0x51, 0x10, 0x03, 0x10, 0x51} }, /* case-25 */
        { {0x51, 0x08, 0x03, 0x10, 0x50} },
        { {0x61, 0x08, 0x03, 0x11, 0x11} }
@@ -4094,7 +4094,8 @@ static const struct coex_tdma_para tdma_nsant_8822c[] = {
        { {0x51, 0x3a, 0x03, 0x10, 0x50} },
        { {0x51, 0x30, 0x03, 0x10, 0x50} },
        { {0x51, 0x20, 0x03, 0x10, 0x50} },
-       { {0x51, 0x10, 0x03, 0x10, 0x50} }  /* case-120 */
+       { {0x51, 0x10, 0x03, 0x10, 0x50} }, /* case-120 */
+       { {0x51, 0x08, 0x03, 0x10, 0x50} }
 };
 
 /* rssi in percentage % (dbm = % - 100) */