Improve RTL8814AU performance
v2 cover Improve RTL8814AU performance
This is the last set of patches for RTL8814AU. They make it go faster.
Bitterblue Smith (4):
wifi: rtw88: usb: Enable switching the RTL8814AU to USB 3
wifi: rtw88: usb: Enable RX aggregation for RTL8814AU
wifi: rtw88: Set AMPDU factor to hardware for RTL8814A
wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU
drivers/net/wireless/realtek/rtw88/mac80211.c | 2 ++ drivers/net/wireless/realtek/rtw88/main.c | 35 ++++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.h | 4 +++ drivers/net/wireless/realtek/rtw88/rtw8812a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8814a.c | 12 +++++++ drivers/net/wireless/realtek/rtw88/rtw8821a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/usb.c | 4 ++- 10 files changed, 60 insertions(+), 2 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/4 wifi: rtw88: usb: Enable switching the RTL8814AU to USB 3
The Realtek wifi 5 devices which support USB 3 are weird: when first plugged in, they pretend to be USB 2. The driver needs to send some commands to the device, which make it disappear and come back as a USB 3 device.
The method used to switch the RTL8812AU also works for the RTL8814AU.
---
v2:
- Add Acked-by.
--- drivers/net/wireless/realtek/rtw88/usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/usb.c +2 -1
@@ -1094,7 +1094,8 @@ static int rtw_usb_switch_mode_new(struct rtw_dev *rtwdev)static bool rtw_usb3_chip_old (u8 chip_id) { -return chip_id ==RTW_CHIP_TYPE_8812A ; +return chip_id ==RTW_CHIP_TYPE_8812A || + chip_id ==RTW_CHIP_TYPE_8814A ; }static bool rtw_usb3_chip_new (u8 chip_id)
Signature · 1 line
2.49.0
PATCH v2 2/4 wifi: rtw88: usb: Enable RX aggregation for RTL8814AU
In reply to Bitterblue SmithLet the chip transfer several frames in a single USB Request Block. This is supposed to improve the RX speed.
It can use the same code used for RTL8822CU, RTL8822BU, and RTL8821CU.
---
v2:
- Add Acked-by.
--- drivers/net/wireless/realtek/rtw88/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw88/usb.c +1 -0
@@ -866,6 +866,7 @@ static void rtw_usb_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable)case RTW_CHIP_TYPE_8822C :case RTW_CHIP_TYPE_8822B :case RTW_CHIP_TYPE_8821C : +case RTW_CHIP_TYPE_8814A :rtw_usb_dynamic_rx_agg_v1 (rtwdev, enable);break ;case RTW_CHIP_TYPE_8821A :
Signature · 1 line
2.49.0
PATCH v2 3/4 wifi: rtw88: Set AMPDU factor to hardware for RTL8814A
In reply to Bitterblue SmithTell the chip the maximum AMPDU size supported by the AP. This greatly improves the TX speed of RTL8814AU in the 2.4 GHz band. Before: ~90 Mbps. After: ~300 Mbps.
---
v2:
- Do this only for RTL8814A.
- Add a comment explaining why this is needed.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 2 ++ drivers/net/wireless/realtek/rtw88/main.c | 32 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 3 ++ drivers/net/wireless/realtek/rtw88/rtw8814a.c | 11 +++++++ 4 files changed, 48 insertions(+)
drivers/net/wireless/realtek/rtw88/mac80211.c +2 -0
@@ -396,6 +396,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,if (rtw_bf_support)rtw_bf_assoc (rtwdev, vif, conf); +rtw_set_ampdu_factor (rtwdev, vif, conf); +rtw_fw_beacon_filter_config (rtwdev, true, vif); }else {rtw_leave_lps (rtwdev);
drivers/net/wireless/realtek/rtw88/main.c +32 -0
@@ -2447,6 +2447,38 @@ void rtw_core_enable_beacon(struct rtw_dev *rtwdev, bool enable) } } +void rtw_set_ampdu_factor (struct rtw_dev *rtwdev,struct ieee80211_vif *vif, +struct ieee80211_bss_conf *bss_conf) +{ +const struct rtw_chip_ops *ops = rtwdev->chip->ops; +struct ieee80211_sta *sta; +u8 factor =0xff ; + +if (!ops->set_ampdu_factor) +return ; + +rcu_read_lock (); + + sta =ieee80211_find_sta (vif, bss_conf->bssid); +if (!sta) { +rcu_read_unlock (); +rtw_warn (rtwdev,"%s: failed to find station %pM\n" , + __func__, bss_conf->bssid); +return ; + } + +if (sta->deflink.vht_cap.vht_supported) + factor =u32_get_bits (sta->deflink.vht_cap.cap, +IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ); +else if (sta->deflink.ht_cap.ht_supported) + factor = sta->deflink.ht_cap.ampdu_factor; + +rcu_read_unlock (); + +if (factor !=0xff ) + ops->set_ampdu_factor (rtwdev, factor); +} +MODULE_AUTHOR ("Realtek Corporation" );MODULE_DESCRIPTION ("Realtek 802.11ac wireless core module" );MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/realtek/rtw88/main.h +3 -0
@@ -878,6 +878,7 @@ struct rtw_chip_ops { u32 antenna_rx);void (*cfg_ldo25)(struct rtw_dev *rtwdev,bool enable);void (*efuse_grant)(struct rtw_dev *rtwdev,bool enable); +void (*set_ampdu_factor)(struct rtw_dev *rtwdev,u8 factor);void (*false_alarm_statistics)(struct rtw_dev *rtwdev);void (*phy_calibration)(struct rtw_dev *rtwdev);void (*dpk_track)(struct rtw_dev *rtwdev);
@@ -2272,4 +2273,6 @@ void rtw_update_channel(struct rtw_dev *rtwdev, u8 center_channel,void rtw_core_port_switch (struct rtw_dev *rtwdev,struct ieee80211_vif *vif);bool rtw_core_check_sta_active (struct rtw_dev *rtwdev);void rtw_core_enable_beacon (struct rtw_dev *rtwdev,bool enable); +void rtw_set_ampdu_factor (struct rtw_dev *rtwdev,struct ieee80211_vif *vif, +struct ieee80211_bss_conf *bss_conf);#endif
drivers/net/wireless/realtek/rtw88/rtw8814a.c +11 -0
@@ -1332,6 +1332,16 @@ static void rtw8814a_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) { } +/* Without this RTL8814A sends too many frames and (some?) 11n AP +* can't handle it, resulting in low TX speed. Other chips seem fine. +*/ +static void rtw8814a_set_ampdu_factor (struct rtw_dev *rtwdev,u8 factor) +{ + factor =min_t (u8, factor,IEEE80211_VHT_MAX_AMPDU_256K ); + +rtw_write32 (rtwdev,REG_AMPDU_MAX_LENGTH , (8192 << factor) -1 ); +} +static void rtw8814a_false_alarm_statistics (struct rtw_dev *rtwdev) {struct rtw_dm_info *dm_info = &rtwdev->dm_info;
@@ -2051,6 +2061,7 @@ static const struct rtw_chip_ops rtw8814a_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8814a_cfg_ldo25, .efuse_grant = rtw8814a_efuse_grant, + .set_ampdu_factor = rtw8814a_set_ampdu_factor, .false_alarm_statistics = rtw8814a_false_alarm_statistics, .phy_calibration = rtw8814a_phy_calibration, .cck_pd_set = rtw8814a_phy_cck_pd_set,
Signature · 1 line
2.49.0
Ping-Ke Shih
maintainerRE: [PATCH rtw-next v2 3/4] wifi: rtw88: Set AMPDU factor to hardware for RTL8814A
drivers/net/wireless/realtek/rtw88/rtw8814a.c static const struct rtw_chip_ops rtw8814a_ops = { · line 2064
Quoted 5 lines · Bitterblue Smith
drivers/net/wireless/realtek/rtw88/rtw8814a.c +1
-0@@ -2051,6 +2061,7 @@ static const struct rtw_chip_ops rtw8814a_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8814a_cfg_ldo25, .efuse_grant = rtw8814a_efuse_grant, + .set_ampdu_factor = rtw8814a_set_ampdu_factor,
Please set NULL to other chips that don't implement this to explicitly point out they don't have this, and also I hope all fields of all chips are aligned.
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/rtw8814a.c +0
-1.false_alarm_statistics = rtw8814a_false_alarm_statistics, .phy_calibration = rtw8814a_phy_calibration, .cck_pd_set = rtw8814a_phy_cck_pd_set, --2.49.0
PATCH v2 4/4 wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU
In reply to Bitterblue SmithRTL8814AU doesn't work well with SUPPORTS_AMSDU_IN_AMPDU. The RX speed is noticeably lower and the VHT RX statistics are strange. Typical values with SUPPORTS_AMSDU_IN_AMPDU:
Reverse mode, remote host 192.168.0.1 is sending
[ 5] local 192.168.0.50 port 60710 connected to 192.168.0.1 port 5201
[ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 74.6 MBytes 626 Mbits/sec [ 5] 1.00-2.00 sec 79.2 MBytes 665 Mbits/sec [ 5] 2.00-3.00 sec 84.9 MBytes 712 Mbits/sec [ 5] 3.00-4.00 sec 83.8 MBytes 703 Mbits/sec [ 5] 4.00-5.00 sec 85.9 MBytes 720 Mbits/sec [ 5] 5.00-6.00 sec 78.9 MBytes 662 Mbits/sec [ 5] 6.00-7.00 sec 81.2 MBytes 682 Mbits/sec [ 5] 7.00-8.00 sec 80.5 MBytes 675 Mbits/sec [ 5] 8.00-9.00 sec 79.4 MBytes 666 Mbits/sec [ 5] 9.00-10.00 sec 82.2 MBytes 689 Mbits/sec [ 5] 10.00-11.00 sec 82.0 MBytes 688 Mbits/sec [ 5] 11.00-12.00 sec 84.2 MBytes 707 Mbits/sec [ 5] 12.00-13.00 sec 71.0 MBytes 596 Mbits/sec [ 5] 13.00-14.00 sec 69.4 MBytes 582 Mbits/sec [ 5] 14.00-15.00 sec 80.2 MBytes 673 Mbits/sec [ 5] 15.00-16.00 sec 74.5 MBytes 625 Mbits/sec
[Rx Counter]:
* CCA (CCK, OFDM, Total) = (0, 2455, 2455)
* False Alarm (CCK, OFDM, Total) = (0, 69, 69)
* CCK cnt (ok, err) = (0, 0)
* OFDM cnt (ok, err) = (1239, 2)
* HT cnt (ok, err) = (0, 0)
* VHT cnt (ok, err) = (21, 12109)
The "VHT ok" number is not believable.
And without SUPPORTS_AMSDU_IN_AMPDU:
Reverse mode, remote host 192.168.0.1 is sending
[ 5] local 192.168.0.50 port 50030 connected to 192.168.0.1 port 5201
[ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 70.5 MBytes 591 Mbits/sec [ 5] 1.00-2.00 sec 86.9 MBytes 729 Mbits/sec [ 5] 2.00-3.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 3.00-4.00 sec 97.4 MBytes 817 Mbits/sec [ 5] 4.00-5.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 5.00-6.00 sec 96.9 MBytes 813 Mbits/sec [ 5] 6.00-7.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 7.00-8.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 8.00-9.00 sec 99.9 MBytes 838 Mbits/sec [ 5] 9.00-10.00 sec 99.2 MBytes 833 Mbits/sec [ 5] 10.00-11.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 11.00-12.00 sec 98.1 MBytes 823 Mbits/sec [ 5] 12.00-13.00 sec 97.0 MBytes 814 Mbits/sec [ 5] 13.00-14.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 14.00-15.00 sec 98.5 MBytes 826 Mbits/sec [ 5] 15.00-16.00 sec 97.4 MBytes 817 Mbits/sec
[Rx Counter]:
* CCA (CCK, OFDM, Total) = (0, 3860, 3860)
* False Alarm (CCK, OFDM, Total) = (0, 2, 2)
* CCK cnt (ok, err) = (0, 0)
* OFDM cnt (ok, err) = (1486, 0)
* HT cnt (ok, err) = (0, 0)
* VHT cnt (ok, err) = (7399, 9118)
Add a new member "amsdu_in_ampdu" in struct rtw_chip_info and use it to set SUPPORTS_AMSDU_IN_AMPDU only for the other chips.
---
v2:
- Add a comment explaining why this is needed.
--- drivers/net/wireless/realtek/rtw88/main.c | 3 ++- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8812a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8814a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + 8 files changed, 9 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.c +2 -1
@@ -2242,7 +2242,8 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORTS_PS );ieee80211_hw_set (hw,SUPPORTS_DYNAMIC_PS );ieee80211_hw_set (hw,SUPPORT_FAST_XMIT ); -ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); +if (rtwdev->chip->amsdu_in_ampdu) +ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU );ieee80211_hw_set (hw,HAS_RATE_CONTROL );ieee80211_hw_set (hw,TX_AMSDU );ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS );
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -1230,6 +1230,7 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs; +bool amsdu_in_ampdu;u8 usb_tx_agg_desc_num;bool hw_feature_report;u8 c2h_ra_report_size;
drivers/net/wireless/realtek/rtw88/rtw8812a.c +1 -0
@@ -1075,6 +1075,7 @@ const struct rtw_chip_info rtw8812a_hw_spec = { .rfe_defs = rtw8812a_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8812a_rfe_defs), .rx_ldpc = false, + .amsdu_in_ampdu = true, .hw_feature_report = false, .c2h_ra_report_size = 4, .old_datarate_fb_limit = true,
drivers/net/wireless/realtek/rtw88/rtw8814a.c +1 -0
@@ -2200,6 +2200,7 @@ const struct rtw_chip_info rtw8814a_hw_spec = { .rx_ldpc = true, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .amsdu_in_ampdu = false, /* RX speed is better without AMSDU */ .usb_tx_agg_desc_num = 3, .hw_feature_report = false, .c2h_ra_report_size = 6,
drivers/net/wireless/realtek/rtw88/rtw8821a.c +1 -0
@@ -1175,6 +1175,7 @@ const struct rtw_chip_info rtw8821a_hw_spec = { .rfe_defs = rtw8821a_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8821a_rfe_defs), .rx_ldpc = false, + .amsdu_in_ampdu = true, .hw_feature_report = false, .c2h_ra_report_size = 4, .old_datarate_fb_limit = true,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -1990,6 +1990,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2531,6 +2531,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -5349,6 +5349,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x20, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7,
Signature · 1 line
2.49.0
RE: [PATCH rtw-next v2 4/4] wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU
Quoted 64 lines · Bitterblue Smith
RTL8814AU doesn't work well with
SUPPORTS_AMSDU_IN_AMPDU. The RX speed is noticeably lower and the VHT RX statistics are strange. Typical values withSUPPORTS_AMSDU_IN_AMPDU:Reverse mode, remote host 192.168.0.1 is sending
[ 5] local 192.168.0.50 port 60710 connected to 192.168.0.1 port 5201[ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 74.6 MBytes 626 Mbits/sec [ 5] 1.00-2.00 sec 79.2 MBytes 665 Mbits/sec [ 5] 2.00-3.00 sec 84.9 MBytes 712 Mbits/sec [ 5] 3.00-4.00 sec 83.8 MBytes 703 Mbits/sec [ 5] 4.00-5.00 sec 85.9 MBytes 720 Mbits/sec [ 5] 5.00-6.00 sec 78.9 MBytes 662 Mbits/sec [ 5] 6.00-7.00 sec 81.2 MBytes 682 Mbits/sec [ 5] 7.00-8.00 sec 80.5 MBytes 675 Mbits/sec [ 5] 8.00-9.00 sec 79.4 MBytes 666 Mbits/sec [ 5] 9.00-10.00 sec 82.2 MBytes 689 Mbits/sec [ 5] 10.00-11.00 sec 82.0 MBytes 688 Mbits/sec [ 5] 11.00-12.00 sec 84.2 MBytes 707 Mbits/sec [ 5] 12.00-13.00 sec 71.0 MBytes 596 Mbits/sec [ 5] 13.00-14.00 sec 69.4 MBytes 582 Mbits/sec [ 5] 14.00-15.00 sec 80.2 MBytes 673 Mbits/sec [ 5] 15.00-16.00 sec 74.5 MBytes 625 Mbits/sec[Rx Counter]:
* CCA (CCK, OFDM, Total) = (0, 2455, 2455)
* False Alarm (CCK, OFDM, Total) = (0, 69, 69)
* CCK cnt (ok, err) = (0, 0)
* OFDM cnt (ok, err) = (1239, 2)
* HT cnt (ok, err) = (0, 0)
* VHT cnt (ok, err) = (21, 12109)The "VHT ok" number is not believable.
And without
SUPPORTS_AMSDU_IN_AMPDU:Reverse mode, remote host 192.168.0.1 is sending
[ 5] local 192.168.0.50 port 50030 connected to 192.168.0.1 port 5201[ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 70.5 MBytes 591 Mbits/sec [ 5] 1.00-2.00 sec 86.9 MBytes 729 Mbits/sec [ 5] 2.00-3.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 3.00-4.00 sec 97.4 MBytes 817 Mbits/sec [ 5] 4.00-5.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 5.00-6.00 sec 96.9 MBytes 813 Mbits/sec [ 5] 6.00-7.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 7.00-8.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 8.00-9.00 sec 99.9 MBytes 838 Mbits/sec [ 5] 9.00-10.00 sec 99.2 MBytes 833 Mbits/sec [ 5] 10.00-11.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 11.00-12.00 sec 98.1 MBytes 823 Mbits/sec [ 5] 12.00-13.00 sec 97.0 MBytes 814 Mbits/sec [ 5] 13.00-14.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 14.00-15.00 sec 98.5 MBytes 826 Mbits/sec [ 5] 15.00-16.00 sec 97.4 MBytes 817 Mbits/sec[Rx Counter]:
* CCA (CCK, OFDM, Total) = (0, 3860, 3860)
* False Alarm (CCK, OFDM, Total) = (0, 2, 2)
* CCK cnt (ok, err) = (0, 0)
* OFDM cnt (ok, err) = (1486, 0)
* HT cnt (ok, err) = (0, 0)
* VHT cnt (ok, err) = (7399, 9118)
Quoted 4 lines
Add a new member "
amsdu_in_ampdu" in structrtw_chip_infoand use it to setSUPPORTS_AMSDU_IN_AMPDUonly for the other chips.Signed-off-by Bitterblue Smith <[email protected]>