mt76: mt7915: fix missing HE phy cap

Fix missing HE phy cap related to vif and starec setting.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 7bb7e97427551584ad42eea302407ab1c3fc8dbd..727c529bfdeadafbd42e118b5de3446a67f71bbe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -630,7 +630,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
                               int vif, int nss)
 {
        struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem;
-       struct ieee80211_he_mcs_nss_supp *mcs = &he_cap->he_mcs_nss_supp;
        u8 c;
 
 #ifdef CONFIG_MAC80211_MESH
@@ -682,8 +681,11 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
        elem->phy_cap_info[3] |= IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;
        elem->phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;
 
-       /* num_snd_dim */
-       c = (nss - 1) | (max_t(int, le16_to_cpu(mcs->tx_mcs_160), 1) << 3);
+       /* num_snd_dim
+        * for mt7915, max supported nss is 2 for bw > 80MHz
+        */
+       c = (nss - 1) |
+           IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2;
        elem->phy_cap_info[5] |= c;
 
        c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
@@ -791,7 +793,11 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
                                IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |
                                IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;
                        he_cap_elem->phy_cap_info[6] |=
+                               IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
                                IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
+                       he_cap_elem->phy_cap_info[9] |=
+                               IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |
+                               IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;
                        break;
                case NL80211_IFTYPE_STATION:
                        he_cap_elem->mac_cap_info[1] |=

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 4c687380120e7589888ef71ad5dbcdba20546f0e..b4cc4cb35762bb1bb0f3e73daa0d8edc41ebe6db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1396,6 +1396,10 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
            IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ)
                cap |= STA_REC_HE_CAP_LE_EQ_80M_RX_STBC;
 
+       if (elem->phy_cap_info[6] &
+           IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB)
+               cap |= STA_REC_HE_CAP_TRIG_CQI_FK;
+
        if (elem->phy_cap_info[6] &
            IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE)
                cap |= STA_REC_HE_CAP_PARTIAL_BW_EXT_RANGE;
@@ -1420,10 +1424,6 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
            IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI)
                cap |= STA_REC_HE_CAP_ER_SU_PPDU_1LTF_8US_GI;
 
-       if (elem->phy_cap_info[9] &
-           IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK)
-               cap |= STA_REC_HE_CAP_TRIG_CQI_FK;
-
        if (elem->phy_cap_info[9] &
            IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU)
                cap |= STA_REC_HE_CAP_TX_1024QAM_UNDER_RU242;