Skip to contentSkip to conversation

wifi: rtw89: 8852bt: add RF calibrations IQK, RX DCK, DACK and RCK

PATCH In review Ping-Ke Shih 1 participant 6 messages Jun 27, 2024 – Jul 2, 2024 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Ping-Ke Shih

author maintainer
#0 lore raw

cover wifi: rtw89: 8852bt: add RF calibrations IQK, RX DCK, DACK and RCK

Complete RF calibrations for 8852BT. The most important one is IQK that can hugely improve performance, and others are minor but necessary.

Ping-Ke Shih (4):
wifi: rtw89: 8852bt: rfk: add IQK
wifi: rtw89: 8852bt: rfk: add RX DCK
wifi: rtw89: 8852bt: rfk: add DACK
wifi: rtw89: 8852bt: rfk: add RCK

 drivers/net/wireless/realtek/rtw89/reg.h      |   16 +
 .../wireless/realtek/rtw89/rtw8852bt_rfk.c    | 1783 +++++++++++++++--
 .../wireless/realtek/rtw89/rtw8852bt_rfk.h    |    4 +
 3 files changed, 1651 insertions(+), 152 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 1/4 wifi: rtw89: 8852bt: rfk: add IQK

IQ signal calibration is a very important calibration to yield good RF performance. We do this calibration once we are going to an AP. During scanning phase, without this calibration RF performance is still acceptable because it transmits and receives with low data rate at this phase.

---
 drivers/net/wireless/realtek/rtw89/reg.h      |   1 +
 .../wireless/realtek/rtw89/rtw8852bt_rfk.c    | 892 ++++++++++++++++++
 .../wireless/realtek/rtw89/rtw8852bt_rfk.h    |   1 +
 3 files changed, 894 insertions(+)
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
index 177981a108e0..24e8d244534e 100644
@@ -8659,6 +8659,7 @@
 #define R_P0_RFCTM 0x5864
 #define B_P0_CLKG_FORCE GENMASK(31, 30)
 #define B_P0_RFCTM_EN BIT(29)
+#define B_P0_GOT_TXRX GENMASK(28, 27)
 #define B_P0_RFCTM_VAL GENMASK(25, 20)
 #define R_P0_RFCTM_RDY BIT(26)
 #define R_P0_TRSW 0x5868
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +892 -0

922 lines not on this page · raw message

drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +1 -0
index 89640b42d4d0..22c0c9c3d173 100644
@@ -7,6 +7,7 @@
 
 #include "core.h"
 
