wifi: rtw89: coex: update coexistence to 6.3.0

Since we maintain coexistence as shared code, so move coexistence version
from chip specific attribute to a definition.

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

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index d3d32f25071e8657e9f5b3481d32fb4686fb7b63..bbdfa9ac203ccdf6bbc75532016a97c1a1998d4e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -9,6 +9,7 @@
 #include "ps.h"
 #include "reg.h"
 
+#define RTW89_COEX_VERSION 0x06030013
 #define FCXDEF_STEP 50 /* MUST <= FCXMAX_STEP and match with wl fw*/
 
 enum btc_fbtc_tdma_template {
@@ -5495,10 +5496,10 @@ static void _show_cx_info(struct rtw89_dev *rtwdev, struct seq_file *m)
        seq_printf(m, "========== [BTC COEX INFO (%d)] ==========\n",
                   chip->chip_id);
 
-       ver_main = FIELD_GET(GENMASK(31, 24), chip->para_ver);
-       ver_sub = FIELD_GET(GENMASK(23, 16), chip->para_ver);
-       ver_hotfix = FIELD_GET(GENMASK(15, 8), chip->para_ver);
-       id_branch = FIELD_GET(GENMASK(7, 0), chip->para_ver);
+       ver_main = FIELD_GET(GENMASK(31, 24), RTW89_COEX_VERSION);
+       ver_sub = FIELD_GET(GENMASK(23, 16), RTW89_COEX_VERSION);
+       ver_hotfix = FIELD_GET(GENMASK(15, 8), RTW89_COEX_VERSION);
+       id_branch = FIELD_GET(GENMASK(7, 0), RTW89_COEX_VERSION);
        seq_printf(m, " %-15s : Coex:%d.%d.%d(branch:%d), ",
                   "[coex_version]", ver_main, ver_sub, ver_hotfix, id_branch);
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index f81335aacddfac52b4909b7d8d05f34f7d5c88bf..be3ec41dc55c0ee2ed234405298c9607e4e882aa 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2234,9 +2234,9 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .dav_log_efuse_size     = 0,
        .phycap_addr            = 0x580,
        .phycap_size            = 128,
-       .para_ver               = 0x05050864,
-       .wlcx_desired           = 0x05050000,
-       .btcx_desired           = 0x5,
+       .para_ver               = 0x0,
+       .wlcx_desired           = 0x06000000,
+       .btcx_desired           = 0x7,
        .scbd                   = 0x1,
        .mailbox                = 0x1,
        .btc_fwinfo_buf         = 1024,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 5b8292d151f6f2d4c802260fdcf8edeb5ee5ba34..5dff65dbc142bb7062ab3f2629c44ac989f4b640 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3084,9 +3084,9 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .dav_log_efuse_size     = 16,
        .phycap_addr            = 0x590,
        .phycap_size            = 0x60,
-       .para_ver               = 0x05050764,
-       .wlcx_desired           = 0x05050000,
-       .btcx_desired           = 0x5,
+       .para_ver               = 0x1,
+       .wlcx_desired           = 0x06000000,
+       .btcx_desired           = 0x7,
        .scbd                   = 0x1,
        .mailbox                = 0x1,
        .btc_fwinfo_buf         = 1280,