rtw89: use count of trigger frames as a clue to accelerate CFO tracking
Ping-Ke Shih
maintainerv2 cover rtw89: use count of trigger frames as a clue to accelerate CFO tracking
The CFO (central frequency offset) is very important to yeild good UL-OFDMA performance. To track CFO accurately, adjust CFO in shorter period of time. Since this is only needed by UL-OFDMA, we use trigger frames as a clue.
v2: remove ULL suffix from MASK definition
Eric Huang (1):
rtw89: add new state to CFO state machine for UL-OFDMA
Po Hao Huang (2):
ieee80211: add trigger frame definition
rtw89: 8852c: add trigger frame counter
drivers/net/wireless/realtek/rtw89/core.c | 48 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 21 ++++++++++ drivers/net/wireless/realtek/rtw89/debug.c | 3 +- drivers/net/wireless/realtek/rtw89/phy.c | 24 +++++++++-- drivers/net/wireless/realtek/rtw89/phy.h | 1 + include/linux/ieee80211.h | 31 ++++++++++++++ 6 files changed, 124 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/3 ieee80211: add trigger frame definition
From: Po Hao Huang <[email protected]>
Define trigger stype of control frame, and its checking function, struct and trigger type within common_info of trigger.
--- include/linux/ieee80211.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
include/linux/ieee80211.h +31 -0
@@ -76,6 +76,7 @@#define IEEE80211_STYPE_ACTION 0x00D0/* control */ +#define IEEE80211_STYPE_TRIGGER 0x0020#define IEEE80211_STYPE_CTL_EXT 0x0060#define IEEE80211_STYPE_BACK_REQ 0x0080#define IEEE80211_STYPE_BACK 0x0090
@@ -295,6 +296,17 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)#define IEEE80211_HT_CTL_LEN 4 +/* trigger type within common_info of trigger frame */ +#define IEEE80211_TRIGGER_TYPE_MASK 0xf +#define IEEE80211_TRIGGER_TYPE_BASIC 0x0 +#define IEEE80211_TRIGGER_TYPE_BFRP 0x1 +#define IEEE80211_TRIGGER_TYPE_MU_BAR 0x2 +#define IEEE80211_TRIGGER_TYPE_MU_RTS 0x3 +#define IEEE80211_TRIGGER_TYPE_BSRP 0x4 +#define IEEE80211_TRIGGER_TYPE_GCR_MU_BAR 0x5 +#define IEEE80211_TRIGGER_TYPE_BQRP 0x6 +#define IEEE80211_TRIGGER_TYPE_NFRP 0x7 +struct ieee80211_hdr {__le16 frame_control;__le16 duration_id;
@@ -324,6 +336,15 @@ struct ieee80211_qos_hdr {__le16 qos_ctrl; } __packed__aligned(2) ; +struct ieee80211_trigger { +__le16 frame_control; +__le16 duration; +u8 ra[ETH_ALEN ]; +u8 ta[ETH_ALEN ]; +__le64 common_info; +u8 variable[]; +} __packed__aligned(2) ; +/** * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set * @fc: frame control bytes in little-endian byteorder
@@ -729,6 +750,16 @@ static inline bool ieee80211_is_qos_nullfunc(__le16 fc)cpu_to_le16 (IEEE80211_FTYPE_DATA |IEEE80211_STYPE_QOS_NULLFUNC ); } +/** +* ieee80211_is_trigger - check if frame is trigger frame +* @fc: frame control field in little-endian byteorder +*/ +static inline bool ieee80211_is_trigger (__le16 fc) +{ +return (fc &cpu_to_le16 (IEEE80211_FCTL_FTYPE |IEEE80211_FCTL_STYPE )) == +cpu_to_le16 (IEEE80211_FTYPE_CTL |IEEE80211_STYPE_TRIGGER ); +} +/** * ieee80211_is_any_nullfunc - check if frame is regular or QoS nullfunc frame * @fc: frame control bytes in little-endian byteorder
Signature · 1 line
2.25.1
Re: [PATCH v2 1/3] ieee80211: add trigger frame definition
Quoted 7 lines · Ping-Ke Shih
From: Po Hao Huang <[email protected]>
Define trigger stype of control frame, and its checking function, struct and trigger type within
common_infoof trigger.Signed-off-by Po Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
21ab562c1f65 ieee80211: add trigger frame definition 5165f1689a2c rtw89: 8852c: add trigger frame counter bc0130524cd9 rtw89: add new state to CFO state machine for UL-OFDMA
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH v2 2/3 rtw89: 8852c: add trigger frame counter
In reply to Ping-Ke ShihFrom: Po Hao Huang <[email protected]>
Adding this allows us to maintain trigger frame statistics, which is required for our CFO tracking decisions.
--- drivers/net/wireless/realtek/rtw89/core.c | 48 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 14 +++++++ drivers/net/wireless/realtek/rtw89/debug.c | 3 +- 3 files changed, 64 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +48 -0
@@ -1343,6 +1343,47 @@ struct rtw89_vif_rx_stats_iter_data {const u8 *bssid; }; +static void rtw89_stats_trigger_frame (struct rtw89_dev *rtwdev, +struct ieee80211_vif *vif, +struct sk_buff *skb) +{ +struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; +struct ieee80211_trigger *tf = (struct ieee80211_trigger *)skb->data; +u8 *pos, *end, type; +u16 aid; + +if (!ether_addr_equal (vif->bss_conf.bssid, tf->ta) || + rtwvif->wifi_role !=RTW89_WIFI_ROLE_STATION || + rtwvif->net_type ==RTW89_NET_TYPE_NO_LINK ) +return ; + + type =le64_get_bits (tf->common_info,IEEE80211_TRIGGER_TYPE_MASK ); +if (type !=IEEE80211_TRIGGER_TYPE_BASIC ) +return ; + + end = (u8 *)tf + skb->len; + pos = tf->variable; + +while (end - pos >=RTW89_TF_BASIC_USER_INFO_SZ ) { + aid =RTW89_GET_TF_USER_INFO_AID12 (pos); +rtw89_debug (rtwdev,RTW89_DBG_TXRX , +"[TF] aid: %d, ul_mcs: %d, rua: %d\n" , + aid,RTW89_GET_TF_USER_INFO_UL_MCS (pos), +RTW89_GET_TF_USER_INFO_RUA (pos)); + +if (aid ==RTW89_TF_PAD ) +break ; + +if (aid == vif->bss_conf.aid) { + rtwvif->stats.rx_tf_acc++; + rtwdev->stats.rx_tf_acc++; +break ; + } + + pos +=RTW89_TF_BASIC_USER_INFO_SZ ; + } +} +static void rtw89_vif_rx_stats_iter (void *data,u8 *mac,struct ieee80211_vif *vif) {
@@ -1355,6 +1396,11 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;const u8 *bssid = iter_data->bssid; +if (ieee80211_is_trigger (hdr->frame_control)) { +rtw89_stats_trigger_frame (rtwdev, vif, skb); +return ; + } +if (!ether_addr_equal (vif->bss_conf.bssid, bssid))return ;
@@ -2023,6 +2069,8 @@ static bool rtw89_traffic_stats_calc(struct rtw89_dev *rtwdev, stats->rx_unicast =0 ; stats->tx_cnt =0 ; stats->rx_cnt =0 ; + stats->rx_tf_periodic = stats->rx_tf_acc; + stats->rx_tf_acc =0 ;if (tx_tfc_lv != stats->tx_tfc_lv || rx_tfc_lv != stats->rx_tfc_lv)return true;
drivers/net/wireless/realtek/rtw89/core.h +14 -0
@@ -55,6 +55,16 @@ enum htc_om_channel_width {#define RTW89_HTC_MASK_HTC_OM_DL_MU_MIMO_RR BIT(16)#define RTW89_HTC_MASK_HTC_OM_UL_MU_DATA_DIS BIT(17) +#define RTW89_TF_PAD GENMASK(11, 0) +#define RTW89_TF_BASIC_USER_INFO_SZ 6 + +#define RTW89_GET_TF_USER_INFO_AID12 (data) \ + le32_get_bits(*((const __le32 *)(data)), GENMASK(11, 0)) +#define RTW89_GET_TF_USER_INFO_RUA (data) \ + le32_get_bits(*((const __le32 *)(data)), GENMASK(19, 12)) +#define RTW89_GET_TF_USER_INFO_UL_MCS (data) \ + le32_get_bits(*((const __le32 *)(data)), GENMASK(24, 21)) +enum rtw89_subband {RTW89_CH_2G =0 ,RTW89_CH_5G_BAND_1 =1 ,
@@ -943,6 +953,10 @@ struct rtw89_traffic_stats {u32 rx_throughput;u32 tx_throughput_raw;u32 rx_throughput_raw; + +u32 rx_tf_acc; +u32 rx_tf_periodic; +enum rtw89_tfc_lv tx_tfc_lv;enum rtw89_tfc_lv rx_tfc_lv;struct ewma_tp tx_ewma_tp;
drivers/net/wireless/realtek/rtw89/debug.c +2 -1
@@ -2376,7 +2376,8 @@ static int rtw89_debug_priv_phy_info_get(struct seq_file *m, void *v)seq_printf (m,"TP TX: %u [%u] Mbps (lv: %d), RX: %u [%u] Mbps (lv: %d)\n" , stats->tx_throughput, stats->tx_throughput_raw, stats->tx_tfc_lv, stats->rx_throughput, stats->rx_throughput_raw, stats->rx_tfc_lv); -seq_printf (m,"Beacon: %u\n" , pkt_stat->beacon_nr); +seq_printf (m,"Beacon: %u, TF: %u\n" , pkt_stat->beacon_nr, + stats->rx_tf_periodic);seq_printf (m,"Avg packet length: TX=%u, RX=%u\n" , stats->tx_avg_len, stats->rx_avg_len);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/3 rtw89: add new state to CFO state machine for UL-OFDMA
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
Add an new state, RTW89_PHY_DCFO_STATE_HOLD, to keep CFO acceleration after CFO_PERIOD_CNT if the traffic is UL-OFDMA, which is calculated based on RX trigger frame counter.
--- drivers/net/wireless/realtek/rtw89/core.h | 7 +++++++ drivers/net/wireless/realtek/rtw89/phy.c | 24 ++++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/phy.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +7 -0
@@ -2809,13 +2809,20 @@ enum rtw89_multi_cfo_mode {enum rtw89_phy_cfo_status {RTW89_PHY_DCFO_STATE_NORMAL =0 ,RTW89_PHY_DCFO_STATE_ENHANCE =1 , +RTW89_PHY_DCFO_STATE_HOLD =2 ,RTW89_PHY_DCFO_STATE_MAX }; +enum rtw89_phy_cfo_ul_ofdma_acc_mode { +RTW89_CFO_UL_OFDMA_ACC_DISABLE =0 , +RTW89_CFO_UL_OFDMA_ACC_ENABLE =1 +}; +struct rtw89_cfo_tracking_info {u16 cfo_timer_ms;bool cfo_trig_by_timer_en;enum rtw89_phy_cfo_status phy_cfo_status; +enum rtw89_phy_cfo_ul_ofdma_acc_mode cfo_ul_ofdma_acc_mode;u8 phy_cfo_trk_cnt;bool is_adjust;enum rtw89_multi_cfo_mode rtw89_multi_cfo_mode;
drivers/net/wireless/realtek/rtw89/phy.c +21 -3
@@ -2151,6 +2151,7 @@ static void rtw89_phy_cfo_init(struct rtw89_dev *rtwdev) cfo->cfo_trig_by_timer_en = false; cfo->phy_cfo_trk_cnt =0 ; cfo->phy_cfo_status =RTW89_PHY_DCFO_STATE_NORMAL ; + cfo->cfo_ul_ofdma_acc_mode =RTW89_CFO_UL_OFDMA_ACC_ENABLE ; } static void rtw89_phy_cfo_crystal_cap_adjust(struct rtw89_dev *rtwdev,
@@ -2419,6 +2420,13 @@ void rtw89_phy_cfo_track(struct rtw89_dev *rtwdev) {struct rtw89_cfo_tracking_info *cfo = &rtwdev->cfo_tracking;struct rtw89_traffic_stats *stats = &rtwdev->stats; +bool is_ul_ofdma = false, ofdma_acc_en = false; + +if (stats->rx_tf_periodic >CFO_TF_CNT_TH ) + is_ul_ofdma = true; +if (cfo->cfo_ul_ofdma_acc_mode ==RTW89_CFO_UL_OFDMA_ACC_ENABLE && + is_ul_ofdma) + ofdma_acc_en = true;switch (cfo->phy_cfo_status) {case RTW89_PHY_DCFO_STATE_NORMAL :
@@ -2430,16 +2438,26 @@ void rtw89_phy_cfo_track(struct rtw89_dev *rtwdev) }break ;case RTW89_PHY_DCFO_STATE_ENHANCE : -if (cfo->phy_cfo_trk_cnt >=CFO_PERIOD_CNT ) { +if (stats->tx_throughput <=CFO_TP_LOWER ) + cfo->phy_cfo_status =RTW89_PHY_DCFO_STATE_NORMAL ; +else if (ofdma_acc_en && + cfo->phy_cfo_trk_cnt >=CFO_PERIOD_CNT ) + cfo->phy_cfo_status =RTW89_PHY_DCFO_STATE_HOLD ; +else + cfo->phy_cfo_trk_cnt++; + +if (cfo->phy_cfo_status ==RTW89_PHY_DCFO_STATE_NORMAL ) { cfo->phy_cfo_trk_cnt =0 ; cfo->cfo_trig_by_timer_en = false; } -if (cfo->cfo_trig_by_timer_en ==1 ) - cfo->phy_cfo_trk_cnt++; +break ; +case RTW89_PHY_DCFO_STATE_HOLD :if (stats->tx_throughput <=CFO_TP_LOWER ) { cfo->phy_cfo_status =RTW89_PHY_DCFO_STATE_NORMAL ; cfo->phy_cfo_trk_cnt =0 ; cfo->cfo_trig_by_timer_en = false; + }else { + cfo->phy_cfo_trk_cnt++; }break ;default :
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -62,6 +62,7 @@#define CFO_COMP_PERIOD 250#define CFO_COMP_WEIGHT 8#define MAX_CFO_TOLERANCE 30 +#define CFO_TF_CNT_TH 300#define CCX_MAX_PERIOD 2097#define CCX_MAX_PERIOD_UNIT 32
Signature · 1 line
2.25.1