+void rtw8852bt_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
 void rtw8852bt_dpk_init(struct rtw89_dev *rtwdev);
 void rtw8852bt_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy);
 void rtw8852bt_dpk_track(struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
author maintainer
#2 lore raw

Re: [PATCH 1/4] wifi: rtw89: 8852bt: rfk: add IQK

Quoted 7 lines · Ping-Ke Shih

IQ signal calibration is a very important calibration to yield good RF performance. We do this calibration once we are going to an AP. During scanning phase, without this calibration RF performance is still acceptable because it transmits and receives with low data rate at this phase.

4 patch(es) applied to rtw-next branch of rtw.git, thanks.

f77c5179bc9f wifi: rtw89: 8852bt: rfk: add IQK c3d9705de5e7 wifi: rtw89: 8852bt: rfk: add RX DCK 39f0123e0321 wifi: rtw89: 8852bt: rfk: add DACK 746f4ae52a38 wifi: rtw89: 8852bt: rfk: add RCK

---
https://github.com/pkshih/rtw.git

author maintainer
#3 lore raw

PATCH 2/4 wifi: rtw89: 8852bt: rfk: add RX DCK

In reply to Ping-Ke Shih

RX DCK stands for receiver DC calibration. With this calibration, we have proper DC offset to reflect correct received signal strength indicator. Do this calibration when bringing up interface and going to connect.

---
 .../wireless/realtek/rtw89/rtw8852bt_rfk.c    | 57 +++++++++++++++++++
 .../wireless/realtek/rtw89/rtw8852bt_rfk.h    |  1 +
 2 files changed, 58 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +57 -0
index 4a638e2444db..52dfbe0b3d6b 100644
@@ -13,6 +13,7 @@
 #include "rtw8852bt_rfk_table.h"
 #include "rtw8852b_common.h"
 
+#define RTW8852BT_RXDCK_VER 0x1
 #define RTW8852BT_IQK_VER 0x2a
 #define RTW8852BT_SS 2
 #define RTW8852BT_TSSI_PATH_NR 2
@@ -365,6 +366,47 @@ static void _rfk_bb_afe_restore(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy
 	rtw89_phy_write32_mask(rtwdev, R_P1_TSSI_MV_AVG, B_P1_TXPW_RSTB, 0x2);
 }
 
+static void _set_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy,
+			enum rtw89_rf_path path)
+{
+	rtw89_write_rf(rtwdev, path, RR_DCK1, RR_DCK1_CLR, 0x0);
+	rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_LV, 0x0);
+	rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_LV, 0x1);
+	mdelay(1);
+}
+
+static void _rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy)
+{
+	u8 path, dck_tune;
+	u32 rf_reg5;
+
+	rtw89_debug(rtwdev, RTW89_DBG_RFK,
+		    "[RX_DCK] ****** RXDCK Start (Ver: 0x%x, CV : 0x%x) ******\n",
+		    RTW8852BT_RXDCK_VER, rtwdev->hal.cv);
+
+	for (path = 0; path < RF_PATH_NUM_8852BT; path++) {
+		rf_reg5 = rtw89_read_rf(rtwdev, path, RR_RSV1, RFREG_MASK);
+		dck_tune = rtw89_read_rf(rtwdev, path, RR_DCK, RR_DCK_FINE);
+
+		if (rtwdev->is_tssi_mode[path])
+			rtw89_phy_write32_mask(rtwdev,
+					       R_P0_TSSI_TRK + (path << 13),
+					       B_P0_TSSI_TRK_EN, 0x1);
+
+		rtw89_write_rf(rtwdev, path, RR_RSV1, RR_RSV1_RST, 0x0);
+		rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_FINE, 0x0);
+		rtw89_write_rf(rtwdev, path, RR_MOD, RR_MOD_MASK, RR_MOD_V_RX);
+		_set_rx_dck(rtwdev, phy, path);
+		rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_FINE, dck_tune);
+		rtw89_write_rf(rtwdev, path, RR_RSV1, RFREG_MASK, rf_reg5);
+
+		if (rtwdev->is_tssi_mode[path])
+			rtw89_phy_write32_mask(rtwdev,
+					       R_P0_TSSI_TRK + (path << 13),
+					       B_P0_TSSI_TRK_EN, 0x0);
+	}
+}
+
 static bool _iqk_check_cal(struct rtw89_dev *rtwdev, u8 path, u8 ktype)
 {
 	bool notready = false;
@@ -3286,6 +3328,21 @@ void rtw8852bt_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)
 	rtw89_btc_ntfy_wl_rfk(rtwdev, phy_map, BTC_WRFKT_IQK, BTC_WRFK_STOP);
 }
 
