wifi: rtw89: 8922a: add set_channel RF part
authorPing-Ke Shih <pkshih@realtek.com>
Thu, 15 Feb 2024 05:57:40 +0000 (13:57 +0800)
committerKalle Valo <kvalo@kernel.org>
Mon, 19 Feb 2024 16:20:59 +0000 (18:20 +0200)
Configure RF registers according to band, channel, bandwidth. Since this
chip will support MLO, it needs check the operating mode to decide paths
we are going to configure.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240215055741.14148-4-pkshih@realtek.com
drivers/net/wireless/realtek/rtw89/phy.c
drivers/net/wireless/realtek/rtw89/phy.h
drivers/net/wireless/realtek/rtw89/reg.h
drivers/net/wireless/realtek/rtw89/rtw8922a.c
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h

index dfbf59895e4ed7bb14b69a88fb0fd9bf153bf9bf..12da63d643072bf832a51d1c8a7e707d5cf9fd46 100644 (file)
@@ -6378,6 +6378,78 @@ void rtw89_phy_edcca_track(struct rtw89_dev *rtwdev)
        rtw89_phy_edcca_log(rtwdev);
 }
 
+enum rtw89_rf_path_bit rtw89_phy_get_kpath(struct rtw89_dev *rtwdev,
+                                          enum rtw89_phy_idx phy_idx)
+{
+       rtw89_debug(rtwdev, RTW89_DBG_RFK,
+                   "[RFK] kpath dbcc_en: 0x%x, mode=0x%x, PHY%d\n",
+                   rtwdev->dbcc_en, rtwdev->mlo_dbcc_mode, phy_idx);
+
+       switch (rtwdev->mlo_dbcc_mode) {
+       case MLO_1_PLUS_1_1RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_A;
+               else
+                       return RF_B;
+       case MLO_1_PLUS_1_2RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_A;
+               else
+                       return RF_D;
+       case MLO_0_PLUS_2_1RF:
+       case MLO_2_PLUS_0_1RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_AB;
+               else
+                       return RF_AB;
+       case MLO_0_PLUS_2_2RF:
+       case MLO_2_PLUS_0_2RF:
+       case MLO_2_PLUS_2_2RF:
+       default:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_AB;
+               else
+                       return RF_CD;
+       }
+}
+EXPORT_SYMBOL(rtw89_phy_get_kpath);
+
+enum rtw89_rf_path rtw89_phy_get_syn_sel(struct rtw89_dev *rtwdev,
+                                        enum rtw89_phy_idx phy_idx)
+{
+       rtw89_debug(rtwdev, RTW89_DBG_RFK,
+                   "[RFK] kpath dbcc_en: 0x%x, mode=0x%x, PHY%d\n",
+                   rtwdev->dbcc_en, rtwdev->mlo_dbcc_mode, phy_idx);
+
+       switch (rtwdev->mlo_dbcc_mode) {
+       case MLO_1_PLUS_1_1RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_PATH_A;
+               else
+                       return RF_PATH_B;
+       case MLO_1_PLUS_1_2RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_PATH_A;
+               else
+                       return RF_PATH_D;
+       case MLO_0_PLUS_2_1RF:
+       case MLO_2_PLUS_0_1RF:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_PATH_A;
+               else
+                       return RF_PATH_B;
+       case MLO_0_PLUS_2_2RF:
+       case MLO_2_PLUS_0_2RF:
+       case MLO_2_PLUS_2_2RF:
+       default:
+               if (phy_idx == RTW89_PHY_0)
+                       return RF_PATH_A;
+               else
+                       return RF_PATH_C;
+       }
+}
+EXPORT_SYMBOL(rtw89_phy_get_syn_sel);
+
 static const struct rtw89_ccx_regs rtw89_ccx_regs_ax = {
        .setting_addr = R_CCX,
        .edcca_opt_mask = B_CCX_EDCCA_OPT_MSK,
index de19f1c7f93123cbf6f840320dd684bb07b537c6..082231ebbee5f3163d667dd2360b789750dc438a 100644 (file)
@@ -945,5 +945,9 @@ void rtw89_decode_chan_idx(struct rtw89_dev *rtwdev, u8 chan_idx,
 void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev, bool scan);
 void rtw89_phy_edcca_track(struct rtw89_dev *rtwdev);
 void rtw89_phy_edcca_thre_calc(struct rtw89_dev *rtwdev);
+enum rtw89_rf_path_bit rtw89_phy_get_kpath(struct rtw89_dev *rtwdev,
+                                          enum rtw89_phy_idx phy_idx);
+enum rtw89_rf_path rtw89_phy_get_syn_sel(struct rtw89_dev *rtwdev,
+                                        enum rtw89_phy_idx phy_idx);
 
 #endif
index 9f3d10766b0468317e355b6e3d1f8e96121fa51b..37ccd8ffa87a5d9a13f0c3936549839e0c557275 100644 (file)
 #define CFGCH_BAND0_2G 0
 #define CFGCH_BAND0_5G 1
 #define CFGCH_BAND0_6G 0
+#define RR_CFGCH_BW_V2 GENMASK(12, 10)
+#define CFGCH_BW_V2_20M 0
+#define CFGCH_BW_V2_40M 1
+#define CFGCH_BW_V2_80M 2
+#define CFGCH_BW_V2_160M 3
+#define CFGCH_BW_V2_320M 4
 #define RR_CFGCH_BW GENMASK(11, 10)
 #define RR_CFGCH_CH GENMASK(7, 0)
 #define CFGCH_BW_20M 3
 #define RR_MMD 0xd5
 #define RR_MMD_RST_EN BIT(8)
 #define RR_MMD_RST_SYN BIT(6)
+#define RR_SMD 0xd6
+#define RR_VCO2 BIT(19)
 #define RR_IQKPLL 0xdc
 #define RR_IQKPLL_MOD GENMASK(9, 8)
 #define RR_SYNLUT 0xdd
index 908d78bbc92ca16bc48aa9daa8caa521d33f440c..7abd7256d1cbf6bb52f4eed06971ab1ba941f506 100644 (file)
@@ -1781,6 +1781,7 @@ static void rtw8922a_set_channel(struct rtw89_dev *rtwdev,
 {
        rtw8922a_set_channel_mac(rtwdev, chan, mac_idx);
        rtw8922a_set_channel_bb(rtwdev, chan, phy_idx);
+       rtw8922a_set_channel_rf(rtwdev, chan, phy_idx);
 }
 
 static void rtw8922a_dfs_en_idx(struct rtw89_dev *rtwdev,
index d8ef986e787751f19eb8eb0012d3b17c23297af1..72953b7358dfd2adb56edc137817204a3ac8aada 100644 (file)
@@ -34,6 +34,126 @@ void rtw8922a_tssi_cont_en_phyidx(struct rtw89_dev *rtwdev, bool en, u8 phy_idx)
        }
 }
 
+static
+void rtw8922a_ctl_band_ch_bw(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy,
+                            u8 central_ch, enum rtw89_band band,
+                            enum rtw89_bandwidth bw)
+{
+       const u32 rf_addr[2] = {RR_CFGCH, RR_CFGCH_V1};
+       struct rtw89_hal *hal = &rtwdev->hal;
+       u32 rf_reg[RF_PATH_NUM_8922A][2];
+       u8 synpath;
+       u32 rf18;
+       u8 kpath;
+       u8 path;
+       u8 i;
+
+       rf_reg[RF_PATH_A][0] = rtw89_read_rf(rtwdev, RF_PATH_A, rf_addr[0], RFREG_MASK);
+       rf_reg[RF_PATH_A][1] = rtw89_read_rf(rtwdev, RF_PATH_A, rf_addr[1], RFREG_MASK);
+       rf_reg[RF_PATH_B][0] = rtw89_read_rf(rtwdev, RF_PATH_B, rf_addr[0], RFREG_MASK);
+       rf_reg[RF_PATH_B][1] = rtw89_read_rf(rtwdev, RF_PATH_B, rf_addr[1], RFREG_MASK);
+
+       kpath = rtw89_phy_get_kpath(rtwdev, phy);
+       synpath = rtw89_phy_get_syn_sel(rtwdev, phy);
+
+       rf18 = rtw89_read_rf(rtwdev, synpath, RR_CFGCH, RFREG_MASK);
+       if (rf18 == INV_RF_DATA) {
+               rtw89_warn(rtwdev, "[RFK] Invalid RF18 value\n");
+               return;
+       }
+
+       for (path = 0; path < RF_PATH_NUM_8922A; path++) {
+               if (!(kpath & BIT(path)))
+                       continue;
+
+               for (i = 0; i < 2; i++) {
+                       if (rf_reg[path][i] == INV_RF_DATA) {
+                               rtw89_warn(rtwdev,
+                                          "[RFK] Invalid RF_0x18 for Path-%d\n", path);
+                               return;
+                       }
+
+                       rf_reg[path][i] &= ~(RR_CFGCH_BAND1 | RR_CFGCH_BW |
+                                            RR_CFGCH_BAND0 | RR_CFGCH_CH);
+                       rf_reg[path][i] |= u32_encode_bits(central_ch, RR_CFGCH_CH);
+
+                       if (band == RTW89_BAND_2G)
+                               rtw89_write_rf(rtwdev, path, RR_SMD, RR_VCO2, 0x0);
+                       else
+                               rtw89_write_rf(rtwdev, path, RR_SMD, RR_VCO2, 0x1);
+
+                       switch (band) {
+                       case RTW89_BAND_2G:
+                       default:
+                               break;
+                       case RTW89_BAND_5G:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BAND1_5G, RR_CFGCH_BAND1) |
+                                       u32_encode_bits(CFGCH_BAND0_5G, RR_CFGCH_BAND0);
+                               break;
+                       case RTW89_BAND_6G:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BAND1_6G, RR_CFGCH_BAND1) |
+                                       u32_encode_bits(CFGCH_BAND0_6G, RR_CFGCH_BAND0);
+                               break;
+                       }
+
+                       switch (bw) {
+                       case RTW89_CHANNEL_WIDTH_5:
+                       case RTW89_CHANNEL_WIDTH_10:
+                       case RTW89_CHANNEL_WIDTH_20:
+                       default:
+                               break;
+                       case RTW89_CHANNEL_WIDTH_40:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BW_V2_40M, RR_CFGCH_BW_V2);
+                               break;
+                       case RTW89_CHANNEL_WIDTH_80:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BW_V2_80M, RR_CFGCH_BW_V2);
+                               break;
+                       case RTW89_CHANNEL_WIDTH_160:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BW_V2_160M, RR_CFGCH_BW_V2);
+                               break;
+                       case RTW89_CHANNEL_WIDTH_320:
+                               rf_reg[path][i] |=
+                                       u32_encode_bits(CFGCH_BW_V2_320M, RR_CFGCH_BW_V2);
+                               break;
+                       }
+
+                       rtw89_write_rf(rtwdev, path, rf_addr[i],
+                                      RFREG_MASK, rf_reg[path][i]);
+                       fsleep(100);
+               }
+       }
+
+       if (hal->cv != CHIP_CAV)
+               return;
+
+       if (band == RTW89_BAND_2G) {
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWE, RFREG_MASK, 0x80000);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWA, RFREG_MASK, 0x00003);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWD1, RFREG_MASK, 0x0c990);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWD0, RFREG_MASK, 0xebe38);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWE, RFREG_MASK, 0x00000);
+       } else {
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWE, RFREG_MASK, 0x80000);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWA, RFREG_MASK, 0x00003);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWD1, RFREG_MASK, 0x0c190);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWD0, RFREG_MASK, 0xebe38);
+               rtw89_write_rf(rtwdev, RF_PATH_A, RR_LUTWE, RFREG_MASK, 0x00000);
+       }
+}
+
+void rtw8922a_set_channel_rf(struct rtw89_dev *rtwdev,
+                            const struct rtw89_chan *chan,
+                            enum rtw89_phy_idx phy_idx)
+{
+       rtw8922a_ctl_band_ch_bw(rtwdev, phy_idx, chan->channel, chan->band_type,
+                               chan->band_width);
+}
+
 enum _rf_syn_pow {
        RF_SYN_ON_OFF,
        RF_SYN_OFF_ON,
index de5fa6c74530e4367893a6e79da59c91b45d2dec..27a2ff8166d0c7c76bc741c4e71070bd2ff98684 100644 (file)
@@ -8,6 +8,9 @@
 #include "core.h"
 
 void rtw8922a_tssi_cont_en_phyidx(struct rtw89_dev *rtwdev, bool en, u8 phy_idx);
+void rtw8922a_set_channel_rf(struct rtw89_dev *rtwdev,
+                            const struct rtw89_chan *chan,
+                            enum rtw89_phy_idx phy_idx);
 void rtw8922a_rfk_hw_init(struct rtw89_dev *rtwdev);
 
 #endif