mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 08:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: mt7925: program BA state on active links

Browse Source 
With MLO, traffic for one TID can be sent on any active link. Programming
BA state only on the default link leaves the other active links out of
sync.

Program BA state on all active links instead.

Fixes: 766ea2cf5a ("Revert "wifi: mt76: mt7925: Update mt7925_mcu_uni_[tx,rx]_ba for MLO"")
Tested-by: Yao Ting Hsieh <yao-ting.hsieh@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20260425154721.738101-3-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Sean Wang
2026-04-25 10:47:21 -05:00
committed by Felix Fietkau
parent a13d341139
commit 733d8aa8d0
3 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/mediatek/mt76/mt7925/main.c
View File

@@ -1410,22 +1410,22 @@ mt7925_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
case IEEE80211_AMPDU_RX_START:
mt76_rx_aggr_start(&dev->mt76, &msta->deflink.wcid, tid, ssn,
params->buf_size);
mt7925_mcu_uni_rx_ba(dev, params, true);
mt7925_mcu_uni_rx_ba(dev, params, vif, true);
break;
case IEEE80211_AMPDU_RX_STOP:
mt76_rx_aggr_stop(&dev->mt76, &msta->deflink.wcid, tid);
mt7925_mcu_uni_rx_ba(dev, params, false);
mt7925_mcu_uni_rx_ba(dev, params, vif, false);
break;
case IEEE80211_AMPDU_TX_OPERATIONAL:
mtxq->aggr = true;
mtxq->send_bar = false;
mt7925_mcu_uni_tx_ba(dev, params, true);
mt7925_mcu_uni_tx_ba(dev, params, vif, true);
break;
case IEEE80211_AMPDU_TX_STOP_FLUSH:
case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
mtxq->aggr = false;
clear_bit(tid, &msta->deflink.wcid.ampdu_state);
mt7925_mcu_uni_tx_ba(dev, params, false);
mt7925_mcu_uni_tx_ba(dev, params, vif, false);
break;
case IEEE80211_AMPDU_TX_START:
set_bit(tid, &msta->deflink.wcid.ampdu_state);
@@ -1434,7 +1434,7 @@ mt7925_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
case IEEE80211_AMPDU_TX_STOP_CONT:
mtxq->aggr = false;
clear_bit(tid, &msta->deflink.wcid.ampdu_state);
mt7925_mcu_uni_tx_ba(dev, params, false);
mt7925_mcu_uni_tx_ba(dev, params, vif, false);
ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break;
}

67
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
View File

@@ -682,32 +682,69 @@ mt7925_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,
MCU_UNI_CMD(STA_REC_UPDATE), true);
}
/** starec & wtbl **/
int mt7925_mcu_uni_tx_ba(struct mt792x_dev *dev,
struct ieee80211_ampdu_params *params,
bool enable)
struct ieee80211_vif *vif, bool enable)
{
struct mt792x_sta *msta = (struct mt792x_sta *)params->sta->drv_priv;
struct mt792x_vif *mvif = msta->vif;
struct ieee80211_sta *sta = params->sta;
struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
struct ieee80211_link_sta *link_sta;
unsigned int link_id;
if (enable && !params->amsdu)
msta->deflink.wcid.amsdu = false;
for_each_sta_active_link(vif, sta, link_sta, link_id) {
struct mt792x_link_sta *mlink;
struct mt792x_bss_conf *mconf;
int ret;
return mt7925_mcu_sta_ba(&dev->mt76, &mvif->bss_conf.mt76, params,
&msta->deflink.wcid,
enable, true);
mlink = mt792x_sta_to_link(msta, link_id);
if (!mlink)
return -EINVAL;
mconf = mt792x_vif_to_link(msta->vif, link_id);
if (!mconf)
return -EINVAL;
if (enable && !params->amsdu)
mlink->wcid.amsdu = false;
ret = mt7925_mcu_sta_ba(&dev->mt76, &mconf->mt76, params,
&mlink->wcid, enable, true);
if (ret)
return ret;
}
return 0;
}
int mt7925_mcu_uni_rx_ba(struct mt792x_dev *dev,
struct ieee80211_ampdu_params *params,
bool enable)
struct ieee80211_vif *vif, bool enable)
{
struct mt792x_sta *msta = (struct mt792x_sta *)params->sta->drv_priv;
struct mt792x_vif *mvif = msta->vif;
struct ieee80211_sta *sta = params->sta;
struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
struct ieee80211_link_sta *link_sta;
unsigned int link_id;
return mt7925_mcu_sta_ba(&dev->mt76, &mvif->bss_conf.mt76, params,
&msta->deflink.wcid,
enable, false);
for_each_sta_active_link(vif, sta, link_sta, link_id) {
struct mt792x_link_sta *mlink;
struct mt792x_bss_conf *mconf;
int ret;
mlink = mt792x_sta_to_link(msta, link_id);
if (!mlink)
return -EINVAL;
mconf = mt792x_vif_to_link(msta->vif, link_id);
if (!mconf)
return -EINVAL;
ret = mt7925_mcu_sta_ba(&dev->mt76, &mconf->mt76, params,
&mlink->wcid, enable, false);
if (ret)
return ret;
}
return 0;
}
static int mt7925_mcu_read_eeprom(struct mt792x_dev *dev, u32 offset, u8 *val)

4
drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
View File

@@ -318,10 +318,10 @@ int mt7925_mcu_set_beacon_filter(struct mt792x_dev *dev,
bool enable);
int mt7925_mcu_uni_tx_ba(struct mt792x_dev *dev,
struct ieee80211_ampdu_params *params,
bool enable);
struct ieee80211_vif *vif, bool enable);
int mt7925_mcu_uni_rx_ba(struct mt792x_dev *dev,
struct ieee80211_ampdu_params *params,
bool enable);
struct ieee80211_vif *vif, bool enable);
void mt7925_mlo_pm_work(struct work_struct *work);
void mt7925_scan_work(struct work_struct *work);
void mt7925_roc_work(struct work_struct *work);