wifi: rtw89: use chip_info::small_fifo_size to choose debug_mask

Previously, 8852B has smaller FIFO size than others, so I use chip_id to
choose debug_mask before. 8851B has similar design, so add a field to
chip_info as a general expression.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230421024551.29994-6-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index fa5b2038cee731f494e2c2dc37e337c2587c269e..2347906dd05004cdbd83ead2e11f1429e48f2b71 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3159,6 +3159,7 @@ struct rtw89_chip_info {
        u8 fw_format_max;
        bool try_ce_fw;
        u32 fifo_size;
+       bool small_fifo_size;
        u32 dle_scc_rsvd_size;
        u16 max_amsdu_limit;
        bool dis_2g_40m_ul_ofdma;

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 70b4754667c9883bbd642268d75791a2592540c2..b53f346fef979af01b1b2e9f534f83c48e242799 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -1003,10 +1003,10 @@ static u32 __rtw89_pci_check_and_reclaim_tx_resource(struct rtw89_dev *rtwdev,
        min_cnt = min(bd_cnt, wd_cnt);
        if (min_cnt == 0) {
                /* This message can be frequently shown in low power mode or
-                * high traffic with 8852B, and we have recognized it as normal
+                * high traffic with small FIFO chips, and we have recognized it as normal
                 * behavior, so print with mask RTW89_DBG_TXRX in these situations.
                 */
-               if (rtwpci->low_power || chip->chip_id == RTL8852B)
+               if (rtwpci->low_power || chip->small_fifo_size)
                        debug_mask = RTW89_DBG_TXRX;
                else
                        debug_mask = RTW89_DBG_UNEXP;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index cc47bcbabfc9737f9c2f37c9c5e4a11b80e9c47e..2c3db08b68310b117f238096c0f31e3c186f889b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -38,6 +38,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .fw_format_max          = RTW8851B_FW_FORMAT_MAX,
        .try_ce_fw              = true,
        .fifo_size              = 196608,
+       .small_fifo_size        = true,
        .dle_scc_rsvd_size      = 98304,
        .max_amsdu_limit        = 3500,
        .dis_2g_40m_ul_ofdma    = true,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index bd417c60171a0fffb14ab7c835b34224b6bd264c..58cb99003be9434eaf0721d739573427e2755377 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2075,6 +2075,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .fw_format_max          = RTW8852A_FW_FORMAT_MAX,
        .try_ce_fw              = false,
        .fifo_size              = 458752,
+       .small_fifo_size        = false,
        .dle_scc_rsvd_size      = 0,
        .max_amsdu_limit        = 3500,
        .dis_2g_40m_ul_ofdma    = true,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index af74d0feeccb98ec48458c1ee5b84375de5308ab..5a67f02557ee7a27e9bfe9937162464e00468f4c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -2506,6 +2506,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .fw_format_max          = RTW8852B_FW_FORMAT_MAX,
        .try_ce_fw              = true,
        .fifo_size              = 196608,
+       .small_fifo_size        = true,
        .dle_scc_rsvd_size      = 98304,
        .max_amsdu_limit        = 3500,
        .dis_2g_40m_ul_ofdma    = true,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 3268be8fea6ccbba2c45383b4926504250bde1d9..35ba30f040c71983d24cfae042ca7ac1bd486aea 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -2805,6 +2805,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .fw_format_max          = RTW8852C_FW_FORMAT_MAX,
        .try_ce_fw              = false,
        .fifo_size              = 458752,
+       .small_fifo_size        = false,
        .dle_scc_rsvd_size      = 0,
        .max_amsdu_limit        = 8000,
        .dis_2g_40m_ul_ofdma    = false,