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

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: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230421024551.29994-6-pkshih@realtek.com
parent 0789881a

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+1 −0
Original line number Diff line number Diff line
@@ -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,

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

+1 −0
Original line number Diff line number Diff line
@@ -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,

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

+1 −0
Original line number Diff line number Diff line
@@ -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,