Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-05 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wifi: mt76: mt7996: Update mt7996_mcu_add_sta to MLO support

Browse Source 
Update mt7996_mcu_add_sta routine and all the called subroutines to
support MLO. This is a preliminary patch to enable MLO for MT7996
driver.

Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Co-developed-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250311-mt7996-mlo-v2-11-31df6972519b@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Shayne Chen 2025-03-11 18:45:10 +01:00 committed by Felix Fietkau
parent 9890624c1b
commit c7e4fc3624
3 changed files with 208 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/net/wireless/mediatek/mt76/mt7996/main.c
View File

@ -293,7 +293,8 @@ int mt7996_vif_link_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,
* interface, since firmware only records BSSID when the entry is new * interface, since firmware only records BSSID when the entry is new
*/ */
if (vif->type != NL80211_IFTYPE_STATION) if (vif->type != NL80211_IFTYPE_STATION)
mt7996_mcu_add_sta(dev, vif, mlink, NULL, CONN_STATE_PORT_SECURE, true); mt7996_mcu_add_sta(dev, link_conf, NULL, link, NULL,
CONN_STATE_PORT_SECURE, true);
rcu_assign_pointer(dev->mt76.wcid[idx], &msta_link->wcid); rcu_assign_pointer(dev->mt76.wcid[idx], &msta_link->wcid);
ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, link); ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, link);
@ -311,7 +312,8 @@ void mt7996_vif_link_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,
struct mt7996_dev *dev = phy->dev; struct mt7996_dev *dev = phy->dev;
int idx = msta_link->wcid.idx; int idx = msta_link->wcid.idx;
mt7996_mcu_add_sta(dev, vif, mlink, NULL, CONN_STATE_DISCONNECT, false); mt7996_mcu_add_sta(dev, link_conf, NULL, link, NULL,
CONN_STATE_DISCONNECT, false);
mt7996_mcu_add_bss_info(phy, vif, link_conf, mlink, false); mt7996_mcu_add_bss_info(phy, vif, link_conf, mlink, false);
mt7996_mcu_add_dev_info(phy, vif, link_conf, mlink, false); mt7996_mcu_add_dev_info(phy, vif, link_conf, mlink, false);
@ -703,7 +705,7 @@ mt7996_vif_cfg_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
mt7996_mcu_add_bss_info(link->phy, vif, link_conf, mt7996_mcu_add_bss_info(link->phy, vif, link_conf,
&link->mt76, true); &link->mt76, true);
mt7996_mcu_add_sta(dev, vif, &link->mt76, NULL, mt7996_mcu_add_sta(dev, link_conf, NULL, link, NULL,
CONN_STATE_PORT_SECURE, CONN_STATE_PORT_SECURE,
!!(changed & BSS_CHANGED_BSSID)); !!(changed & BSS_CHANGED_BSSID));
} }
@ -717,17 +719,17 @@ mt7996_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_bss_conf *info, u64 changed) struct ieee80211_bss_conf *info, u64 changed)
{ {
struct mt7996_dev *dev = mt7996_hw_dev(hw); struct mt7996_dev *dev = mt7996_hw_dev(hw);
struct mt76_vif_link *mvif; struct mt7996_vif_link *link;
struct mt7996_phy *phy; struct mt7996_phy *phy;
struct mt76_phy *mphy; struct mt76_phy *mphy;
mutex_lock(&dev->mt76.mutex); mutex_lock(&dev->mt76.mutex);
mvif = mt76_vif_conf_link(&dev->mt76, vif, info); link = mt7996_vif_conf_link(dev, vif, info);
if (!mvif) if (!link)
goto out; goto out;
mphy = mt76_vif_link_phy(mvif); mphy = mt76_vif_link_phy(&link->mt76);
if (!mphy) if (!mphy)
goto out; goto out;
@ -738,8 +740,9 @@ mt7996_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
*/ */
if ((changed & BSS_CHANGED_BSSID && !is_zero_ether_addr(info->bssid)) || if ((changed & BSS_CHANGED_BSSID && !is_zero_ether_addr(info->bssid)) ||
(changed & BSS_CHANGED_BEACON_ENABLED && info->enable_beacon)) { (changed & BSS_CHANGED_BEACON_ENABLED && info->enable_beacon)) {
mt7996_mcu_add_bss_info(phy, vif, info, mvif, true); mt7996_mcu_add_bss_info(phy, vif, info, &link->mt76, true);
mt7996_mcu_add_sta(dev, vif, mvif, NULL, CONN_STATE_PORT_SECURE, mt7996_mcu_add_sta(dev, info, NULL, link, NULL,
CONN_STATE_PORT_SECURE,
!!(changed & BSS_CHANGED_BSSID)); !!(changed & BSS_CHANGED_BSSID));
} }
@ -756,11 +759,11 @@ mt7996_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
} }
if (changed & BSS_CHANGED_MCAST_RATE) if (changed & BSS_CHANGED_MCAST_RATE)
mvif->mcast_rates_idx = link->mt76.mcast_rates_idx =
mt7996_get_rates_table(phy, info, false, true); mt7996_get_rates_table(phy, info, false, true);
if (changed & BSS_CHANGED_BASIC_RATES) if (changed & BSS_CHANGED_BASIC_RATES)
mvif->basic_rates_idx = link->mt76.basic_rates_idx =
mt7996_get_rates_table(phy, info, false, false); mt7996_get_rates_table(phy, info, false, false);
/* ensure that enable txcmd_mode after bss_info */ /* ensure that enable txcmd_mode after bss_info */
@ -772,15 +775,15 @@ mt7996_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
if (changed & BSS_CHANGED_HE_BSS_COLOR) { if (changed & BSS_CHANGED_HE_BSS_COLOR) {
if ((vif->type == NL80211_IFTYPE_AP && if ((vif->type == NL80211_IFTYPE_AP &&
mvif->omac_idx <= HW_BSSID_MAX) || link->mt76.omac_idx <= HW_BSSID_MAX) ||
vif->type == NL80211_IFTYPE_STATION) vif->type == NL80211_IFTYPE_STATION)
mt7996_mcu_update_bss_color(dev, mvif, mt7996_mcu_update_bss_color(dev, &link->mt76,
&info->he_bss_color); &info->he_bss_color);
} }
if (changed & (BSS_CHANGED_BEACON | if (changed & (BSS_CHANGED_BEACON |
BSS_CHANGED_BEACON_ENABLED)) { BSS_CHANGED_BEACON_ENABLED)) {
mvif->beacon_rates_idx = link->mt76.beacon_rates_idx =
mt7996_get_rates_table(phy, info, true, false); mt7996_get_rates_table(phy, info, true, false);
mt7996_mcu_add_beacon(hw, vif, info); mt7996_mcu_add_beacon(hw, vif, info);
@ -816,10 +819,12 @@ mt7996_channel_switch_beacon(struct ieee80211_hw *hw,
} }
static int static int
mt7996_mac_sta_init_link(struct mt7996_dev *dev, struct ieee80211_vif *vif, mt7996_mac_sta_init_link(struct mt7996_dev *dev,
struct mt7996_vif_link *link, struct ieee80211_bss_conf *link_conf,
struct ieee80211_sta *sta, unsigned int link_id) struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link, unsigned int link_id)
{ {
struct ieee80211_sta *sta = link_sta->sta;
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
struct mt7996_phy *phy = link->phy; struct mt7996_phy *phy = link->phy;
struct mt7996_sta_link *msta_link; struct mt7996_sta_link *msta_link;
@ -863,8 +868,8 @@ mt7996_mac_sta_init_link(struct mt7996_dev *dev, struct ieee80211_vif *vif,
rcu_assign_pointer(msta->link[link_id], msta_link); rcu_assign_pointer(msta->link[link_id], msta_link);
mt7996_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); mt7996_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
mt7996_mcu_add_sta(dev, vif, &link->mt76, sta, CONN_STATE_DISCONNECT, mt7996_mcu_add_sta(dev, link_conf, link_sta, link, msta_link,
true); CONN_STATE_DISCONNECT, true);
rcu_assign_pointer(dev->mt76.wcid[idx], &msta_link->wcid); rcu_assign_pointer(dev->mt76.wcid[idx], &msta_link->wcid);
mt76_wcid_init(&msta_link->wcid, phy->mt76->band_idx); mt76_wcid_init(&msta_link->wcid, phy->mt76->band_idx);
@ -930,16 +935,27 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif,
int err; int err;
for_each_set_bit(link_id, &new_links, IEEE80211_MLD_MAX_NUM_LINKS) { for_each_set_bit(link_id, &new_links, IEEE80211_MLD_MAX_NUM_LINKS) {
struct ieee80211_bss_conf *link_conf;
struct ieee80211_link_sta *link_sta;
struct mt7996_vif_link *link; struct mt7996_vif_link *link;
if (rcu_access_pointer(msta->link[link_id])) if (rcu_access_pointer(msta->link[link_id]))
continue; continue;
link_conf = link_conf_dereference_protected(vif, link_id);
if (!link_conf)
goto error_unlink;
link = mt7996_vif_link(dev, vif, link_id); link = mt7996_vif_link(dev, vif, link_id);
if (!link) if (!link)
goto error_unlink; goto error_unlink;
err = mt7996_mac_sta_init_link(dev, vif, link, sta, link_id); link_sta = link_sta_dereference_protected(sta, link_id);
if (!link_sta)
goto error_unlink;
err = mt7996_mac_sta_init_link(dev, link_conf, link_sta, link,
link_id);
if (err) if (err)
goto error_unlink; goto error_unlink;
} }
@ -1005,10 +1021,15 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
unsigned int link_id; unsigned int link_id;
for_each_sta_active_link(vif, sta, link_sta, link_id) { for_each_sta_active_link(vif, sta, link_sta, link_id) {
struct ieee80211_bss_conf *link_conf;
struct mt7996_sta_link *msta_link; struct mt7996_sta_link *msta_link;
struct mt7996_vif_link *link; struct mt7996_vif_link *link;
int i, err; int i, err;
link_conf = link_conf_dereference_protected(vif, link_id);
if (!link_conf)
continue;
link = mt7996_vif_link(dev, vif, link_id); link = mt7996_vif_link(dev, vif, link_id);
if (!link) if (!link)
continue; continue;
@ -1019,7 +1040,8 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
switch (ev) { switch (ev) {
case MT76_STA_EVENT_ASSOC: case MT76_STA_EVENT_ASSOC:
err = mt7996_mcu_add_sta(dev, vif, &link->mt76, sta, err = mt7996_mcu_add_sta(dev, link_conf, link_sta,
link, msta_link,
CONN_STATE_CONNECT, true); CONN_STATE_CONNECT, true);
if (err) if (err)
return err; return err;
@ -1032,7 +1054,8 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
msta_link->wcid.sta = 1; msta_link->wcid.sta = 1;
break; break;
case MT76_STA_EVENT_AUTHORIZE: case MT76_STA_EVENT_AUTHORIZE:
err = mt7996_mcu_add_sta(dev, vif, &link->mt76, sta, err = mt7996_mcu_add_sta(dev, link_conf, link_sta,
link, msta_link,
CONN_STATE_PORT_SECURE, false); CONN_STATE_PORT_SECURE, false);
if (err) if (err)
return err; return err;
@ -1041,8 +1064,9 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
for (i = 0; i < ARRAY_SIZE(msta_link->twt.flow); i++) for (i = 0; i < ARRAY_SIZE(msta_link->twt.flow); i++)
mt7996_mac_twt_teardown_flow(dev, msta, i); mt7996_mac_twt_teardown_flow(dev, msta, i);
mt7996_mcu_add_sta(dev, vif, &link->mt76, sta, mt7996_mcu_add_sta(dev, link_conf, link_sta, link,
CONN_STATE_DISCONNECT, false); msta_link, CONN_STATE_DISCONNECT,
false);
msta_link->wcid.sta_disabled = 1; msta_link->wcid.sta_disabled = 1;
msta_link->wcid.sta = 0; msta_link->wcid.sta = 0;
break; break;

296
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
View File

@ -118,13 +118,13 @@ mt7996_mcu_get_sta_nss(u16 mcs_map)
} }
static void static void
mt7996_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs, mt7996_mcu_set_sta_he_mcs(struct ieee80211_link_sta *link_sta,
u16 mcs_map) struct mt7996_vif_link *link,
__le16 *he_mcs, u16 mcs_map)
{ {
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; int nss, max_nss = link_sta->rx_nss > 3 ? 4 : link_sta->rx_nss;
enum nl80211_band band = msta->vif->deflink.phy->mt76->chandef.chan->band; enum nl80211_band band = link->phy->mt76->chandef.chan->band;
const u16 *mask = msta->vif->deflink.bitrate_mask.control[band].he_mcs; const u16 *mask = link->bitrate_mask.control[band].he_mcs;
int nss, max_nss = sta->deflink.rx_nss > 3 ? 4 : sta->deflink.rx_nss;
for (nss = 0; nss < max_nss; nss++) { for (nss = 0; nss < max_nss; nss++) {
int mcs; int mcs;
@ -1182,15 +1182,17 @@ int mt7996_mcu_add_rx_ba(struct mt7996_dev *dev,
} }
static void static void
mt7996_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7996_mcu_sta_he_tlv(struct sk_buff *skb,
struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link)
{ {
struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem; struct ieee80211_he_cap_elem *elem = &link_sta->he_cap.he_cap_elem;
struct ieee80211_he_mcs_nss_supp mcs_map; struct ieee80211_he_mcs_nss_supp mcs_map;
struct sta_rec_he_v2 *he; struct sta_rec_he_v2 *he;
struct tlv *tlv; struct tlv *tlv;
int i = 0; int i = 0;
if (!sta->deflink.he_cap.has_he) if (!link_sta->he_cap.has_he)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_V2, sizeof(*he)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_V2, sizeof(*he));
@ -1202,21 +1204,21 @@ mt7996_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
he->he_phy_cap[i] = elem->phy_cap_info[i]; he->he_phy_cap[i] = elem->phy_cap_info[i];
} }
mcs_map = sta->deflink.he_cap.he_mcs_nss_supp; mcs_map = link_sta->he_cap.he_mcs_nss_supp;
switch (sta->deflink.bandwidth) { switch (link_sta->bandwidth) {
case IEEE80211_STA_RX_BW_160: case IEEE80211_STA_RX_BW_160:
if (elem->phy_cap_info[0] & if (elem->phy_cap_info[0] &
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)
mt7996_mcu_set_sta_he_mcs(sta, mt7996_mcu_set_sta_he_mcs(link_sta, link,
&he->max_nss_mcs[CMD_HE_MCS_BW8080], &he->max_nss_mcs[CMD_HE_MCS_BW8080],
le16_to_cpu(mcs_map.rx_mcs_80p80)); le16_to_cpu(mcs_map.rx_mcs_80p80));
mt7996_mcu_set_sta_he_mcs(sta, mt7996_mcu_set_sta_he_mcs(link_sta, link,
&he->max_nss_mcs[CMD_HE_MCS_BW160], &he->max_nss_mcs[CMD_HE_MCS_BW160],
le16_to_cpu(mcs_map.rx_mcs_160)); le16_to_cpu(mcs_map.rx_mcs_160));
fallthrough; fallthrough;
default: default:
mt7996_mcu_set_sta_he_mcs(sta, mt7996_mcu_set_sta_he_mcs(link_sta, link,
&he->max_nss_mcs[CMD_HE_MCS_BW80], &he->max_nss_mcs[CMD_HE_MCS_BW80],
le16_to_cpu(mcs_map.rx_mcs_80)); le16_to_cpu(mcs_map.rx_mcs_80));
break; break;
@ -1226,24 +1228,26 @@ mt7996_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
} }
static void static void
mt7996_mcu_sta_he_6g_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7996_mcu_sta_he_6g_tlv(struct sk_buff *skb,
struct ieee80211_link_sta *link_sta)
{ {
struct sta_rec_he_6g_capa *he_6g; struct sta_rec_he_6g_capa *he_6g;
struct tlv *tlv; struct tlv *tlv;
if (!sta->deflink.he_6ghz_capa.capa) if (!link_sta->he_6ghz_capa.capa)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G, sizeof(*he_6g)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G, sizeof(*he_6g));
he_6g = (struct sta_rec_he_6g_capa *)tlv; he_6g = (struct sta_rec_he_6g_capa *)tlv;
he_6g->capa = sta->deflink.he_6ghz_capa.capa; he_6g->capa = link_sta->he_6ghz_capa.capa;
} }
static void static void
mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7996_mcu_sta_eht_tlv(struct sk_buff *skb,
struct ieee80211_link_sta *link_sta)
{ {
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; struct mt7996_sta *msta = (struct mt7996_sta *)link_sta->sta->drv_priv;
struct ieee80211_vif *vif = container_of((void *)msta->vif, struct ieee80211_vif *vif = container_of((void *)msta->vif,
struct ieee80211_vif, drv_priv); struct ieee80211_vif, drv_priv);
struct ieee80211_eht_mcs_nss_supp *mcs_map; struct ieee80211_eht_mcs_nss_supp *mcs_map;
@ -1251,11 +1255,11 @@ mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
struct sta_rec_eht *eht; struct sta_rec_eht *eht;
struct tlv *tlv; struct tlv *tlv;
if (!sta->deflink.eht_cap.has_eht) if (!link_sta->eht_cap.has_eht)
return; return;
mcs_map = &sta->deflink.eht_cap.eht_mcs_nss_supp; mcs_map = &link_sta->eht_cap.eht_mcs_nss_supp;
elem = &sta->deflink.eht_cap.eht_cap_elem; elem = &link_sta->eht_cap.eht_cap_elem;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT, sizeof(*eht)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT, sizeof(*eht));
@ -1266,7 +1270,7 @@ mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
eht->phy_cap_ext = cpu_to_le64(elem->phy_cap_info[8]); eht->phy_cap_ext = cpu_to_le64(elem->phy_cap_info[8]);
if (vif->type != NL80211_IFTYPE_STATION && if (vif->type != NL80211_IFTYPE_STATION &&
(sta->deflink.he_cap.he_cap_elem.phy_cap_info[0] & (link_sta->he_cap.he_cap_elem.phy_cap_info[0] &
(IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G | (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
@ -1282,48 +1286,48 @@ mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
} }
static void static void
mt7996_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7996_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)
{ {
struct sta_rec_ht_uni *ht; struct sta_rec_ht_uni *ht;
struct tlv *tlv; struct tlv *tlv;
if (!sta->deflink.ht_cap.ht_supported) if (!link_sta->ht_cap.ht_supported)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));
ht = (struct sta_rec_ht_uni *)tlv; ht = (struct sta_rec_ht_uni *)tlv;
ht->ht_cap = cpu_to_le16(sta->deflink.ht_cap.cap); ht->ht_cap = cpu_to_le16(link_sta->ht_cap.cap);
ht->ampdu_param = u8_encode_bits(sta->deflink.ht_cap.ampdu_factor, ht->ampdu_param = u8_encode_bits(link_sta->ht_cap.ampdu_factor,
IEEE80211_HT_AMPDU_PARM_FACTOR) | IEEE80211_HT_AMPDU_PARM_FACTOR) |
u8_encode_bits(sta->deflink.ht_cap.ampdu_density, u8_encode_bits(link_sta->ht_cap.ampdu_density,
IEEE80211_HT_AMPDU_PARM_DENSITY); IEEE80211_HT_AMPDU_PARM_DENSITY);
} }
static void static void
mt7996_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) mt7996_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)
{ {
struct sta_rec_vht *vht; struct sta_rec_vht *vht;
struct tlv *tlv; struct tlv *tlv;
/* For 6G band, this tlv is necessary to let hw work normally */ /* For 6G band, this tlv is necessary to let hw work normally */
if (!sta->deflink.he_6ghz_capa.capa && !sta->deflink.vht_cap.vht_supported) if (!link_sta->he_6ghz_capa.capa && !link_sta->vht_cap.vht_supported)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht));
vht = (struct sta_rec_vht *)tlv; vht = (struct sta_rec_vht *)tlv;
vht->vht_cap = cpu_to_le32(sta->deflink.vht_cap.cap); vht->vht_cap = cpu_to_le32(link_sta->vht_cap.cap);
vht->vht_rx_mcs_map = sta->deflink.vht_cap.vht_mcs.rx_mcs_map; vht->vht_rx_mcs_map = link_sta->vht_cap.vht_mcs.rx_mcs_map;
vht->vht_tx_mcs_map = sta->deflink.vht_cap.vht_mcs.tx_mcs_map; vht->vht_tx_mcs_map = link_sta->vht_cap.vht_mcs.tx_mcs_map;
} }
static void static void
mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb, mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
struct ieee80211_vif *vif, struct ieee80211_sta *sta) struct ieee80211_vif *vif,
struct ieee80211_link_sta *link_sta,
struct mt7996_sta_link *msta_link)
{ {
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
struct mt7996_sta_link *msta_link = &msta->deflink;
struct sta_rec_amsdu *amsdu; struct sta_rec_amsdu *amsdu;
struct tlv *tlv; struct tlv *tlv;
@ -1332,7 +1336,7 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
vif->type != NL80211_IFTYPE_AP) vif->type != NL80211_IFTYPE_AP)
return; return;
if (!sta->deflink.agg.max_amsdu_len) if (!link_sta->agg.max_amsdu_len)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu));
@ -1341,7 +1345,7 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
amsdu->amsdu_en = true; amsdu->amsdu_en = true;
msta_link->wcid.amsdu = true; msta_link->wcid.amsdu = true;
switch (sta->deflink.agg.max_amsdu_len) { switch (link_sta->agg.max_amsdu_len) {
case IEEE80211_MAX_MPDU_LEN_VHT_11454: case IEEE80211_MAX_MPDU_LEN_VHT_11454:
amsdu->max_mpdu_size = amsdu->max_mpdu_size =
IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454; IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;
@ -1358,30 +1362,31 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
static void static void
mt7996_mcu_sta_muru_tlv(struct mt7996_dev *dev, struct sk_buff *skb, mt7996_mcu_sta_muru_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
struct ieee80211_vif *vif, struct ieee80211_sta *sta) struct ieee80211_bss_conf *link_conf,
struct ieee80211_link_sta *link_sta)
{ {
struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem; struct ieee80211_he_cap_elem *elem = &link_sta->he_cap.he_cap_elem;
struct sta_rec_muru *muru; struct sta_rec_muru *muru;
struct tlv *tlv; struct tlv *tlv;
if (vif->type != NL80211_IFTYPE_STATION && if (link_conf->vif->type != NL80211_IFTYPE_STATION &&
vif->type != NL80211_IFTYPE_AP) link_conf->vif->type != NL80211_IFTYPE_AP)
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));
muru = (struct sta_rec_muru *)tlv; muru = (struct sta_rec_muru *)tlv;
muru->cfg.mimo_dl_en = vif->bss_conf.eht_mu_beamformer || muru->cfg.mimo_dl_en = link_conf->eht_mu_beamformer ||
vif->bss_conf.he_mu_beamformer || link_conf->he_mu_beamformer ||
vif->bss_conf.vht_mu_beamformer || link_conf->vht_mu_beamformer ||
vif->bss_conf.vht_mu_beamformee; link_conf->vht_mu_beamformee;
muru->cfg.ofdma_dl_en = true; muru->cfg.ofdma_dl_en = true;
if (sta->deflink.vht_cap.vht_supported) if (link_sta->vht_cap.vht_supported)
muru->mimo_dl.vht_mu_bfee = muru->mimo_dl.vht_mu_bfee =
!!(sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE); !!(link_sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
if (!sta->deflink.he_cap.has_he) if (!link_sta->he_cap.has_he)
return; return;
muru->mimo_dl.partial_bw_dl_mimo = muru->mimo_dl.partial_bw_dl_mimo =
@ -1412,49 +1417,50 @@ mt7996_mcu_sta_muru_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
} }
static inline bool static inline bool
mt7996_is_ebf_supported(struct mt7996_phy *phy, struct ieee80211_vif *vif, mt7996_is_ebf_supported(struct mt7996_phy *phy,
struct ieee80211_sta *sta, bool bfee) struct ieee80211_bss_conf *link_conf,
struct ieee80211_link_sta *link_sta, bool bfee)
{ {
int sts = hweight16(phy->mt76->chainmask); int sts = hweight16(phy->mt76->chainmask);
if (vif->type != NL80211_IFTYPE_STATION && if (link_conf->vif->type != NL80211_IFTYPE_STATION &&
vif->type != NL80211_IFTYPE_AP) link_conf->vif->type != NL80211_IFTYPE_AP)
return false; return false;
if (!bfee && sts < 2) if (!bfee && sts < 2)
return false; return false;
if (sta->deflink.eht_cap.has_eht) { if (link_sta->eht_cap.has_eht) {
struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap; struct ieee80211_sta_eht_cap *pc = &link_sta->eht_cap;
struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem; struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
if (bfee) if (bfee)
return vif->bss_conf.eht_su_beamformee && return link_conf->eht_su_beamformee &&
EHT_PHY(CAP0_SU_BEAMFORMER, pe->phy_cap_info[0]); EHT_PHY(CAP0_SU_BEAMFORMER, pe->phy_cap_info[0]);
else else
return vif->bss_conf.eht_su_beamformer && return link_conf->eht_su_beamformer &&
EHT_PHY(CAP0_SU_BEAMFORMEE, pe->phy_cap_info[0]); EHT_PHY(CAP0_SU_BEAMFORMEE, pe->phy_cap_info[0]);
} }
if (sta->deflink.he_cap.has_he) { if (link_sta->he_cap.has_he) {
struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem; struct ieee80211_he_cap_elem *pe = &link_sta->he_cap.he_cap_elem;
if (bfee) if (bfee)
return vif->bss_conf.he_su_beamformee && return link_conf->he_su_beamformee &&
HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]); HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
else else
return vif->bss_conf.he_su_beamformer && return link_conf->he_su_beamformer &&
HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]); HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
} }
if (sta->deflink.vht_cap.vht_supported) { if (link_sta->vht_cap.vht_supported) {
u32 cap = sta->deflink.vht_cap.cap; u32 cap = link_sta->vht_cap.cap;
if (bfee) if (bfee)
return vif->bss_conf.vht_su_beamformee && return link_conf->vht_su_beamformee &&
(cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE); (cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
else else
return vif->bss_conf.vht_su_beamformer && return link_conf->vht_su_beamformer &&
(cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE); (cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
} }
@ -1475,10 +1481,11 @@ mt7996_mcu_sta_sounding_rate(struct sta_rec_bf *bf, struct mt7996_phy *phy)
} }
static void static void
mt7996_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7996_phy *phy, mt7996_mcu_sta_bfer_ht(struct ieee80211_link_sta *link_sta,
struct sta_rec_bf *bf, bool explicit) struct mt7996_phy *phy, struct sta_rec_bf *bf,
bool explicit)
{ {
struct ieee80211_mcs_info *mcs = &sta->deflink.ht_cap.mcs; struct ieee80211_mcs_info *mcs = &link_sta->ht_cap.mcs;
u8 n = 0; u8 n = 0;
bf->tx_mode = MT_PHY_TYPE_HT; bf->tx_mode = MT_PHY_TYPE_HT;
@ -1501,10 +1508,11 @@ mt7996_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7996_phy *phy,
} }
static void static void
mt7996_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7996_phy *phy, mt7996_mcu_sta_bfer_vht(struct ieee80211_link_sta *link_sta,
struct sta_rec_bf *bf, bool explicit) struct mt7996_phy *phy, struct sta_rec_bf *bf,
bool explicit)
{ {
struct ieee80211_sta_vht_cap *pc = &sta->deflink.vht_cap; struct ieee80211_sta_vht_cap *pc = &link_sta->vht_cap;
struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap; struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap;
u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map); u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map);
u8 nss_mcs = mt7996_mcu_get_sta_nss(mcs_map); u8 nss_mcs = mt7996_mcu_get_sta_nss(mcs_map);
@ -1525,24 +1533,24 @@ mt7996_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7996_phy *phy,
bf->ncol = min_t(u8, nss_mcs, bf->nrow); bf->ncol = min_t(u8, nss_mcs, bf->nrow);
bf->ibf_ncol = min_t(u8, MT7996_IBF_MAX_NC, bf->ncol); bf->ibf_ncol = min_t(u8, MT7996_IBF_MAX_NC, bf->ncol);
if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160)
bf->nrow = 1; bf->nrow = 1;
} else { } else {
bf->nrow = tx_ant; bf->nrow = tx_ant;
bf->ncol = min_t(u8, nss_mcs, bf->nrow); bf->ncol = min_t(u8, nss_mcs, bf->nrow);
bf->ibf_ncol = min_t(u8, MT7996_IBF_MAX_NC, nss_mcs); bf->ibf_ncol = min_t(u8, MT7996_IBF_MAX_NC, nss_mcs);
if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160)
bf->ibf_nrow = 1; bf->ibf_nrow = 1;
} }
} }
static void static void
mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, mt7996_mcu_sta_bfer_he(struct ieee80211_link_sta *link_sta,
struct mt7996_phy *phy, struct sta_rec_bf *bf, struct ieee80211_vif *vif, struct mt7996_phy *phy,
bool explicit) struct sta_rec_bf *bf, bool explicit)
{ {
struct ieee80211_sta_he_cap *pc = &sta->deflink.he_cap; struct ieee80211_sta_he_cap *pc = &link_sta->he_cap;
struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem; struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
const struct ieee80211_sta_he_cap *vc = const struct ieee80211_sta_he_cap *vc =
mt76_connac_get_he_phy_cap(phy->mt76, vif); mt76_connac_get_he_phy_cap(phy->mt76, vif);
@ -1571,7 +1579,7 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
bf->ibf_ncol = explicit ? min_t(u8, MT7996_IBF_MAX_NC, bf->ncol) : bf->ibf_ncol = explicit ? min_t(u8, MT7996_IBF_MAX_NC, bf->ncol) :
min_t(u8, MT7996_IBF_MAX_NC, nss_mcs); min_t(u8, MT7996_IBF_MAX_NC, nss_mcs);
if (sta->deflink.bandwidth != IEEE80211_STA_RX_BW_160) if (link_sta->bandwidth != IEEE80211_STA_RX_BW_160)
return; return;
/* go over for 160MHz and 80p80 */ /* go over for 160MHz and 80p80 */
@ -1603,11 +1611,11 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
} }
static void static void
mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif, mt7996_mcu_sta_bfer_eht(struct ieee80211_link_sta *link_sta,
struct mt7996_phy *phy, struct sta_rec_bf *bf, struct ieee80211_vif *vif, struct mt7996_phy *phy,
bool explicit) struct sta_rec_bf *bf, bool explicit)
{ {
struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap; struct ieee80211_sta_eht_cap *pc = &link_sta->eht_cap;
struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem; struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
struct ieee80211_eht_mcs_nss_supp *eht_nss = &pc->eht_mcs_nss_supp; struct ieee80211_eht_mcs_nss_supp *eht_nss = &pc->eht_mcs_nss_supp;
const struct ieee80211_sta_eht_cap *vc = const struct ieee80211_sta_eht_cap *vc =
@ -1631,10 +1639,10 @@ mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
bf->ibf_ncol = explicit ? min_t(u8, MT7996_IBF_MAX_NC, bf->ncol) : bf->ibf_ncol = explicit ? min_t(u8, MT7996_IBF_MAX_NC, bf->ncol) :
min_t(u8, MT7996_IBF_MAX_NC, nss_mcs); min_t(u8, MT7996_IBF_MAX_NC, nss_mcs);
if (sta->deflink.bandwidth < IEEE80211_STA_RX_BW_160) if (link_sta->bandwidth < IEEE80211_STA_RX_BW_160)
return; return;
switch (sta->deflink.bandwidth) { switch (link_sta->bandwidth) {
case IEEE80211_STA_RX_BW_160: case IEEE80211_STA_RX_BW_160:
snd_dim = EHT_PHY(CAP2_SOUNDING_DIM_160MHZ_MASK, ve->phy_cap_info[2]); 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]); sts = EHT_PHY(CAP1_BEAMFORMEE_SS_160MHZ_MASK, pe->phy_cap_info[1]);
@ -1662,13 +1670,15 @@ mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
static void static void
mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb, mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
struct ieee80211_vif *vif, struct ieee80211_sta *sta) struct ieee80211_bss_conf *link_conf,
struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link)
{ {
#define EBF_MODE BIT(0) #define EBF_MODE BIT(0)
#define IBF_MODE BIT(1) #define IBF_MODE BIT(1)
#define BF_MAT_ORDER 4 #define BF_MAT_ORDER 4
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct ieee80211_vif *vif = link_conf->vif;
struct mt7996_phy *phy = mvif->deflink.phy; struct mt7996_phy *phy = link->phy;
int tx_ant = hweight16(phy->mt76->chainmask) - 1; int tx_ant = hweight16(phy->mt76->chainmask) - 1;
struct sta_rec_bf *bf; struct sta_rec_bf *bf;
struct tlv *tlv; struct tlv *tlv;
@ -1680,10 +1690,10 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
}; };
bool ebf; bool ebf;
if (!(sta->deflink.ht_cap.ht_supported || sta->deflink.he_cap.has_he)) if (!(link_sta->ht_cap.ht_supported || link_sta->he_cap.has_he))
return; return;
ebf = mt7996_is_ebf_supported(phy, vif, sta, false); ebf = mt7996_is_ebf_supported(phy, link_conf, link_sta, false);
if (!ebf && !dev->ibf) if (!ebf && !dev->ibf)
return; return;
@ -1694,28 +1704,29 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
* vht: support eBF and iBF * vht: support eBF and iBF
* ht: iBF only, since mac80211 lacks of eBF support * ht: iBF only, since mac80211 lacks of eBF support
*/ */
if (sta->deflink.eht_cap.has_eht) if (link_sta->eht_cap.has_eht)
mt7996_mcu_sta_bfer_eht(sta, vif, phy, bf, ebf); mt7996_mcu_sta_bfer_eht(link_sta, vif, link->phy, bf, ebf);
else if (sta->deflink.he_cap.has_he) else if (link_sta->he_cap.has_he)
mt7996_mcu_sta_bfer_he(sta, vif, phy, bf, ebf); mt7996_mcu_sta_bfer_he(link_sta, vif, link->phy, bf, ebf);
else if (sta->deflink.vht_cap.vht_supported) else if (link_sta->vht_cap.vht_supported)
mt7996_mcu_sta_bfer_vht(sta, phy, bf, ebf); mt7996_mcu_sta_bfer_vht(link_sta, link->phy, bf, ebf);
else if (sta->deflink.ht_cap.ht_supported) else if (link_sta->ht_cap.ht_supported)
mt7996_mcu_sta_bfer_ht(sta, phy, bf, ebf); mt7996_mcu_sta_bfer_ht(link_sta, link->phy, bf, ebf);
else else
return; return;
bf->bf_cap = ebf ? EBF_MODE : (dev->ibf ? IBF_MODE : 0); bf->bf_cap = ebf ? EBF_MODE : (dev->ibf ? IBF_MODE : 0);
if (is_mt7992(&dev->mt76) && tx_ant == 4) if (is_mt7992(&dev->mt76) && tx_ant == 4)
bf->bf_cap |= IBF_MODE; bf->bf_cap |= IBF_MODE;
bf->bw = sta->deflink.bandwidth;
bf->ibf_dbw = sta->deflink.bandwidth; bf->bw = link_sta->bandwidth;
bf->ibf_dbw = link_sta->bandwidth;
bf->ibf_nrow = tx_ant; bf->ibf_nrow = tx_ant;
if (sta->deflink.eht_cap.has_eht || sta->deflink.he_cap.has_he) if (link_sta->eht_cap.has_eht || link_sta->he_cap.has_he)
bf->ibf_timeout = is_mt7996(&dev->mt76) ? MT7996_IBF_TIMEOUT : bf->ibf_timeout = is_mt7996(&dev->mt76) ? MT7996_IBF_TIMEOUT :
MT7992_IBF_TIMEOUT; MT7992_IBF_TIMEOUT;
else if (!ebf && sta->deflink.bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->ncol) else if (!ebf && link_sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->ncol)
bf->ibf_timeout = MT7996_IBF_TIMEOUT_LEGACY; bf->ibf_timeout = MT7996_IBF_TIMEOUT_LEGACY;
else else
bf->ibf_timeout = MT7996_IBF_TIMEOUT; bf->ibf_timeout = MT7996_IBF_TIMEOUT;
@ -1729,7 +1740,7 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
matrix[bf->nrow][bf->ncol] : 0; matrix[bf->nrow][bf->ncol] : 0;
} }
switch (sta->deflink.bandwidth) { switch (link_sta->bandwidth) {
case IEEE80211_STA_RX_BW_160: case IEEE80211_STA_RX_BW_160:
case IEEE80211_STA_RX_BW_80: case IEEE80211_STA_RX_BW_80:
bf->mem_total = bf->mem_20m * 2; bf->mem_total = bf->mem_20m * 2;
@ -1745,31 +1756,32 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
static void static void
mt7996_mcu_sta_bfee_tlv(struct mt7996_dev *dev, struct sk_buff *skb, mt7996_mcu_sta_bfee_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
struct ieee80211_vif *vif, struct ieee80211_sta *sta) struct ieee80211_bss_conf *link_conf,
struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link)
{ {
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct mt7996_phy *phy = link->phy;
struct mt7996_phy *phy = mvif->deflink.phy;
int tx_ant = hweight8(phy->mt76->antenna_mask) - 1; int tx_ant = hweight8(phy->mt76->antenna_mask) - 1;
struct sta_rec_bfee *bfee; struct sta_rec_bfee *bfee;
struct tlv *tlv; struct tlv *tlv;
u8 nrow = 0; u8 nrow = 0;
if (!(sta->deflink.vht_cap.vht_supported || sta->deflink.he_cap.has_he)) if (!(link_sta->vht_cap.vht_supported || link_sta->he_cap.has_he))
return; return;
if (!mt7996_is_ebf_supported(phy, vif, sta, true)) if (!mt7996_is_ebf_supported(phy, link_conf, link_sta, true))
return; return;
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee)); tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee));
bfee = (struct sta_rec_bfee *)tlv; bfee = (struct sta_rec_bfee *)tlv;
if (sta->deflink.he_cap.has_he) { if (link_sta->he_cap.has_he) {
struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem; struct ieee80211_he_cap_elem *pe = &link_sta->he_cap.he_cap_elem;
nrow = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK, nrow = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,
pe->phy_cap_info[5]); pe->phy_cap_info[5]);
} else if (sta->deflink.vht_cap.vht_supported) { } else if (link_sta->vht_cap.vht_supported) {
struct ieee80211_sta_vht_cap *pc = &sta->deflink.vht_cap; struct ieee80211_sta_vht_cap *pc = &link_sta->vht_cap;
nrow = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK, nrow = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK,
pc->cap); pc->cap);
@ -2131,7 +2143,7 @@ int mt7996_mcu_add_rate_ctrl(struct mt7996_dev *dev, struct ieee80211_vif *vif,
* update sta_rec_he here. * update sta_rec_he here.
*/ */
if (changed) if (changed)
mt7996_mcu_sta_he_tlv(skb, sta); mt7996_mcu_sta_he_tlv(skb, &sta->deflink, &mvif->deflink);
/* sta_rec_ra accommodates BW, NSS and only MCS range format /* sta_rec_ra accommodates BW, NSS and only MCS range format
* i.e 0-{7,8,9} for VHT. * i.e 0-{7,8,9} for VHT.
@ -2179,67 +2191,67 @@ mt7996_mcu_add_group(struct mt7996_dev *dev, struct ieee80211_vif *vif,
sizeof(req), true); sizeof(req), true);
} }
int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif, int mt7996_mcu_add_sta(struct mt7996_dev *dev,
struct mt76_vif_link *mlink, struct ieee80211_bss_conf *link_conf,
struct ieee80211_sta *sta, int conn_state, bool newly) struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link,
struct mt7996_sta_link *msta_link,
int conn_state, bool newly)
{ {
struct ieee80211_link_sta *link_sta = NULL; struct mt76_wcid *wcid = msta_link ? &msta_link->wcid : link->mt76.wcid;
struct mt76_wcid *wcid = mlink->wcid; struct ieee80211_sta *sta = link_sta ? link_sta->sta : NULL;
struct sk_buff *skb; struct sk_buff *skb;
int ret; int ret;
if (sta) { skb = __mt76_connac_mcu_alloc_sta_req(&dev->mt76, &link->mt76, wcid,
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
struct mt7996_sta_link *msta_link = &msta->deflink;
wcid = &msta_link->wcid;
link_sta = &sta->deflink;
}
skb = __mt76_connac_mcu_alloc_sta_req(&dev->mt76, mlink, wcid,
MT7996_STA_UPDATE_MAX_SIZE); MT7996_STA_UPDATE_MAX_SIZE);
if (IS_ERR(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
/* starec basic */ /* starec basic */
mt76_connac_mcu_sta_basic_tlv(&dev->mt76, skb, &vif->bss_conf, link_sta, mt76_connac_mcu_sta_basic_tlv(&dev->mt76, skb, link_conf, link_sta,
conn_state, newly); conn_state, newly);
if (conn_state == CONN_STATE_DISCONNECT) if (conn_state == CONN_STATE_DISCONNECT)
goto out; goto out;
/* starec hdr trans */ /* starec hdr trans */
mt7996_mcu_sta_hdr_trans_tlv(dev, skb, vif, wcid); mt7996_mcu_sta_hdr_trans_tlv(dev, skb, link_conf->vif, wcid);
/* starec tx proc */ /* starec tx proc */
mt7996_mcu_sta_tx_proc_tlv(skb); mt7996_mcu_sta_tx_proc_tlv(skb);
/* tag order is in accordance with firmware dependency. */ /* tag order is in accordance with firmware dependency. */
if (sta) { if (link_sta) {
/* starec hdrt mode */ /* starec hdrt mode */
mt7996_mcu_sta_hdrt_tlv(dev, skb); mt7996_mcu_sta_hdrt_tlv(dev, skb);
/* starec bfer */ if (conn_state == CONN_STATE_CONNECT) {
mt7996_mcu_sta_bfer_tlv(dev, skb, vif, sta); /* starec bfer */
mt7996_mcu_sta_bfer_tlv(dev, skb, link_conf, link_sta,
link);
/* starec bfee */
mt7996_mcu_sta_bfee_tlv(dev, skb, link_conf, link_sta,
link);
}
/* starec ht */ /* starec ht */
mt7996_mcu_sta_ht_tlv(skb, sta); mt7996_mcu_sta_ht_tlv(skb, link_sta);
/* starec vht */ /* starec vht */
mt7996_mcu_sta_vht_tlv(skb, sta); mt7996_mcu_sta_vht_tlv(skb, link_sta);
/* starec uapsd */ /* starec uapsd */
mt76_connac_mcu_sta_uapsd(skb, vif, sta); mt76_connac_mcu_sta_uapsd(skb, link_conf->vif, sta);
/* starec amsdu */ /* starec amsdu */
mt7996_mcu_sta_amsdu_tlv(dev, skb, vif, sta); mt7996_mcu_sta_amsdu_tlv(dev, skb, link_conf->vif, link_sta,
msta_link);
/* starec he */ /* starec he */
mt7996_mcu_sta_he_tlv(skb, sta); mt7996_mcu_sta_he_tlv(skb, link_sta, link);
/* starec he 6g*/ /* starec he 6g*/
mt7996_mcu_sta_he_6g_tlv(skb, sta); mt7996_mcu_sta_he_6g_tlv(skb, link_sta);
/* starec eht */ /* starec eht */
mt7996_mcu_sta_eht_tlv(skb, sta); mt7996_mcu_sta_eht_tlv(skb, link_sta);
/* starec muru */ /* starec muru */
mt7996_mcu_sta_muru_tlv(dev, skb, vif, sta); mt7996_mcu_sta_muru_tlv(dev, skb, link_conf, link_sta);
/* starec bfee */
mt7996_mcu_sta_bfee_tlv(dev, skb, vif, sta);
} }
ret = mt7996_mcu_add_group(dev, vif, sta); ret = mt7996_mcu_add_group(dev, link_conf->vif, sta);
if (ret) { if (ret) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
return ret; return ret;

9
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
View File

@ -572,9 +572,12 @@ int mt7996_mcu_add_dev_info(struct mt7996_phy *phy, struct ieee80211_vif *vif,
int mt7996_mcu_add_bss_info(struct mt7996_phy *phy, struct ieee80211_vif *vif, int mt7996_mcu_add_bss_info(struct mt7996_phy *phy, struct ieee80211_vif *vif,
struct ieee80211_bss_conf *link_conf, struct ieee80211_bss_conf *link_conf,
struct mt76_vif_link *mlink, int enable); struct mt76_vif_link *mlink, int enable);
int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif, int mt7996_mcu_add_sta(struct mt7996_dev *dev,
struct mt76_vif_link *mlink, struct ieee80211_bss_conf *link_conf,
struct ieee80211_sta *sta, int conn_state, bool newly); struct ieee80211_link_sta *link_sta,
struct mt7996_vif_link *link,
struct mt7996_sta_link *msta_link,
int conn_state, bool newly);
int mt7996_mcu_add_tx_ba(struct mt7996_dev *dev, int mt7996_mcu_add_tx_ba(struct mt7996_dev *dev,
struct ieee80211_ampdu_params *params, struct ieee80211_ampdu_params *params,
bool add); bool add);