Skip to contentSkip to conversation

rtw89: correct 8852c settings

PATCH In review Ping-Ke Shih 2 participants 7 messages May 6, 2022 – May 11, 2022 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Ping-Ke Shih

author maintainer
#0 lore raw

cover rtw89: correct 8852c settings

We are continue to verify 8852CE, and use additional debug entries to find some unexpected settings. First patch is to handle spur due to effect of DC. Patches 2 and 3 are to correct two settings related to MAC. The last two patches are debug entries that can help to analyze problem.

Hsuan Hung (1):
rtw89: 8852c: add settings to decrease the effect of DC

Ping-Ke Shih (4):
rtw89: correct setting of RX MPDU length
rtw89: correct CCA control
rtw89: add debug select to dump MAC pages 0x30 to 0x33
rtw89: add debug entry to dump BSSID CAM

 drivers/net/wireless/realtek/rtw89/debug.c    |  5 ++
 drivers/net/wireless/realtek/rtw89/debug.h    |  1 +
 drivers/net/wireless/realtek/rtw89/mac.c      | 16 ++---
 drivers/net/wireless/realtek/rtw89/mac.h      |  1 +
 drivers/net/wireless/realtek/rtw89/reg.h      | 14 +++++
 drivers/net/wireless/realtek/rtw89/rtw8852c.c | 63 +++++++++++++++++--
 6 files changed, 88 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 1/5 rtw89: 8852c: add settings to decrease the effect of DC

From: Hsuan Hung <[email protected]>

Modify NBI and PD boost settings according to different primary channels. This setting can decrease the false alarm induced by DC.

---
 drivers/net/wireless/realtek/rtw89/reg.h      | 14 +++++
 drivers/net/wireless/realtek/rtw89/rtw8852c.c | 63 +++++++++++++++++--
 2 files changed, 72 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/reg.h +14 -0
index 5c4de043845b2..ebf28719d935e 100644
@@ -3822,6 +3822,8 @@
 #define B_CHBW_MOD_SBW GENMASK(13, 12)
 #define B_CHBW_MOD_PRICH GENMASK(11, 8)
 #define B_ANT_RX_SEG0 GENMASK(3, 0)
+#define R_PD_BOOST_EN 0x49E8
+#define B_PD_BOOST_EN BIT(7)
 #define R_P1_BACKOFF_IBADC_V1 0x49F0
 #define B_P1_BACKOFF_IBADC_V1 GENMASK(31, 26)
 #define R_BK_FC0_INV_V1 0x4A1C
@@ -3840,6 +3842,12 @@
 #define B_PATH1_BT_BACKOFF_V1 GENMASK(23, 0)
 #define R_PATH0_FRC_FIR_TYPE_V1 0x4C00
 #define B_PATH0_FRC_FIR_TYPE_MSK_V1 GENMASK(1, 0)
+#define R_PATH0_NOTCH 0x4C14
+#define B_PATH0_NOTCH_EN BIT(12)
+#define B_PATH0_NOTCH_VAL GENMASK(11, 0)
+#define R_PATH0_NOTCH2 0x4C20
+#define B_PATH0_NOTCH2_EN BIT(12)
+#define B_PATH0_NOTCH2_VAL GENMASK(11, 0)
 #define R_PATH0_5MDET 0x4C4C
 #define B_PATH0_5MDET_EN BIT(12)
 #define B_PATH0_5MDET_SB2 BIT(8)
@@ -3847,6 +3855,12 @@
 #define B_PATH0_5MDET_TH GENMASK(5, 0)
 #define R_PATH1_FRC_FIR_TYPE_V1 0x4CC4
 #define B_PATH1_FRC_FIR_TYPE_MSK_V1 GENMASK(1, 0)
+#define R_PATH1_NOTCH 0x4CD8
+#define B_PATH1_NOTCH_EN BIT(12)
+#define B_PATH1_NOTCH_VAL GENMASK(11, 0)
+#define R_PATH1_NOTCH2 0x4CE4
+#define B_PATH1_NOTCH2_EN BIT(12)
+#define B_PATH1_NOTCH2_VAL GENMASK(11, 0)
 #define R_PATH1_5MDET 0x4D10
 #define B_PATH1_5MDET_EN BIT(12)
 #define B_PATH1_5MDET_SB2 BIT(8)
