Commit 2e405cff authored by Ching-Te Ku's avatar Ching-Te Ku Committed by Kalle Valo

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: default avatarChing-Te Ku <ku920601@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220920010939.12173-10-pkshih@realtek.com
parent 4d5468c6
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "ps.h" #include "ps.h"
#include "reg.h" #include "reg.h"
#define RTW89_COEX_VERSION 0x06030013
#define FCXDEF_STEP 50 /* MUST <= FCXMAX_STEP and match with wl fw*/ #define FCXDEF_STEP 50 /* MUST <= FCXMAX_STEP and match with wl fw*/
enum btc_fbtc_tdma_template { enum btc_fbtc_tdma_template {
...@@ -5495,10 +5496,10 @@ static void _show_cx_info(struct rtw89_dev *rtwdev, struct seq_file *m) ...@@ -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", seq_printf(m, "========== [BTC COEX INFO (%d)] ==========\n",
chip->chip_id); chip->chip_id);
ver_main = FIELD_GET(GENMASK(31, 24), chip->para_ver); ver_main = FIELD_GET(GENMASK(31, 24), RTW89_COEX_VERSION);
ver_sub = FIELD_GET(GENMASK(23, 16), chip->para_ver); ver_sub = FIELD_GET(GENMASK(23, 16), RTW89_COEX_VERSION);
ver_hotfix = FIELD_GET(GENMASK(15, 8), chip->para_ver); ver_hotfix = FIELD_GET(GENMASK(15, 8), RTW89_COEX_VERSION);
id_branch = FIELD_GET(GENMASK(7, 0), chip->para_ver); id_branch = FIELD_GET(GENMASK(7, 0), RTW89_COEX_VERSION);
seq_printf(m, " %-15s : Coex:%d.%d.%d(branch:%d), ", seq_printf(m, " %-15s : Coex:%d.%d.%d(branch:%d), ",
"[coex_version]", ver_main, ver_sub, ver_hotfix, id_branch); "[coex_version]", ver_main, ver_sub, ver_hotfix, id_branch);
......
...@@ -2234,9 +2234,9 @@ const struct rtw89_chip_info rtw8852a_chip_info = { ...@@ -2234,9 +2234,9 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
.dav_log_efuse_size = 0, .dav_log_efuse_size = 0,
.phycap_addr = 0x580, .phycap_addr = 0x580,
.phycap_size = 128, .phycap_size = 128,
.para_ver = 0x05050864, .para_ver = 0x0,
.wlcx_desired = 0x05050000, .wlcx_desired = 0x06000000,
.btcx_desired = 0x5, .btcx_desired = 0x7,
.scbd = 0x1, .scbd = 0x1,
.mailbox = 0x1, .mailbox = 0x1,
.btc_fwinfo_buf = 1024, .btc_fwinfo_buf = 1024,
......
...@@ -3084,9 +3084,9 @@ const struct rtw89_chip_info rtw8852c_chip_info = { ...@@ -3084,9 +3084,9 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
.dav_log_efuse_size = 16, .dav_log_efuse_size = 16,
.phycap_addr = 0x590, .phycap_addr = 0x590,
.phycap_size = 0x60, .phycap_size = 0x60,
.para_ver = 0x05050764, .para_ver = 0x1,
.wlcx_desired = 0x05050000, .wlcx_desired = 0x06000000,
.btcx_desired = 0x5, .btcx_desired = 0x7,
.scbd = 0x1, .scbd = 0x1,
.mailbox = 0x1, .mailbox = 0x1,
.btc_fwinfo_buf = 1280, .btc_fwinfo_buf = 1280,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment