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: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220927062611.30484-8-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index d79e84f436c1a4660d8c8054a541e63151afb8b5..be01350ee0e29063b84af8af3dc9001d49931293 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 30132c4583d7daa7c40938415669d273d921bd27..8fd70730689f8454ba9f70662e23f8775c57bc02 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -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);

diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h
index cb81c7eaece8a6bb38b8c68153b851326f61ade6..ca20bb024b407a9fe6bcea7d62eca4958367ca02 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/reg.h
+++ b/drivers/net/wireless/realtek/rtw89/reg.h
@@ -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 | \

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 124e63fe6968141fa0201bd389b0ca7085c4c74a..948a2027ed69c4f75f519d9c0a579c5fa30b1bcf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -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,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 00462c912ec7ecf7e65ad1a390ea6c301c223800..c8c0d68e1601475980d472f65719f5373db527a3 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -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,