wifi: rtw89: 8852b: implement RFK multi-channel handling and support chanctx up to 2

To support multiple channels, 2 for this case, RFK requires to record each
calibration result for each channel in different RFK tables, and also needs
to notify FW. Then, when FW runs in MCC (multi-channel concurrency), it can
switch to the corresponding calibration result according to the channel.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250710042423.73617-15-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 33ab71d84ffc2093cd48585ef83d9b505ae75b10..389dfac26028aeae82c5a47e65027c3447a9294b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -628,8 +628,11 @@ static void rtw8852b_set_channel_help(struct rtw89_dev *rtwdev, bool enter,
 
 static void rtw8852b_rfk_init(struct rtw89_dev *rtwdev)
 {
+       struct rtw89_rfk_mcc_info *rfk_mcc = &rtwdev->rfk_mcc;
+
        rtwdev->is_tssi_mode[RF_PATH_A] = false;
        rtwdev->is_tssi_mode[RF_PATH_B] = false;
+       memset(rfk_mcc, 0, sizeof(*rfk_mcc));
 
        rtw8852b_dpk_init(rtwdev);
        rtw8852b_rck(rtwdev);
@@ -643,6 +646,7 @@ static void rtw8852b_rfk_channel(struct rtw89_dev *rtwdev,
        enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;
        enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx;
 
+       rtw8852b_mcc_get_ch_info(rtwdev, phy_idx);
        rtw89_btc_ntfy_conn_rfk(rtwdev, true);
 
        rtw8852b_rx_dck(rtwdev, phy_idx, chanctx_idx);
@@ -653,6 +657,7 @@ static void rtw8852b_rfk_channel(struct rtw89_dev *rtwdev,
        rtw8852b_dpk(rtwdev, phy_idx, chanctx_idx);
 
        rtw89_btc_ntfy_conn_rfk(rtwdev, false);
+       rtw89_fw_h2c_rf_ntfy_mcc(rtwdev);
 }
 
 static void rtw8852b_rfk_band_changed(struct rtw89_dev *rtwdev,
@@ -861,6 +866,10 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = {
        .btc_set_policy         = rtw89_btc_set_policy_v1,
 };
 
+static const struct rtw89_chanctx_listener rtw8852b_chanctx_listener = {
+       .callbacks[RTW89_CHANCTX_CALLBACK_RFK] = rtw8852b_rfk_chanctx_cb,
+};
+
 #ifdef CONFIG_PM
 static const struct wiphy_wowlan_support rtw_wowlan_stub_8852b = {
        .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -909,6 +918,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .nctl_post_table        = NULL,
        .dflt_parms             = &rtw89_8852b_dflt_parms,
        .rfe_parms_conf         = NULL,
+       .chanctx_listener       = &rtw8852b_chanctx_listener,
        .txpwr_factor_bb        = 3,
        .txpwr_factor_rf        = 2,
        .txpwr_factor_mac       = 1,
@@ -917,7 +927,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .tssi_dbw_table         = NULL,
        .support_macid_num      = RTW89_MAX_MAC_ID_NUM,
        .support_link_num       = 0,
-       .support_chanctx_num    = 0,
+       .support_chanctx_num    = 2,
        .support_rnr            = false,
        .support_bands          = BIT(NL80211_BAND_2GHZ) |
                                  BIT(NL80211_BAND_5GHZ),

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c b/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c
index fbf82d42687bace4fa40a556b7e19457752b1bf0..4796588c0256fe3836e14910cb3c452f79d4a762 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c
@@ -2,6 +2,7 @@
 /* Copyright(c) 2019-2022  Realtek Corporation
  */
 
+#include "chan.h"
 #include "coex.h"
 #include "debug.h"
 #include "mac.h"
@@ -1145,19 +1146,19 @@ static void _lok_res_table(struct rtw89_dev *rtwdev, u8 path, u8 ibias)
 
 static bool _lok_finetune_check(struct rtw89_dev *rtwdev, u8 path)
 {
+       struct rtw89_rfk_mcc_info_data *rfk_mcc = rtwdev->rfk_mcc.data;
        struct rtw89_iqk_info *iqk_info = &rtwdev->iqk;
+       u8 ch = rfk_mcc->table_idx;
        bool is_fail1, is_fail2;
        u32 vbuff_i;
        u32 vbuff_q;
        u32 core_i;
        u32 core_q;
        u32 tmp;
-       u8 ch;
 
        tmp = rtw89_read_rf(rtwdev, path, RR_TXMO, RFREG_MASK);
        core_i = FIELD_GET(RR_TXMO_COI, tmp);
        core_q = FIELD_GET(RR_TXMO_COQ, tmp);
-       ch = (iqk_info->iqk_times / 2) % RTW89_IQK_CHS_NR;
 
        if (core_i < 0x2 || core_i > 0x1d || core_q < 0x2 || core_q > 0x1d)
                is_fail1 = true;
@@ -1386,26 +1387,11 @@ static void _iqk_get_ch_info(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, u
                             enum rtw89_chanctx_idx chanctx_idx)
 {
        const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, chanctx_idx);
+       struct rtw89_rfk_mcc_info_data *rfk_mcc = rtwdev->rfk_mcc.data;
        struct rtw89_iqk_info *iqk_info = &rtwdev->iqk;
+       u8 idx = rfk_mcc->table_idx;
        u32 reg_rf18;
        u32 reg_35c;
-       u8 idx;
-       u8 get_empty_table = false;
-
-       for (idx = 0; idx < RTW89_IQK_CHS_NR; idx++) {
-               if (iqk_info->iqk_mcc_ch[idx][path] == 0) {
-                       get_empty_table = true;
-                       break;
-               }
-       }
-       rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK] (1)idx = %x\n", idx);
-
-       if (!get_empty_table) {
-               idx = iqk_info->iqk_table_idx[path] + 1;
-               if (idx > 1)
-                       idx = 0;
-       }
-       rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK] (2)idx = %x\n", idx);
 
        reg_rf18 = rtw89_read_rf(rtwdev, path, RR_CFGCH, RFREG_MASK);
        reg_35c = rtw89_phy_read32_mask(rtwdev, R_CIRST, B_CIRST_SYN);
@@ -1506,11 +1492,10 @@ static void _iqk_afebb_restore(struct rtw89_dev *rtwdev,
 
 static void _iqk_preset(struct rtw89_dev *rtwdev, u8 path)
 {
-       struct rtw89_iqk_info *iqk_info = &rtwdev->iqk;
-       u8 idx;
+       struct rtw89_rfk_mcc_info_data *rfk_mcc = rtwdev->rfk_mcc.data;
+       u8 idx = rfk_mcc->table_idx;
 
-       idx = iqk_info->iqk_table_idx[path];
-       rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK] (3)idx = %x\n", idx);
+       rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK] idx = %x\n", idx);
 
        rtw89_phy_write32_mask(rtwdev, R_COEF_SEL + (path << 8), B_COEF_SEL_IQC, idx);
        rtw89_phy_write32_mask(rtwdev, R_CFIR_LUT + (path << 8), B_CFIR_LUT_G3, idx);
@@ -4179,3 +4164,49 @@ void rtw8852b_set_channel_rf(struct rtw89_dev *rtwdev,
        rtw8852b_ctrl_bw_ch(rtwdev, phy_idx, chan->channel, chan->band_type,
                            chan->band_width);
 }
+
+void rtw8852b_mcc_get_ch_info(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)
+{
+       const struct rtw89_chan *chan = rtw89_mgnt_chan_get(rtwdev, 0);
+       struct rtw89_rfk_mcc_info_data *rfk_mcc = rtwdev->rfk_mcc.data;
+       struct rtw89_rfk_chan_desc desc[__RTW89_RFK_CHS_NR_V0] = {};
+       u8 idx;
+
+       for (idx = 0; idx < ARRAY_SIZE(desc); idx++) {
+               struct rtw89_rfk_chan_desc *p = &desc[idx];
+
+               p->ch = rfk_mcc->ch[idx];
+
+               p->has_band = true;
+               p->band = rfk_mcc->band[idx];
+       }
+
+       idx = rtw89_rfk_chan_lookup(rtwdev, desc, ARRAY_SIZE(desc), chan);
+
+       rfk_mcc->ch[idx] = chan->channel;
+       rfk_mcc->band[idx] = chan->band_type;
+       rfk_mcc->table_idx = idx;
+}
+
+void rtw8852b_rfk_chanctx_cb(struct rtw89_dev *rtwdev,
+                            enum rtw89_chanctx_state state)
+{
+       struct rtw89_dpk_info *dpk = &rtwdev->dpk;
+       u8 path;
+
+       switch (state) {
+       case RTW89_CHANCTX_STATE_MCC_START:
+               dpk->is_dpk_enable = false;
+               for (path = 0; path < RTW8852B_DPK_RF_PATH; path++)
+                       _dpk_onoff(rtwdev, path, false);
+               break;
+       case RTW89_CHANCTX_STATE_MCC_STOP:
+               dpk->is_dpk_enable = true;
+               for (path = 0; path < RTW8852B_DPK_RF_PATH; path++)
+                       _dpk_onoff(rtwdev, path, false);
+               rtw8852b_dpk(rtwdev, RTW89_PHY_0, RTW89_CHANCTX_0);
+               break;
+       default:
+               break;
+       }
+}

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h b/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h
index c31ba446e6e0960429f5096b92ed1b61161d81b6..5fae980d5e2c240aa8c0b2c81dedaf139d712bfc 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h
@@ -27,5 +27,8 @@ void rtw8852b_wifi_scan_notify(struct rtw89_dev *rtwdev, bool scan_start,
 void rtw8852b_set_channel_rf(struct rtw89_dev *rtwdev,
                             const struct rtw89_chan *chan,
                             enum rtw89_phy_idx phy_idx);
+void rtw8852b_mcc_get_ch_info(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
+void rtw8852b_rfk_chanctx_cb(struct rtw89_dev *rtwdev,
+                            enum rtw89_chanctx_state state);
 
 #endif