package/kernel/mt76/patches/101-wireless-align-some-HE-capabilities-with-the-spec.patch

   1 From: Johannes Berg <johannes.berg@intel.com>
   2 Date: Fri, 9 Apr 2021 12:40:17 +0300
   3 Subject: [PATCH] wireless: align some HE capabilities with the spec
   4
   5 Some names were changed, align that with the spec as of
   6 802.11ax-D6.1.
   7
   8 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
   9 Link: https://lore.kernel.org/r/iwlwifi.20210409123755.b1e5fbab0d8c.I3eb6076cb0714ec6aec6b8f9dee613ce4a05d825@changeid
  10 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  11 ---
  12
  13 --- a/mt7915/init.c
  14 +++ b/mt7915/init.c
  15 @@ -646,8 +646,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
  16             IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;
  17         elem->phy_cap_info[5] &= ~c;
  18
  19 -       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
  20 -           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB;
  21 +       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
  22 +           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;
  23         elem->phy_cap_info[6] &= ~c;
  24
  25         elem->phy_cap_info[7] &= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;
  26 @@ -687,8 +687,8 @@ mt7915_set_stream_he_txbf_caps(struct ie
  27         c = (nss - 1) | (max_t(int, le16_to_cpu(mcs->tx_mcs_160), 1) << 3);
  28         elem->phy_cap_info[5] |= c;
  29
  30 -       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
  31 -           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB;
  32 +       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
  33 +           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;
  34         elem->phy_cap_info[6] |= c;
  35  }
  36
  37 @@ -816,7 +816,7 @@ mt7915_init_he_caps(struct mt7915_phy *p
  38                                 IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
  39                                 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
  40                         he_cap_elem->phy_cap_info[7] |=
  41 -                               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
  42 +                               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |
  43                                 IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;
  44                         he_cap_elem->phy_cap_info[8] |=
  45                                 IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
  46 --- a/mt7915/mcu.c
  47 +++ b/mt7915/mcu.c
  48 @@ -1842,9 +1842,9 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_
  49
  50         bf->tx_mode = MT_PHY_TYPE_HE_SU;
  51         mt7915_mcu_sta_sounding_rate(bf);
  52 -       bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMER_FB,
  53 +       bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMING_FB,
  54                                 pe->phy_cap_info[6]);
  55 -       bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMER_FB,
  56 +       bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB,
  57                                 pe->phy_cap_info[6]);
  58         bfer_nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,
  59                          ve->phy_cap_info[5]);
  60 --- a/mt7921/main.c
  61 +++ b/mt7921/main.c
  62 @@ -116,7 +116,7 @@ mt7921_init_he_caps(struct mt7921_phy *p
  63                                 IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
  64                                 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
  65                         he_cap_elem->phy_cap_info[7] |=
  66 -                               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
  67 +                               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |
  68                                 IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;
  69                         he_cap_elem->phy_cap_info[8] |=
  70                                 IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |