wifi: rtw89: 8852c: support firmware with fw_element

Firmware from v1 will include fw_element so that the driver will loading
parameters of BB and RF, TX power related tables from firmware. For the
current flow, if fw_element is present, the driver will prioritize
loading parameters and tables from firmware; otherwise, it will
revert to the original loading method.

Signed-off-by: Kuan-Chung Chen <damon.chen@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20240809072012.84152-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c b/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
index 6e199e82690b2a0f2b5339886a652a546c842fc6..8fee820be258800726f130364fee836f3584b1cb 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
@@ -5,6 +5,7 @@
 #include "chan.h"
 #include "coex.h"
 #include "debug.h"
+#include "fw.h"
 #include "phy.h"
 #include "reg.h"
 #include "rtw8852c.h"
@@ -2985,8 +2986,9 @@ static void _tssi_set_tmeter_tbl(struct rtw89_dev *rtwdev, enum rtw89_phy_idx ph
        }                                               \
        __val;                                          \
 })
-       struct rtw89_tssi_info *tssi_info = &rtwdev->tssi;
        const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_CHANCTX_0);
+       struct rtw89_fw_txpwr_track_cfg *trk = rtwdev->fw.elm_info.txpwr_trk;
+       struct rtw89_tssi_info *tssi_info = &rtwdev->tssi;
        u8 ch = chan->channel;
        u8 subband = chan->subband_type;
        const s8 *thm_up_a = NULL;
@@ -3001,56 +3003,88 @@ static void _tssi_set_tmeter_tbl(struct rtw89_dev *rtwdev, enum rtw89_phy_idx ph
        switch (subband) {
        default:
        case RTW89_CH_2G:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_2ga_p;
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_2ga_n;
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_2gb_p;
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_2gb_n;
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_2GA_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_2ga_p;
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_2GA_N][0] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_2ga_n;
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_2GB_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_2gb_p;
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_2GB_N][0] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_2gb_n;
                break;
        case RTW89_CH_5G_BAND_1:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[0];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[0];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[0];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[0];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[0];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_N][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[0];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[0];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_N][0] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[0];
                break;
        case RTW89_CH_5G_BAND_3:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[1];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[1];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[1];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[1];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_P][1] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[1];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_N][1] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[1];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_P][1] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[1];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_N][1] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[1];
                break;
        case RTW89_CH_5G_BAND_4:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[2];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[2];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[2];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[2];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_P][2] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5ga_p[2];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GA_N][2] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_5ga_n[2];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_P][2] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_5gb_p[2];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_5GB_N][2] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_5gb_n[2];
                break;
        case RTW89_CH_6G_BAND_IDX0:
        case RTW89_CH_6G_BAND_IDX1:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[0];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[0];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[0];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[0];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[0];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_N][0] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[0];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_P][0] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[0];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_N][0] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[0];
                break;
        case RTW89_CH_6G_BAND_IDX2:
        case RTW89_CH_6G_BAND_IDX3:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[1];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[1];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[1];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[1];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_P][1] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[1];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_N][1] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[1];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_P][1] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[1];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_N][1] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[1];
                break;
        case RTW89_CH_6G_BAND_IDX4:
        case RTW89_CH_6G_BAND_IDX5:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[2];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[2];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[2];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[2];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_P][2] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[2];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_N][2] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[2];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_P][2] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[2];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_N][2] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[2];
                break;
        case RTW89_CH_6G_BAND_IDX6:
        case RTW89_CH_6G_BAND_IDX7:
-               thm_up_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[3];
-               thm_down_a = rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[3];
-               thm_up_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[3];
-               thm_down_b = rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[3];
+               thm_up_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_P][3] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6ga_p[3];
+               thm_down_a = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GA_N][3] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6ga_n[3];
+               thm_up_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_P][3] :
+                                rtw89_8852c_trk_cfg.delta_swingidx_6gb_p[3];
+               thm_down_b = trk ? trk->delta[RTW89_FW_TXPWR_TRK_TYPE_6GB_N][3] :
+                                  rtw89_8852c_trk_cfg.delta_swingidx_6gb_n[3];
                break;
        }