lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 059/350] rtw88: fix NSS of hw_cap
    Date
    From: Ping-Ke Shih <pkshih@realtek.com>

    [ 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 | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
    index 6dd457741b15d..7a3a4911bde2a 100644
    --- a/drivers/net/wireless/realtek/rtw88/main.c
    +++ b/drivers/net/wireless/realtek/rtw88/main.c
    @@ -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,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:08    [W:7.268 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site