rtw88 and rtw89: recover rates of rate adaptive mechanism
Ping-Ke Shih
maintainercover rtw88 and rtw89: recover rates of rate adaptive mechanism
To have better user experience, we mask out some rates depends on RSSI and operating mode. Somehow, AP can possibly support partial rates, and then we may get empty rate set. To avoid this, recover the supported rates of sta if we fall into this situation.
Since rtw88 and rtw89 have the same issue, I send them together.
Chien-Hsun Liao (2):
rtw88: recover rates of rate adaptive mechanism
rtw89: recover rates of rate adaptive mechanism
drivers/net/wireless/realtek/rtw88/main.c | 67 +++++++++++++++-------- drivers/net/wireless/realtek/rtw89/phy.c | 47 ++++++++++------ 2 files changed, 74 insertions(+), 40 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/2 rtw88: recover rates of rate adaptive mechanism
From: Chien-Hsun Liao <[email protected]>
Some APs like CMW270 only support one phyrate and the function rtw_update_rate_mask could disable that rate. To fix such problem, we restore the rate mask if we find that the rate_mask is empty.
--- drivers/net/wireless/realtek/rtw88/main.c | 67 +++++++++++++++-------- 1 file changed, 44 insertions(+), 23 deletions(-)
drivers/net/wireless/realtek/rtw88/main.c +44 -23
@@ -1020,37 +1020,52 @@ static u8 get_rate_id(u8 wireless_set, enum rtw_bandwidth bw_mode, u8 tx_num)#define RA_MASK_VHT_RATES (RA_MASK_VHT_RATES_1SS | \ RA_MASK_VHT_RATES_2SS | \ RA_MASK_VHT_RATES_3SS) +#define RA_MASK_CCK_IN_BG 0x00005#define RA_MASK_CCK_IN_HT 0x00005#define RA_MASK_CCK_IN_VHT 0x00005#define RA_MASK_OFDM_IN_VHT 0x00010#define RA_MASK_OFDM_IN_HT_2G 0x00010#define RA_MASK_OFDM_IN_HT_5G 0x00030 -static u64 rtw_update_rate_mask (struct rtw_dev *rtwdev, -struct rtw_sta_info *si, -u64 ra_mask,bool is_vht_enable, -u8 wireless_set) +static u64 rtw_rate_mask_rssi (struct rtw_sta_info *si,u8 wireless_set) +{ +u8 rssi_level = si->rssi_level; + +if (wireless_set ==WIRELESS_CCK ) +return 0xffffffffffffffffULL ; + +if (rssi_level ==0 ) +return 0xffffffffffffffffULL ; +else if (rssi_level ==1 ) +return 0xfffffffffffffff0ULL ; +else if (rssi_level ==2 ) +return 0xffffffffffffefe0ULL ; +else if (rssi_level ==3 ) +return 0xffffffffffffcfc0ULL ; +else if (rssi_level ==4 ) +return 0xffffffffffff8f80ULL ; +else +return 0xffffffffffff0f00ULL ; +} + +static u64 rtw_rate_mask_recover (u64 ra_mask,u64 ra_mask_bak) +{ +if ((ra_mask & ~(RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )) ==0 ) + ra_mask |= (ra_mask_bak & ~(RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )); + +if (ra_mask ==0 ) + ra_mask |= (ra_mask_bak & (RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )); + +return ra_mask; +} + +static u64 rtw_rate_mask_cfg (struct rtw_dev *rtwdev,struct rtw_sta_info *si, +u64 ra_mask,bool is_vht_enable) {struct rtw_hal *hal = &rtwdev->hal;const struct cfg80211_bitrate_mask *mask = si->mask;u64 cfg_mask =GENMASK_ULL (63 ,0 ); -u8 rssi_level, band; - -if (wireless_set !=WIRELESS_CCK ) { - rssi_level = si->rssi_level; -if (rssi_level ==0 ) - ra_mask &=0xffffffffffffffffULL ; -else if (rssi_level ==1 ) - ra_mask &=0xfffffffffffffff0ULL ; -else if (rssi_level ==2 ) - ra_mask &=0xffffffffffffefe0ULL ; -else if (rssi_level ==3 ) - ra_mask &=0xffffffffffffcfc0ULL ; -else if (rssi_level ==4 ) - ra_mask &=0xffffffffffff8f80ULL ; -else if (rssi_level >=5 ) - ra_mask &=0xffffffffffff0f00ULL ; - } +u8 band;if (!si->use_cfg_mask)return ra_mask;
@@ -1100,6 +1115,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)u8 ldpc_en =0 ;u8 tx_num =1 ;u64 ra_mask =0 ; +u64 ra_mask_bak =0 ;bool is_vht_enable = false;bool is_support_sgi = false;
@@ -1124,6 +1140,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)if (hal->current_band_type ==RTW_BAND_5G ) { ra_mask |= (u64 )sta->supp_rates[NL80211_BAND_5GHZ ] <<4 ; + ra_mask_bak = ra_mask;if (sta->vht_cap.vht_supported) { ra_mask &=RA_MASK_VHT_RATES |RA_MASK_OFDM_IN_VHT ; wireless_set =WIRELESS_OFDM |WIRELESS_VHT ;
@@ -1136,6 +1153,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) dm_info->rrsr_val_init =RRSR_INIT_5G ; }else if (hal->current_band_type ==RTW_BAND_2G ) { ra_mask |= sta->supp_rates[NL80211_BAND_2GHZ ]; + ra_mask_bak = ra_mask;if (sta->vht_cap.vht_supported) { ra_mask &=RA_MASK_VHT_RATES |RA_MASK_CCK_IN_VHT |RA_MASK_OFDM_IN_VHT ;
@@ -1149,11 +1167,13 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) }else if (sta->supp_rates[0 ] <=0xf ) { wireless_set =WIRELESS_CCK ; }else { + ra_mask &=RA_MASK_OFDM_RATES |RA_MASK_CCK_IN_BG ; wireless_set =WIRELESS_CCK |WIRELESS_OFDM ; } dm_info->rrsr_val_init =RRSR_INIT_2G ; }else {rtw_err (rtwdev,"Unknown band type\n" ); + ra_mask_bak = ra_mask; wireless_set =0 ; }
@@ -1185,8 +1205,9 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) rate_id =get_rate_id (wireless_set, bw_mode, tx_num); - ra_mask =rtw_update_rate_mask (rtwdev, si, ra_mask, is_vht_enable, - wireless_set); + ra_mask &=rtw_rate_mask_rssi (si, wireless_set); + ra_mask =rtw_rate_mask_recover (ra_mask, ra_mask_bak); + ra_mask =rtw_rate_mask_cfg (rtwdev, si, ra_mask, is_vht_enable); si->bw_mode = bw_mode; si->stbc_en = stbc_en;
Signature · 1 line
2.25.1
Re: [PATCH 1/2] rtw88: recover rates of rate adaptive mechanism
Quoted 9 lines · Ping-Ke Shih
From: Chien-Hsun Liao <[email protected]>
Some APs like CMW270 only support one phyrate and the function
rtw_update_rate_maskcould disable that rate. To fix such problem, we restore the rate mask if we find that therate_maskis empty.Signed-off-by Chien-Hsun Liao <[email protected]>Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
2 patches applied to wireless-next.git, thanks.
9eb071f84496 rtw88: recover rates of rate adaptive mechanism 3c2c2e2ec1d6 rtw89: recover rates of rate adaptive mechanism
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 2/2 rtw89: recover rates of rate adaptive mechanism
In reply to Ping-Ke ShihFrom: Chien-Hsun Liao <[email protected]>
Some APs like CMW270 only support one phyrate and the function rtw89_phy_ra_mask_rssi could disable that rate. To fix such problem, we restore the rate mask if we find that the rate_mask is empty. Also, apply missed legacy rates from sta->supp_rates[].
--- drivers/net/wireless/realtek/rtw89/phy.c | 47 +++++++++++++++--------- 1 file changed, 30 insertions(+), 17 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +30 -17
@@ -117,17 +117,28 @@ static u64 rtw89_phy_ra_mask_rssi(struct rtw89_dev *rtwdev, u8 rssi,else if (rssi_lv ==1 )return 0xfffffffffffffff0ULL ;else if (rssi_lv ==2 ) -return 0xffffffffffffffe0ULL ; +return 0xffffffffffffefe0ULL ;else if (rssi_lv ==3 ) -return 0xffffffffffffffc0ULL ; +return 0xffffffffffffcfc0ULL ;else if (rssi_lv ==4 ) -return 0xffffffffffffff80ULL ; +return 0xffffffffffff8f80ULL ;else if (rssi_lv >=5 ) -return 0xffffffffffffff00ULL ; +return 0xffffffffffff0f00ULL ;return 0xffffffffffffffffULL ; } +static u64 rtw89_phy_ra_mask_recover (u64 ra_mask,u64 ra_mask_bak) +{ +if ((ra_mask & ~(RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )) ==0 ) + ra_mask |= (ra_mask_bak & ~(RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )); + +if (ra_mask ==0 ) + ra_mask |= (ra_mask_bak & (RA_MASK_CCK_RATES |RA_MASK_OFDM_RATES )); + +return ra_mask; +} +static u64 rtw89_phy_ra_mask_cfg (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta) {struct rtw89_hal *hal = &rtwdev->hal;
@@ -194,8 +205,8 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,struct rtw89_ra_info *ra = &rtwsta->ra;const u64 *high_rate_masks = rtw89_ra_mask_ht_rates;u8 rssi =ewma_rssi_read (&rtwsta->avg_rssi); -u64 high_rate_mask =0 ;u64 ra_mask =0 ; +u64 ra_mask_bak;u8 mode =0 ;u8 csi_mode =RTW89_RA_RPT_MODE_LEGACY ;u8 bw_mode =0 ;
@@ -244,34 +255,36 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, }if (rtwdev->hal.current_band_type ==RTW89_BAND_2G ) { + ra_mask |= sta->supp_rates[NL80211_BAND_2GHZ ];if (sta->supp_rates[NL80211_BAND_2GHZ ] <=0xf ) mode |=RTW89_RA_MODE_CCK ;else mode |=RTW89_RA_MODE_CCK |RTW89_RA_MODE_OFDM ; }else { + ra_mask |= (u64 )sta->supp_rates[NL80211_BAND_5GHZ ] <<4 ; mode |=RTW89_RA_MODE_OFDM ; } + ra_mask_bak = ra_mask; +if (mode >=RTW89_RA_MODE_HT ) { +u64 mask =0 ;for (i =0 ; i < rtwdev->hal.tx_nss; i++) - high_rate_mask |= high_rate_masks[i]; - ra_mask &= high_rate_mask; + mask |= high_rate_masks[i];if (mode &RTW89_RA_MODE_OFDM ) - ra_mask |=RA_MASK_SUBOFDM_RATES ; + mask |=RA_MASK_SUBOFDM_RATES ;if (mode &RTW89_RA_MODE_CCK ) - ra_mask |=RA_MASK_SUBCCK_RATES ; + mask |=RA_MASK_SUBCCK_RATES ; + ra_mask &= mask; }else if (mode &RTW89_RA_MODE_OFDM ) { -if (mode &RTW89_RA_MODE_CCK ) - ra_mask |=RA_MASK_SUBCCK_RATES ; - ra_mask |=RA_MASK_OFDM_RATES ; - }else { - ra_mask =RA_MASK_CCK_RATES ; + ra_mask &= (RA_MASK_OFDM_RATES |RA_MASK_SUBCCK_RATES ); } -if (mode !=RTW89_RA_MODE_CCK ) { +if (mode !=RTW89_RA_MODE_CCK ) ra_mask &=rtw89_phy_ra_mask_rssi (rtwdev, rssi,0 ); - ra_mask &=rtw89_phy_ra_mask_cfg (rtwdev, rtwsta); - } + + ra_mask =rtw89_phy_ra_mask_recover (ra_mask, ra_mask_bak); + ra_mask &=rtw89_phy_ra_mask_cfg (rtwdev, rtwsta);switch (sta->bandwidth) {case IEEE80211_STA_RX_BW_80 :
Signature · 1 line
2.25.1