wifi: rtw89: 8852b: add chip_ops to configure TX/RX path

To support variant models, such as 1x1 or 1T2R, we need this chip_ops to
change the path accordingly.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221009125403.19662-8-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h
index 570fb1aee80c350de254e7558462458fbbb6fc2f..5482e32a72d55d571a23cac85cd9c519f8b5213f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/reg.h
+++ b/drivers/net/wireless/realtek/rtw89/reg.h
@@ -3666,6 +3666,8 @@
 #define B_P0_RFMODE_MUX GENMASK(11, 4)
 #define R_P0_RFMODE_ORI_RX 0x12AC
 #define B_P0_RFMODE_ORI_RX_ALL GENMASK(23, 12)
+#define R_P0_RFMODE_FTM_RX 0x12B0
+#define B_P0_RFMODE_FTM_RX GENMASK(11, 0)
 #define R_P0_NRBW 0x12B8
 #define B_P0_NRBW_DBG BIT(30)
 #define R_S0_RXDC 0x12D4
@@ -3779,6 +3781,8 @@
 #define B_P1_RFMODE_MUX GENMASK(11, 4)
 #define R_P1_RFMODE_ORI_RX 0x32AC
 #define B_P1_RFMODE_ORI_RX_ALL GENMASK(23, 12)
+#define R_P1_RFMODE_FTM_RX 0x32B0
+#define B_P1_RFMODE_FTM_RX GENMASK(11, 0)
 #define R_P1_DBGMOD 0x32B8
 #define B_P1_DBGMOD_ON BIT(30)
 #define R_S1_RXDC 0x32D4

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index abb35553a2b044a7ca78d408267cd62605483cae..a5156d7aca5b8b09c810a086bb2636d28a2bd4e9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -1484,6 +1484,117 @@ static void rtw8852b_ctrl_btg(struct rtw89_dev *rtwdev, bool btg)
        }
 }
 
