Skip to content

Commit c49154f

Browse files
Ping-Ke ShihKalle Valo
authored andcommitted
rtw89: update scheduler setting
Update IC specific settings accordingly. Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/20220325060055.58482-14-pkshih@realtek.com
1 parent b61adee commit c49154f

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

drivers/net/wireless/realtek/rtw89/mac.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,6 +1731,17 @@ static int scheduler_init(struct rtw89_dev *rtwdev, u8 mac_idx)
17311731
if (ret)
17321732
return ret;
17331733

1734+
reg = rtw89_mac_reg_by_idx(R_AX_PREBKF_CFG_1, mac_idx);
1735+
rtw89_write32_mask(rtwdev, reg, B_AX_SIFS_MACTXEN_T1_MASK, SIFS_MACTXEN_T1);
1736+
1737+
if (rtwdev->chip->chip_id == RTL8852B) {
1738+
reg = rtw89_mac_reg_by_idx(R_AX_SCH_EXT_CTRL, mac_idx);
1739+
rtw89_write32_set(rtwdev, reg, B_AX_PORT_RST_TSF_ADV);
1740+
}
1741+
1742+
reg = rtw89_mac_reg_by_idx(R_AX_CCA_CFG_0, mac_idx);
1743+
rtw89_write32_clr(rtwdev, reg, B_AX_BTCCA_EN);
1744+
17341745
reg = rtw89_mac_reg_by_idx(R_AX_PREBKF_CFG_0, mac_idx);
17351746
rtw89_write32_mask(rtwdev, reg, B_AX_PREBKF_TIME_MASK, SCH_PREBKF_24US);
17361747

drivers/net/wireless/realtek/rtw89/reg.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,14 @@
977977
#define R_AX_PREBKF_CFG_0_C1 0xE338
978978
#define B_AX_PREBKF_TIME_MASK GENMASK(4, 0)
979979

980+
#define R_AX_PREBKF_CFG_1 0xC33C
981+
#define R_AX_PREBKF_CFG_1_C1 0xE33C
982+
#define B_AX_SIFS_TIMEOUT_TB_AGGR_MASK GENMASK(30, 24)
983+
#define B_AX_SIFS_PREBKF_MASK GENMASK(23, 16)
984+
#define B_AX_SIFS_TIMEOUT_T2_MASK GENMASK(14, 8)
985+
#define B_AX_SIFS_MACTXEN_T1_MASK GENMASK(6, 0)
986+
#define SIFS_MACTXEN_T1 0x47
987+
980988
#define R_AX_CCA_CFG_0 0xC340
981989
#define R_AX_CCA_CFG_0_C1 0xE340
982990
#define B_AX_BTCCA_BRK_TXOP_EN BIT(9)
@@ -1076,6 +1084,10 @@
10761084
#define R_AX_SCH_DBG_C1 0xE3F8
10771085
#define B_AX_SCHEDULER_DBG_MASK GENMASK(31, 0)
10781086

1087+
#define R_AX_SCH_EXT_CTRL 0xC3FC
1088+
#define R_AX_SCH_EXT_CTRL_C1 0xE3FC
1089+
#define B_AX_PORT_RST_TSF_ADV BIT(1)
1090+
10791091
#define R_AX_PORT_CFG_P0 0xC400
10801092
#define R_AX_PORT_CFG_P1 0xC440
10811093
#define R_AX_PORT_CFG_P2 0xC480

0 commit comments

Comments
 (0)