wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU

[ Upstream commit 6be7544d19fcfcb729495e793bc6181f85bb8949 ]

Set the MCS maps and the highest rates according to the number of
spatial streams the chip has. For RTL8814AU that is 3.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/e86aa009-b5bf-4b3a-8112-ea5e3cd49465@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 0cee0fd8c0ef074ec623eebf1fde48d64f836159..d66abb31f091bbef0e0ea7aafd902a408968a12e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1597,8 +1597,9 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev,
                             struct ieee80211_sta_vht_cap *vht_cap)
 {
        struct rtw_efuse *efuse = &rtwdev->efuse;
-       u16 mcs_map;
+       u16 mcs_map = 0;
        __le16 highest;
+       int i;
 
        if (efuse->hw_cap.ptcl != EFUSE_HW_CAP_IGNORE &&
            efuse->hw_cap.ptcl != EFUSE_HW_CAP_PTCL_VHT)
@@ -1621,21 +1622,15 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev,
        if (rtw_chip_has_rx_ldpc(rtwdev))
                vht_cap->cap |= IEEE80211_VHT_CAP_RXLDPC;
 
-       mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 << 0 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 4 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 6 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 8 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 10 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |
-                 IEEE80211_VHT_MCS_NOT_SUPPORTED << 14;
-       if (efuse->hw_cap.nss > 1) {
-               highest = cpu_to_le16(780);
-               mcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 << 2;
-       } else {
-               highest = cpu_to_le16(390);
-               mcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED << 2;
+       for (i = 0; i < 8; i++) {
+               if (i < efuse->hw_cap.nss)
+                       mcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 << (i * 2);
+               else
+                       mcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED << (i * 2);
        }
 
+       highest = cpu_to_le16(390 * efuse->hw_cap.nss);
+
        vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
        vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
        vht_cap->vht_mcs.rx_highest = highest;