wifi: mt76: mt7996: add EHT beamforming support

Add mt7996_mcu_sta_bfer_eht() and related capability checks.

Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
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/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 6a8b152..dbe3083 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -70,6 +70,7 @@ struct mt7996_fw_region {
 
 #define HE_PHY(p, c)                   u8_get_bits(c, IEEE80211_HE_PHY_##p)
 #define HE_MAC(m, c)                   u8_get_bits(c, IEEE80211_HE_MAC_##m)
+#define EHT_PHY(p, c)                  u8_get_bits(c, IEEE80211_EHT_PHY_##p)
 
 static bool sr_scene_detect = true;
 module_param(sr_scene_detect, bool, 0644);
@@ -1053,15 +1054,27 @@ mt7996_is_ebf_supported(struct mt7996_phy *phy, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta, bool bfee)
 {
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
-       int tx_ant = hweight8(phy->mt76->antenna_mask) - 1;
+       int sts = hweight16(phy->mt76->chainmask);
 
        if (vif->type != NL80211_IFTYPE_STATION &&
            vif->type != NL80211_IFTYPE_AP)
                return false;
 
-       if (!bfee && tx_ant < 2)
+       if (!bfee && sts < 2)
                return false;
 
+       if (sta->deflink.eht_cap.has_eht) {
+               struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap;
+               struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
+
+               if (bfee)
+                       return mvif->cap.eht_su_ebfee &&
+                              EHT_PHY(CAP0_SU_BEAMFORMEE, pe->phy_cap_info[0]);
+               else
+                       return mvif->cap.eht_su_ebfer &&
+                              EHT_PHY(CAP0_SU_BEAMFORMER, pe->phy_cap_info[0]);
+       }
+
        if (sta->deflink.he_cap.has_he) {
                struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem;
 
@@ -1219,12 +1232,68 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
 }
 
 static void
+mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
+                       struct mt7996_phy *phy, struct sta_rec_bf *bf)
+{
+       struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap;
+       struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
+       struct ieee80211_eht_mcs_nss_supp *eht_nss = &pc->eht_mcs_nss_supp;
+       const struct ieee80211_sta_eht_cap *vc =
+               mt76_connac_get_eht_phy_cap(phy->mt76, vif);
+       const struct ieee80211_eht_cap_elem_fixed *ve = &vc->eht_cap_elem;
+       u8 nss_mcs = u8_get_bits(eht_nss->bw._80.rx_tx_mcs9_max_nss,
+                                IEEE80211_EHT_MCS_NSS_RX) - 1;
+       u8 snd_dim, sts;
+
+       bf->tx_mode = MT_PHY_TYPE_EHT_MU;
+
+       mt7996_mcu_sta_sounding_rate(bf);
+
+       bf->trigger_su = EHT_PHY(CAP3_TRIG_SU_BF_FDBK, pe->phy_cap_info[3]);
+       bf->trigger_mu = EHT_PHY(CAP3_TRIG_MU_BF_PART_BW_FDBK, pe->phy_cap_info[3]);
+       snd_dim = EHT_PHY(CAP2_SOUNDING_DIM_80MHZ_MASK, ve->phy_cap_info[2]);
+       sts = EHT_PHY(CAP0_BEAMFORMEE_SS_80MHZ_MASK, pe->phy_cap_info[0]) +
+             (EHT_PHY(CAP1_BEAMFORMEE_SS_80MHZ_MASK, pe->phy_cap_info[1]) << 1);
+       bf->nrow = min_t(u8, snd_dim, sts);
+       bf->ncol = min_t(u8, nss_mcs, bf->nrow);
+       bf->ibf_ncol = bf->ncol;
+
+       if (sta->deflink.bandwidth < IEEE80211_STA_RX_BW_160)
+               return;
+
+       switch (sta->deflink.bandwidth) {
+       case IEEE80211_STA_RX_BW_160:
+               snd_dim = EHT_PHY(CAP2_SOUNDING_DIM_160MHZ_MASK, ve->phy_cap_info[2]);
+               sts = EHT_PHY(CAP1_BEAMFORMEE_SS_160MHZ_MASK, pe->phy_cap_info[1]);
+               nss_mcs = u8_get_bits(eht_nss->bw._160.rx_tx_mcs9_max_nss,
+                                     IEEE80211_EHT_MCS_NSS_RX) - 1;
+
+               bf->nrow_gt_bw80 = min_t(u8, snd_dim, sts);
+               bf->ncol_gt_bw80 = nss_mcs;
+               break;
+       case IEEE80211_STA_RX_BW_320:
+               snd_dim = EHT_PHY(CAP2_SOUNDING_DIM_320MHZ_MASK, ve->phy_cap_info[2]) +
+                         (EHT_PHY(CAP3_SOUNDING_DIM_320MHZ_MASK,
+                                  ve->phy_cap_info[3]) << 1);
+               sts = EHT_PHY(CAP1_BEAMFORMEE_SS_320MHZ_MASK, pe->phy_cap_info[1]);
+               nss_mcs = u8_get_bits(eht_nss->bw._320.rx_tx_mcs9_max_nss,
+                                     IEEE80211_EHT_MCS_NSS_RX) - 1;
+
+               bf->nrow_gt_bw80 = min_t(u8, snd_dim, sts) << 4;
+               bf->ncol_gt_bw80 = nss_mcs << 4;
+               break;
+       default:
+               break;
+       }
+}
+
+static void
 mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
                        struct ieee80211_vif *vif, struct ieee80211_sta *sta)
 {
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
        struct mt7996_phy *phy = mvif->phy;
-       int tx_ant = hweight8(phy->mt76->antenna_mask) - 1;
+       int tx_ant = hweight8(phy->mt76->chainmask) - 1;
        struct sta_rec_bf *bf;
        struct tlv *tlv;
        const u8 matrix[4][4] = {
@@ -1245,11 +1314,13 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
        tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BF, sizeof(*bf));
        bf = (struct sta_rec_bf *)tlv;
 
-       /* he: eBF only, in accordance with spec
+       /* he/eht: eBF only, in accordance with spec
         * vht: support eBF and iBF
         * ht: iBF only, since mac80211 lacks of eBF support
         */
-       if (sta->deflink.he_cap.has_he && ebf)
+       if (sta->deflink.eht_cap.has_eht && ebf)
+               mt7996_mcu_sta_bfer_eht(sta, vif, phy, bf);
+       else if (sta->deflink.he_cap.has_he && ebf)
                mt7996_mcu_sta_bfer_he(sta, vif, phy, bf);
        else if (sta->deflink.vht_cap.vht_supported)
                mt7996_mcu_sta_bfer_vht(sta, phy, bf, ebf);
@@ -1846,6 +1917,7 @@ mt7996_mcu_beacon_check_caps(struct mt7996_phy *phy, struct ieee80211_vif *vif,
 {
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
        struct mt7996_vif_cap *vc = &mvif->cap;
+       const struct ieee80211_eht_cap_elem_fixed *eht;
        const struct ieee80211_he_cap_elem *he;
        const struct ieee80211_vht_cap *vht;
        const struct ieee80211_ht_cap *ht;
@@ -1916,6 +1988,23 @@ mt7996_mcu_beacon_check_caps(struct mt7996_phy *phy, struct ieee80211_vif *vif,
                        HE_PHY(CAP4_MU_BEAMFORMER, he->phy_cap_info[4]) &&
                        HE_PHY(CAP4_MU_BEAMFORMER, pe->phy_cap_info[4]);
        }
+
+       ie = cfg80211_find_ext_ie(WLAN_EID_EXT_EHT_CAPABILITY,
+                                 mgmt->u.beacon.variable, len);
+       if (ie && ie[1] >= sizeof(*eht) + 1) {
+               const struct ieee80211_sta_eht_cap *pc =
+                       mt76_connac_get_eht_phy_cap(phy->mt76, vif);
+               const struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
+
+               eht = (void *)(ie + 3);
+
+               vc->eht_su_ebfer =
+                       EHT_PHY(CAP0_SU_BEAMFORMER, eht->phy_cap_info[0]) &&
+                       EHT_PHY(CAP0_SU_BEAMFORMER, pe->phy_cap_info[0]);
+               vc->eht_su_ebfee =
+                       EHT_PHY(CAP0_SU_BEAMFORMEE, eht->phy_cap_info[0]) &&
+                       EHT_PHY(CAP0_SU_BEAMFORMEE, pe->phy_cap_info[0]);
+       }
 }
 
 int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 84f9f66..018dfd2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -123,6 +123,8 @@ struct mt7996_vif_cap {
        bool he_su_ebfer:1;
        bool he_su_ebfee:1;
        bool he_mu_ebfer:1;
+       bool eht_su_ebfer:1;
+       bool eht_su_ebfee:1;
 };
 
 struct mt7996_vif {