+void rtw8852b_bb_ctrl_rx_path(struct rtw89_dev *rtwdev,
+                             enum rtw89_rf_path_bit rx_path)
+{
+       const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);
+       u32 rst_mask0;
+       u32 rst_mask1;
+
+       if (rx_path == RF_A) {
+               rtw89_phy_write32_mask(rtwdev, R_CHBW_MOD_V1, B_ANT_RX_SEG0, 1);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG0, 1);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG1, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXHT_MCS_LIMIT, B_RXHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXVHT_MCS_LIMIT, B_RXVHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_USER_MAX, 4);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_MAX_NSS, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHETB_MAX_NSS, 0);
+       } else if (rx_path == RF_B) {
+               rtw89_phy_write32_mask(rtwdev, R_CHBW_MOD_V1, B_ANT_RX_SEG0, 2);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG0, 2);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG1, 2);
+               rtw89_phy_write32_mask(rtwdev, R_RXHT_MCS_LIMIT, B_RXHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXVHT_MCS_LIMIT, B_RXVHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_USER_MAX, 4);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_MAX_NSS, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHETB_MAX_NSS, 0);
+       } else if (rx_path == RF_AB) {
+               rtw89_phy_write32_mask(rtwdev, R_CHBW_MOD_V1, B_ANT_RX_SEG0, 3);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG0, 3);
+               rtw89_phy_write32_mask(rtwdev, R_FC0_BW_V1, B_ANT_RX_1RCCA_SEG1, 3);
+               rtw89_phy_write32_mask(rtwdev, R_RXHT_MCS_LIMIT, B_RXHT_MCS_LIMIT, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXVHT_MCS_LIMIT, B_RXVHT_MCS_LIMIT, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_USER_MAX, 4);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_MAX_NSS, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHETB_MAX_NSS, 1);
+       }
+
+       rtw8852b_set_gain_offset(rtwdev, chan->subband_type, RTW89_PHY_0);
+
+       if (chan->band_type == RTW89_BAND_2G &&
+           (rx_path == RF_B || rx_path == RF_AB))
+               rtw8852b_ctrl_btg(rtwdev, true);
+       else
+               rtw8852b_ctrl_btg(rtwdev, false);
+
+       rst_mask0 = B_P0_TXPW_RSTB_MANON | B_P0_TXPW_RSTB_TSSI;
+       rst_mask1 = B_P1_TXPW_RSTB_MANON | B_P1_TXPW_RSTB_TSSI;
+       if (rx_path == RF_A) {
+               rtw89_phy_write32_mask(rtwdev, R_P0_TXPW_RSTB, rst_mask0, 1);
+               rtw89_phy_write32_mask(rtwdev, R_P0_TXPW_RSTB, rst_mask0, 3);
+       } else {
+               rtw89_phy_write32_mask(rtwdev, R_P1_TXPW_RSTB, rst_mask1, 1);
+               rtw89_phy_write32_mask(rtwdev, R_P1_TXPW_RSTB, rst_mask1, 3);
+       }
+}
+
+static void rtw8852b_bb_ctrl_rf_mode_rx_path(struct rtw89_dev *rtwdev,
+                                            enum rtw89_rf_path_bit rx_path)
+{
+       if (rx_path == RF_A) {
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE,
+                                      B_P0_RFMODE_ORI_TXRX_FTM_TX, 0x1233312);
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE_FTM_RX,
+                                      B_P0_RFMODE_FTM_RX, 0x333);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE,
+                                      B_P1_RFMODE_ORI_TXRX_FTM_TX, 0x1111111);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE_FTM_RX,
+                                      B_P1_RFMODE_FTM_RX, 0x111);
+       } else if (rx_path == RF_B) {
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE,
+                                      B_P0_RFMODE_ORI_TXRX_FTM_TX, 0x1111111);
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE_FTM_RX,
+                                      B_P0_RFMODE_FTM_RX, 0x111);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE,
+                                      B_P1_RFMODE_ORI_TXRX_FTM_TX, 0x1233312);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE_FTM_RX,
+                                      B_P1_RFMODE_FTM_RX, 0x333);
+       } else if (rx_path == RF_AB) {
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE,
+                                      B_P0_RFMODE_ORI_TXRX_FTM_TX, 0x1233312);
+               rtw89_phy_write32_mask(rtwdev, R_P0_RFMODE_FTM_RX,
+                                      B_P0_RFMODE_FTM_RX, 0x333);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE,
+                                      B_P1_RFMODE_ORI_TXRX_FTM_TX, 0x1233312);
+               rtw89_phy_write32_mask(rtwdev, R_P1_RFMODE_FTM_RX,
+                                      B_P1_RFMODE_FTM_RX, 0x333);
+       }
+}
+
+static void rtw8852b_bb_cfg_txrx_path(struct rtw89_dev *rtwdev)
+{
+       struct rtw89_hal *hal = &rtwdev->hal;
+       enum rtw89_rf_path_bit rx_path = hal->antenna_rx ? hal->antenna_rx : RF_AB;
+
+       rtw8852b_bb_ctrl_rx_path(rtwdev, rx_path);
+       rtw8852b_bb_ctrl_rf_mode_rx_path(rtwdev, rx_path);
+
+       if (rtwdev->hal.rx_nss == 1) {
+               rtw89_phy_write32_mask(rtwdev, R_RXHT_MCS_LIMIT, B_RXHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXVHT_MCS_LIMIT, B_RXVHT_MCS_LIMIT, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_MAX_NSS, 0);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHETB_MAX_NSS, 0);
+       } else {
+               rtw89_phy_write32_mask(rtwdev, R_RXHT_MCS_LIMIT, B_RXHT_MCS_LIMIT, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXVHT_MCS_LIMIT, B_RXVHT_MCS_LIMIT, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHE_MAX_NSS, 1);
+               rtw89_phy_write32_mask(rtwdev, R_RXHE, B_RXHETB_MAX_NSS, 1);
+       }
+
+       rtw89_phy_write32_idx(rtwdev, R_MAC_SEL, B_MAC_SEL_MOD, 0x0, RTW89_PHY_0);
+}
+
 static u8 rtw8852b_get_thermal(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path)
 {
        if (rtwdev->is_tssi_mode[rf_path]) {
@@ -1808,6 +1919,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = {
        .ctrl_btg               = rtw8852b_ctrl_btg,
        .query_ppdu             = rtw8852b_query_ppdu,
        .bb_ctrl_btc_preagc     = rtw8852b_bb_ctrl_btc_preagc,
+       .cfg_txrx_path          = rtw8852b_bb_cfg_txrx_path,
        .pwr_on_func            = rtw8852b_pwr_on_func,
        .pwr_off_func           = rtw8852b_pwr_off_func,
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.h b/drivers/net/wireless/realtek/rtw89/rtw8852b.h
index bc0a383c4a39094b5dfbe47ab8fb2a9a43fc8af0..33f621014e4972ee41d1d74998345a756e564d6e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.h
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.h
@@ -87,4 +87,7 @@ struct rtw8852b_efuse {
 
 extern const struct rtw89_chip_info rtw8852b_chip_info;
 
+void rtw8852b_bb_ctrl_rx_path(struct rtw89_dev *rtwdev,
+                             enum rtw89_rf_path_bit rx_path);
+
 #endif