Commit c1afb267 authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

rtw88: 8822c: update rx settings to prevent potential hw deadlock 



These settings enables mac to detect and recover when rx fifo
circuit deadlock occurs. Previous version missed this, so we fix it.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
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/20211217012708.8623-1-pkshih@realtek.com
parent a3fd1f9a

drivers/net/wireless/realtek/rtw88/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ int rtw_core_init(struct rtw_dev *rtwdev) 


	/* default rx filter setting */

	rtwdev->hal.rcr = BIT_APP_FCS | BIT_APP_MIC | BIT_APP_ICV |

			  BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |

			  BIT_PKTCTL_DLEN | BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |

			  BIT_AB | BIT_AM | BIT_APM;



	ret = rtw_load_firmware(rtwdev, RTW_NORMAL_FW);

drivers/net/wireless/realtek/rtw88/rtw8821c.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data) 
#define WLAN_TX_FUNC_CFG2		0x30

#define WLAN_MAC_OPT_NORM_FUNC1		0x98

#define WLAN_MAC_OPT_LB_FUNC1		0x80

#define WLAN_MAC_OPT_FUNC2		0x30810041

#define WLAN_MAC_OPT_FUNC2		0xb0810041



#define WLAN_SIFS_CFG	(WLAN_SIFS_CCK_CONT_TX | \

			(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \

drivers/net/wireless/realtek/rtw88/rtw8822b.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void rtw8822b_phy_set_param(struct rtw_dev *rtwdev) 
#define WLAN_TX_FUNC_CFG2		0x30

#define WLAN_MAC_OPT_NORM_FUNC1		0x98

#define WLAN_MAC_OPT_LB_FUNC1		0x80

#define WLAN_MAC_OPT_FUNC2		0x30810041

#define WLAN_MAC_OPT_FUNC2		0xb0810041



#define WLAN_SIFS_CFG	(WLAN_SIFS_CCK_CONT_TX | \

			(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \

drivers/net/wireless/realtek/rtw88/rtw8822c.c

+1 −1
Original line number Diff line number Diff line
@@ -1962,7 +1962,7 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev) 
#define WLAN_TX_FUNC_CFG2		0x30

#define WLAN_MAC_OPT_NORM_FUNC1		0x98

#define WLAN_MAC_OPT_LB_FUNC1		0x80

#define WLAN_MAC_OPT_FUNC2		0x30810041

#define WLAN_MAC_OPT_FUNC2		0xb0810041

#define WLAN_MAC_INT_MIG_CFG		0x33330000



#define WLAN_SIFS_CFG	(WLAN_SIFS_CCK_CONT_TX | \