projects / openwrt / openwrt.git / blob
? search:


1b030761d3203ce21beb19107197ad206842251e
[openwrt/openwrt.git] /
1 From b8d49bb8d16ae7dde8e05b275d6e3b8bbf27f011 Mon Sep 17 00:00:00 2001
2 From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
3 Date: Wed, 2 Apr 2025 18:31:36 +0300
4 Subject: [PATCH] wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU
5
6 RTL8814AU doesn't work well with SUPPORTS_AMSDU_IN_AMPDU. The RX speed
7 is noticeably lower and the VHT RX statistics are strange. Typical
8 values with SUPPORTS_AMSDU_IN_AMPDU:
9
10 Reverse mode, remote host 192.168.0.1 is sending
11 [ 5] local 192.168.0.50 port 60710 connected to 192.168.0.1 port 5201
12 [ ID] Interval Transfer Bitrate
13 [ 5] 0.00-1.00 sec 74.6 MBytes 626 Mbits/sec
14 [ 5] 1.00-2.00 sec 79.2 MBytes 665 Mbits/sec
15 [ 5] 2.00-3.00 sec 84.9 MBytes 712 Mbits/sec
16 [ 5] 3.00-4.00 sec 83.8 MBytes 703 Mbits/sec
17 [ 5] 4.00-5.00 sec 85.9 MBytes 720 Mbits/sec
18 [ 5] 5.00-6.00 sec 78.9 MBytes 662 Mbits/sec
19 [ 5] 6.00-7.00 sec 81.2 MBytes 682 Mbits/sec
20 [ 5] 7.00-8.00 sec 80.5 MBytes 675 Mbits/sec
21 [ 5] 8.00-9.00 sec 79.4 MBytes 666 Mbits/sec
22 [ 5] 9.00-10.00 sec 82.2 MBytes 689 Mbits/sec
23 [ 5] 10.00-11.00 sec 82.0 MBytes 688 Mbits/sec
24 [ 5] 11.00-12.00 sec 84.2 MBytes 707 Mbits/sec
25 [ 5] 12.00-13.00 sec 71.0 MBytes 596 Mbits/sec
26 [ 5] 13.00-14.00 sec 69.4 MBytes 582 Mbits/sec
27 [ 5] 14.00-15.00 sec 80.2 MBytes 673 Mbits/sec
28 [ 5] 15.00-16.00 sec 74.5 MBytes 625 Mbits/sec
29
30 [Rx Counter]:
31 * CCA (CCK, OFDM, Total) = (0, 2455, 2455)
32 * False Alarm (CCK, OFDM, Total) = (0, 69, 69)
33 * CCK cnt (ok, err) = (0, 0)
34 * OFDM cnt (ok, err) = (1239, 2)
35 * HT cnt (ok, err) = (0, 0)
36 * VHT cnt (ok, err) = (21, 12109)
37
38 The "VHT ok" number is not believable.
39
40 And without SUPPORTS_AMSDU_IN_AMPDU:
41
42 Reverse mode, remote host 192.168.0.1 is sending
43 [ 5] local 192.168.0.50 port 50030 connected to 192.168.0.1 port 5201
44 [ ID] Interval Transfer Bitrate
45 [ 5] 0.00-1.00 sec 70.5 MBytes 591 Mbits/sec
46 [ 5] 1.00-2.00 sec 86.9 MBytes 729 Mbits/sec
47 [ 5] 2.00-3.00 sec 98.6 MBytes 827 Mbits/sec
48 [ 5] 3.00-4.00 sec 97.4 MBytes 817 Mbits/sec
49 [ 5] 4.00-5.00 sec 98.6 MBytes 827 Mbits/sec
50 [ 5] 5.00-6.00 sec 96.9 MBytes 813 Mbits/sec
51 [ 5] 6.00-7.00 sec 98.2 MBytes 824 Mbits/sec
52 [ 5] 7.00-8.00 sec 98.0 MBytes 822 Mbits/sec
53 [ 5] 8.00-9.00 sec 99.9 MBytes 838 Mbits/sec
54 [ 5] 9.00-10.00 sec 99.2 MBytes 833 Mbits/sec
55 [ 5] 10.00-11.00 sec 98.0 MBytes 822 Mbits/sec
56 [ 5] 11.00-12.00 sec 98.1 MBytes 823 Mbits/sec
57 [ 5] 12.00-13.00 sec 97.0 MBytes 814 Mbits/sec
58 [ 5] 13.00-14.00 sec 98.2 MBytes 824 Mbits/sec
59 [ 5] 14.00-15.00 sec 98.5 MBytes 826 Mbits/sec
60 [ 5] 15.00-16.00 sec 97.4 MBytes 817 Mbits/sec
61
62 [Rx Counter]:
63 * CCA (CCK, OFDM, Total) = (0, 3860, 3860)
64 * False Alarm (CCK, OFDM, Total) = (0, 2, 2)
65 * CCK cnt (ok, err) = (0, 0)
66 * OFDM cnt (ok, err) = (1486, 0)
67 * HT cnt (ok, err) = (0, 0)
68 * VHT cnt (ok, err) = (7399, 9118)
69
70 Add a new member "amsdu_in_ampdu" in struct rtw_chip_info and use it
71 to set SUPPORTS_AMSDU_IN_AMPDU only for the other chips.
72
73 Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
74 Acked-by: Ping-Ke Shih <pkshih@realtek.com>
75 Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
76 Link: https://patch.msgid.link/6202ccfb-feb0-4107-a08d-db2699e179f0@gmail.com
77 ---
78 drivers/net/wireless/realtek/rtw88/main.c | 3 ++-
79 drivers/net/wireless/realtek/rtw88/main.h | 1 +
80 drivers/net/wireless/realtek/rtw88/rtw8812a.c | 1 +
81 drivers/net/wireless/realtek/rtw88/rtw8814a.c | 1 +
82 drivers/net/wireless/realtek/rtw88/rtw8821a.c | 1 +
83 drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 +
84 drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 +
85 drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 +
86 8 files changed, 9 insertions(+), 1 deletion(-)
87
88 --- a/drivers/net/wireless/realtek/rtw88/main.c
89 +++ b/drivers/net/wireless/realtek/rtw88/main.c
90 @@ -2242,7 +2242,8 @@ int rtw_register_hw(struct rtw_dev *rtwd
91 ieee80211_hw_set(hw, SUPPORTS_PS);
92 ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);
93 ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
94 - ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);
95 + if (rtwdev->chip->amsdu_in_ampdu)
96 + ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);
97 ieee80211_hw_set(hw, HAS_RATE_CONTROL);
98 ieee80211_hw_set(hw, TX_AMSDU);
99 ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);
100 --- a/drivers/net/wireless/realtek/rtw88/main.h
101 +++ b/drivers/net/wireless/realtek/rtw88/main.h
102 @@ -1230,6 +1230,7 @@ struct rtw_chip_info {
103 u16 fw_fifo_addr[RTW_FW_FIFO_MAX];
104 const struct rtw_fwcd_segs *fwcd_segs;
105
106 + bool amsdu_in_ampdu;
107 u8 usb_tx_agg_desc_num;
108 bool hw_feature_report;
109 u8 c2h_ra_report_size;
110 --- a/drivers/net/wireless/realtek/rtw88/rtw8812a.c
111 +++ b/drivers/net/wireless/realtek/rtw88/rtw8812a.c
112 @@ -1076,6 +1076,7 @@ const struct rtw_chip_info rtw8812a_hw_s
113 .rfe_defs = rtw8812a_rfe_defs,
114 .rfe_defs_size = ARRAY_SIZE(rtw8812a_rfe_defs),
115 .rx_ldpc = false,
116 + .amsdu_in_ampdu = true,
117 .hw_feature_report = false,
118 .c2h_ra_report_size = 4,
119 .old_datarate_fb_limit = true,
120 --- a/drivers/net/wireless/realtek/rtw88/rtw8814a.c
121 +++ b/drivers/net/wireless/realtek/rtw88/rtw8814a.c
122 @@ -2200,6 +2200,7 @@ const struct rtw_chip_info rtw8814a_hw_s
123 .rx_ldpc = true,
124 .max_power_index = 0x3f,
125 .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2,
126 + .amsdu_in_ampdu = false, /* RX speed is better without AMSDU */
127 .usb_tx_agg_desc_num = 3,
128 .hw_feature_report = false,
129 .c2h_ra_report_size = 6,
130 --- a/drivers/net/wireless/realtek/rtw88/rtw8821a.c
131 +++ b/drivers/net/wireless/realtek/rtw88/rtw8821a.c
132 @@ -1176,6 +1176,7 @@ const struct rtw_chip_info rtw8821a_hw_s
133 .rfe_defs = rtw8821a_rfe_defs,
134 .rfe_defs_size = ARRAY_SIZE(rtw8821a_rfe_defs),
135 .rx_ldpc = false,
136 + .amsdu_in_ampdu = true,
137 .hw_feature_report = false,
138 .c2h_ra_report_size = 4,
139 .old_datarate_fb_limit = true,
140 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
141 +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
142 @@ -1991,6 +1991,7 @@ const struct rtw_chip_info rtw8821c_hw_s
143 .band = RTW_BAND_2G | RTW_BAND_5G,
144 .page_size = TX_PAGE_SIZE,
145 .dig_min = 0x1c,
146 + .amsdu_in_ampdu = true,
147 .usb_tx_agg_desc_num = 3,
148 .hw_feature_report = true,
149 .c2h_ra_report_size = 7,
150 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
151 +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
152 @@ -2532,6 +2532,7 @@ const struct rtw_chip_info rtw8822b_hw_s
153 .band = RTW_BAND_2G | RTW_BAND_5G,
154 .page_size = TX_PAGE_SIZE,
155 .dig_min = 0x1c,
156 + .amsdu_in_ampdu = true,
157 .usb_tx_agg_desc_num = 3,
158 .hw_feature_report = true,
159 .c2h_ra_report_size = 7,
160 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
161 +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
162 @@ -5350,6 +5350,7 @@ const struct rtw_chip_info rtw8822c_hw_s
163 .band = RTW_BAND_2G | RTW_BAND_5G,
164 .page_size = TX_PAGE_SIZE,
165 .dig_min = 0x20,
166 + .amsdu_in_ampdu = true,
167 .usb_tx_agg_desc_num = 3,
168 .hw_feature_report = true,
169 .c2h_ra_report_size = 7,
OpenWrt Source Repository