wifi: rtw89: refine uplink trigger based control mechanism

Rename support_ul_tb_ctrl to waveform_ctrl since we need to do more
trigger based control and the naming could be confusing. Move related
code to leaf function so we make each functions separate and can be
easier to maintain.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230929004024.7504-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 0d3445f..65de2d5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3649,7 +3649,7 @@ struct rtw89_chip_info {
        u8 support_bands;
        bool support_bw160;
        bool support_unii4;
-       bool support_ul_tb_ctrl;
+       bool ul_tb_waveform_ctrl;
        bool hw_sec_hdr;
        u8 rf_path_num;
        u8 tx_nss;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index 6e1f4d6..1232ca4 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -2904,7 +2904,7 @@ void rtw89_phy_ul_tb_assoc(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
                                                       rtwvif->sub_entity_idx);
        struct rtw89_phy_ul_tb_info *ul_tb_info = &rtwdev->ul_tb_info;
 
-       if (!chip->support_ul_tb_ctrl)
+       if (!chip->ul_tb_waveform_ctrl)
                return;
 
        rtwvif->def_tri_idx =
@@ -2948,41 +2948,32 @@ void rtw89_phy_ul_tb_ctrl_check(struct rtw89_dev *rtwdev,
        if (!vif->cfg.assoc)
                return;
 
-       if (stats->rx_tf_periodic > UL_TB_TF_CNT_L2H_TH)
-               ul_tb_data->high_tf_client = true;
-       else if (stats->rx_tf_periodic < UL_TB_TF_CNT_H2L_TH)
-               ul_tb_data->low_tf_client = true;
+       if (rtwdev->chip->ul_tb_waveform_ctrl) {
+               if (stats->rx_tf_periodic > UL_TB_TF_CNT_L2H_TH)
+                       ul_tb_data->high_tf_client = true;
+               else if (stats->rx_tf_periodic < UL_TB_TF_CNT_H2L_TH)
+                       ul_tb_data->low_tf_client = true;
 
-       ul_tb_data->valid = true;
-       ul_tb_data->def_tri_idx = rtwvif->def_tri_idx;
-       ul_tb_data->dyn_tb_bedge_en = rtwvif->dyn_tb_bedge_en;
+               ul_tb_data->valid = true;
+               ul_tb_data->def_tri_idx = rtwvif->def_tri_idx;
+               ul_tb_data->dyn_tb_bedge_en = rtwvif->dyn_tb_bedge_en;
+       }
 }
 
-void rtw89_phy_ul_tb_ctrl_track(struct rtw89_dev *rtwdev)
+static void rtw89_phy_ul_tb_waveform_ctrl(struct rtw89_dev *rtwdev,
+                                         struct rtw89_phy_ul_tb_check_data *ul_tb_data)
 {
-       const struct rtw89_chip_info *chip = rtwdev->chip;
        struct rtw89_phy_ul_tb_info *ul_tb_info = &rtwdev->ul_tb_info;
-       struct rtw89_phy_ul_tb_check_data ul_tb_data = {};
-       struct rtw89_vif *rtwvif;
 
-       if (!chip->support_ul_tb_ctrl)
+       if (!rtwdev->chip->ul_tb_waveform_ctrl)
                return;
 
-       if (rtwdev->total_sta_assoc != 1)
-               return;
-
-       rtw89_for_each_rtwvif(rtwdev, rtwvif)
-               rtw89_phy_ul_tb_ctrl_check(rtwdev, rtwvif, &ul_tb_data);
-
-       if (!ul_tb_data.valid)
-               return;
-
-       if (ul_tb_data.dyn_tb_bedge_en) {
-               if (ul_tb_data.high_tf_client) {
+       if (ul_tb_data->dyn_tb_bedge_en) {
+               if (ul_tb_data->high_tf_client) {
                        rtw89_phy_write32_mask(rtwdev, R_BANDEDGE, B_BANDEDGE_EN, 0);
                        rtw89_debug(rtwdev, RTW89_DBG_UL_TB,
                                    "[ULTB] Turn off if_bandedge\n");
-               } else if (ul_tb_data.low_tf_client) {
+               } else if (ul_tb_data->low_tf_client) {
                        rtw89_phy_write32_mask(rtwdev, R_BANDEDGE, B_BANDEDGE_EN,
                                               ul_tb_info->def_if_bandedge);
                        rtw89_debug(rtwdev, RTW89_DBG_UL_TB,
@@ -2992,28 +2983,49 @@ void rtw89_phy_ul_tb_ctrl_track(struct rtw89_dev *rtwdev)
        }
 
        if (ul_tb_info->dyn_tb_tri_en) {
-               if (ul_tb_data.high_tf_client) {
+               if (ul_tb_data->high_tf_client) {
                        rtw89_phy_write32_mask(rtwdev, R_DCFO_OPT,
                                               B_TXSHAPE_TRIANGULAR_CFG, 0);
                        rtw89_debug(rtwdev, RTW89_DBG_UL_TB,
                                    "[ULTB] Turn off Tx triangle\n");
-               } else if (ul_tb_data.low_tf_client) {
+               } else if (ul_tb_data->low_tf_client) {
                        rtw89_phy_write32_mask(rtwdev, R_DCFO_OPT,
                                               B_TXSHAPE_TRIANGULAR_CFG,
-                                              ul_tb_data.def_tri_idx);
+                                              ul_tb_data->def_tri_idx);
                        rtw89_debug(rtwdev, RTW89_DBG_UL_TB,
                                    "[ULTB] Set to default tx_shap_idx = %d\n",
-                                   ul_tb_data.def_tri_idx);
+                                   ul_tb_data->def_tri_idx);
                }
        }
 }
 
+void rtw89_phy_ul_tb_ctrl_track(struct rtw89_dev *rtwdev)
+{
+       const struct rtw89_chip_info *chip = rtwdev->chip;
+       struct rtw89_phy_ul_tb_check_data ul_tb_data = {};
+       struct rtw89_vif *rtwvif;
+
+       if (!chip->ul_tb_waveform_ctrl)
+               return;
+
+       if (rtwdev->total_sta_assoc != 1)
+               return;
+
+       rtw89_for_each_rtwvif(rtwdev, rtwvif)
+               rtw89_phy_ul_tb_ctrl_check(rtwdev, rtwvif, &ul_tb_data);
+
+       if (!ul_tb_data.valid)
+               return;
+
+       rtw89_phy_ul_tb_waveform_ctrl(rtwdev, &ul_tb_data);
+}
+
 static void rtw89_phy_ul_tb_info_init(struct rtw89_dev *rtwdev)
 {
        const struct rtw89_chip_info *chip = rtwdev->chip;
        struct rtw89_phy_ul_tb_info *ul_tb_info = &rtwdev->ul_tb_info;
 
-       if (!chip->support_ul_tb_ctrl)
+       if (!chip->ul_tb_waveform_ctrl)
                return;
 
        ul_tb_info->dyn_tb_tri_en = true;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index f9599fc..b276816 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2379,7 +2379,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
                                  BIT(NL80211_BAND_5GHZ),
        .support_bw160          = false,
        .support_unii4          = true,
-       .support_ul_tb_ctrl     = true,
+       .ul_tb_waveform_ctrl    = true,
        .hw_sec_hdr             = false,
        .rf_path_num            = 1,
        .tx_nss                 = 1,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index c783e17..12b591d 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2115,7 +2115,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
                                  BIT(NL80211_BAND_5GHZ),
        .support_bw160          = false,
        .support_unii4          = false,
-       .support_ul_tb_ctrl     = false,
+       .ul_tb_waveform_ctrl    = false,
        .hw_sec_hdr             = false,
        .rf_path_num            = 2,
        .tx_nss                 = 2,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 3c1f5a9..1591ae8 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -2549,7 +2549,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
                                  BIT(NL80211_BAND_5GHZ),
        .support_bw160          = false,
        .support_unii4          = true,
-       .support_ul_tb_ctrl     = true,
+       .ul_tb_waveform_ctrl    = true,
        .hw_sec_hdr             = false,
        .rf_path_num            = 2,
        .tx_nss                 = 2,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index ad5baf6..553f60d 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -2859,7 +2859,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
                                  BIT(NL80211_BAND_6GHZ),
        .support_bw160          = true,
        .support_unii4          = true,
-       .support_ul_tb_ctrl     = false,
+       .ul_tb_waveform_ctrl    = false,
        .hw_sec_hdr             = true,
        .rf_path_num            = 2,
        .tx_nss                 = 2,