wifi: mt76: mt7915: fix capabilities in non-AP mode

[ Upstream commit 02a894046d5ab7d0010f39ea54fde7e167919d04 ]

Capabilities in vif->bss_conf are only initialized in AP mode.
For other modes, they should be enabled by default, in order to avoid a
mismatch.

Fixes: 885f7af7e544 ("wifi: mt76: mt7915: remove mt7915_mcu_beacon_check_caps()")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 13d429bd44e285396fb84d0af1b05f062f540528..ed345a0b931e0241f03e14924b96420701d77468 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -269,6 +269,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR;
 
        mt7915_init_bitrate_mask(vif);
+       memset(&mvif->cap, -1, sizeof(mvif->cap));
 
        mt7915_mcu_add_bss_info(phy, vif, true);
        mt7915_mcu_add_sta(dev, vif, NULL, true);
@@ -657,6 +658,24 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
        mutex_unlock(&dev->mt76.mutex);
 }
 
+static void
+mt7915_vif_check_caps(struct mt7915_phy *phy, struct ieee80211_vif *vif)
+{
+       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
+       struct mt7915_vif_cap *vc = &mvif->cap;
+
+       vc->ht_ldpc = vif->bss_conf.ht_ldpc;
+       vc->vht_ldpc = vif->bss_conf.vht_ldpc;
+       vc->vht_su_ebfer = vif->bss_conf.vht_su_beamformer;
+       vc->vht_su_ebfee = vif->bss_conf.vht_su_beamformee;
+       vc->vht_mu_ebfer = vif->bss_conf.vht_mu_beamformer;
+       vc->vht_mu_ebfee = vif->bss_conf.vht_mu_beamformee;
+       vc->he_ldpc = vif->bss_conf.he_ldpc;
+       vc->he_su_ebfer = vif->bss_conf.he_su_beamformer;
+       vc->he_su_ebfee = vif->bss_conf.he_su_beamformee;
+       vc->he_mu_ebfer = vif->bss_conf.he_mu_beamformer;
+}
+
 static int
 mt7915_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                struct ieee80211_bss_conf *link_conf)
@@ -667,6 +686,8 @@ mt7915_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 
        mutex_lock(&dev->mt76.mutex);
 
+       mt7915_vif_check_caps(phy, vif);
+
        err = mt7915_mcu_add_bss_info(phy, vif, true);
        if (err)
                goto out;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 8da9c87e98042ba2e6c0c652c9b337293c281e51..a325066bf57e9abd13744be5e00a0ae96be0ac19 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -710,6 +710,7 @@ static void
 mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
                      struct ieee80211_vif *vif)
 {
+       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem;
        struct ieee80211_he_mcs_nss_supp mcs_map;
        struct sta_rec_he *he;
@@ -743,7 +744,7 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
             IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G))
                cap |= STA_REC_HE_CAP_BW20_RU242_SUPPORT;
 
-       if (vif->bss_conf.he_ldpc &&
+       if (mvif->cap.he_ldpc &&
            (elem->phy_cap_info[1] &
             IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))
                cap |= STA_REC_HE_CAP_LDPC;
@@ -852,6 +853,7 @@ static void
 mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
                        struct ieee80211_sta *sta, struct ieee80211_vif *vif)
 {
+       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem;
        struct sta_rec_muru *muru;
        struct tlv *tlv;
@@ -864,9 +866,9 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
 
        muru = (struct sta_rec_muru *)tlv;
 
-       muru->cfg.mimo_dl_en = vif->bss_conf.he_mu_beamformer ||
-                              vif->bss_conf.vht_mu_beamformer ||
-                              vif->bss_conf.vht_mu_beamformee;
+       muru->cfg.mimo_dl_en = mvif->cap.he_mu_ebfer ||
+                              mvif->cap.vht_mu_ebfer ||
+                              mvif->cap.vht_mu_ebfee;
        if (!is_mt7915(&dev->mt76))
                muru->cfg.mimo_ul_en = true;
        muru->cfg.ofdma_dl_en = true;
@@ -999,8 +1001,8 @@ mt7915_mcu_sta_wtbl_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
        mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, tlv, wtbl_hdr);
        if (sta)
                mt76_connac_mcu_wtbl_ht_tlv(&dev->mt76, skb, sta, tlv,
-                                           wtbl_hdr, vif->bss_conf.ht_ldpc,
-                                           vif->bss_conf.vht_ldpc);
+                                           wtbl_hdr, mvif->cap.ht_ldpc,
+                                           mvif->cap.vht_ldpc);
 
        return 0;
 }
@@ -1009,6 +1011,7 @@ static inline bool
 mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta, bool bfee)
 {
+       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        int tx_ant = hweight8(phy->mt76->chainmask) - 1;
 
        if (vif->type != NL80211_IFTYPE_STATION &&
@@ -1022,10 +1025,10 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem;
 
                if (bfee)
-                       return vif->bss_conf.he_su_beamformee &&
+                       return mvif->cap.he_su_ebfee &&
                               HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
                else
-                       return vif->bss_conf.he_su_beamformer &&
+                       return mvif->cap.he_su_ebfer &&
                               HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
        }
 
@@ -1033,10 +1036,10 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                u32 cap = sta->deflink.vht_cap.cap;
 
                if (bfee)
-                       return vif->bss_conf.vht_su_beamformee &&
+                       return mvif->cap.vht_su_ebfee &&
                               (cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
                else
-                       return vif->bss_conf.vht_su_beamformer &&
+                       return mvif->cap.vht_su_ebfer &&
                               (cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
        }
 
@@ -1531,7 +1534,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
                        cap |= STA_CAP_TX_STBC;
                if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC)
                        cap |= STA_CAP_RX_STBC;
-               if (vif->bss_conf.ht_ldpc &&
+               if (mvif->cap.ht_ldpc &&
                    (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING))
                        cap |= STA_CAP_LDPC;
 
@@ -1557,7 +1560,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
                        cap |= STA_CAP_VHT_TX_STBC;
                if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1)
                        cap |= STA_CAP_VHT_RX_STBC;
-               if (vif->bss_conf.vht_ldpc &&
+               if (mvif->cap.vht_ldpc &&
                    (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC))
                        cap |= STA_CAP_VHT_LDPC;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 3053f4abf7dbe272f432e347fbd756dd56ce39df..0f76733c9c1ac9276825b324bddc3504d23737b5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -147,9 +147,23 @@ struct mt7915_sta {
        } twt;
 };
 
+struct mt7915_vif_cap {
+       bool ht_ldpc:1;
+       bool vht_ldpc:1;
+       bool he_ldpc:1;
+       bool vht_su_ebfer:1;
+       bool vht_su_ebfee:1;
+       bool vht_mu_ebfer:1;
+       bool vht_mu_ebfee:1;
+       bool he_su_ebfer:1;
+       bool he_su_ebfee:1;
+       bool he_mu_ebfer:1;
+};
+
 struct mt7915_vif {
        struct mt76_vif mt76; /* must be first */
 
+       struct mt7915_vif_cap cap;
        struct mt7915_sta sta;
        struct mt7915_phy *phy;