Commit 75f1ed29 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw89: mac: correct register of report IMR 



The register of report IMR is chip specific, so add a field to strut to
correct them.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220927062611.30484-8-pkshih@realtek.com
parent 3d747589

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

+1 −0
Original line number Diff line number Diff line
@@ -2563,6 +2563,7 @@ struct rtw89_imr_info { 
	u32 cpu_disp_imr_set;

	u32 other_disp_imr_clr;

	u32 other_disp_imr_set;

	u32 bbrpt_com_err_imr_reg;

	u32 bbrpt_chinfo_err_imr_reg;

	u32 bbrpt_err_imr_set;

	u32 bbrpt_dfs_err_imr_reg;

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

+1 −1
Original line number Diff line number Diff line
@@ -2853,7 +2853,7 @@ static void rtw89_bbrpt_imr_enable(struct rtw89_dev *rtwdev) 
{

	const struct rtw89_imr_info *imr = rtwdev->chip->imr_info;



	rtw89_write32_set(rtwdev, R_AX_BBRPT_COM_ERR_IMR,

	rtw89_write32_set(rtwdev, imr->bbrpt_com_err_imr_reg,

			  B_AX_BBRPT_COM_NULL_PLPKTID_ERR_INT_EN);

	rtw89_write32_clr(rtwdev, imr->bbrpt_chinfo_err_imr_reg,

			  B_AX_BBRPT_CHINFO_IMR_CLR);

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

+1 −0
Original line number Diff line number Diff line
@@ -2280,6 +2280,7 @@ 
#define B_AX_F2PCMDRPT_FULL_DROP_ERR_INT_EN BIT(8)

#define B_AX_FSM1_TIMEOUT_ERR_INT_EN BIT(1)

#define B_AX_FSM_TIMEOUT_ERR_INT_EN BIT(0)

#define B_AX_PTCL_IMR_CLR_ALL GENMASK(31, 0)

#define B_AX_PTCL_IMR_CLR (B_AX_FSM_TIMEOUT_ERR_INT_EN | \

			   B_AX_F2PCMDRPT_FULL_DROP_ERR_INT_EN | \

			   B_AX_TXPRT_FULL_DROP_ERR_INT_EN | \

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

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ static const struct rtw89_imr_info rtw8852a_imr_info = { 
	.cpu_disp_imr_set	= B_AX_CPU_DISP_IMR_SET,

	.other_disp_imr_clr	= B_AX_OTHER_DISP_IMR_CLR,

	.other_disp_imr_set	= 0,

	.bbrpt_com_err_imr_reg	= R_AX_BBRPT_COM_ERR_IMR_ISR,

	.bbrpt_chinfo_err_imr_reg = R_AX_BBRPT_CHINFO_ERR_IMR_ISR,

	.bbrpt_err_imr_set	= 0,

	.bbrpt_dfs_err_imr_reg	= R_AX_BBRPT_DFS_ERR_IMR_ISR,

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static const struct rtw89_imr_info rtw8852c_imr_info = { 
	.cpu_disp_imr_set	= B_AX_CPU_DISP_IMR_SET_V1,

	.other_disp_imr_clr	= B_AX_OTHER_DISP_IMR_CLR_V1,

	.other_disp_imr_set	= B_AX_OTHER_DISP_IMR_SET_V1,

	.bbrpt_com_err_imr_reg	= R_AX_BBRPT_COM_ERR_IMR,

	.bbrpt_chinfo_err_imr_reg = R_AX_BBRPT_CHINFO_ERR_IMR,

	.bbrpt_err_imr_set	= R_AX_BBRPT_CHINFO_IMR_SET_V1,

	.bbrpt_dfs_err_imr_reg	= R_AX_BBRPT_DFS_ERR_IMR,