]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtw88: fix NSS of hw_cap
authorPing-Ke Shih <pkshih@realtek.com>
Wed, 2 Oct 2019 06:35:30 +0000 (14:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:43:36 +0000 (16:43 +0100)
[ Upstream commit 4f5bb7ff8b8d4bafd91243fc969ed240e67aa1ca ]

8822C is a 2x2 11ac chip, and then NSS must be less or equal to 2. However,
current nss of hw cap is 3, likes
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=3

This commit adds constraint to make sure NSS <= rf_path_num, and result
looks like
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=2

Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtw88/main.c

index 6dd457741b15dea619e6b364b78837c5e9649c35..7a3a4911bde2a13a5bec4ede205fdfa65457e049 100644 (file)
@@ -1020,7 +1020,8 @@ static int rtw_dump_hw_feature(struct rtw_dev *rtwdev)
 
        rtw_hw_config_rf_ant_num(rtwdev, efuse->hw_cap.ant_num);
 
-       if (efuse->hw_cap.nss == EFUSE_HW_CAP_IGNORE)
+       if (efuse->hw_cap.nss == EFUSE_HW_CAP_IGNORE ||
+           efuse->hw_cap.nss > rtwdev->hal.rf_path_num)
                efuse->hw_cap.nss = rtwdev->hal.rf_path_num;
 
        rtw_dbg(rtwdev, RTW_DBG_EFUSE,