wifi: rtw89: load TX power by rate when RFE parms setup

Table of TX power by rate only needs to be loaded once. But, we originally
loaded it every time we start core. Now, we load it one time along as RFE
(RF Front End) parameters are determined.

Signed-off-by: Zong-Zhe Yang <kevin_yang@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/20230920074322.42898-6-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 362aa0922339a5e6c3091212f0eafd111607fb20..f9467adf0a147afb948a967f7aadb3e34b47858c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -4008,21 +4008,27 @@ static void rtw89_core_setup_rfe_parms(struct rtw89_dev *rtwdev)
        const struct rtw89_chip_info *chip = rtwdev->chip;
        const struct rtw89_rfe_parms_conf *conf = chip->rfe_parms_conf;
        struct rtw89_efuse *efuse = &rtwdev->efuse;
+       const struct rtw89_rfe_parms *sel;
        u8 rfe_type = efuse->rfe_type;
 
-       if (!conf)
+       if (!conf) {
+               sel = chip->dflt_parms;
                goto out;
+       }
 
        while (conf->rfe_parms) {
                if (rfe_type == conf->rfe_type) {
-                       rtwdev->rfe_parms = conf->rfe_parms;
-                       return;
+                       sel = conf->rfe_parms;
+                       goto out;
                }
                conf++;
        }
 
+       sel = chip->dflt_parms;
+
 out:
-       rtwdev->rfe_parms = chip->dflt_parms;
+       rtwdev->rfe_parms = sel;
+       rtw89_load_txpwr_table(rtwdev, sel->byr_tbl);
 }
 
 static int rtw89_chip_efuse_info_setup(struct rtw89_dev *rtwdev)

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index f86de8c8ce180c811ea73059ea62b0d9857a7cbd..f9f203295ee44c53b45cb253522c5a6e48f7c74a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -4481,8 +4481,6 @@ static void rtw89_phy_env_monitor_init(struct rtw89_dev *rtwdev)
 
 void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)
 {
-       const struct rtw89_rfe_parms *rfe_parms = rtwdev->rfe_parms;
-
        rtw89_phy_stat_init(rtwdev);
 
        rtw89_chip_bb_sethw(rtwdev);
@@ -4498,7 +4496,6 @@ void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)
 
        rtw89_phy_init_rf_nctl(rtwdev);
        rtw89_chip_rfk_init(rtwdev);
-       rtw89_load_txpwr_table(rtwdev, rfe_parms->byr_tbl);
        rtw89_chip_set_txpwr_ctrl(rtwdev);
        rtw89_chip_power_trim(rtwdev);
        rtw89_chip_cfg_txrx_path(rtwdev);