drivers/net/wireless/realtek/rtw89/rtw8852c.c +58 -5

84 lines not on this page · raw message

Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 1/5] rtw89: 8852c: add settings to decrease the effect of DC

Quoted 7 lines · Ping-Ke Shih

From: Hsuan Hung <[email protected]>

Modify NBI and PD boost settings according to different primary channels. This setting can decrease the false alarm induced by DC.

5 patches applied to wireless-next.git, thanks.

0cd75e4f1c9d rtw89: 8852c: add settings to decrease the effect of DC 4b0d341b2e04 rtw89: correct setting of RX MPDU length 98ed6159a505 rtw89: correct CCA control
0b75b35c3867 rtw89: add debug select to dump MAC pages 0x30 to 0x33 dadb20864d89 rtw89: add debug entry to dump BSSID CAM

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
author maintainer
#3 lore raw

PATCH 2/5 rtw89: correct setting of RX MPDU length

In reply to Ping-Ke Shih

Set proper setting according to RX quota, and then it doesn't break buffer due to size of received packet exceeding buffer size.

---
 drivers/net/wireless/realtek/rtw89/mac.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +5 -5
index a06ca65b339ff..e1a1699a1a9cf 100644
@@ -2005,6 +2005,7 @@ static int rmac_init(struct rtw89_dev *rtwdev, u8 mac_idx)
 #define TRXCFG_RMAC_DATA_TO	15
 #define RX_MAX_LEN_UNIT 512
 #define PLD_RLS_MAX_PG 127
+#define RX_SPEC_MAX_LEN (11454 + RX_MAX_LEN_UNIT)
 	int ret;
 	u32 reg, rx_max_len, rx_qta;
 	u16 val;
@@ -2035,11 +2036,10 @@ static int rmac_init(struct rtw89_dev *rtwdev, u8 mac_idx)
 		rx_qta = rtwdev->mac.dle_info.c0_rx_qta;
 	else
 		rx_qta = rtwdev->mac.dle_info.c1_rx_qta;
-	rx_qta = rx_qta > PLD_RLS_MAX_PG ? PLD_RLS_MAX_PG : rx_qta;
-	rx_max_len = (rx_qta - 1) * rtwdev->mac.dle_info.ple_pg_size /
-		     RX_MAX_LEN_UNIT;
-	rx_max_len = rx_max_len > B_AX_RX_MPDU_MAX_LEN_SIZE ?
-		     B_AX_RX_MPDU_MAX_LEN_SIZE : rx_max_len;
+	rx_qta = min_t(u32, rx_qta, PLD_RLS_MAX_PG);
+	rx_max_len = rx_qta * rtwdev->mac.dle_info.ple_pg_size;
+	rx_max_len = min_t(u32, rx_max_len, RX_SPEC_MAX_LEN);
+	rx_max_len /= RX_MAX_LEN_UNIT;
 	rtw89_write32_mask(rtwdev, reg, B_AX_RX_MPDU_MAX_LEN_MASK, rx_max_len);
 
 	if (rtwdev->chip->chip_id == RTL8852A &&
Signature · 1 line
2.25.1
author maintainer
#4 lore raw

PATCH 3/5 rtw89: correct CCA control

In reply to Ping-Ke Shih

EDCCA signal can block transmitting in certain situation, so ignore this signal and use others to decide transmitting time.

---
 drivers/net/wireless/realtek/rtw89/mac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +3 -2
index e1a1699a1a9cf..3b61ff02fe849 100644
@@ -1890,11 +1890,12 @@ static int cca_ctrl_init(struct rtw89_dev *rtwdev, u8 mac_idx)
 		B_AX_CTN_CHK_BASIC_NAV | B_AX_CTN_CHK_BTCCA |
 		B_AX_CTN_CHK_EDCCA | B_AX_CTN_CHK_CCA_S80 |
 		B_AX_CTN_CHK_CCA_S40 | B_AX_CTN_CHK_CCA_S20 |
-		B_AX_CTN_CHK_CCA_P20 | B_AX_SIFS_CHK_EDCCA);
+		B_AX_CTN_CHK_CCA_P20);
 	val &= ~(B_AX_TB_CHK_TX_NAV | B_AX_TB_CHK_CCA_S80 |
 		 B_AX_TB_CHK_CCA_S40 | B_AX_TB_CHK_CCA_S20 |
 		 B_AX_SIFS_CHK_CCA_S80 | B_AX_SIFS_CHK_CCA_S40 |
-		 B_AX_SIFS_CHK_CCA_S20 | B_AX_CTN_CHK_TXNAV);
+		 B_AX_SIFS_CHK_CCA_S20 | B_AX_CTN_CHK_TXNAV |
+		 B_AX_SIFS_CHK_EDCCA);
 
 	rtw89_write32(rtwdev, reg, val);
 
