wifi: rtw88: Set AMPDU factor to hardware for RTL8814A

Tell 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.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/4edc2a63-81b3-431c-9a37-5a7d899a6cc2@gmail.com

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 026fbf4ad9cce98a7cc44bcdc6659ee16c42c213..77f9fbe1870c66519aac53b6226996f42e64c22a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 959f56a3cc1ab43e7376daffbadaf1052d3fb968..bc2c1a5a30b37908e95f9b5c561fa00d53a66412 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -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");

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 02343e059fd9772207a255754a1078c3b2347880..f410c554da58a30ea84b755290a2d79ac05b4b01 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -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

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8703b.c b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
index 1d232adbdd7e31bc5d388ef1b1594450f944b25c..5e59cfe4dfdf5d4fa4f454e6419507905e93a22c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
@@ -1904,6 +1904,7 @@ static const struct rtw_chip_ops rtw8703b_ops = {
        .set_antenna            = NULL,
        .cfg_ldo25              = rtw8723x_cfg_ldo25,
        .efuse_grant            = rtw8723x_efuse_grant,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw8723x_false_alarm_statistics,
        .phy_calibration        = rtw8703b_phy_calibration,
        .dpk_track              = NULL,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 87715bd54860a0a6283e74f76762f7c0b3e6c4a3..31876e708f9ef651a450c3fc6d436fa4b841dede 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -1404,6 +1404,7 @@ static const struct rtw_chip_ops rtw8723d_ops = {
        .set_antenna            = NULL,
        .cfg_ldo25              = rtw8723x_cfg_ldo25,
        .efuse_grant            = rtw8723x_efuse_grant,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw8723x_false_alarm_statistics,
        .phy_calibration        = rtw8723d_phy_calibration,
        .cck_pd_set             = rtw8723d_phy_cck_pd_set,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8812a.c b/drivers/net/wireless/realtek/rtw88/rtw8812a.c
index f9ba2aa2928a42a392c32dc38bac0c6356de3a2e..adbfb37105d0516de71b19fc7b8c2aaae889d6c1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8812a.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8812a.c
@@ -925,6 +925,7 @@ static const struct rtw_chip_ops rtw8812a_ops = {
        .set_tx_power_index     = rtw88xxa_set_tx_power_index,
        .cfg_ldo25              = rtw8812a_cfg_ldo25,
        .efuse_grant            = rtw88xxa_efuse_grant,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw88xxa_false_alarm_statistics,
        .phy_calibration        = rtw8812a_phy_calibration,
        .cck_pd_set             = rtw88xxa_phy_cck_pd_set,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814a.c b/drivers/net/wireless/realtek/rtw88/rtw8814a.c
index cfd35d40d46e22304888a1e7585d1eb24e81b5a3..ce8d4e4c6c57bc49d2b250a13b9a8e1b64f88cbc 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8814a.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8814a.c
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821a.c b/drivers/net/wireless/realtek/rtw88/rtw8821a.c
index f68239b073191da49c8c7a906dbf5ba358377b3f..4d81fb29c9fcd8cd85ee8c53486726ce522dbedf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821a.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821a.c
@@ -871,6 +871,7 @@ static const struct rtw_chip_ops rtw8821a_ops = {
        .set_tx_power_index     = rtw88xxa_set_tx_power_index,
        .cfg_ldo25              = rtw8821a_cfg_ldo25,
        .efuse_grant            = rtw88xxa_efuse_grant,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw88xxa_false_alarm_statistics,
        .phy_calibration        = rtw8821a_phy_calibration,
        .cck_pd_set             = rtw88xxa_phy_cck_pd_set,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index 0ade7f11cbd2eb121cbd7e50dba39bc8dc8865ea..f68b0041dcc06c77d559a64a5b2ed663dfa80a42 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1668,6 +1668,7 @@ static const struct rtw_chip_ops rtw8821c_ops = {
        .set_antenna            = NULL,
        .set_tx_power_index     = rtw8821c_set_tx_power_index,
        .cfg_ldo25              = rtw8821c_cfg_ldo25,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw8821c_false_alarm_statistics,
        .phy_calibration        = rtw8821c_phy_calibration,
        .cck_pd_set             = rtw8821c_phy_cck_pd_set,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index b4934da88e33ad77caf31241e3104c26fe9d3087..0da212e27d55b3be03d162e8858c4751eacba8ce 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2158,6 +2158,7 @@ static const struct rtw_chip_ops rtw8822b_ops = {
        .set_tx_power_index     = rtw8822b_set_tx_power_index,
        .set_antenna            = rtw8822b_set_antenna,
        .cfg_ldo25              = rtw8822b_cfg_ldo25,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw8822b_false_alarm_statistics,
        .phy_calibration        = rtw8822b_phy_calibration,
        .pwr_track              = rtw8822b_pwr_track,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 5e53e0db177efe2b8b8bda5a4ac01e4f12d7da4f..ca0cf26b905533c7c4c7e7697ffd375c6ca968ca 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -4968,6 +4968,7 @@ static const struct rtw_chip_ops rtw8822c_ops = {
        .set_tx_power_index     = rtw8822c_set_tx_power_index,
        .set_antenna            = rtw8822c_set_antenna,
        .cfg_ldo25              = rtw8822c_cfg_ldo25,
+       .set_ampdu_factor       = NULL,
        .false_alarm_statistics = rtw8822c_false_alarm_statistics,
        .dpk_track              = rtw8822c_dpk_track,
        .phy_calibration        = rtw8822c_phy_calibration,