+void rtw8852bt_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)
+{
+	u8 phy_map = rtw89_btc_phymap(rtwdev, phy_idx, 0);
+	u32 tx_en;
+
+	rtw89_btc_ntfy_wl_rfk(rtwdev, phy_map, BTC_WRFKT_RXDCK, BTC_WRFK_START);
+	rtw89_chip_stop_sch_tx(rtwdev, phy_idx, &tx_en, RTW89_SCH_TX_SEL_ALL);
+	_wait_rx_mode(rtwdev, _kpath(rtwdev, phy_idx));
+
+	_rx_dck(rtwdev, phy_idx);
+
+	rtw89_chip_resume_sch_tx(rtwdev, phy_idx, tx_en);
+	rtw89_btc_ntfy_wl_rfk(rtwdev, phy_map, BTC_WRFKT_RXDCK, BTC_WRFK_STOP);
+}
+
 void rtw8852bt_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)
 {
 	rtw89_debug(rtwdev, RTW89_DBG_RFK,
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +1 -0
index 22c0c9c3d173..3ac63a2a63f7 100644
@@ -8,6 +8,7 @@
 #include "core.h"
 
 void rtw8852bt_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
+void rtw8852bt_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
 void rtw8852bt_dpk_init(struct rtw89_dev *rtwdev);
 void rtw8852bt_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy);
 void rtw8852bt_dpk_track(struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
author maintainer
#4 lore raw

PATCH 3/4 wifi: rtw89: 8852bt: rfk: add DACK

In reply to Ping-Ke Shih

DACK (digital-to-analog converters calibration) is used to calibrate DAC to output signals as expected.

---
 drivers/net/wireless/realtek/rtw89/reg.h      |  15 +
 .../wireless/realtek/rtw89/rtw8852bt_rfk.c    | 487 ++++++++++++++++++
 .../wireless/realtek/rtw89/rtw8852bt_rfk.h    |   1 +
 3 files changed, 503 insertions(+)
drivers/net/wireless/realtek/rtw89/reg.h +15 -0
index 24e8d244534e..7df36f3bff0b 100644
@@ -7836,6 +7836,7 @@
 #define B_ANAPAR_PW15_H2 GENMASK(27, 26)
 #define R_ANAPAR 0x032C
 #define B_ANAPAR_15 GENMASK(31, 16)
+#define B_ANAPAR_EN1 BIT(31)
 #define B_ANAPAR_ADCCLK BIT(30)
 #define B_ANAPAR_FLTRST BIT(22)
 #define B_ANAPAR_CRXBB GENMASK(18, 16)
@@ -9080,11 +9081,13 @@
 #define B_DCOF0_RST BIT(17)
 #define B_DCOF0_V GENMASK(4, 1)
 #define R_DCOF1 0xC004
+#define B_DCOF1_VAL GENMASK(31, 20)
 #define B_DCOF1_RST BIT(17)
 #define B_DCOF1_S BIT(0)
 #define R_DCOF8 0xC020
 #define B_DCOF8_V GENMASK(4, 1)
 #define R_DCOF9 0xC024
+#define B_DCOF9_VAL GENMASK(31, 20)
 #define B_DCOF9_RST BIT(17)
 #define R_DACK_S0P0 0xC040
 #define B_DACK_S0P0_OK BIT(31)
@@ -9158,11 +9161,18 @@
 #define B_ADDCKR0_DC GENMASK(15, 4)
 #define B_ADDCKR0_A1 GENMASK(9, 0)
 #define R_DACK10 0xC100
+#define B_DACK10_RST BIT(17)
 #define B_DACK10 GENMASK(4, 1)
 #define R_DACK1_K 0xc104
+#define B_DACK1_VAL GENMASK(31, 20)
+#define B_DACK1_RST BIT(17)
 #define B_DACK1_EN BIT(0)
 #define R_DACK11 0xC120
 #define B_DACK11 GENMASK(4, 1)
+#define R_DACK2_K 0xC124
+#define B_DACK2_VAL GENMASK(31, 20)
+#define B_DACK2_RST BIT(17)
+#define B_DACK2_EN BIT(0)
 #define R_DACK_S1P0 0xC140
 #define B_DACK_S1P0_OK BIT(31)
 #define R_DACK_BIAS10 0xC148
@@ -9211,6 +9221,11 @@
 #define B_DACKN0_V GENMASK(21, 14)
 #define R_DACKN1_CTL 0xC224
 #define B_DACKN1_V GENMASK(21, 14)
+#define B_DACKN1_ON BIT(0)
+#define R_DACKN2_CTL 0xC238
+#define B_DACKN2_ON BIT(0)
+#define R_DACKN3_CTL 0xC24C
+#define B_DACKN3_ON BIT(0)
 #define R_GAIN_MAP0 0xE44C
 #define B_GAIN_MAP0_EN BIT(0)
 #define R_GAIN_MAP1 0xE54C
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +487 -0

499 lines not on this page · raw message

drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +1 -0
index 3ac63a2a63f7..772a5b099377 100644
@@ -7,6 +7,7 @@
 
 #include "core.h"
 
+void rtw8852bt_dack(struct rtw89_dev *rtwdev);
 void rtw8852bt_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
 void rtw8852bt_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
 void rtw8852bt_dpk_init(struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
author maintainer
#5 lore raw

PATCH 4/4 wifi: rtw89: 8852bt: rfk: add RCK

In reply to Ping-Ke Shih

RCK is synchronize RC calibration. Driver triggers this calibration and writes the result to registers.

---
 .../wireless/realtek/rtw89/rtw8852bt_rfk.c    | 43 +++++++++++++++++++
 .../wireless/realtek/rtw89/rtw8852bt_rfk.h    |  1 +
 2 files changed, 44 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +43 -0
index 6c2fecb58940..fa0e49d58112 100644
@@ -407,6 +407,41 @@ static void _rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy)
 	}
 }
 