Signature · 1 line
2.25.1
author maintainer
#5 lore raw

PATCH 4/5 rtw89: add debug select to dump MAC pages 0x30 to 0x33

In reply to Ping-Ke Shih

Dump new region 0x3000 to 0x33ff to help debug.

---
 drivers/net/wireless/realtek/rtw89/debug.c | 5 +++++
 drivers/net/wireless/realtek/rtw89/debug.h | 1 +
 2 files changed, 6 insertions(+)
drivers/net/wireless/realtek/rtw89/debug.c +5 -0
index f93f3fee15058..7820bc3ab3b47 100644
@@ -635,6 +635,11 @@ static int rtw89_debug_priv_mac_reg_dump_get(struct seq_file *m, void *v)
 		start = 0x000;
 		end = 0x014;
 		break;
+	case RTW89_DBG_SEL_MAC_30:
+		seq_puts(m, "Debug selected MAC page 0x30\n");
+		start = 0x030;
+		end = 0x033;
+		break;
 	case RTW89_DBG_SEL_MAC_40:
 		seq_puts(m, "Debug selected MAC page 0x40\n");
 		start = 0x040;
drivers/net/wireless/realtek/rtw89/debug.h +1 -0
index 1745815f5e00f..de72155ad1fea 100644
@@ -28,6 +28,7 @@ enum rtw89_debug_mask {
 
 enum rtw89_debug_mac_reg_sel {
 	RTW89_DBG_SEL_MAC_00,
+	RTW89_DBG_SEL_MAC_30,
 	RTW89_DBG_SEL_MAC_40,
 	RTW89_DBG_SEL_MAC_80,
 	RTW89_DBG_SEL_MAC_C0,
Signature · 1 line
2.25.1
author maintainer
#6 lore raw

PATCH 5/5 rtw89: add debug entry to dump BSSID CAM

In reply to Ping-Ke Shih

BSSID CAM is a kind of CAM that is used to determine if we receive a packet or not. Add an entry to assist in debugging.

---
 drivers/net/wireless/realtek/rtw89/mac.c | 1 +
 drivers/net/wireless/realtek/rtw89/mac.h | 1 +
 2 files changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
index 3b61ff02fe849..3cf892912c1d9 100644
@@ -29,6 +29,7 @@ const u32 rtw89_mac_mem_base_addrs[RTW89_MAC_MEM_NUM] = {
 	[RTW89_MAC_MEM_TXDATA_FIFO_0]	= TXDATA_FIFO_0_BASE_ADDR,
 	[RTW89_MAC_MEM_TXDATA_FIFO_1]	= TXDATA_FIFO_1_BASE_ADDR,
 	[RTW89_MAC_MEM_CPU_LOCAL]	= CPU_LOCAL_BASE_ADDR,
+	[RTW89_MAC_MEM_BSSID_CAM]	= BSSID_CAM_BASE_ADDR,
 };
 
 static void rtw89_mac_mem_write(struct rtw89_dev *rtwdev, u32 offset,
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
index 9eb4afe348b30..9f511c8d8a376 100644
@@ -268,6 +268,7 @@ enum rtw89_mac_mem_sel {
 	RTW89_MAC_MEM_TXDATA_FIFO_0,
 	RTW89_MAC_MEM_TXDATA_FIFO_1,
 	RTW89_MAC_MEM_CPU_LOCAL,
+	RTW89_MAC_MEM_BSSID_CAM,
 
 	/* keep last */
 	RTW89_MAC_MEM_NUM,
Signature · 1 line
2.25.1