wifi: rtw89: coex: add logic related to MLO
Ping-Ke Shih
maintainerv2 cover wifi: rtw89: coex: add logic related to MLO
WiFi under MLO can operate on more than one channels (links) simultaneously, and BT-coexistence mechanism needs to know the operating channels/bands to assign timeslot for WiFi/BT. Iterate chanctx to fill the information for coex.
To support MLO use case, the hardware is also added more settings, so update to control hardware as wanted.
v2:
- (patch 03/10) fix clang warning - set but not used
Ching-Te Ku (9):
wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.63.0
wifi: rtw89: coex: Implement Wi-Fi MLO related logic
wifi: rtw89: coex: Update Wi-Fi status logic for WiFi 7
wifi: rtw89: coex: refine debug log with format version and readable
string
wifi: rtw89: coex: Add H2C command to collect driver outsource
information to firmware
wifi: rtw89: coex: Update Pre-AGC logic for WiFi 7
wifi: rtw89: coex: Update BTG control for WiFi 7
wifi: rtw89: coex: Update hardware PTA resource binding logic
wifi: rtw89: coex: Add PTA grant signal setting offload to firmware
feature
Zong-Zhe Yang (1):
wifi: rtw89: introduce rtw89_query_mr_chanctx_info() for multi-role
chanctx info
drivers/net/wireless/realtek/rtw89/chan.c | 195 ++++ drivers/net/wireless/realtek/rtw89/chan.h | 45 + drivers/net/wireless/realtek/rtw89/coex.c | 1022 +++++++++++++++------ drivers/net/wireless/realtek/rtw89/coex.h | 7 + drivers/net/wireless/realtek/rtw89/core.h | 99 +- drivers/net/wireless/realtek/rtw89/fw.c | 40 + drivers/net/wireless/realtek/rtw89/fw.h | 6 + drivers/net/wireless/realtek/rtw89/reg.h | 1 + 8 files changed, 1084 insertions(+), 331 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/10 wifi: rtw89: introduce rtw89_query_mr_chanctx_info() for multi-role chanctx info
From: Zong-Zhe Yang <[email protected]>
Add Wi-Fi 7 MLO related multi-role (MR) chanctx descriptors and query function. They are designed for other components, e.g. coex, which are interested in the following info.
* whether a MLD exists and how many active link
* the number of AP mode and station mode respectively
* how many chanctx and the number of 2/5/6 GHz respectively
--- drivers/net/wireless/realtek/rtw89/chan.c | 195 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/chan.h | 45 +++++ 2 files changed, 240 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +195 -0
@@ -2626,6 +2626,201 @@ void rtw89_queue_chanctx_work(struct rtw89_dev *rtwdev)rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_CHANGE_DFLT ); } +static enum rtw89_mr_wtype __rtw89_query_mr_wtype (struct rtw89_dev *rtwdev) +{ +struct rtw89_entity_mgnt *mgnt = &rtwdev->hal.entity_mgnt; +enum rtw89_chanctx_idx chanctx_idx; +struct ieee80211_vif *vif; +struct rtw89_vif *rtwvif; +unsigned int num_mld =0 ; +unsigned int num_ml =0 ; +unsigned int cnt =0 ; +u8 role_idx; +u8 idx; + +for (role_idx =0 ; role_idx <RTW89_MAX_INTERFACE_NUM ; role_idx++) { + rtwvif = mgnt->active_roles[role_idx]; +if (!rtwvif) +continue ; + + cnt++; + + vif =rtwvif_to_vif (rtwvif); +if (!ieee80211_vif_is_mld (vif)) +continue ; + + num_mld++; + +for (idx =0 ; idx < __RTW89_MLD_MAX_LINK_NUM; idx++) { + chanctx_idx = mgnt->chanctx_tbl[role_idx][idx]; +if (chanctx_idx !=RTW89_CHANCTX_IDLE ) + num_ml++; + } + } + +if (num_mld >1 ) + goto err; + +switch (cnt) { +case 0 : +return RTW89_MR_WTYPE_NONE ; +case 1 : +if (!num_mld) +return RTW89_MR_WTYPE_NONMLD ; +switch (num_ml) { +case 1 : +return RTW89_MR_WTYPE_MLD1L1R ; +case 2 : +return RTW89_MR_WTYPE_MLD2L1R ; +default : +break ; + } +break ; +case 2 : +if (!num_mld) +return RTW89_MR_WTYPE_NONMLD_NONMLD ; +switch (num_ml) { +case 1 : +return RTW89_MR_WTYPE_MLD1L1R_NONMLD ; +case 2 : +return RTW89_MR_WTYPE_MLD2L1R_NONMLD ; +default : +break ; + } +break ; +default : +break ; + } + +err: +rtw89_warn (rtwdev,"%s: unhandled cnt %u mld %u ml %u\n" , __func__, + cnt, num_mld, num_ml); +return RTW89_MR_WTYPE_UNKNOWN ; +} + +static enum rtw89_mr_wmode __rtw89_query_mr_wmode (struct rtw89_dev *rtwdev, +u8 inst_idx) +{ +struct rtw89_entity_mgnt *mgnt = &rtwdev->hal.entity_mgnt; +unsigned int num[NUM_NL80211_IFTYPES ] = {}; +enum rtw89_chanctx_idx chanctx_idx; +struct ieee80211_vif *vif; +struct rtw89_vif *rtwvif; +unsigned int cnt =0 ; +u8 role_idx; + +if (unlikely (inst_idx >= __RTW89_MLD_MAX_LINK_NUM)) +return RTW89_MR_WMODE_UNKNOWN ; + +for (role_idx =0 ; role_idx <RTW89_MAX_INTERFACE_NUM ; role_idx++) { + chanctx_idx = mgnt->chanctx_tbl[role_idx][inst_idx]; +if (chanctx_idx ==RTW89_CHANCTX_IDLE ) +continue ; + + rtwvif = mgnt->active_roles[role_idx]; +if (unlikely (!rtwvif)) +continue ; + + vif =rtwvif_to_vif (rtwvif); + num[vif->type]++; + cnt++; + } + +switch (cnt) { +case 0 : +return RTW89_MR_WMODE_NONE ; +case 1 : +if (num[NL80211_IFTYPE_STATION ]) +return RTW89_MR_WMODE_1CLIENT ; +if (num[NL80211_IFTYPE_AP ]) +return RTW89_MR_WMODE_1AP ; +break ; +case 2 : +if (num[NL80211_IFTYPE_STATION ] ==2 ) +return RTW89_MR_WMODE_2CLIENTS ; +if (num[NL80211_IFTYPE_AP ] ==2 ) +return RTW89_MR_WMODE_2APS ; +if (num[NL80211_IFTYPE_STATION ] && num[NL80211_IFTYPE_AP ]) +return RTW89_MR_WMODE_1AP_1CLIENT ; +break ; +default : +break ; + } + +rtw89_warn (rtwdev,"%s: unhandled cnt %u\n" , __func__, cnt); +return RTW89_MR_WMODE_UNKNOWN ; +} + +static enum rtw89_mr_ctxtype __rtw89_query_mr_ctxtype (struct rtw89_dev *rtwdev, +u8 inst_idx) +{ +struct rtw89_entity_mgnt *mgnt = &rtwdev->hal.entity_mgnt; + DECLARE_BITMAP(map, NUM_OF_RTW89_CHANCTX) = {}; +unsigned int num[RTW89_BAND_NUM ] = {}; +enum rtw89_chanctx_idx chanctx_idx; +const struct rtw89_chan *chan; +unsigned int cnt =0 ; +u8 role_idx; + +if (unlikely (inst_idx >= __RTW89_MLD_MAX_LINK_NUM)) +return RTW89_MR_CTX_UNKNOWN ; + +for (role_idx =0 ; role_idx <RTW89_MAX_INTERFACE_NUM ; role_idx++) { + chanctx_idx = mgnt->chanctx_tbl[role_idx][inst_idx]; +if (chanctx_idx ==RTW89_CHANCTX_IDLE ) +continue ; + +if (__test_and_set_bit (chanctx_idx, map)) +continue ; + + chan =rtw89_chan_get (rtwdev, chanctx_idx); + num[chan->band_type]++; + cnt++; + } + +switch (cnt) { +case 0 : +return RTW89_MR_CTX_NONE ; +case 1 : +if (num[RTW89_BAND_2G ]) +return RTW89_MR_CTX1_2GHZ ; +if (num[RTW89_BAND_5G ]) +return RTW89_MR_CTX1_5GHZ ; +if (num[RTW89_BAND_6G ]) +return RTW89_MR_CTX1_6GHZ ; +break ; +case 2 : +if (num[RTW89_BAND_2G ] ==2 ) +return RTW89_MR_CTX2_2GHZ ; +if (num[RTW89_BAND_5G ] ==2 ) +return RTW89_MR_CTX2_5GHZ ; +if (num[RTW89_BAND_6G ] ==2 ) +return RTW89_MR_CTX2_6GHZ ; +if (num[RTW89_BAND_2G ] && num[RTW89_BAND_5G ]) +return RTW89_MR_CTX2_2GHZ_5GHZ ; +if (num[RTW89_BAND_2G ] && num[RTW89_BAND_6G ]) +return RTW89_MR_CTX2_2GHZ_6GHZ ; +if (num[RTW89_BAND_5G ] && num[RTW89_BAND_6G ]) +return RTW89_MR_CTX2_5GHZ_6GHZ ; +break ; +default : +break ; + } + +rtw89_warn (rtwdev,"%s: unhandled cnt %u\n" , __func__, cnt); +return RTW89_MR_CTX_UNKNOWN ; +} + +void rtw89_query_mr_chanctx_info (struct rtw89_dev *rtwdev,u8 inst_idx, +struct rtw89_mr_chanctx_info *info) +{ +lockdep_assert_wiphy (rtwdev->hw->wiphy); + + info->wtype =__rtw89_query_mr_wtype (rtwdev); + info->wmode =__rtw89_query_mr_wmode (rtwdev, inst_idx); + info->ctxtype =__rtw89_query_mr_ctxtype (rtwdev, inst_idx); +} +void rtw89_chanctx_track (struct rtw89_dev *rtwdev) {struct rtw89_hal *hal = &rtwdev->hal;
drivers/net/wireless/realtek/rtw89/chan.h +45 -0
57 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next v2 01/10] wifi: rtw89: introduce rtw89_query_mr_chanctx_info() for multi-role chanctx info
Quoted 11 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
Add Wi-Fi 7 MLO related multi-role (MR) chanctx descriptors and query function. They are designed for other components, e.g. coex, which are interested in the following info.
* whether a MLD exists and how many active link
* the number of AP mode and station mode respectively
* how many chanctx and the number of 2/5/6 GHz respectivelySigned-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
10 patch(es) applied to rtw-next branch of rtw.git, thanks.
cbaf1110af41 wifi: rtw89: introduce rtw89_query_mr_chanctx_info() for multi-role chanctx info 1625d70f523b wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.63.0 ccd57356f311 wifi: rtw89: coex: Implement Wi-Fi MLO related logic26c62dca8243 wifi: rtw89: coex: Update Wi-Fi status logic for WiFi 7fac16e4147a2 wifi: rtw89: coex: refine debug log with format version and readable string 825f5514127a wifi: rtw89: coex: Add H2C command to collect driver outsource information to firmware 1683ae3e0069 wifi: rtw89: coex: Update Pre-AGC logic for WiFi 74cb9092289ec wifi: rtw89: coex: Update BTG control for WiFi 77d1b3c22fe0f wifi: rtw89: coex: Update hardware PTA resource binding logic 0bc2aef36949 wifi: rtw89: coex: Add PTA grant signal setting offload to firmware feature
Ping-Ke Shih
maintainerPATCH v2 2/10 wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.63.0
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
There were some driver API offloaded to firmware, and to recognize the feature add a version tag for it.
--- drivers/net/wireless/realtek/rtw89/coex.c | 34 ++++++++++++++--------- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ 2 files changed, 23 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +21 -13
@@ -138,7 +138,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 7, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852BT ,RTW89_FW_VER_CODE (0 ,29 ,90 ,0 ), .fcxbtcrpt = 7, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -146,7 +146,15 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 7, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + }, + {RTL8922A ,RTW89_FW_VER_CODE (0 ,35 ,63 ,0 ), + .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 8, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, }, {RTL8922A, RTW89_FW_VER_CODE(0, 35, 8, 0), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -154,7 +162,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 8, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 1, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, {RTL8851B ,RTW89_FW_VER_CODE (0 ,29 ,29 ,0 ), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5,
@@ -162,7 +170,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,57 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -170,7 +178,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,42 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -178,7 +186,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,0 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -186,7 +194,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,29 ,0 ), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5,
@@ -194,7 +202,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,14 ,0 ), .fcxbtcrpt = 5, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 4,
@@ -202,7 +210,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,27 ,0 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -210,7 +218,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 1, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852A ,RTW89_FW_VER_CODE (0 ,13 ,37 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -218,7 +226,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 0, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, {RTL8852A ,RTW89_FW_VER_CODE (0 ,13 ,0 ,0 ), .fcxbtcrpt = 1, .fcxtdma = 1, .fcxslots = 1, .fcxcysta = 2,
@@ -226,7 +234,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 0, .drvinfo_type = 0, .info_buf = 1024, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, },/* keep it to be the last as default entry */
@@ -236,7 +244,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1024, - .max_role_num = 5, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, }, };
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3167,6 +3167,8 @@ struct rtw89_btc_ver {u8 drvinfo_type;u16 info_buf;u8 max_role_num; +u8 fcxosi; +u8 fcxmlo; };#define RTW89_BTC_POLICY_MAXLEN 512
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/10 wifi: rtw89: coex: Implement Wi-Fi MLO related logic
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To make the logic can work well with WiFi 7 & before generations, extend & add logic for WiFi 7.
--- drivers/net/wireless/realtek/rtw89/coex.c | 623 +++++++++++++++------- drivers/net/wireless/realtek/rtw89/coex.h | 7 + drivers/net/wireless/realtek/rtw89/core.h | 30 ++ 3 files changed, 479 insertions(+), 181 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +442 -181
@@ -2,6 +2,7 @@/* Copyright(c) 2019-2020 Realtek Corporation */ +#include "chan.h" #include "coex.h" #include "debug.h" #include "fw.h"
@@ -676,6 +677,27 @@ enum btc_wl_link_mode {BTC_WLINK_MAX }; +#define CASE_BTC_WL_LINK_MODE (e) case BTC_WLINK_## e: return #e + +static const char *id_to_linkmode (u8 id) +{ +switch (id) { +CASE_BTC_WL_LINK_MODE (NOLINK ); + CASE_BTC_WL_LINK_MODE(2G_STA); + CASE_BTC_WL_LINK_MODE(2G_AP); + CASE_BTC_WL_LINK_MODE(2G_GO); + CASE_BTC_WL_LINK_MODE(2G_GC); + CASE_BTC_WL_LINK_MODE(2G_SCC); + CASE_BTC_WL_LINK_MODE(2G_MCC); + CASE_BTC_WL_LINK_MODE(25G_MCC); + CASE_BTC_WL_LINK_MODE(25G_DBCC); + CASE_BTC_WL_LINK_MODE(5G); +CASE_BTC_WL_LINK_MODE (OTHER ); +default : +return "unknown" ; + } +} +enum btc_wl_mrole_type {BTC_WLMROLE_NONE =0x0 ,BTC_WLMROLE_STA_GC ,
@@ -6247,23 +6269,16 @@ static bool _chk_role_ch_group(const struct rtw89_btc_chdef *r1, }static u8 _chk_dbcc (struct rtw89_dev *rtwdev,struct rtw89_btc_chdef *ch, -u8 *phy,u8 *role,u8 *dbcc_2g_phy) +u8 *phy,u8 *role,u8 link_cnt) {struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl;struct rtw89_btc_wl_role_info_v7 *rinfo_v7 = &wl->role_info_v7;struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &wl->role_info_v8;bool is_2g_ch_exist = false, is_multi_role_in_2g_phy = false; -u8 j, k, dbcc_2g_cid, dbcc_2g_cid2, connect_cnt; - -if (rtwdev->btc.ver->fwlrole ==7 ) - connect_cnt = rinfo_v7->connect_cnt; -else if (rtwdev->btc.ver->fwlrole ==8 ) - connect_cnt = rinfo_v8->connect_cnt; -else -return BTC_WLINK_NOLINK ; +u8 j, k, dbcc_2g_cid, dbcc_2g_cid2, dbcc_2g_phy, pta_req_band;/* find out the 2G-PHY by connect-id ->ch */ -for (j =0 ; j < connect_cnt; j++) { +for (j =0 ; j < link_cnt; j++) {if (ch[j].center_ch <=14 ) { is_2g_ch_exist = true;break ;
@@ -6272,21 +6287,33 @@ static u8 _chk_dbcc(struct rtw89_dev *rtwdev, struct rtw89_btc_chdef *ch,/* If no any 2G-port exist, it's impossible because 5G-exclude */ if (!is_2g_ch_exist) -return BTC_WLINK_OTHER ; +return BTC_WLINK_5G ; dbcc_2g_cid = j; - *dbcc_2g_phy = phy[dbcc_2g_cid]; + dbcc_2g_phy = phy[dbcc_2g_cid]; + +if (dbcc_2g_phy ==RTW89_PHY_1 ) + pta_req_band =RTW89_PHY_1 ; +else + pta_req_band =RTW89_PHY_0 ; + +if (rtwdev->btc.ver->fwlrole ==7 ) { + rinfo_v7->dbcc_2g_phy = dbcc_2g_phy; + }else if (rtwdev->btc.ver->fwlrole ==8 ) { + rinfo_v8->dbcc_2g_phy = dbcc_2g_phy; + rinfo_v8->pta_req_band = pta_req_band; + }/* connect_cnt <= 2 */ -if (connect_cnt <BTC_TDMA_WLROLE_MAX ) +if (link_cnt <BTC_TDMA_WLROLE_MAX )return (_get_role_link_mode ((role[dbcc_2g_cid])));/* find the other-port in the 2G-PHY, ex: PHY-0:6G, PHY1: mcc/scc */ -for (k =0 ; k < connect_cnt; k++) { +for (k =0 ; k < link_cnt; k++) {if (k == dbcc_2g_cid)continue ; -if (phy[k] == *dbcc_2g_phy) { +if (phy[k] == dbcc_2g_phy) { is_multi_role_in_2g_phy = true; dbcc_2g_cid2 = k;break ;
@@ -6488,7 +6515,7 @@ static void _update_wl_info_v7(struct rtw89_dev *rtwdev, u8 rid) }else if (cnt >BTC_TDMA_WLROLE_MAX ) { mode =BTC_WLINK_OTHER ; }else if (rtwdev->dbcc_en) { - mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, &dbcc_2g_phy); + mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, cnt);/* correct 2G-located PHY band for gnt ctrl */ if (dbcc_2g_phy <RTW89_PHY_NUM )
@@ -6533,26 +6560,336 @@ static void _update_wl_info_v7(struct rtw89_dev *rtwdev, u8 rid)_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); } +static u8 _update_wl_link_mode (struct rtw89_dev *rtwdev,u8 hw_band,u8 type) +{ +struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; +struct rtw89_btc_wl_mlo_info *mlo_info = &wl->mlo_info; +u8 mode =BTC_WLINK_NOLINK ; + +switch (type) { +case RTW89_MR_WTYPE_NONE :/* no-link */ + mode =BTC_WLINK_NOLINK ; +break ; +case RTW89_MR_WTYPE_NONMLD :/* Non_MLO 1-role 2+0/0+2 */ +case RTW89_MR_WTYPE_MLD1L1R :/* MLO only-1 link 2+0/0+2 */ +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { + mode =BTC_WLINK_5G ; + }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1AP ) { + mode =BTC_WLINK_2G_GO ; + }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1CLIENT ) { +if (wl->role_info_v8.p2p_2g) + mode =BTC_WLINK_2G_GC ; +else + mode =BTC_WLINK_2G_STA ; + } +break ; +case RTW89_MR_WTYPE_NONMLD_NONMLD :/* Non_MLO 2-role 2+0/0+2 */ +case RTW89_MR_WTYPE_MLD1L1R_NONMLD :/* MLO only-1 link + P2P 2+0/0+2 */ +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { + mode =BTC_WLINK_5G ; + }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_5GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_6GHZ ) { + mode =BTC_WLINK_25G_MCC ; + }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ ) { + mode =BTC_WLINK_2G_MCC ; + }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX1_2GHZ ) { + mode =BTC_WLINK_2G_SCC ; + } +break ; +case RTW89_MR_WTYPE_MLD2L1R :/* MLO_MLSR 2+0/0+2 */ +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) + mode =BTC_WLINK_5G ; +else if (wl->role_info_v8.p2p_2g) + mode =BTC_WLINK_2G_GC ; +else + mode =BTC_WLINK_2G_STA ; +break ; +case RTW89_MR_WTYPE_MLD2L1R_NONMLD :/* MLO_MLSR + P2P 2+0/0+2 */ +case RTW89_MR_WTYPE_MLD2L2R_NONMLD :/* MLO_MLMR + P2P 1+1/2+2 */ +/* driver may doze 1-link to +* 2G+5G -> TDMA slot switch by E2G/E5G +* 5G only -> TDMA slot switch by E5G +*/ + mode =BTC_WLINK_25G_MCC ; +break ; +case RTW89_MR_WTYPE_MLD2L2R :/* MLO_MLMR 1+1/2+2 */ +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { + mode =BTC_WLINK_5G ; + }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1AP ) { + mode =BTC_WLINK_2G_GO ; + }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1CLIENT ) { +if (wl->role_info_v8.p2p_2g) + mode =BTC_WLINK_2G_GC ; +else + mode =BTC_WLINK_2G_STA ; + } +break ; + } +return mode; +} + +static void _update_wl_mlo_info (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; +struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_wl_mlo_info *mlo_info = &wl->mlo_info; +struct rtw89_mr_chanctx_info qinfo; +u8 track_band =RTW89_PHY_0 ; +u8 rf_band =RTW89_BAND_2G ; +u8 i, type; + +/* parse MLO info form PHL API for each HW-band */ +for (i =RTW89_MAC_0 ; i <=RTW89_MAC_1 ; i++) { +memset (&qinfo,0 ,sizeof (qinfo)); + +rtw89_query_mr_chanctx_info (rtwdev, i, &qinfo); + mlo_info->wmode[i] = qinfo.wmode; + mlo_info->ch_type[i] = qinfo.ctxtype; + mlo_info->wtype = qinfo.wtype; + +if (mlo_info->ch_type[i] ==RTW89_MR_CTX1_5GHZ || + mlo_info->ch_type[i] ==RTW89_MR_CTX2_5GHZ || + mlo_info->ch_type[i] ==RTW89_MR_CTX2_5GHZ_6GHZ ) + mlo_info->hwb_rf_band[i] =RTW89_BAND_5G ; +else if (mlo_info->ch_type[i] ==RTW89_MR_CTX1_6GHZ || + mlo_info->ch_type[i] ==RTW89_MR_CTX2_6GHZ ) + mlo_info->hwb_rf_band[i] =RTW89_BAND_6G ; +else /* check if "2G-included" or unknown in each HW-band */ + mlo_info->hwb_rf_band[i] =RTW89_BAND_2G ; + } + + mlo_info->link_status = rtwdev->mlo_dbcc_mode; + type = mlo_info->wtype; + +if (mlo_info->wtype ==RTW89_MR_WTYPE_MLD1L1R || + mlo_info->wtype ==RTW89_MR_WTYPE_MLD2L1R || + mlo_info->wtype ==RTW89_MR_WTYPE_MLD2L2R || + mlo_info->wtype ==RTW89_MR_WTYPE_MLD1L1R_NONMLD || + mlo_info->wtype ==RTW89_MR_WTYPE_MLD2L1R_NONMLD || + mlo_info->wtype ==RTW89_MR_WTYPE_MLD2L2R_NONMLD ) + mlo_info->mlo_en =1 ; +else + mlo_info->mlo_en =0 ; + +if (mlo_info->ch_type[RTW89_MAC_0 ] !=RTW89_MR_CTX_NONE && + mlo_info->ch_type[RTW89_MAC_0 ] !=RTW89_MR_CTX_UNKNOWN && + mlo_info->ch_type[RTW89_MAC_1 ] !=RTW89_MR_CTX_NONE && + mlo_info->ch_type[RTW89_MAC_1 ] !=RTW89_MR_CTX_UNKNOWN ) + mlo_info->dual_hw_band_en =1 ;/* two HW-hand link exist */ +else + mlo_info->dual_hw_band_en =0 ; + +if (mlo_info->link_status ==MLO_2_PLUS_0_2RF || + mlo_info->link_status ==MLO_0_PLUS_2_2RF || + mlo_info->link_status ==MLO_2_PLUS_2_2RF ) + mlo_info->mlo_adie =2 ; +else + mlo_info->mlo_adie =1 ; + +switch (mlo_info->link_status) { +default : +case MLO_2_PLUS_0_1RF :/* 2+0 */ +case MLO_2_PLUS_0_2RF : + mlo_info->rf_combination =BTC_MLO_RF_2_PLUS_0 ; + track_band =RTW89_MAC_0 ; + rf_band = mlo_info->hwb_rf_band[RTW89_MAC_0 ]; + mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; + mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band; + + wl_rinfo->pta_req_band =RTW89_MAC_0 ; + wl_rinfo->dbcc_2g_phy =RTW89_PHY_0 ; + wl_rinfo->dbcc_en =0 ; +break ; +case MLO_0_PLUS_2_1RF :/* 0+2 */ +case MLO_0_PLUS_2_2RF : + mlo_info->rf_combination =BTC_MLO_RF_0_PLUS_2 ; + track_band =RTW89_MAC_1 ; + rf_band = mlo_info->hwb_rf_band[RTW89_MAC_1 ]; + mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; + mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band; + + wl_rinfo->pta_req_band =RTW89_MAC_1 ; + wl_rinfo->dbcc_2g_phy =RTW89_PHY_1 ; + wl_rinfo->dbcc_en =0 ; +break ; +case MLO_1_PLUS_1_1RF :/* 1+1 */ +case MLO_1_PLUS_1_2RF :/* 1+1 */ +case MLO_2_PLUS_2_2RF :/* 2+2 */ +case DBCC_LEGACY :/* DBCC 1+1 */ +if (mlo_info->link_status ==MLO_2_PLUS_2_2RF ) + mlo_info->rf_combination =BTC_MLO_RF_2_PLUS_2 ; +else + mlo_info->rf_combination =BTC_MLO_RF_1_PLUS_1 ; + +if (mlo_info->hwb_rf_band[RTW89_MAC_0 ] ==RTW89_BAND_2G ) + track_band =RTW89_MAC_0 ; +else + track_band =RTW89_MAC_1 ; + + mlo_info->path_rf_band[BTC_RF_S0 ] = + mlo_info->hwb_rf_band[RTW89_MAC_0 ]; + mlo_info->path_rf_band[BTC_RF_S1 ] = + mlo_info->hwb_rf_band[RTW89_MAC_1 ]; + +/* Check ch count from ch_type @ 2.4G HW-band, and modify type */ +if (mlo_info->ch_type[track_band] ==RTW89_MR_CTX1_2GHZ ) + type =RTW89_MR_WTYPE_NONMLD ;/* only 1-role at 2G */ +else + type =RTW89_MR_WTYPE_NONMLD_NONMLD ; + +if (mlo_info->hwb_rf_band[RTW89_MAC_0 ] ==RTW89_BAND_2G ) { + wl_rinfo->pta_req_band =RTW89_MAC_0 ; + wl_rinfo->dbcc_2g_phy =RTW89_PHY_0 ; + }else { + wl_rinfo->pta_req_band =RTW89_MAC_1 ; + wl_rinfo->dbcc_2g_phy =RTW89_PHY_1 ; + } + +if (mlo_info->wmode[RTW89_MAC_0 ] ==RTW89_MR_WMODE_NONE && + mlo_info->wmode[RTW89_MAC_1 ] ==RTW89_MR_WMODE_NONE ) + wl_rinfo->dbcc_en =0 ; +else + wl_rinfo->dbcc_en =1 ; +break ; + } + + wl_rinfo->link_mode =_update_wl_link_mode (rtwdev, track_band, type); + +rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(), mode=%s, pta_band=%d" , + __func__,id_to_linkmode (wl_rinfo->link_mode), + wl_rinfo->pta_req_band); +} + +static void _update_wl_non_mlo_info (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; +struct rtw89_btc_wl_rlink *rlink =NULL ; +struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_chdef cid_ch[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; +u8 cid_role[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; +u8 cid_phy[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; +bool b2g = false, b5g = false, outloop = false; +u8 mode =BTC_WLINK_NOLINK ; +u8 cnt_2g =0 , cnt_5g =0 ; +u8 i, j, cnt =0 ; + +for (j =RTW89_PHY_0 ; j <RTW89_PHY_NUM ; j++) { +for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { + rlink = &wl_rinfo->rlink[i][j]; + +if (!rlink->active || !rlink->connected) +continue ; + +if (cnt >=RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ) { + outloop = true; +break ; + } + + cid_ch[cnt] = wl->rlink_info[i][j].chdef; + cid_phy[cnt] = rlink->phy; + cid_role[cnt] = rlink->role; + cnt++; + +if (rlink->rf_band !=RTW89_BAND_2G ) { + cnt_5g++; + b5g = true; + }else { + cnt_2g++; + b2g = true; + } + } +if (outloop) +break ; + } + +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): cnt_2g=%d, cnt_5g=%d\n" , __func__, cnt_2g, cnt_5g); + + wl_rinfo->dbcc_en = rtwdev->dbcc_en; +/* Be careful to change the following sequence!! */ +if (cnt ==0 ) { + mode =BTC_WLINK_NOLINK ; + }else if (!b2g && b5g) { + mode =BTC_WLINK_5G ; + }else if (wl_rinfo->dbcc_en) { + mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, cnt); + }else if (b2g && b5g) { + mode =BTC_WLINK_25G_MCC ; + }else if (!b5g && cnt >=2 ) { +if (_chk_role_ch_group (&cid_ch[0 ], &cid_ch[1 ])) + mode =BTC_WLINK_2G_SCC ; +else + mode =BTC_WLINK_2G_MCC ; + }else if (!b5g) {/* cnt_connect = 1 */ + mode =_get_role_link_mode (cid_role[0 ]); + } + + wl_rinfo->link_mode = mode; +} + +static void _modify_role_link_mode (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; +struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +u8 go_cleint_exist = wl->go_client_exist; +u8 link_mode = wl_rinfo->link_mode; +u32 role_map = wl_rinfo->role_map; +u8 noa_exist = wl->noa_exist; +u32 mrole =BTC_WLMROLE_NONE ; + +/* if no client_joined, don't care P2P-GO/AP role */ +if (((role_map &BIT (RTW89_WIFI_ROLE_P2P_GO )) || + (role_map &BIT (RTW89_WIFI_ROLE_AP ))) && !go_cleint_exist) { +if (link_mode ==BTC_WLINK_2G_SCC ) { + wl_rinfo->link_mode =BTC_WLINK_2G_STA ; + }else if (link_mode ==BTC_WLINK_2G_GO || + link_mode ==BTC_WLINK_2G_AP ) { + wl_rinfo->link_mode =BTC_WLINK_NOLINK ; + } + } + +/* Identify 2-Role type */ +if (link_mode ==BTC_WLINK_2G_SCC || + link_mode ==BTC_WLINK_2G_MCC || + link_mode ==BTC_WLINK_25G_MCC || + link_mode ==BTC_WLINK_5G ) { +if ((role_map &BIT (RTW89_WIFI_ROLE_P2P_GO )) || + (role_map &BIT (RTW89_WIFI_ROLE_AP ))) { +if (noa_exist) + mrole =BTC_WLMROLE_STA_GO_NOA ; +else + mrole =BTC_WLMROLE_STA_GO ; + }else if (role_map &BIT (RTW89_WIFI_ROLE_P2P_CLIENT )) { +if (noa_exist) + mrole =BTC_WLMROLE_STA_GC_NOA ; +else + mrole =BTC_WLMROLE_STA_GC ; + }else { + mrole =BTC_WLMROLE_STA_STA ; + } + } + + wl_rinfo->mrole_type = mrole; + +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): link_mode=%s, mrole_type=%d\n" , __func__, +id_to_linkmode (wl_rinfo->link_mode), wl_rinfo->mrole_type); +} +static void _update_wl_info_v8 (struct rtw89_dev *rtwdev,u8 role_id,u8 rlink_id,enum btc_role_state state) { +struct rtw89_btc_wl_rlink *rlink =NULL ; +struct rtw89_btc_wl_link_info *wl_linfo;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_chdef cid_ch[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ];struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -bool client_joined = false, b2g = false, b5g = false; -u8 cid_role[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; -u8 cid_phy[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; -u8 dbcc_en =0 , pta_req_band =RTW89_MAC_0 ; -u8 i, j, cnt =0 , cnt_2g =0 , cnt_5g =0 ; -struct rtw89_btc_wl_link_info *wl_linfo; -struct rtw89_btc_wl_rlink *rlink =NULL ; -u8 dbcc_2g_phy =RTW89_PHY_0 ; -u8 mode =BTC_WLINK_NOLINK ; -u32 noa_dur =0 ; +bool client_joined = false, noa_exist = false, p2p_exist = false; +bool is_5g_hi_channel = false, bg_mode = false, dbcc_en_ori; +u8 i, j, link_mode_ori; +u32 role_map =0 ; -if (role_id >=RTW89_BE_BTC_WL_MAX_ROLE_NUMBER || rlink_id >RTW89_MAC_1 ) +if (role_id >=RTW89_BE_BTC_WL_MAX_ROLE_NUMBER || rlink_id >=RTW89_MAC_NUM )return ;/* Extract wl->link_info[role_id][rlink_id] to wl->role_info
@@ -6562,10 +6899,8 @@ static void _update_wl_info_v8(struct rtw89_dev *rtwdev, u8 role_id, u8 rlink_id*/ wl_linfo = &wl->rlink_info[role_id][rlink_id]; -if (wl_linfo->connected ==MLME_LINKING ) -return ; - rlink = &wl_rinfo->rlink[role_id][rlink_id]; + rlink->role = wl_linfo->role; rlink->active = wl_linfo->active;/* Doze or not */ rlink->pid = wl_linfo->pid;
@@ -6581,8 +6916,6 @@ static void _update_wl_info_v8(struct rtw89_dev *rtwdev, u8 role_id, u8 rlink_idswitch (wl_linfo->connected) {case MLME_NO_LINK : rlink->connected =0 ; -if (rlink->role ==RTW89_WIFI_ROLE_STATION ) - btc->dm.leak_ap =0 ;break ;case MLME_LINKED : rlink->connected =1 ;
@@ -6591,130 +6924,72 @@ static void _update_wl_info_v8(struct rtw89_dev *rtwdev, u8 role_id, u8 rlink_idreturn ; } - wl->is_5g_hi_channel = false; - wl->bg_mode = false; - wl_rinfo->role_map =0 ; - wl_rinfo->p2p_2g =0 ; -memset (cid_ch,0 ,sizeof (cid_ch)); - -for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { -for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) { +for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) { +for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { rlink = &wl_rinfo->rlink[i][j];if (!rlink->active || !rlink->connected)continue ; - cnt++; - wl_rinfo->role_map |=BIT (rlink->role); - -/* only if client connect for p2p-Go/AP */ -if ((rlink->role ==RTW89_WIFI_ROLE_P2P_GO || - rlink->role ==RTW89_WIFI_ROLE_AP ) && - rlink->client_cnt >1 ) - client_joined = true; - -/* Identufy if P2P-Go (GO/GC/AP) exist at 2G band*/ -if (rlink->rf_band ==RTW89_BAND_2G && - (client_joined || rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) - wl_rinfo->p2p_2g =1 ; + role_map |=BIT (rlink->role);/* only one noa-role exist */ if (rlink->noa && rlink->noa_dur >0 ) - noa_dur = rlink->noa_dur; + noa_exist = true;/* for WL 5G-Rx interfered with BT issue */ -if (rlink->rf_band ==RTW89_BAND_5G && rlink->ch >=100 ) - wl->is_5g_hi_channel =1 ; - -if ((rlink->mode &BIT (BTC_WL_MODE_11B )) || - (rlink->mode &BIT (BTC_WL_MODE_11G ))) - wl->bg_mode =1 ; +if (rlink->rf_band ==RTW89_BAND_5G ) { +if (rlink->ch >=100 ) + is_5g_hi_channel = true; -if (rtwdev->chip->para_ver &BTC_FEAT_MLO_SUPPORT )continue ; + } - cid_ch[cnt -1 ] = wl_linfo->chdef; - cid_phy[cnt -1 ] = rlink->phy; - cid_role[cnt -1 ] = rlink->role; - -if (rlink->rf_band !=RTW89_BAND_2G ) { - cnt_5g++; - b5g = true; - }else { - cnt_2g++; - b2g = true; +/* only if client connect for p2p-Go/AP */ +if ((rlink->role ==RTW89_WIFI_ROLE_P2P_GO || + rlink->role ==RTW89_WIFI_ROLE_AP ) && + rlink->client_cnt >1 ) { + p2p_exist = true; + client_joined = true; } - } - } -if (rtwdev->chip->para_ver &BTC_FEAT_MLO_SUPPORT ) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC] rlink cnt_2g=%d cnt_5g=%d\n" , cnt_2g, cnt_5g); -rtw89_warn (rtwdev,"not support MLO feature yet" ); - }else { - dbcc_en = rtwdev->dbcc_en; +/* Identify if P2P-Go (GO/GC/AP) exist at 2G band */ +if (rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT ) + p2p_exist = true; -/* Be careful to change the following sequence!! */ -if (cnt ==0 ) { - mode =BTC_WLINK_NOLINK ; - }else if (!b2g && b5g) { - mode =BTC_WLINK_5G ; - }else if (wl_rinfo->role_map &BIT (RTW89_WIFI_ROLE_NAN )) { - mode =BTC_WLINK_2G_NAN ; - }else if (cnt >BTC_TDMA_WLROLE_MAX ) { - mode =BTC_WLINK_OTHER ; - }else if (dbcc_en) { - mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, - &dbcc_2g_phy); - }else if (b2g && b5g && cnt ==2 ) { - mode =BTC_WLINK_25G_MCC ; - }else if (!b5g && cnt ==2 ) {/* cnt_connect = 2 */ -if (_chk_role_ch_group (&cid_ch[0 ], &cid_ch[cnt -1 ])) - mode =BTC_WLINK_2G_SCC ; -else - mode =BTC_WLINK_2G_MCC ; - }else if (!b5g && cnt ==1 ) {/* cnt_connect = 1 */ - mode =_get_role_link_mode (cid_role[0 ]); +if ((rlink->mode &BIT (BTC_WL_MODE_11B )) || + (rlink->mode &BIT (BTC_WL_MODE_11G ))) + bg_mode = true; } } - wl_rinfo->link_mode = mode; - wl_rinfo->connect_cnt = cnt; -if (wl_rinfo->connect_cnt ==0 ) - wl_rinfo->role_map =BIT (RTW89_WIFI_ROLE_NONE ); -_update_role_link_mode (rtwdev, client_joined, noa_dur); + link_mode_ori = wl_rinfo->link_mode; + wl->is_5g_hi_channel = is_5g_hi_channel; + wl->bg_mode = bg_mode; + wl->go_client_exist = client_joined; + wl->noa_exist = noa_exist; + wl_rinfo->p2p_2g = p2p_exist; + wl_rinfo->role_map = role_map; - wl_rinfo->dbcc_2g_phy = dbcc_2g_phy; -if (wl_rinfo->dbcc_en != dbcc_en) { - wl_rinfo->dbcc_en = dbcc_en; - wl_rinfo->dbcc_chg =1 ; - btc->cx.cnt_wl[BTC_WCNT_DBCC_CHG ]++; + dbcc_en_ori = wl_rinfo->dbcc_en; + +if (rtwdev->chip->para_ver &BTC_FEAT_MLO_SUPPORT ) { +/* for MLO-supported, link-mode from driver directly */ +_update_wl_mlo_info (rtwdev); }else { - wl_rinfo->dbcc_chg =0 ; +/* for non-MLO-supported, link-mode by BTC */ +_update_wl_non_mlo_info (rtwdev); } -if (wl_rinfo->dbcc_en) { -memset (wl_dinfo,0 ,sizeof (struct rtw89_btc_wl_dbcc_info )); +_modify_role_link_mode (rtwdev); -if (mode ==BTC_WLINK_5G ) { - pta_req_band =RTW89_PHY_0 ; - wl_dinfo->op_band[RTW89_PHY_0 ] =RTW89_BAND_5G ; - wl_dinfo->op_band[RTW89_PHY_1 ] =RTW89_BAND_2G ; - }else if (wl_rinfo->dbcc_2g_phy ==RTW89_PHY_1 ) { - pta_req_band =RTW89_PHY_1 ; - wl_dinfo->op_band[RTW89_PHY_0 ] =RTW89_BAND_5G ; - wl_dinfo->op_band[RTW89_PHY_1 ] =RTW89_BAND_2G ; - }else { - pta_req_band =RTW89_PHY_0 ; - wl_dinfo->op_band[RTW89_PHY_0 ] =RTW89_BAND_2G ; - wl_dinfo->op_band[RTW89_PHY_1 ] =RTW89_BAND_5G ; - } -_update_dbcc_band (rtwdev,RTW89_PHY_0 ); -_update_dbcc_band (rtwdev,RTW89_PHY_1 ); - } +if (link_mode_ori != wl_rinfo->link_mode) + wl->link_mode_chg = true; - wl_rinfo->pta_req_band = pta_req_band; -_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); +if (wl_rinfo->dbcc_en != dbcc_en_ori) { + wl->dbcc_chg = true; + btc->cx.cnt_wl[BTC_WCNT_DBCC_CHG ]++; + } }void rtw89_coex_act1_work (struct wiphy *wiphy,struct wiphy_work *work)
@@ -7626,7 +7901,6 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, wlinfo = &wl->link_info[r.pid]; - rlink_id =0 ;/* to do */ if (ver->fwlrole ==0 ) { *wlinfo = r;_update_wl_info (rtwdev);
@@ -7640,6 +7914,7 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, *wlinfo = r;_update_wl_info_v7 (rtwdev, r.pid); }else if (ver->fwlrole ==8 ) { + rlink_id = rtwvif_link->mac_idx; wlinfo = &wl->rlink_info[r.pid][rlink_id]; *wlinfo = r; link_mode_ori = wl->role_info_v8.link_mode;
@@ -8256,65 +8531,51 @@ static int _show_wl_role_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_link_info *plink =NULL ; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;struct rtw89_traffic_stats *t;char *p = buf, *end = buf + bufsz; -u8 i; +u8 i, j; -if (rtwdev->dbcc_en) { - p +=scnprintf (p, end - p, -" %-15s : PHY0_band(op:%d/scan:%d/real:%d), " , -"[dbcc_info]" , wl_dinfo->op_band[RTW89_PHY_0 ], - wl_dinfo->scan_band[RTW89_PHY_0 ], - wl_dinfo->real_band[RTW89_PHY_0 ]); - p +=scnprintf (p, end - p, -"PHY1_band(op:%d/scan:%d/real:%d)\n" , - wl_dinfo->op_band[RTW89_PHY_1 ], - wl_dinfo->scan_band[RTW89_PHY_1 ], - wl_dinfo->real_band[RTW89_PHY_1 ]); - } - -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (btc->ver->fwlrole ==8 ) - plink = &btc->cx.wl.rlink_info[i][0 ]; -else - plink = &btc->cx.wl.link_info[i]; +for (i =0 ; i < btc->ver->max_role_num; i++) { +for (j =0 ; j <RTW89_MAC_NUM ; j++) { +if (btc->ver->fwlrole ==8 ) + plink = &btc->cx.wl.rlink_info[i][j]; +else + plink = &btc->cx.wl.link_info[i]; -if (!plink->active) -continue ; +if (!plink->active) +continue ; - p +=scnprintf (p, end - p, -" [port_%d] : role=%d(phy-%d), connect=%d(client_cnt=%d), mode=%d, center_ch=%d, bw=%d" , - plink->pid, (u32 )plink->role, plink->phy, - (u32 )plink->connected, plink->client_cnt -1 , - (u32 )plink->mode, plink->ch, (u32 )plink->bw); + p +=scnprintf (p, end - p, +" [port_%d] : role=%d(phy-%d), connect=%d(client_cnt=%d), mode=%d, center_ch=%d, bw=%d" , + plink->pid, plink->role, plink->phy, + plink->connected, plink->client_cnt -1 , + plink->mode, plink->ch, plink->bw); -if (plink->connected ==MLME_NO_LINK ) -continue ; +if (plink->connected ==MLME_NO_LINK ) +continue ; - p +=scnprintf (p, end - p, -", mac_id=%d, max_tx_time=%dus, max_tx_retry=%d\n" , - plink->mac_id, plink->tx_time, plink->tx_retry); + p +=scnprintf (p, end - p, +", mac_id=%d, max_tx_time=%dus, max_tx_retry=%d\n" , + plink->mac_id, plink->tx_time, plink->tx_retry); - p +=scnprintf (p, end - p, -" [port_%d] : rssi=-%ddBm(%d), busy=%d, dir=%s, " , - plink->pid,110 - plink->stat.rssi, - plink->stat.rssi, plink->busy, - plink->dir ==RTW89_TFC_UL ?"UL" :"DL" ); + p +=scnprintf (p, end - p, +" [port_%d] : rssi=-%ddBm(%d), busy=%d, dir=%s, " , + plink->pid,110 - plink->stat.rssi, + plink->stat.rssi, plink->busy, + plink->dir ==RTW89_TFC_UL ?"UL" :"DL" ); - t = &plink->stat.traffic; + t = &plink->stat.traffic; - p +=scnprintf (p, end - p, -"tx[rate:%d/busy_level:%d], " , - (u32 )t->tx_rate, t->tx_tfc_lv); + p +=scnprintf (p, end - p, +"tx[rate:%d/busy_level:%d], " , + t->tx_rate, t->tx_tfc_lv); - p +=scnprintf (p, end - p, -"rx[rate:%d/busy_level:%d/drop:%d]\n" , - (u32 )t->rx_rate, - t->rx_tfc_lv, plink->rx_rate_drop_cnt); + p +=scnprintf (p, end - p, +"rx[rate:%d/busy_level:%d/drop:%d]\n" , + t->rx_rate, + t->rx_tfc_lv, plink->rx_rate_drop_cnt); + } } -return p - buf; }
drivers/net/wireless/realtek/rtw89/coex.h +7 -0
@@ -224,6 +224,13 @@ enum btc_wl_mode { BTC_WL_MODE_NUM, }; +enum btc_mlo_rf_combin { +BTC_MLO_RF_2_PLUS_0 =0 , +BTC_MLO_RF_0_PLUS_2 =1 , +BTC_MLO_RF_1_PLUS_1 =2 , +BTC_MLO_RF_2_PLUS_2 =3 , +}; +enum btc_wl_gpio_debug {BTC_DBG_GNT_BT =0 ,BTC_DBG_GNT_WL =1 ,
drivers/net/wireless/realtek/rtw89/core.h +30 -0
@@ -1557,6 +1557,25 @@ struct rtw89_btc_wl_dbcc_info {u8 role[RTW89_PHY_NUM ];/* role in each phy */ }; +struct rtw89_btc_wl_mlo_info { +u8 wmode[RTW89_PHY_NUM ];/* enum phl_mr_wmode */ +u8 ch_type[RTW89_PHY_NUM ];/* enum phl_mr_ch_type */ +u8 hwb_rf_band[RTW89_PHY_NUM ];/* enum band_type, RF-band for HW-band */ +u8 path_rf_band[RTW89_PHY_NUM ];/* enum band_type, RF-band for PHY0/1 */ + +u8 wtype;/* enum phl_mr_wtype */ +u8 mrcx_mode; +u8 mrcx_act_hwb_map; +u8 mrcx_bt_slot_rsp; + +u8 rf_combination;/* enum btc_mlo_rf_combin 0:2+0, 1:0+2, 2:1+1,3:2+2 */ +u8 mlo_en;/* MLO enable */ +u8 mlo_adie;/* a-die count */ +u8 dual_hw_band_en;/* both 2 HW-band link exist */ + +u32 link_status;/* enum mlo_dbcc_mode_type */ +}; +struct rtw89_btc_wl_active_role {u8 connected:1 ;u8 pid:3 ;
@@ -1895,6 +1914,7 @@ struct rtw89_btc_wl_info {struct rtw89_btc_wl_role_info_v8 role_info_v8;struct rtw89_btc_wl_scan_info scan_info;struct rtw89_btc_wl_dbcc_info dbcc_info; +struct rtw89_btc_wl_mlo_info mlo_info;struct rtw89_btc_rf_para rf_para;struct rtw89_btc_wl_nhm nhm;union rtw89_btc_wl_state_map status;
@@ -1907,12 +1927,16 @@ struct rtw89_btc_wl_info {u8 bt_polut_type[RTW89_PHY_NUM ];/* BT polluted WL-Tx type for phy0/1 */ bool is_5g_hi_channel; +bool go_client_exist; +bool noa_exist;bool pta_reg_mac_chg;bool bg_mode;bool he_mode;bool scbd_change;bool fw_ver_mismatch;bool client_cnt_inc_2g; +bool link_mode_chg; +bool dbcc_chg;u32 scbd; };
@@ -2903,6 +2927,12 @@ struct rtw89_btc_trx_info {u32 rx_err_ratio; }; +enum btc_rf_path { +BTC_RF_S0 =0 , +BTC_RF_S1 =1 , +BTC_RF_NUM , +}; +union rtw89_btc_fbtc_slot_u {struct rtw89_btc_fbtc_slot v1[CXST_MAX ];struct rtw89_btc_fbtc_slot_v7 v7[CXST_MAX ];
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/10 wifi: rtw89: coex: Update Wi-Fi status logic for WiFi 7
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because WiFi 7 generation has dual MAC, logic need to assign & save the information to correct index. Update the related logic.
--- drivers/net/wireless/realtek/rtw89/coex.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +9 -6
@@ -8159,7 +8159,11 @@ void __rtw89_btc_ntfy_wl_sta_iter(struct rtw89_vif_link *rtwvif_link, rssi =ewma_rssi_read (&rtwsta_link->avg_rssi) >>RSSI_FACTOR ;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], rssi=%d\n" , rssi); - link_info = &wl->link_info[port]; +if (btc->ver->fwlrole !=8 ) + link_info = &wl->link_info[port]; +else + link_info = &wl->rlink_info[port][rtwvif_link->mac_idx]; + link_info->stat.traffic = *stats; link_info_t = &link_info->stat.traffic;
@@ -8240,13 +8244,12 @@ void __rtw89_btc_ntfy_wl_sta_iter(struct rtw89_vif_link *rtwvif_link, r1->active_role_v1[port].rx_lvl = stats->rx_tfc_lv; r1->active_role_v1[port].tx_rate = rtwsta_link->ra_report.hw_rate; r1->active_role_v1[port].rx_rate = rtwsta_link->rx_hw_rate; - }else if (ver->fwlrole ==2 ) { - dm->trx_info.tx_lvl = stats->tx_tfc_lv; - dm->trx_info.rx_lvl = stats->rx_tfc_lv; - dm->trx_info.tx_rate = rtwsta_link->ra_report.hw_rate; - dm->trx_info.rx_rate = rtwsta_link->rx_hw_rate; } + dm->trx_info.tx_lvl = stats->tx_tfc_lv; + dm->trx_info.rx_lvl = stats->rx_tfc_lv; + dm->trx_info.tx_rate = rtwsta_link->ra_report.hw_rate; + dm->trx_info.rx_rate = rtwsta_link->rx_hw_rate; dm->trx_info.tx_tp = link_info_t->tx_throughput; dm->trx_info.rx_tp = link_info_t->rx_throughput;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/10 wifi: rtw89: coex: refine debug log with format version and readable string
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Fix unexpected line warp. Collect firmware report format version and driver support report format version code to check unexpected C2H report exception.
--- drivers/net/wireless/realtek/rtw89/coex.c | 148 ++++++++++++++++------ drivers/net/wireless/realtek/rtw89/core.h | 51 ++++---- 2 files changed, 133 insertions(+), 66 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +107 -41
@@ -278,6 +278,39 @@ static u32 chip_id_to_bt_rom_code_id(u32 id) } } +#define CASE_BTC_MLME_STATE (e) case MLME_##e: return #e + +static const char *id_to_mlme_state (u32 id) +{ +switch (id) { +CASE_BTC_MLME_STATE (NO_LINK ); +CASE_BTC_MLME_STATE (LINKING ); +CASE_BTC_MLME_STATE (LINKED ); +default : +return "unknown" ; + } +} + +static char *chip_id_str (u32 id) +{ +switch (id) { +case RTL8852A : +return "RTL8852A" ; +case RTL8852B : +return "RTL8852B" ; +case RTL8852C : +return "RTL8852C" ; +case RTL8852BT : +return "RTL8852BT" ; +case RTL8851B : +return "RTL8851B" ; +case RTL8922A : +return "RTL8922A" ; +default : +return "UNKNOWN" ; + } +} +struct rtw89_btc_btf_tlv {u8 type;u8 len;
@@ -1354,6 +1387,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, u8 *prptbuf, u32 index) {struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_ver *fwsubver = &btc->fwinfo.fw_subver;const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;
@@ -1396,23 +1430,29 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxbtcrpt ==1 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v1); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v1.fver; }else if (ver->fcxbtcrpt ==4 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v4; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v4); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v4.fver; }else if (ver->fcxbtcrpt ==5 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v5; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v5); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v5.fver; }else if (ver->fcxbtcrpt ==105 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v105; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v105); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v105.fver; pcinfo->req_fver =5 ;break ; }else if (ver->fcxbtcrpt ==8 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v8; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v8); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v8.fver; }else if (ver->fcxbtcrpt ==7 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v7); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v7.fver; }else { goto err; }
@@ -1423,9 +1463,11 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxtdma ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo.v1); + fwsubver->fcxtdma =0 ; }else if (ver->fcxtdma ==3 || ver->fcxtdma ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo.v3; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo.v3); + fwsubver->fcxtdma = pfwinfo->rpt_fbtc_tdma.finfo.v3.fver; }else { goto err; }
@@ -1436,9 +1478,11 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxslots ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_slots.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo.v1); + fwsubver->fcxslots = pfwinfo->rpt_fbtc_slots.finfo.v1.fver; }else if (ver->fcxslots ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_slots.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo.v7); + fwsubver->fcxslots = pfwinfo->rpt_fbtc_slots.finfo.v7.fver; }else { goto err; }
@@ -1451,22 +1495,27 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v2; pcysta->v2 = pfwinfo->rpt_fbtc_cysta.finfo.v2; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v2); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v2.fver; }else if (ver->fcxcysta ==3 ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v3; pcysta->v3 = pfwinfo->rpt_fbtc_cysta.finfo.v3; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v3); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v3.fver; }else if (ver->fcxcysta ==4 ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v4; pcysta->v4 = pfwinfo->rpt_fbtc_cysta.finfo.v4; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v4); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v4.fver; }else if (ver->fcxcysta ==5 ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v5; pcysta->v5 = pfwinfo->rpt_fbtc_cysta.finfo.v5; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v5); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v5.fver; }else if (ver->fcxcysta ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v7; pcysta->v7 = pfwinfo->rpt_fbtc_cysta.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v7); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v7.fver; }else { goto err; }
@@ -1482,11 +1531,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_step.finfo.v2.step[0 ]) * trace_step + offsetof(struct rtw89_btc_fbtc_steps_v2 , step); + fwsubver->fcxstep = pfwinfo->rpt_fbtc_step.finfo.v2.fver; }else if (ver->fcxstep ==3 ) { pfinfo = &pfwinfo->rpt_fbtc_step.finfo.v3; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_step.finfo.v3.step[0 ]) * trace_step + offsetof(struct rtw89_btc_fbtc_steps_v3 , step); + fwsubver->fcxstep = pfwinfo->rpt_fbtc_step.finfo.v3.fver; }else { goto err; }
@@ -1497,12 +1548,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxnullsta ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_nullsta.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_nullsta.finfo.v1); + fwsubver->fcxnullsta = pfwinfo->rpt_fbtc_nullsta.finfo.v1.fver; }else if (ver->fcxnullsta ==2 ) { pfinfo = &pfwinfo->rpt_fbtc_nullsta.finfo.v2; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_nullsta.finfo.v2); + fwsubver->fcxnullsta = pfwinfo->rpt_fbtc_nullsta.finfo.v2.fver; }else if (ver->fcxnullsta ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_nullsta.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_nullsta.finfo.v7); + fwsubver->fcxnullsta = pfwinfo->rpt_fbtc_nullsta.finfo.v7.fver; }else { goto err; }
@@ -1513,12 +1567,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxmreg ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_mregval.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_mregval.finfo.v1); + fwsubver->fcxmreg = pfwinfo->rpt_fbtc_mregval.finfo.v1.fver; }else if (ver->fcxmreg ==2 ) { pfinfo = &pfwinfo->rpt_fbtc_mregval.finfo.v2; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_mregval.finfo.v2); + fwsubver->fcxmreg = pfwinfo->rpt_fbtc_mregval.finfo.v2.fver; }else if (ver->fcxmreg ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_mregval.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_mregval.finfo.v7); + fwsubver->fcxmreg = pfwinfo->rpt_fbtc_mregval.finfo.v7.fver; }else { goto err; }
@@ -1529,9 +1586,11 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxgpiodbg ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_gpio_dbg.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_gpio_dbg.finfo.v7); + fwsubver->fcxgpiodbg = pfwinfo->rpt_fbtc_gpio_dbg.finfo.v7.fver; }else { pfinfo = &pfwinfo->rpt_fbtc_gpio_dbg.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_gpio_dbg.finfo.v1); + fwsubver->fcxgpiodbg = pfwinfo->rpt_fbtc_gpio_dbg.finfo.v1.fver; } pcinfo->req_fver = ver->fcxgpiodbg;break ;
@@ -1540,9 +1599,11 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxbtver ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_btver.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btver.finfo.v1); + fwsubver->fcxbtver = pfwinfo->rpt_fbtc_btver.finfo.v1.fver; }else if (ver->fcxbtver ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_btver.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btver.finfo.v7); + fwsubver->fcxbtver = pfwinfo->rpt_fbtc_btver.finfo.v7.fver; } pcinfo->req_fver = ver->fcxbtver;break ;
@@ -1551,12 +1612,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxbtscan ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_btscan.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btscan.finfo.v1); + fwsubver->fcxbtscan = pfwinfo->rpt_fbtc_btscan.finfo.v1.fver; }else if (ver->fcxbtscan ==2 ) { pfinfo = &pfwinfo->rpt_fbtc_btscan.finfo.v2; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btscan.finfo.v2); + fwsubver->fcxbtscan = pfwinfo->rpt_fbtc_btscan.finfo.v2.fver; }else if (ver->fcxbtscan ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_btscan.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btscan.finfo.v7); + fwsubver->fcxbtscan = pfwinfo->rpt_fbtc_btscan.finfo.v7.fver; }else { goto err; }
@@ -1567,12 +1631,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (ver->fcxbtafh ==1 ) { pfinfo = &pfwinfo->rpt_fbtc_btafh.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btafh.finfo.v1); + fwsubver->fcxbtafh = pfwinfo->rpt_fbtc_btafh.finfo.v1.fver; }else if (ver->fcxbtafh ==2 ) { pfinfo = &pfwinfo->rpt_fbtc_btafh.finfo.v2; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btafh.finfo.v2); + fwsubver->fcxbtafh = pfwinfo->rpt_fbtc_btafh.finfo.v2.fver; }else if (ver->fcxbtafh ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_btafh.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btafh.finfo.v7); + fwsubver->fcxbtafh = pfwinfo->rpt_fbtc_btafh.finfo.v7.fver; }else { goto err; }
@@ -1582,6 +1649,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_btdev.cinfo; pfinfo = &pfwinfo->rpt_fbtc_btdev.finfo; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btdev.finfo); + fwsubver->fcxbtdevinfo = pfwinfo->rpt_fbtc_btdev.finfo.fver; pcinfo->req_fver = ver->fcxbtdevinfo;break ;default :
@@ -8454,11 +8522,9 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)if (!(dm->coex_info_map &BTC_COEX_INFO_CX ))return 0 ; - dm->cnt_notify[BTC_NCNT_SHOW_COEX_INFO ]++; - p +=scnprintf (p, end - p, -"========== [BTC COEX INFO (%d)] ==========\n" , - chip->chip_id); +"\n========== [BTC COEX INFO (%s)] ==========\n" , +chip_id_str (chip->chip_id)); ver_main =FIELD_GET (GENMASK (31 ,24 ),RTW89_COEX_VERSION ); ver_sub =FIELD_GET (GENMASK (23 ,16 ),RTW89_COEX_VERSION );
@@ -8549,10 +8615,11 @@ static int _show_wl_role_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)continue ; p +=scnprintf (p, end - p, -" [port_%d] : role=%d(phy-%d), connect=%d(client_cnt=%d), mode=%d, center_ch=%d, bw=%d" , +" [port_%d] : role=%d(phy-%d), connect=%s(client_cnt=%d), mode=%d, center_ch=%d, bw=%d" , plink->pid, plink->role, plink->phy, - plink->connected, plink->client_cnt -1 , - plink->mode, plink->ch, plink->bw); +id_to_mlme_state (plink->connected), + plink->client_cnt -1 , plink->mode, + plink->ch, plink->bw);if (plink->connected ==MLME_NO_LINK )continue ;
@@ -8614,8 +8681,8 @@ static int _show_wl_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)else goto out; - p +=scnprintf (p, end - p," %-15s : link_mode:%d, " ,"[status]" , - mode); + p +=scnprintf (p, end - p," %-15s : link_mode:%s, " ,"[status]" , +id_to_linkmode (mode)); p += scnprintf(p, end - p, "rf_off:%d, power_save:%d, scan:%s(band:%d/phy_map:0x%x), ",
@@ -9414,7 +9481,6 @@ static int _show_fbtc_slots(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)if (i %5 ==4 ) p +=scnprintf (p, end - p,"\n" ); } - p +=scnprintf (p, end - p,"\n" );return p - buf; }
@@ -9986,7 +10052,7 @@ static int _show_fbtc_cysta_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufszreturn 0 ; pcysta = &pfwinfo->rpt_fbtc_cysta.finfo.v7; - p +=scnprintf (p, end - p,"\n\r %-15s : cycle:%d" ,"[slot_stat]" , + p +=scnprintf (p, end - p,"\n %-15s : cycle:%d" ,"[slot_stat]" ,le16_to_cpu (pcysta->cycles));for (i =0 ; i <CXST_MAX ; i++) {
@@ -10134,7 +10200,7 @@ static int _show_fbtc_nullsta(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) ns = &pfwinfo->rpt_fbtc_nullsta.finfo;if (ver->fcxnullsta ==1 ) {for (i =0 ; i <2 ; i++) { - p +=scnprintf (p, end - p," %-15s : " ,"[NULL-STA]" ); + p +=scnprintf (p, end - p," %-15s : " ,"\n[NULL-STA]" ); p +=scnprintf (p, end - p,"null-%d" , i); p +=scnprintf (p, end - p,"[ok:%d/" ,le32_to_cpu (ns->v1.result[i][1 ]));
@@ -10147,13 +10213,13 @@ static int _show_fbtc_nullsta(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=scnprintf (p, end - p,"avg_t:%d.%03d/" ,le32_to_cpu (ns->v1.avg_t[i]) /1000 ,le32_to_cpu (ns->v1.avg_t[i]) %1000 ); - p +=scnprintf (p, end - p,"max_t:%d.%03d]\n" , + p +=scnprintf (p, end - p,"max_t:%d.%03d]" ,le32_to_cpu (ns->v1.max_t[i]) /1000 ,le32_to_cpu (ns->v1.max_t[i]) %1000 ); } }else if (ver->fcxnullsta ==7 ) {for (i =0 ; i <2 ; i++) { - p +=scnprintf (p, end - p," %-15s : " ,"[NULL-STA]" ); + p +=scnprintf (p, end - p," %-15s : " ,"\n[NULL-STA]" ); p +=scnprintf (p, end - p,"null-%d" , i); p +=scnprintf (p, end - p,"[Tx:%d/" ,le32_to_cpu (ns->v7.result[i][4 ]));
@@ -10168,13 +10234,13 @@ static int _show_fbtc_nullsta(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=scnprintf (p, end - p,"avg_t:%d.%03d/" ,le32_to_cpu (ns->v7.tavg[i]) /1000 ,le32_to_cpu (ns->v7.tavg[i]) %1000 ); - p +=scnprintf (p, end - p,"max_t:%d.%03d]\n" , + p +=scnprintf (p, end - p,"max_t:%d.%03d]" ,le32_to_cpu (ns->v7.tmax[i]) /1000 ,le32_to_cpu (ns->v7.tmax[i]) %1000 ); } }else {for (i =0 ; i <2 ; i++) { - p +=scnprintf (p, end - p," %-15s : " ,"[NULL-STA]" ); + p +=scnprintf (p, end - p," %-15s : " ,"\n[NULL-STA]" ); p +=scnprintf (p, end - p,"null-%d" , i); p +=scnprintf (p, end - p,"[Tx:%d/" ,le32_to_cpu (ns->v2.result[i][4 ]));
@@ -10189,7 +10255,7 @@ static int _show_fbtc_nullsta(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=scnprintf (p, end - p,"avg_t:%d.%03d/" ,le32_to_cpu (ns->v2.avg_t[i]) /1000 ,le32_to_cpu (ns->v2.avg_t[i]) %1000 ); - p +=scnprintf (p, end - p,"max_t:%d.%03d]\n" , + p +=scnprintf (p, end - p,"max_t:%d.%03d]" ,le32_to_cpu (ns->v2.max_t[i]) /1000 ,le32_to_cpu (ns->v2.max_t[i]) %1000 ); }
@@ -10431,7 +10497,6 @@ static int _show_gpio_dbg(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): stop due rpt_fbtc_gpio_dbg.cinfo\n" , __func__); - p +=scnprintf (p, end - p,"\n" ); goto out; }
@@ -10704,7 +10769,6 @@ static int _show_mreg_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) id_to_regtype(type), offset, val); cnt++; } - p +=scnprintf (p, end - p,"\n" ); out:return p - buf;
@@ -11404,37 +11468,39 @@ static int _show_summary_v8(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)ssize_t rtw89_btc_dump_info (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) { -struct rtw89_fw_suit *fw_suit = &rtwdev->fw.normal;struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_ver *fwsubver = &btc->fwinfo.fw_subver;const struct rtw89_btc_ver *ver = btc->ver; -struct rtw89_btc_cx *cx = &btc->cx; -struct rtw89_btc_bt_info *bt = &cx->bt; +struct rtw89_btc_dm *dm = &btc->dm;char *p = buf, *end = buf + bufsz; + dm->cnt_notify[BTC_NCNT_SHOW_COEX_INFO ]++; + p +=scnprintf (p, end - p, -"=========================================\n" ); +"\n\n\n** Page:%3d/RunCNT:%3d **" , + dm->cnt_notify[BTC_NCNT_SHOW_COEX_INFO ], + dm->cnt_dm[BTC_DCNT_RUN ]); p +=scnprintf (p, end - p, -"WL FW / BT FW %d.%d.%d.%d / NA\n" , - fw_suit->major_ver, fw_suit->minor_ver, - fw_suit->sub_ver, fw_suit->sub_idex); - p +=scnprintf (p, end - p,"manual %d\n" , - btc->manual_ctrl); - +"\n========== [BTC FEATURE SUB VER] ==========" ); p +=scnprintf (p, end - p, -"=========================================\n" ); - +"\n %-15s : fcxbtcrpt[%d/%d], fcxtdma[%d/%d], fcxslots[%d/%d], fcxcysta[%d/%d]" , +"[FW/DRV]" , fwsubver->fcxbtcrpt, ver->fcxbtcrpt, + fwsubver->fcxtdma, ver->fcxtdma, fwsubver->fcxslots, + ver->fcxslots, fwsubver->fcxcysta, ver->fcxcysta); p +=scnprintf (p, end - p, -"\n\r %-15s : raw_data[%02x %02x %02x %02x %02x %02x] (type:%s/cnt:%d/same:%d)" , -"[bt_info]" , - bt->raw_info[2 ], bt->raw_info[3 ], - bt->raw_info[4 ], bt->raw_info[5 ], - bt->raw_info[6 ], bt->raw_info[7 ], - bt->raw_info[0 ] ==BTC_BTINFO_AUTO ?"auto" :"reply" , - cx->cnt_bt[BTC_BCNT_INFOUPDATE ], - cx->cnt_bt[BTC_BCNT_INFOSAME ]); - +"\n %-15s : fcxstep[%d/%d], fcxnullsta[%d/%d], fcxmreg[%d/%d], fcxgpiodbg[%d/%d]" , +"[FW/DRV]" , fwsubver->fcxstep, ver->fcxstep, + fwsubver->fcxnullsta, ver->fcxnullsta, fwsubver->fcxmreg, + ver->fcxmreg, fwsubver->fcxgpiodbg, ver->fcxgpiodbg); + p +=scnprintf (p, end - p, +"\n %-15s : fcxbtver[%d/%d], fcxbtscan[%d/%d], fcxbtafh[%d/%d], fcxbtdevinfo[%d/%d]" , +"[FW/DRV]" , fwsubver->fcxbtver, ver->fcxbtver, + fwsubver->fcxbtscan, ver->fcxbtscan, fwsubver->fcxbtafh, + ver->fcxbtafh, fwsubver->fcxbtdevinfo, ver->fcxbtdevinfo); p +=scnprintf (p, end - p, -"\n=========================================\n" ); +"\n %-15s : fcxosi[%d/%d], fcxmlo[%d/%d]," , +"[FW/DRV]" , fwsubver->fcxosi, ver->fcxosi, + fwsubver->fcxmlo, ver->fcxmlo); p +=_show_cx_info (rtwdev, p, end - p); p +=_show_wl_info (rtwdev, p, end - p);
drivers/net/wireless/realtek/rtw89/core.h +26 -25
63 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/10 wifi: rtw89: coex: Add H2C command to collect driver outsource information to firmware
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
In order to reduce driver I/O & some detail instant hardware control, some of the necessary API offload to Wi-Fi firmware. Collect the reference parameters to let firmware do decisions.
--- drivers/net/wireless/realtek/rtw89/coex.c | 12 ++++++- drivers/net/wireless/realtek/rtw89/core.h | 16 ++++++++- drivers/net/wireless/realtek/rtw89/fw.c | 40 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 6 ++++ 4 files changed, 72 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +11 -1
@@ -154,7 +154,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7, .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 8, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, - .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 2, .info_buf = 1800, .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, }, {RTL8922A, RTW89_FW_VER_CODE(0, 35, 8, 0),
@@ -2776,6 +2776,16 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 type)case CXDRVINFO_FDDT :case CXDRVINFO_MLO :case CXDRVINFO_OSI : +if (!ver->fcxosi) +return ; + +if (ver->drvinfo_type ==2 ) + type =7 ; +else +return ; + +rtw89_fw_h2c_cxdrv_osi_info (rtwdev, type); +break ;default :break ; }
drivers/net/wireless/realtek/rtw89/core.h +15 -1
@@ -1205,7 +1205,7 @@ struct rtw89_mac_ax_gnt {struct rtw89_mac_ax_wl_act {u8 wlan_act_en;u8 wlan_act; -}; +} __packed;#define RTW89_MAC_AX_COEX_GNT_NR 2struct rtw89_mac_ax_coex_gnt {
@@ -2933,12 +2933,26 @@ enum btc_rf_path { BTC_RF_NUM, }; +struct rtw89_btc_fbtc_outsrc_set_info { +u8 rf_band[BTC_RF_NUM ];/* 0:2G, 1:non-2G */ +u8 btg_rx[BTC_RF_NUM ]; +u8 nbtg_tx[BTC_RF_NUM ]; + +struct rtw89_mac_ax_gnt gnt_set[BTC_RF_NUM ];/* refer to btc_gnt_ctrl */ +struct rtw89_mac_ax_wl_act wlact_set[BTC_RF_NUM ];/* BT0/BT1 */ + +u8 pta_req_hw_band; +u8 rf_gbt_source; +} __packed; +union rtw89_btc_fbtc_slot_u {struct rtw89_btc_fbtc_slot v1[CXST_MAX ];struct rtw89_btc_fbtc_slot_v7 v7[CXST_MAX ]; };struct rtw89_btc_dm { +struct rtw89_btc_fbtc_outsrc_set_info ost_info_last;/* outsrc API setup info */ +struct rtw89_btc_fbtc_outsrc_set_info ost_info;/* outsrc API setup info */ union rtw89_btc_fbtc_slot_u slot;union rtw89_btc_fbtc_slot_u slot_now;struct rtw89_btc_fbtc_tdma tdma;
drivers/net/wireless/realtek/rtw89/fw.c +40 -0
@@ -5085,6 +5085,46 @@ int rtw89_fw_h2c_cxdrv_role_v8(struct rtw89_dev *rtwdev, u8 type)return ret; } +int rtw89_fw_h2c_cxdrv_osi_info (struct rtw89_dev *rtwdev,u8 type) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_fbtc_outsrc_set_info *osi = &btc->dm.ost_info; +struct rtw89_h2c_cxosi *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for h2c cxdrv_osi\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_cxosi *)skb->data; + + h2c->hdr.type = type; + h2c->hdr.ver = btc->ver->fcxosi; + h2c->hdr.len = len -H2C_LEN_CXDRVHDR_V7 ; + h2c->osi = *osi; + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_OUTSRC ,BTFC_SET , +SET_DRV_INFO ,0 ,0 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +#define H2C_LEN_CXDRVINFO_CTRL (4 + H2C_LEN_CXDRVHDR)int rtw89_fw_h2c_cxdrv_ctrl (struct rtw89_dev *rtwdev,u8 type) {
drivers/net/wireless/realtek/rtw89/fw.h +6 -0
@@ -2247,6 +2247,11 @@ struct rtw89_h2c_cxrole_v8 {struct rtw89_btc_wl_role_info_v8_u32 _u32; } __packed; +struct rtw89_h2c_cxosi { +struct rtw89_h2c_cxhdr_v7 hdr; +struct rtw89_btc_fbtc_outsrc_set_info osi; +} __packed; +struct rtw89_h2c_cxinit {struct rtw89_h2c_cxhdr hdr;u8 ant_type;
@@ -4732,6 +4737,7 @@ int rtw89_fw_h2c_cxdrv_role_v1(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_cxdrv_role_v2 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v8 (struct rtw89_dev *rtwdev,u8 type); +int rtw89_fw_h2c_cxdrv_osi_info (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_trx (struct rtw89_dev *rtwdev,u8 type);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 7/10 wifi: rtw89: coex: Update Pre-AGC logic for WiFi 7
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Pre-AGC is Wi-Fi auto Rx gain control. The mechanism need to switching very fast, especially while Wi-Fi is under 2GHz/5GHz multi-port scenario. To earn a more accuracy & sensitive gain control, in the WiFi 7 later firmware, Pre-AGC mechanism has offloaded to firmware.
--- drivers/net/wireless/realtek/rtw89/coex.c | 37 ++++++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +32 -5
@@ -5056,6 +5056,7 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev)static void _set_wl_preagc_ctrl (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_fbtc_outsrc_set_info *o_info = &btc->dm.ost_info;struct rtw89_btc_bt_link_info *bt_linfo = &btc->cx.bt.link_info;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_role_info_v2 *rinfo_v2 = &wl->role_info_v2;
@@ -5087,9 +5088,7 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev)return ; } -if (link_mode ==BTC_WLINK_25G_MCC ) { - is_preagc =BTC_PREAGC_BB_FWCTRL ; - }else if (!(bt->run_patch_code && bt->enable.now)) { +if (!(bt->run_patch_code && bt->enable.now)) { is_preagc =BTC_PREAGC_DISABLE ; }else if (link_mode ==BTC_WLINK_5G ) { is_preagc =BTC_PREAGC_DISABLE ;
@@ -5109,6 +5108,9 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev) is_preagc =BTC_PREAGC_ENABLE ; } +if (!btc->ver->fcxosi && link_mode ==BTC_WLINK_25G_MCC ) + is_preagc =BTC_PREAGC_BB_FWCTRL ; +if (dm->wl_pre_agc_rb != dm->wl_pre_agc && dm->wl_pre_agc_rb !=BTC_PREAGC_NOTFOUND ) {_get_reg_status (rtwdev,BTC_CSTATUS_BB_PRE_AGC , &val);
@@ -5122,9 +5124,34 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev) is_preagc != dm->wl_pre_agc) { dm->wl_pre_agc = is_preagc; -if (is_preagc >BTC_PREAGC_ENABLE ) +if (!btc->ver->fcxosi && is_preagc >BTC_PREAGC_ENABLE ) +return ; + +if (o_info->rf_band[BTC_RF_S0 ] != o_info->rf_band[BTC_RF_S1 ]) {/* 1+1 */ +if (o_info->rf_band[BTC_RF_S0 ])/* Non-2G */ + o_info->nbtg_tx[BTC_RF_S0 ] =BTC_PREAGC_DISABLE ; +else + o_info->nbtg_tx[BTC_RF_S0 ] = is_preagc; + +if (o_info->rf_band[BTC_RF_S1 ])/* Non-2G */ + o_info->nbtg_tx[BTC_RF_S1 ] =BTC_PREAGC_DISABLE ; +else + o_info->nbtg_tx[BTC_RF_S1 ] = is_preagc; + + }else {/* 2+0 or 0+2 */ + o_info->nbtg_tx[BTC_RF_S0 ] = is_preagc; + o_info->nbtg_tx[BTC_RF_S1 ] = is_preagc; + } + +if (btc->ver->fcxosi) +return ; + + chip->ops->ctrl_nbtg_bt_tx (rtwdev, o_info->nbtg_tx[BTC_RF_S0 ], +RTW89_PHY_0 ); +if (chip->chip_id !=RTL8922A )return ; - chip->ops->ctrl_nbtg_bt_tx (rtwdev, dm->wl_pre_agc,RTW89_PHY_0 ); + chip->ops->ctrl_nbtg_bt_tx (rtwdev, o_info->nbtg_tx[BTC_RF_S1 ], +RTW89_PHY_1 ); } }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 8/10 wifi: rtw89: coex: Update BTG control for WiFi 7
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
BTG means a path work for Bluetooth & Wi-Fi 2.4GHz. To earn a better coexistence performance, need to do some RF setting for BTG path. WiFi 7 generation offload the feature to firmware, to get a more accuracy control. And decrease driver I/O.
--- drivers/net/wireless/realtek/rtw89/coex.c | 90 +++++++++++------------ 1 file changed, 43 insertions(+), 47 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +43 -47
@@ -4972,16 +4972,14 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2;struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7;struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8; +struct rtw89_btc_fbtc_outsrc_set_info *o_info = &btc->dm.ost_info;struct rtw89_btc_wl_role_info *wl_rinfo_v0 = &wl->role_info; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;const struct rtw89_chip_info *chip = rtwdev->chip;const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_bt_info *bt = &btc->cx.bt;struct rtw89_btc_dm *dm = &btc->dm;struct _wl_rinfo_now wl_rinfo; -u32 run_reason = btc->dm.run_reason; -u32 is_btg; -u8 i, val; +u32 is_btg =BTC_BTGCTRL_DISABLE ;if (btc->manual_ctrl)return ;
@@ -4999,58 +4997,56 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev)else return ; -if (rtwdev->dbcc_en) { -if (ver->fwlrole ==0 ) { - wl_rinfo.dbcc_2g_phy =RTW89_PHY_NUM ; +/* notify halbb ignore GNT_BT or not for WL BB Rx-AGC control */ +if (btc->ant_type ==BTC_ANT_SHARED ) { +if (!(bt->run_patch_code && bt->enable.now)) + is_btg =BTC_BTGCTRL_DISABLE ; +else if (wl_rinfo.link_mode !=BTC_WLINK_5G ) + is_btg =BTC_BTGCTRL_ENABLE ; +else + is_btg =BTC_BTGCTRL_DISABLE ; -for (i =0 ; i <RTW89_PHY_NUM ; i++) { -if (wl_dinfo->real_band[i] ==RTW89_BAND_2G ) - wl_rinfo.dbcc_2g_phy = i; - } - }else if (ver->fwlrole ==1 ) { - wl_rinfo.dbcc_2g_phy = wl_rinfo_v1->dbcc_2g_phy; - }else if (ver->fwlrole ==2 ) { - wl_rinfo.dbcc_2g_phy = wl_rinfo_v2->dbcc_2g_phy; - }else if (ver->fwlrole ==7 ) { - wl_rinfo.dbcc_2g_phy = wl_rinfo_v7->dbcc_2g_phy; - }else if (ver->fwlrole ==8 ) { - wl_rinfo.dbcc_2g_phy = wl_rinfo_v8->dbcc_2g_phy; - }else { -return ; - } +/* bb call ctrl_btg() in WL FW by slot */ +if (!ver->fcxosi && + wl_rinfo.link_mode ==BTC_WLINK_25G_MCC ) + is_btg =BTC_BTGCTRL_BB_GNT_FWCTRL ; } -if (wl_rinfo.link_mode ==BTC_WLINK_25G_MCC ) - is_btg =BTC_BTGCTRL_BB_GNT_FWCTRL ; -else if (!(bt->run_patch_code && bt->enable.now)) - is_btg =BTC_BTGCTRL_DISABLE ; -else if (wl_rinfo.link_mode ==BTC_WLINK_5G ) - is_btg =BTC_BTGCTRL_DISABLE ; -else if (dm->freerun) - is_btg =BTC_BTGCTRL_DISABLE ; -else if (rtwdev->dbcc_en && wl_rinfo.dbcc_2g_phy !=RTW89_PHY_1 ) - is_btg =BTC_BTGCTRL_DISABLE ; +if (is_btg == dm->wl_btg_rx) +return ;else - is_btg =BTC_BTGCTRL_ENABLE ; + dm->wl_btg_rx = is_btg; -if (dm->wl_btg_rx_rb != dm->wl_btg_rx && - dm->wl_btg_rx_rb !=BTC_BTGCTRL_BB_GNT_NOTFOUND ) { -_get_reg_status (rtwdev,BTC_CSTATUS_BB_GNT_MUX , &val); - dm->wl_btg_rx_rb = val; - } +/* skip setup if btg_ctrl set by wl fw */ +if (!ver->fcxosi && is_btg >BTC_BTGCTRL_ENABLE ) +return ; -if (run_reason ==BTC_RSN_NTFY_INIT || - run_reason ==BTC_RSN_NTFY_SWBAND || - dm->wl_btg_rx_rb != dm->wl_btg_rx || - is_btg != dm->wl_btg_rx) { +/* Below flow is for BTC_FEAT_NEW_BBAPI_FLOW = 1 */ +if (o_info->rf_band[BTC_RF_S0 ] != o_info->rf_band[BTC_RF_S1 ]) {/* 1+1 */ +if (o_info->rf_band[BTC_RF_S0 ])/* Non-2G */ + o_info->btg_rx[BTC_RF_S0 ] =BTC_BTGCTRL_DISABLE ; +else + o_info->btg_rx[BTC_RF_S0 ] = is_btg; - dm->wl_btg_rx = is_btg; +if (o_info->rf_band[BTC_RF_S1 ])/* Non-2G */ + o_info->btg_rx[BTC_RF_S1 ] =BTC_BTGCTRL_DISABLE ; +else + o_info->btg_rx[BTC_RF_S1 ] = is_btg; + }else {/* 2+0 or 0+2 */ + o_info->btg_rx[BTC_RF_S0 ] = is_btg; + o_info->btg_rx[BTC_RF_S1 ] = is_btg; + } -if (is_btg >BTC_BTGCTRL_ENABLE ) -return ; +if (ver->fcxosi) +return ; - chip->ops->ctrl_btg_bt_rx (rtwdev, is_btg,RTW89_PHY_0 ); - } + chip->ops->ctrl_btg_bt_rx (rtwdev, o_info->btg_rx[BTC_RF_S0 ], +RTW89_PHY_0 ); +if (chip->chip_id !=RTL8922A ) +return ; + + chip->ops->ctrl_btg_bt_rx (rtwdev, o_info->btg_rx[BTC_RF_S1 ], +RTW89_PHY_1 ); }static void _set_wl_preagc_ctrl (struct rtw89_dev *rtwdev)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 9/10 wifi: rtw89: coex: Update hardware PTA resource binding logic
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
WiFi 7 generation has 2 MAC, the PTA should bind the input/output to correct MAC to do the packet arbitration as expected.
--- drivers/net/wireless/realtek/rtw89/coex.c | 41 ++++++++++++++++++----- drivers/net/wireless/realtek/rtw89/reg.h | 1 + 2 files changed, 34 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +33 -8
@@ -5360,15 +5360,47 @@ static void _set_bt_rx_scan_pri(struct rtw89_dev *rtwdev)_write_scbd (rtwdev,BTC_WSCB_RXSCAN_PRI , (bool )(!!bt->scan_rx_low_pri)); } +static void _wl_req_mac (struct rtw89_dev *rtwdev,u8 mac) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_dm *dm = &btc->dm; +u32 add; + +if (mac == wl->pta_req_mac) +return ; + + dm->ost_info.pta_req_hw_band = mac; + wl->pta_req_mac = mac; + wl->pta_reg_mac_chg = true; + +if (btc->ver->fcxosi) +return ; + +if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) + add =R_BE_BTC_CFG ; +else + add =R_AX_BTC_CFG ; + +if (mac ==RTW89_MAC_0 ) +rtw89_write32_clr (rtwdev, add,B_AX_WL_SRC ); +else +rtw89_write32_set (rtwdev, add,B_AX_WL_SRC ); +} +static void _action_common (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &wl->role_info_v8;struct rtw89_btc_wl_smap *wl_smap = &wl->status.map;struct rtw89_btc_bt_info *bt = &btc->cx.bt;struct rtw89_btc_dm *dm = &btc->dm;u32 bt_rom_code_id, bt_fw_ver; +if (btc->ver->fwlrole ==8 ) +_wl_req_mac (rtwdev, rinfo_v8->pta_req_band); +_set_btg_ctrl (rtwdev);_set_wl_preagc_ctrl (rtwdev);_set_wl_tx_limit (rtwdev);
@@ -5405,6 +5437,7 @@ static void _action_common(struct rtw89_dev *rtwdev) btc->cx.cnt_wl[BTC_WCNT_SCBDUPDATE ]++; } btc->dm.tdma_instant_excute =0 ; + wl->pta_reg_mac_chg = false; }static void _action_by_bt (struct rtw89_dev *rtwdev)
@@ -5867,14 +5900,6 @@ _update_rssi_state(struct rtw89_dev *rtwdev, u8 pre_state, u8 rssi, u8 thresh)return next_state; } -static void _wl_req_mac (struct rtw89_dev *rtwdev,u8 mac) -{ -if (mac ==RTW89_MAC_0 ) -rtw89_write32_clr (rtwdev,R_AX_BTC_CFG ,B_AX_WL_SRC ); -else -rtw89_write32_set (rtwdev,R_AX_BTC_CFG ,B_AX_WL_SRC ); -} -static void _update_dbcc_band (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) {
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -6070,6 +6070,7 @@#define B_BE_MACID_ACQ_GRP0_CLR_P BIT(2)#define B_BE_R_MACID_ACQ_CHK_EN BIT(0) +#define R_BE_BTC_CFG 0x0E300#define R_BE_BT_BREAK_TABLE 0x0E344#define R_BE_GNT_SW_CTRL 0x0E348
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 10/10 wifi: rtw89: coex: Add PTA grant signal setting offload to firmware feature
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
In the before experience there are many issue occurred because of the grant control signal can not be set in time especially WiFi power save enter/leave. To control the signal more accuracy, offload the control to firmware.
--- drivers/net/wireless/realtek/rtw89/coex.c | 30 +++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +23 -7
@@ -2866,6 +2866,8 @@ static void _set_gnt_v1(struct rtw89_dev *rtwdev, u8 phy_map, {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_fbtc_outsrc_set_info *osi = &dm->ost_info; +struct rtw89_mac_ax_wl_act *b = dm->gnt.bt;struct rtw89_mac_ax_gnt *g = dm->gnt.band;u8 i, bt_idx = dm->bt_select +1 ;
@@ -2914,21 +2916,35 @@ static void _set_gnt_v1(struct rtw89_dev *rtwdev, u8 phy_map,switch (wlact_state) {case BTC_WLACT_HW : - dm->gnt.bt[i].wlan_act_en =0 ; - dm->gnt.bt[i].wlan_act =0 ; + b[i].wlan_act_en =0 ; + b[i].wlan_act =0 ;break ;case BTC_WLACT_SW_LO : - dm->gnt.bt[i].wlan_act_en =1 ; - dm->gnt.bt[i].wlan_act =0 ; + b[i].wlan_act_en =1 ; + b[i].wlan_act =0 ;break ;case BTC_WLACT_SW_HI : - dm->gnt.bt[i].wlan_act_en =1 ; - dm->gnt.bt[i].wlan_act =1 ; + b[i].wlan_act_en =1 ; + b[i].wlan_act =1 ;break ; } } } -rtw89_mac_cfg_gnt_v2 (rtwdev, &dm->gnt); + +if (!btc->ver->fcxosi) { +rtw89_mac_cfg_gnt_v2 (rtwdev, &dm->gnt); +return ; + } + +memcpy (osi->gnt_set, dm->gnt.band,sizeof (osi->gnt_set)); +memcpy (osi->wlact_set, dm->gnt.bt,sizeof (osi->wlact_set)); + +/* GBT source should be GBT_S1 in 1+1 (HWB0:5G + HWB1:2G) case */ +if (osi->rf_band[BTC_RF_S0 ] ==1 && + osi->rf_band[BTC_RF_S1 ] ==0 ) + osi->rf_gbt_source =BTC_RF_S1 ; +else + osi->rf_gbt_source =BTC_RF_S0 ; }#define BTC_TDMA_WLROLE_MAX 3
Signature · 1 line
2.25.1