+static void _rck(struct rtw89_dev *rtwdev, enum rtw89_rf_path path)
+{
+	u32 rf_reg5;
+	u32 rck_val;
+	u32 val;
+	int ret;
+
+	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[RCK] ====== S%d RCK ======\n", path);
+
+	rf_reg5 = rtw89_read_rf(rtwdev, path, RR_RSV1, RFREG_MASK);
+
+	rtw89_write_rf(rtwdev, path, RR_RSV1, RR_RSV1_RST, 0x0);
+	rtw89_write_rf(rtwdev, path, RR_MOD, RR_MOD_MASK, RR_MOD_V_RX);
+
+	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[RCK] RF0x00 = 0x%05x\n",
+		    rtw89_read_rf(rtwdev, path, RR_MOD, RFREG_MASK));
+
+	/* RCK trigger */
+	rtw89_write_rf(rtwdev, path, RR_RCKC, RFREG_MASK, 0x00240);
+
+	ret = read_poll_timeout_atomic(rtw89_read_rf, val, val, 2, 30,
+				       false, rtwdev, path, RR_RCKS, BIT(3));
+
+	rck_val = rtw89_read_rf(rtwdev, path, RR_RCKC, RR_RCKC_CA);
+
+	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[RCK] rck_val = 0x%x, ret = %d\n",
+		    rck_val, ret);
+
+	rtw89_write_rf(rtwdev, path, RR_RCKC, RFREG_MASK, rck_val);
+	rtw89_write_rf(rtwdev, path, RR_RSV1, RFREG_MASK, rf_reg5);
+
+	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[RCK] RF 0x1b = 0x%x\n",
+		    rtw89_read_rf(rtwdev, path, RR_RCKC, RFREG_MASK));
+}
+
 static void _drck(struct rtw89_dev *rtwdev)
 {
 	u32 rck_d;
@@ -3790,6 +3825,14 @@ void rtw8852bt_dpk_init(struct rtw89_dev *rtwdev)
 	_set_dpd_backoff(rtwdev, RTW89_PHY_0);
 }
 
+void rtw8852bt_rck(struct rtw89_dev *rtwdev)
+{
+	u8 path;
+
+	for (path = 0; path < RF_PATH_NUM_8852BT; path++)
+		_rck(rtwdev, path);
+}
+
 void rtw8852bt_dack(struct rtw89_dev *rtwdev)
 {
 	u8 phy_map = rtw89_btc_phymap(rtwdev, RTW89_PHY_0, 0);
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +1 -0
index 772a5b099377..09918835c6e8 100644
@@ -7,6 +7,7 @@
 
 #include "core.h"
 
+void rtw8852bt_rck(struct rtw89_dev *rtwdev);
 void rtw8852bt_dack(struct rtw89_dev *rtwdev);
 void rtw8852bt_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
 void rtw8852bt_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);
Signature · 1 line
2.25.1