wifi: rtw89: no HTC field if TX rate might fallback to legacy
Ping-Ke Shih
maintainerPATCH 1/3 wifi: rtw89: no HTC field if TX rate might fallback to legacy
Packets containing HTC field with legacy rate could be dropped by AP. If TX rate of report is lower than MCS2, hardware might fall back rate to legacy. Therefore, add a checking rule to avoid HTC field in this situation.
--- drivers/net/wireless/realtek/rtw89/core.c | 4 ++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/debug.c | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 20 ++++++++------------ 4 files changed, 14 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -0
@@ -617,6 +617,7 @@ __rtw89_core_tx_check_he_qos_htc(struct rtw89_dev *rtwdev, enum btc_pkt_type pkt_type) {struct ieee80211_sta *sta = tx_req->sta; +struct rtw89_sta *rtwsta =sta_to_rtwsta_safe (sta);struct sk_buff *skb = tx_req->skb;struct ieee80211_hdr *hdr = (void *)skb->data;__le16 fc = hdr->frame_control;
@@ -634,6 +635,9 @@ __rtw89_core_tx_check_he_qos_htc(struct rtw89_dev *rtwdev,if (skb_headroom (skb) <IEEE80211_HT_CTL_LEN )return false; +if (rtwsta && rtwsta->ra_report.might_fallback_legacy) +return false; +return true; }
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -1911,6 +1911,7 @@ struct rtw89_ra_report {struct rate_info txrate;u32 bit_rate;u16 hw_rate; +bool might_fallback_legacy; };DECLARE_EWMA (rssi,10 ,16 );
drivers/net/wireless/realtek/rtw89/debug.c +1 -0
@@ -2305,6 +2305,7 @@ static void rtw89_sta_info_get_iter(void *data, struct ieee80211_sta *sta) he_gi_str[rate->he_gi] : "N/A"); else seq_printf(m,"Legacy %d" , rate->legacy); +seq_printf (m,"%s" , rtwsta->ra_report.might_fallback_legacy ?" FB_G" :"" );seq_printf (m,"\t(hw_rate=0x%x)" , rtwsta->ra_report.hw_rate);seq_printf (m,"\t==> agg_wait=%d (%d)\n" , rtwsta->max_agg_wait, sta->max_rc_amsdu_len);
drivers/net/wireless/realtek/rtw89/phy.c +8 -12
@@ -14,23 +14,14 @@static u16 get_max_amsdu_len (struct rtw89_dev *rtwdev,const struct rtw89_ra_report *report) { -const struct rate_info *txrate = &report->txrate;u32 bit_rate = report->bit_rate; -u8 mcs;/* lower than ofdm, do not aggregate */ if (bit_rate <550 )return 1 ; -/* prevent hardware rate fallback to G mode rate */ -if (txrate->flags &RATE_INFO_FLAGS_MCS ) - mcs = txrate->mcs &0x07 ; -else if (txrate->flags & (RATE_INFO_FLAGS_VHT_MCS |RATE_INFO_FLAGS_HE_MCS )) - mcs = txrate->mcs; -else - mcs =0 ; - -if (mcs <=2 ) +/* avoid AMSDU for legacy rate */ +if (report->might_fallback_legacy)return 1 ;/* lower than 20M vht 2ss mcs8, make it small */
@@ -1920,6 +1911,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta)u8 mode, rate, bw, giltf, mac_id;u16 legacy_bitrate;bool valid; +u8 mcs =0 ; mac_id =RTW89_GET_PHY_C2H_RA_RPT_MACID (c2h->data);if (mac_id != rtwsta->mac_id)
@@ -1936,7 +1928,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta)return ; } -memset (ra_report,0 ,sizeof (*ra_report)); +memset (&ra_report->txrate,0 ,sizeof (ra_report->txrate));switch (mode) {case RTW89_RA_RPT_MODE_LEGACY :
@@ -1952,6 +1944,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta) ra_report->txrate.mcs = rate;if (giltf) ra_report->txrate.flags |=RATE_INFO_FLAGS_SHORT_GI ; + mcs = ra_report->txrate.mcs &0x07 ;break ;case RTW89_RA_RPT_MODE_VHT : ra_report->txrate.flags |=RATE_INFO_FLAGS_VHT_MCS ;
@@ -1959,6 +1952,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta) ra_report->txrate.nss =FIELD_GET (RTW89_RA_RATE_MASK_NSS , rate) +1 ;if (giltf) ra_report->txrate.flags |=RATE_INFO_FLAGS_SHORT_GI ; + mcs = ra_report->txrate.mcs;break ;case RTW89_RA_RPT_MODE_HE : ra_report->txrate.flags |=RATE_INFO_FLAGS_HE_MCS ;
@@ -1970,6 +1964,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta) ra_report->txrate.he_gi =NL80211_RATE_INFO_HE_GI_1_6 ; else ra_report->txrate.he_gi = NL80211_RATE_INFO_HE_GI_3_2; + mcs = ra_report->txrate.mcs;break ; }
@@ -1977,6 +1972,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta) ra_report->bit_rate =cfg80211_calculate_bitrate (&ra_report->txrate); ra_report->hw_rate =FIELD_PREP (RTW89_HW_RATE_MASK_MOD , mode) |FIELD_PREP (RTW89_HW_RATE_MASK_VAL , rate); + ra_report->might_fallback_legacy = mcs <=2 ; sta->max_rc_amsdu_len =get_max_amsdu_len (rtwdev, ra_report); rtwsta->max_agg_wait = sta->max_rc_amsdu_len /1500 -1 ; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/3 wifi: rtw89: correct polling address of address CAM
Writing address to kick hardware to initialize address CAM, and then poll ready bit to determine completed. Old wrong code poll wrong register address, so it can lead error and fail to bring up interface.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -1734,7 +1734,7 @@ static int addr_cam_init(struct rtw89_dev *rtwdev, u8 mac_idx)rtw89_write32 (rtwdev, reg, val); ret =read_poll_timeout (rtw89_read16, p_val, !(p_val &B_AX_ADDR_CAM_CLR ), -1 ,TRXCFG_WAIT_CNT , false, rtwdev,B_AX_ADDR_CAM_CLR ); +1 ,TRXCFG_WAIT_CNT , false, rtwdev, reg);if (ret) {rtw89_err (rtwdev,"[ERR]ADDR_CAM reset\n" );return ret;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/3 wifi: rtw89: declare to support beamformee above bandwidth 80MHz
In reply to Ping-Ke ShihDeclare this to tell AP we can support beamformee over bandwidth 160M, and then yield better performance in field.
--- drivers/net/wireless/realtek/rtw89/core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +2 -0
@@ -2710,6 +2710,8 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU ; phy_cap_info[4 ] =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 ; +if (chip->support_bw160) + phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 ; phy_cap_info[5 ] = no_ng16 ?0 :IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK ;
Signature · 1 line
2.25.1
Quoted 6 lines · Ping-Ke Shih
Packets containing HTC field with legacy rate could be dropped by AP. If TX rate of report is lower than MCS2, hardware might fall back rate to legacy. Therefore, add a checking rule to avoid HTC field in this situation.
Signed-off-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
0d466f05262a wifi: rtw89: no HTC field if TX rate might fallback to legacy ad275d0a82cb wifi: rtw89: correct polling address of address CAM fec11dee177a wifi: rtw89: declare to support beamformee above bandwidth 80MHz
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches