niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mt76: mt7915: introduce mt7915_mcu_beacon_check_caps()

Browse source 
Beacon elements might be changed by hostapd configuraion, so driver
should compare both IEs and PHY capabilities to get the least common
denominator before association.

Co-developed-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Ryder Lee 2021-10-18 16:06:59 +08:00 • committed by Felix Fietkau
parent b5f2ba8a4c
commit 22dffbddf0
3 changed files with 136 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/mediatek/mt76/mt7915/main.c
View file

@ -253,6 +253,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR;
mt7915_init_bitrate_mask(vif); mt7915_init_bitrate_mask(vif);
memset(&mvif->cap, -1, sizeof(mvif->cap));
out: out:
mutex_unlock(&dev->mt76.mutex); mutex_unlock(&dev->mt76.mutex);

161
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
View file

@ -1337,9 +1337,11 @@ mt7915_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
} }
static void static void
mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
struct ieee80211_vif *vif)
{ {
struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
struct ieee80211_sta_he_cap *he_cap = &sta->he_cap; struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem;
enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band; enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band;
@ -1372,8 +1374,8 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G)) IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G))
cap |= STA_REC_HE_CAP_BW20_RU242_SUPPORT; cap |= STA_REC_HE_CAP_BW20_RU242_SUPPORT;
if (elem->phy_cap_info[1] & if (mvif->cap.ldpc && (elem->phy_cap_info[1] &
IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD) IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))
cap |= STA_REC_HE_CAP_LDPC; cap |= STA_REC_HE_CAP_LDPC;
if (elem->phy_cap_info[1] & if (elem->phy_cap_info[1] &
@ -1508,8 +1510,10 @@ mt7915_mcu_sta_uapsd_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
} }
static void static void
mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7915_mcu_sta_muru_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_sta_he_cap *he_cap = &sta->he_cap; struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem;
struct sta_rec_muru *muru; struct sta_rec_muru *muru;
@ -1519,7 +1523,13 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
muru = (struct sta_rec_muru *)tlv; muru = (struct sta_rec_muru *)tlv;
muru->cfg.ofdma_dl_en = true; muru->cfg.ofdma_dl_en = true;
muru->cfg.mimo_dl_en = true;
/* A non-AP HE station must support MU beamformee */
muru->cfg.mimo_dl_en = (vif->type == NL80211_IFTYPE_STATION &&
vif->bss_conf.he_support) ||
mvif->cap.he_mu_ebfer ||
mvif->cap.vht_mu_ebfer ||
mvif->cap.vht_mu_ebfee;
muru->ofdma_dl.punc_pream_rx = muru->ofdma_dl.punc_pream_rx =
HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem->phy_cap_info[1]); HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem->phy_cap_info[1]);
@ -1618,7 +1628,7 @@ mt7915_mcu_sta_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
/* starec he */ /* starec he */
if (sta->he_cap.has_he) if (sta->he_cap.has_he)
mt7915_mcu_sta_he_tlv(skb, sta); mt7915_mcu_sta_he_tlv(skb, sta, vif);
/* starec uapsd */ /* starec uapsd */
mt7915_mcu_sta_uapsd_tlv(skb, sta, vif); mt7915_mcu_sta_uapsd_tlv(skb, sta, vif);
@ -1640,9 +1650,11 @@ mt7915_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
} }
static void static void
mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
void *sta_wtbl, void *wtbl_tlv) struct ieee80211_sta *sta, void *sta_wtbl,
void *wtbl_tlv)
{ {
struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
struct wtbl_ht *ht = NULL; struct wtbl_ht *ht = NULL;
struct tlv *tlv; struct tlv *tlv;
@ -1651,7 +1663,8 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_HT, sizeof(*ht), tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_HT, sizeof(*ht),
wtbl_tlv, sta_wtbl); wtbl_tlv, sta_wtbl);
ht = (struct wtbl_ht *)tlv; ht = (struct wtbl_ht *)tlv;
ht->ldpc = !!(sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING); ht->ldpc = mvif->cap.ldpc &&
(sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING);
ht->af = sta->ht_cap.ampdu_factor; ht->af = sta->ht_cap.ampdu_factor;
ht->mm = sta->ht_cap.ampdu_density; ht->mm = sta->ht_cap.ampdu_density;
ht->ht = true; ht->ht = true;
@ -1665,7 +1678,8 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_VHT, sizeof(*vht), tlv = mt7915_mcu_add_nested_tlv(skb, WTBL_VHT, sizeof(*vht),
wtbl_tlv, sta_wtbl); wtbl_tlv, sta_wtbl);
vht = (struct wtbl_vht *)tlv; vht = (struct wtbl_vht *)tlv;
vht->ldpc = !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC); vht->ldpc = mvif->cap.ldpc &&
(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC);
vht->vht = true; vht->vht = true;
af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,
@ -1988,7 +2002,7 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
struct mt7915_phy *phy; struct mt7915_phy *phy;
struct sk_buff *skb; struct sk_buff *skb;
int r, len; int r, len;
bool ebfee = 0, ebf = 0; bool ebfee = false, ebfer = false;
if (vif->type != NL80211_IFTYPE_STATION && if (vif->type != NL80211_IFTYPE_STATION &&
vif->type != NL80211_IFTYPE_AP) vif->type != NL80211_IFTYPE_AP)
@ -1997,42 +2011,32 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif,
phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy; phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;
if (sta->he_cap.has_he) { if (sta->he_cap.has_he) {
struct ieee80211_he_cap_elem *pe; struct ieee80211_he_cap_elem *pe = &sta->he_cap.he_cap_elem;
const struct ieee80211_he_cap_elem *ve;
const struct ieee80211_sta_he_cap *vc;
pe = &sta->he_cap.he_cap_elem; ebfee = mvif->cap.he_su_ebfee &&
vc = mt7915_get_he_phy_cap(phy, vif); HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
ve = &vc->he_cap_elem; ebfer = mvif->cap.he_su_ebfer &&
HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
ebfee = !!(HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]) &&
HE_PHY(CAP4_SU_BEAMFORMEE, ve->phy_cap_info[4]));
ebf = !!(HE_PHY(CAP3_SU_BEAMFORMER, ve->phy_cap_info[3]) &&
HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]));
} else if (sta->vht_cap.vht_supported) { } else if (sta->vht_cap.vht_supported) {
struct ieee80211_sta_vht_cap *pc; u32 cap = sta->vht_cap.cap;
struct ieee80211_sta_vht_cap *vc;
pc = &sta->vht_cap; ebfee = mvif->cap.vht_su_ebfee &&
vc = &phy->mt76->sband_5g.sband.vht_cap; (cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
ebfer = mvif->cap.vht_su_ebfer &&
ebfee = !!((pc->cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) && (cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
(vc->cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE));
ebf = !!((vc->cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) &&
(pc->cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE));
} }
/* must keep each tag independent */ /* must keep each tag independent */
/* starec bf */ /* starec bf */
if (ebf || dev->ibf) { if (ebfer || dev->ibf) {
len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf); len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);
skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len); skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
if (IS_ERR(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebf); mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebfer);
r = mt76_mcu_skb_send_msg(&dev->mt76, skb, r = mt76_mcu_skb_send_msg(&dev->mt76, skb,
MCU_EXT_CMD(STA_REC_UPDATE), true); MCU_EXT_CMD(STA_REC_UPDATE), true);
@ -2116,7 +2120,8 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
cap |= STA_CAP_TX_STBC; cap |= STA_CAP_TX_STBC;
if (sta->ht_cap.cap & IEEE80211_HT_CAP_RX_STBC) if (sta->ht_cap.cap & IEEE80211_HT_CAP_RX_STBC)
cap |= STA_CAP_RX_STBC; cap |= STA_CAP_RX_STBC;
if (sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING) if (mvif->cap.ldpc &&
(sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING))
cap |= STA_CAP_LDPC; cap |= STA_CAP_LDPC;
mt7915_mcu_set_sta_ht_mcs(sta, ra->ht_mcs, mcs_mask); mt7915_mcu_set_sta_ht_mcs(sta, ra->ht_mcs, mcs_mask);
@ -2141,7 +2146,8 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
cap |= STA_CAP_VHT_TX_STBC; cap |= STA_CAP_VHT_TX_STBC;
if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1) if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1)
cap |= STA_CAP_VHT_RX_STBC; cap |= STA_CAP_VHT_RX_STBC;
if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC) if (mvif->cap.ldpc &&
(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC))
cap |= STA_CAP_VHT_LDPC; cap |= STA_CAP_VHT_LDPC;
mt7915_mcu_set_sta_vht_mcs(sta, ra->supp_vht_mcs, mcs_mask); mt7915_mcu_set_sta_vht_mcs(sta, ra->supp_vht_mcs, mcs_mask);
@ -2190,7 +2196,7 @@ int mt7915_mcu_add_he(struct mt7915_dev *dev, struct ieee80211_vif *vif,
if (IS_ERR(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
mt7915_mcu_sta_he_tlv(skb, sta); mt7915_mcu_sta_he_tlv(skb, sta, vif);
return mt76_mcu_skb_send_msg(&dev->mt76, skb, return mt76_mcu_skb_send_msg(&dev->mt76, skb,
MCU_EXT_CMD(STA_REC_UPDATE), true); MCU_EXT_CMD(STA_REC_UPDATE), true);
@ -2246,7 +2252,7 @@ mt7915_mcu_add_mu(struct mt7915_dev *dev, struct ieee80211_vif *vif,
/* wait until TxBF and MU ready to update stare vht */ /* wait until TxBF and MU ready to update stare vht */
/* starec muru */ /* starec muru */
mt7915_mcu_sta_muru_tlv(skb, sta); mt7915_mcu_sta_muru_tlv(skb, sta, vif);
/* starec vht */ /* starec vht */
mt7915_mcu_sta_vht_tlv(skb, sta); mt7915_mcu_sta_vht_tlv(skb, sta);
@ -2305,7 +2311,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,
mt7915_mcu_wtbl_generic_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr); mt7915_mcu_wtbl_generic_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr);
mt7915_mcu_wtbl_hdr_trans_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr); mt7915_mcu_wtbl_hdr_trans_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr);
if (sta) if (sta)
mt7915_mcu_wtbl_ht_tlv(skb, sta, sta_wtbl, wtbl_hdr); mt7915_mcu_wtbl_ht_tlv(skb, vif, sta, sta_wtbl, wtbl_hdr);
} }
return mt76_mcu_skb_send_msg(&dev->mt76, skb, return mt76_mcu_skb_send_msg(&dev->mt76, skb,
@ -2455,6 +2461,83 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct ieee80211_vif *vif,
memcpy(buf + MT_TXD_SIZE, skb->data, skb->len); memcpy(buf + MT_TXD_SIZE, skb->data, skb->len);
} }
static void
mt7915_mcu_beacon_check_caps(struct mt7915_phy *phy, struct ieee80211_vif *vif,
struct sk_buff *skb)
{
struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
struct mt7915_vif_cap *vc = &mvif->cap;
const struct ieee80211_he_cap_elem *he;
const struct ieee80211_vht_cap *vht;
const struct ieee80211_ht_cap *ht;
struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
const u8 *ie;
u32 len, bc;
/* Check missing configuration options to allow AP mode in mac80211
* to remain in sync with hostapd settings, and get a subset of
* beacon and hardware capabilities.
*/
if (WARN_ON_ONCE(skb->len <= (mgmt->u.beacon.variable - skb->data)))
return;
memset(vc, 0, sizeof(*vc));
len = skb->len - (mgmt->u.beacon.variable - skb->data);
ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, mgmt->u.beacon.variable,
len);
if (ie && ie[1] >= sizeof(*ht)) {
ht = (void *)(ie + 2);
bc = le32_to_cpu(ht->cap_info);
vc->ldpc |= !!(bc & IEEE80211_HT_CAP_LDPC_CODING);
}
ie = cfg80211_find_ie(WLAN_EID_VHT_CAPABILITY, mgmt->u.beacon.variable,
len);
if (ie && ie[1] >= sizeof(*vht)) {
u32 pc = phy->mt76->sband_5g.sband.vht_cap.cap;
vht = (void *)(ie + 2);
bc = le32_to_cpu(vht->vht_cap_info);
vc->ldpc |= !!(bc & IEEE80211_VHT_CAP_RXLDPC);
vc->vht_su_ebfer =
(bc & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) &&
(pc & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
vc->vht_su_ebfee =
(bc & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) &&
(pc & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
vc->vht_mu_ebfer =
(bc & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) &&
(pc & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);
vc->vht_mu_ebfee =
(bc & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) &&
(pc & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
}
ie = cfg80211_find_ext_ie(WLAN_EID_EXT_HE_CAPABILITY,
mgmt->u.beacon.variable, len);
if (ie && ie[1] >= sizeof(*he) + 1) {
const struct ieee80211_sta_he_cap *pc =
mt7915_get_he_phy_cap(phy, vif);
const struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
he = (void *)(ie + 3);
vc->he_su_ebfer =
HE_PHY(CAP3_SU_BEAMFORMER, he->phy_cap_info[3]) &&
HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
vc->he_su_ebfee =
HE_PHY(CAP4_SU_BEAMFORMEE, he->phy_cap_info[4]) &&
HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
vc->he_mu_ebfer =
HE_PHY(CAP4_MU_BEAMFORMER, he->phy_cap_info[4]) &&
HE_PHY(CAP4_MU_BEAMFORMER, pe->phy_cap_info[4]);
}
}
int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, int mt7915_mcu_add_beacon(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, int en) struct ieee80211_vif *vif, int en)
{ {
@ -2495,6 +2578,8 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw,
info->hw_queue |= MT_TX_HW_QUEUE_EXT_PHY; info->hw_queue |= MT_TX_HW_QUEUE_EXT_PHY;
} }
mt7915_mcu_beacon_check_caps(phy, vif, skb);
/* TODO: subtag - 11v MBSSID */ /* TODO: subtag - 11v MBSSID */
mt7915_mcu_beacon_cntdwn(vif, rskb, skb, bcn, &offs); mt7915_mcu_beacon_cntdwn(vif, rskb, skb, bcn, &offs);
mt7915_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &offs); mt7915_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &offs);

12
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
View file

@ -116,12 +116,24 @@ struct mt7915_sta {
} twt; } twt;
}; };
struct mt7915_vif_cap {
bool 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 mt7915_vif {
u16 idx; u16 idx;
u8 omac_idx; u8 omac_idx;
u8 band_idx; u8 band_idx;
u8 wmm_idx; u8 wmm_idx;
struct mt7915_vif_cap cap;
struct mt7915_sta sta; struct mt7915_sta sta;
struct mt7915_phy *phy; struct mt7915_phy *phy;