mt76: mt7915: clean up station stats polling and rate control update
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/8 mt76: mt7915: clean up station stats polling and rate control update
Queueing a per-sta work item from the tx free path can become very expensive under load. This work is only supposed to pull rate control stats every second and deal with rate control changes.
Additionally, the rate control update code was wrong, because it was confusing bit masks and bit numbers in test_bit.
Fix this by introducing a dedicated device work item for rate control updates, and by polling station stats from the phy mac work. Stations requiring polling or rate control updates are added to lists protected by dev->sta_poll_lock.
--- .../wireless/mediatek/mt76/mt7915/debugfs.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/init.c | 4 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 83 +++++++++++++------ .../net/wireless/mediatek/mt76/mt7915/main.c | 27 +++--- .../wireless/mediatek/mt76/mt7915/mt7915.h | 11 ++- 5 files changed, 88 insertions(+), 39 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +1 -1
@@ -414,7 +414,7 @@ static int mt7915_sta_fixed_rate_set(void *data, u64 rate)struct ieee80211_sta *sta = data;struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; -return mt7915_mcu_set_fixed_rate (msta->vif->dev, sta, rate); +return mt7915_mcu_set_fixed_rate (msta->vif->phy->dev, sta, rate); } DEFINE_DEBUGFS_ATTRIBUTE(fops_fixed_rate, NULL,
drivers/net/wireless/mediatek/mt76/mt7915/init.c +4 -0
@@ -618,6 +618,7 @@ int mt7915_register_ext_phy(struct mt7915_dev *dev) mphy->antenna_mask =BIT (hweight8 (phy->chainmask)) -1 ;mt7915_init_wiphy (mphy->hw); +INIT_LIST_HEAD (&phy->stats_list);INIT_DELAYED_WORK (&phy->mac_work, mt7915_mac_work);/*
@@ -658,7 +659,10 @@ int mt7915_register_device(struct mt7915_dev *dev) dev->phy.dev = dev; dev->phy.mt76 = &dev->mt76.phy; dev->mt76.phy.priv = &dev->phy; +INIT_LIST_HEAD (&dev->phy.stats_list); +INIT_WORK (&dev->rc_work, mt7915_mac_sta_rc_work);INIT_DELAYED_WORK (&dev->phy.mac_work, mt7915_mac_work); +INIT_LIST_HEAD (&dev->sta_rc_list);INIT_LIST_HEAD (&dev->sta_poll_list);spin_lock_init (&dev->sta_poll_lock);
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +59 -24
118 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/main.c +16 -11
@@ -137,7 +137,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, goto out; } mvif->omac_idx = idx; - mvif->dev = dev; + mvif->phy = phy; mvif->band_idx = ext_phy;if (ext_phy)
@@ -155,6 +155,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, idx =MT7915_WTBL_RESERVED - mvif->idx; +INIT_LIST_HEAD (&mvif->sta.rc_list); +INIT_LIST_HEAD (&mvif->sta.stats_list);INIT_LIST_HEAD (&mvif->sta.poll_list); mvif->sta.wcid.idx = idx; mvif->sta.wcid.ext_phy = mvif->band_idx;
@@ -493,8 +495,9 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,if (idx <0 )return -ENOSPC ; +INIT_LIST_HEAD (&msta->rc_list); +INIT_LIST_HEAD (&msta->stats_list);INIT_LIST_HEAD (&msta->poll_list); -INIT_WORK (&msta->stats_work, mt7915_mac_sta_stats_work);spin_lock_init (&msta->ampdu_lock); msta->vif = mvif; msta->wcid.sta =1 ;
@@ -528,6 +531,10 @@ void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,spin_lock_bh (&dev->sta_poll_lock);if (!list_empty (&msta->poll_list))list_del_init (&msta->poll_list); +if (!list_empty (&msta->stats_list)) +list_del_init (&msta->stats_list); +if (!list_empty (&msta->rc_list)) +list_del_init (&msta->rc_list);spin_unlock_bh (&dev->sta_poll_lock); }
@@ -789,18 +796,16 @@ mt7915_sta_rc_update(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u32 changed) { +struct mt7915_dev *dev =mt7915_hw_dev (hw);struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; -rcu_read_lock (); - sta =ieee80211_find_sta (vif, sta->addr); -if (!sta) { -rcu_read_unlock (); -return ; - } -rcu_read_unlock (); +spin_lock_bh (&dev->sta_poll_lock); + msta->stats.changed |= changed; +if (list_empty (&msta->rc_list)) +list_add_tail (&msta->rc_list, &dev->sta_rc_list); +spin_unlock_bh (&dev->sta_poll_lock); -set_bit (changed, &msta->stats.changed); -ieee80211_queue_work (hw, &msta->stats_work); +ieee80211_queue_work (hw, &dev->rc_work); }const struct ieee80211_ops mt7915_ops = {
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +8 -3
@@ -79,11 +79,12 @@ struct mt7915_sta {struct mt7915_vif *vif; +struct list_head stats_list;struct list_head poll_list; +struct list_head rc_list;u32 airtime_ac[8 ];struct mt7915_sta_stats stats; -struct work_struct stats_work;spinlock_t ampdu_lock;enum mt7915_ampdu_state ampdu_state[IEEE80211_NUM_TIDS ];
@@ -96,7 +97,7 @@ struct mt7915_vif {u8 wmm_idx;struct mt7915_sta sta; -struct mt7915_dev *dev; +struct mt7915_phy *phy;struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS ]; };
@@ -131,9 +132,11 @@ struct mt7915_phy {u32 ampdu_ref;struct mib_stats mib; +struct list_head stats_list;struct delayed_work mac_work;u8 mac_work_count; +u8 sta_work_count; };struct mt7915_dev {
@@ -147,10 +150,12 @@ struct mt7915_dev {u16 chainmask;struct work_struct init_work; +struct work_struct rc_work;struct work_struct reset_work;wait_queue_head_t reset_wait;u32 reset_state; +struct list_head sta_rc_list;struct list_head sta_poll_list;spinlock_t sta_poll_lock;
@@ -455,7 +460,7 @@ void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, struct ieee80211_sta *sta);void mt7915_mac_work (struct work_struct *work);void mt7915_mac_reset_work (struct work_struct *work); -void mt7915_mac_sta_stats_work (struct work_struct *work); +void mt7915_mac_sta_rc_work (struct work_struct *work); int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, enum mt76_txq_id qid, struct mt76_wcid *wcid, struct ieee80211_sta *sta,
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/8 mt76: mt7915: increase tx retry count
Set it to 15 to match reference driver
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -1
@@ -571,7 +571,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,bool ext_phy = info->hw_queue &MT_TX_HW_QUEUE_EXT_PHY ;u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx =0 , wmm_idx =0 ;__le16 fc = hdr->frame_control; -u16 tx_count =4 , seqno =0 ; +u16 tx_count =15 , seqno =0 ;u32 val;if (vif) {
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 3/8 mt76: mt7915: enable offloading of sequence number assignment
In reply to Felix FietkauPreparation for supporting more offload features
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 49 +++++++++++++------ .../net/wireless/mediatek/mt76/mt7915/main.c | 1 - 2 files changed, 33 insertions(+), 17 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +33 -16
@@ -565,6 +565,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;bool multicast =is_multicast_ether_addr (hdr->addr1);struct ieee80211_vif *vif = info->control.vif;struct mt76_phy *mphy = &dev->mphy;
@@ -572,6 +573,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx =0 , wmm_idx =0 ;__le16 fc = hdr->frame_control;u16 tx_count =15 , seqno =0 ; +u8 tid = skb->priority &IEEE80211_QOS_CTL_TID_MASK ;u32 val;if (vif) {
@@ -587,6 +589,10 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, fc_type = (le16_to_cpu (fc) &IEEE80211_FCTL_FTYPE ) >>2 ; fc_stype = (le16_to_cpu (fc) &IEEE80211_FCTL_STYPE ) >>4 ; + txwi[4 ] =0 ; + txwi[5 ] =0 ; + txwi[6 ] =0 ; +if (beacon) { p_fmt =MT_TX_TYPE_FW ; q_idx =MT_LMAC_BCN0 ;
@@ -599,6 +605,20 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,mt7915_lmac_mapping (dev,skb_get_queue_mapping (skb)); } +if (ieee80211_is_action (fc) && + mgmt->u.action.category ==WLAN_CATEGORY_BACK && + mgmt->u.action.u.addba_req.action_code ==WLAN_ACTION_ADDBA_REQ ) { +u16 capab =le16_to_cpu (mgmt->u.action.u.addba_req.capab); + + txwi[5 ] |=cpu_to_le32 (MT_TXD5_ADD_BA ); + tid = (capab >>2 ) &IEEE80211_QOS_CTL_TID_MASK ; + }else if (ieee80211_is_back_req (hdr->frame_control)) { +struct ieee80211_bar *bar = (struct ieee80211_bar *)hdr; +u16 control =le16_to_cpu (bar->control); + + tid =FIELD_GET (IEEE80211_BAR_CTRL_TID_INFO_MASK , control); + } + val =FIELD_PREP (MT_TXD0_TX_BYTES , skb->len +MT_TXD_SIZE ) |FIELD_PREP (MT_TXD0_PKT_FMT , p_fmt) |FIELD_PREP (MT_TXD0_Q_IDX , q_idx);
@@ -609,8 +629,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,FIELD_PREP (MT_TXD1_HDR_FORMAT ,MT_HDR_FORMAT_802_11 ) |FIELD_PREP (MT_TXD1_HDR_INFO ,ieee80211_get_hdrlen_from_skb (skb) /2 ) | -FIELD_PREP (MT_TXD1_TID , - skb->priority &IEEE80211_QOS_CTL_TID_MASK ) | +FIELD_PREP (MT_TXD1_TID , tid) |FIELD_PREP (MT_TXD1_OWN_MAC , omac_idx);if (ext_phy && q_idx >=MT_LMAC_ALTX0 && q_idx <=MT_LMAC_BCN0 )
@@ -634,10 +653,6 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, } txwi[2 ] =cpu_to_le32 (val); - txwi[4 ] =0 ; - txwi[5 ] =0 ; - txwi[6 ] =0 ; -if (!ieee80211_is_data (fc) || multicast) {u16 rate;
@@ -668,17 +683,19 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, txwi[7 ] =cpu_to_le32 (val); val =FIELD_PREP (MT_TXD3_REM_TX_COUNT , tx_count); -if (ieee80211_is_data_qos (fc)) { - seqno =IEEE80211_SEQ_TO_SN (le16_to_cpu (hdr->seq_ctrl)); - val |=MT_TXD3_SN_VALID ; - }else if (ieee80211_is_back_req (fc)) { -struct ieee80211_bar *bar; - - bar = (struct ieee80211_bar *)skb->data; - seqno =IEEE80211_SEQ_TO_SN (le16_to_cpu (bar->start_seq_num)); - val |=MT_TXD3_SN_VALID ; +if (info->flags &IEEE80211_TX_CTL_INJECTED ) { + seqno =le16_to_cpu (hdr->seq_ctrl); + +if (ieee80211_is_back_req (hdr->frame_control)) { +struct ieee80211_bar *bar; + + bar = (struct ieee80211_bar *)skb->data; + seqno =le16_to_cpu (bar->start_seq_num); + } + + val |=MT_TXD3_SN_VALID | +FIELD_PREP (MT_TXD3_SEQ ,IEEE80211_SEQ_TO_SN (seqno)); } - val |=FIELD_PREP (MT_TXD3_SEQ , seqno); txwi[3 ] |=cpu_to_le32 (val); }
drivers/net/wireless/mediatek/mt76/mt7915/main.c +0 -1
@@ -620,7 +620,6 @@ mt7915_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mt7915_mcu_add_tx_ba (dev, params, false);break ;case IEEE80211_AMPDU_TX_START : - mtxq->agg_ssn =IEEE80211_SN_TO_SEQ (ssn);mt7915_set_aggr_state (msta, tid,MT7915_AGGR_START ); ret =IEEE80211_AMPDU_TX_START_IMMEDIATE ;break ;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 4/8 mt76: move mt76_check_agg_ssn to driver tx_prepare calls
In reply to Felix Fietkaumt7615 and newer drivers do not need this, since they use sequence number offload Moving this code also reduces the number of callsites to make it easier to review
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + .../net/wireless/mediatek/mt76/mt7603/mac.c | 2 + .../net/wireless/mediatek/mt76/mt76x02_mac.c | 2 + drivers/net/wireless/mediatek/mt76/tx.c | 38 +++++++------------ 4 files changed, 18 insertions(+), 25 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -914,6 +914,7 @@ void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq);void mt76_wake_tx_queue (struct ieee80211_hw *hw,struct ieee80211_txq *txq);void mt76_stop_tx_queues (struct mt76_dev *dev,struct ieee80211_sta *sta,bool send_bar); +void mt76_tx_check_agg_ssn (struct ieee80211_sta *sta,struct sk_buff *skb);void mt76_txq_schedule (struct mt76_phy *phy,enum mt76_txq_id qid);void mt76_txq_schedule_all (struct mt76_phy *phy);void mt76_tx_tasklet (unsigned long data);
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +2 -0
@@ -1036,6 +1036,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, IEEE80211_TX_CTL_CLEAR_PS_FILT)) || (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE))mt7603_wtbl_set_ps (dev, msta, false); + +mt76_tx_check_agg_ssn (sta, tx_info->skb); } pid =mt76_tx_status_skb_add (mdev, wcid, tx_info->skb);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +2 -0
@@ -349,6 +349,8 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,memset (txwi,0 ,sizeof (*txwi)); +mt76_tx_check_agg_ssn (sta, skb); +if (!info->control.hw_key && wcid && wcid->hw_key_idx !=0xff &&ieee80211_has_protected (hdr->frame_control)) { wcid =NULL ;
drivers/net/wireless/mediatek/mt76/tx.c +13 -25
@@ -83,17 +83,27 @@ mt76_txq_get_qid(struct ieee80211_txq *txq)return txq->ac; } -static void -mt76_check_agg_ssn (struct mt76_txq *mtxq,struct sk_buff *skb) +void +mt76_tx_check_agg_ssn (struct ieee80211_sta *sta,struct sk_buff *skb) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +struct ieee80211_txq *txq; +struct mt76_txq *mtxq; +u8 tid; -if (!ieee80211_is_data_qos (hdr->frame_control) || +if (!sta || !ieee80211_is_data_qos (hdr->frame_control) || !ieee80211_is_data_present (hdr->frame_control))return ; + tid = skb->priority &IEEE80211_QOS_CTL_TAG1D_MASK ; + txq = sta->txq[tid]; + mtxq = (struct mt76_txq *)txq->drv_priv; +if (!mtxq->aggr) +return ; + mtxq->agg_ssn =le16_to_cpu (hdr->seq_ctrl) +0x10 ; } +EXPORT_SYMBOL_GPL (mt76_tx_check_agg_ssn);void mt76_tx_status_lock (struct mt76_dev *dev,struct sk_buff_head *list)
@@ -288,19 +298,6 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,ieee80211_get_tx_rates (info->control.vif, sta, skb, info->control.rates,1 ); -if (sta &&ieee80211_is_data_qos (hdr->frame_control)) { -struct ieee80211_txq *txq; -struct mt76_txq *mtxq; -u8 tid; - - tid = skb->priority &IEEE80211_QOS_CTL_TID_MASK ; - txq = sta->txq[tid]; - mtxq = (struct mt76_txq *)txq->drv_priv; - -if (mtxq->aggr) -mt76_check_agg_ssn (mtxq, skb); - } -if (ext_phy) info->hw_queue |=MT_TX_HW_QUEUE_EXT_PHY ;
@@ -390,9 +387,6 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,if (!skb)break ; -if (mtxq->aggr) -mt76_check_agg_ssn (mtxq, skb); - nframes--;if (last_skb)mt76_queue_ps_skb (dev, sta, last_skb, false);
@@ -446,9 +440,6 @@ mt76_txq_send_burst(struct mt76_phy *phy, struct mt76_sw_queue *sq, ampdu =IEEE80211_SKB_CB (skb)->flags &IEEE80211_TX_CTL_AMPDU ; limit = ampdu ?16 :3 ; -if (ampdu) -mt76_check_agg_ssn (mtxq, skb); - idx = dev->queue_ops->tx_queue_skb (dev, qid, skb, wcid, txq->sta);if (idx <0 )
@@ -479,9 +470,6 @@ mt76_txq_send_burst(struct mt76_phy *phy, struct mt76_sw_queue *sq, info->control.rates[0 ] = tx_rate; -if (cur_ampdu) -mt76_check_agg_ssn (mtxq, skb); - idx = dev->queue_ops->tx_queue_skb (dev, qid, skb, wcid, txq->sta);if (idx <0 )
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 5/8 mt76: mt7615: remove mtxq->agg_ssn assignment
In reply to Felix FietkauIt is not used anywhere for this driver
--- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +0 -1
@@ -818,7 +818,6 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,case IEEE80211_AMPDU_TX_START : ssn =mt7615_mac_get_sta_tid_sn (dev, msta->wcid.idx, tid); params->ssn = ssn; - mtxq->agg_ssn =IEEE80211_SN_TO_SEQ (ssn); ret =IEEE80211_AMPDU_TX_START_IMMEDIATE ;break ;case IEEE80211_AMPDU_TX_STOP_CONT :
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 6/8 mt76: mt7915: simplify aggregation session check
In reply to Felix FietkauUse the txwi data as primary source information to avoid touching skb data Use bitfield instead of state variable + spinlock
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 44 +++++++------------ .../net/wireless/mediatek/mt76/mt7915/main.c | 8 ++-- .../wireless/mediatek/mt76/mt7915/mt7915.h | 19 +------- 3 files changed, 19 insertions(+), 52 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +15 -29
@@ -765,45 +765,29 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,return 0 ; } -static inline bool -mt7915_tx_check_aggr_tid (struct mt7915_sta *msta,u8 tid) -{ -bool ret = false; - -spin_lock_bh (&msta->ampdu_lock); -if (msta->ampdu_state[tid] ==MT7915_AGGR_STOP ) - ret = true; -spin_unlock_bh (&msta->ampdu_lock); - -return ret; -} -static void -mt7915_tx_check_aggr (struct ieee80211_sta *sta,struct sk_buff *skb) +mt7915_tx_check_aggr (struct ieee80211_sta *sta,__le32 *txwi) { -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct mt7915_sta *msta; -u16 tid; - -if (!sta->ht_cap.ht_supported) -return ; +u16 fc, tid; +u32 val; -if (skb_get_queue_mapping (skb) ==IEEE80211_AC_VO ) +if (!sta || !sta->ht_cap.ht_supported)return ; -if (unlikely (!ieee80211_is_data_qos (hdr->frame_control))) + tid =FIELD_GET (MT_TXD1_TID ,le32_to_cpu (txwi[1 ])); +if (tid >=6 )/* skip VO queue */ return ; -if (unlikely (skb->protocol ==cpu_to_be16 (ETH_P_PAE ))) + val =le32_to_cpu (txwi[2 ]); + fc =FIELD_GET (MT_TXD2_FRAME_TYPE , val) <<2 | +FIELD_GET (MT_TXD2_SUB_TYPE , val) <<4 ; +if (unlikely (fc != (IEEE80211_FTYPE_DATA |IEEE80211_STYPE_QOS_DATA )))return ; msta = (struct mt7915_sta *)sta->drv_priv; - tid =ieee80211_get_tid (hdr); - -if (mt7915_tx_check_aggr_tid (msta, tid)) { +if (!test_and_set_bit (tid, &msta->ampdu_state))ieee80211_start_tx_ba_session (sta, tid,0 ); -mt7915_set_aggr_state (msta, tid,MT7915_AGGR_PROGRESS ); - } } static inline void
@@ -840,8 +824,6 @@ mt7915_tx_complete_status(struct mt76_dev *mdev, struct sk_buff *skb,if (info->flags &IEEE80211_TX_CTL_AMPDU ) info->flags |=IEEE80211_TX_STAT_AMPDU ; -else if (sta) -mt7915_tx_check_aggr (sta, skb);if (stat)ieee80211_tx_info_clear_status (info);
@@ -931,6 +913,10 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)mt7915_txp_skb_unmap (mdev, txwi);if (txwi->skb) { +void *txwi_ptr =mt76_get_txwi_ptr (mdev, txwi); + +if (likely (txwi->skb->protocol !=cpu_to_be16 (ETH_P_PAE ))) +mt7915_tx_check_aggr (sta, txwi_ptr);mt7915_tx_complete_status (mdev, txwi->skb, sta, stat); txwi->skb =NULL ; }
drivers/net/wireless/mediatek/mt76/mt7915/main.c +3 -5
@@ -498,7 +498,6 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,INIT_LIST_HEAD (&msta->rc_list);INIT_LIST_HEAD (&msta->stats_list);INIT_LIST_HEAD (&msta->poll_list); -spin_lock_init (&msta->ampdu_lock); msta->vif = mvif; msta->wcid.sta =1 ; msta->wcid.idx = idx;
@@ -610,22 +609,21 @@ mt7915_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,case IEEE80211_AMPDU_TX_OPERATIONAL : mtxq->aggr = true; mtxq->send_bar = false; -mt7915_set_aggr_state (msta, tid,MT7915_AGGR_OPERATIONAL );mt7915_mcu_add_tx_ba (dev, params, true);break ;case IEEE80211_AMPDU_TX_STOP_FLUSH :case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT : mtxq->aggr = false; -mt7915_set_aggr_state (msta, tid,MT7915_AGGR_STOP ); +clear_bit (tid, &msta->ampdu_state);mt7915_mcu_add_tx_ba (dev, params, false);break ;case IEEE80211_AMPDU_TX_START : -mt7915_set_aggr_state (msta, tid,MT7915_AGGR_START ); +set_bit (tid, &msta->ampdu_state); ret =IEEE80211_AMPDU_TX_START_IMMEDIATE ;break ;case IEEE80211_AMPDU_TX_STOP_CONT : mtxq->aggr = false; -mt7915_set_aggr_state (msta, tid,MT7915_AGGR_STOP ); +clear_bit (tid, &msta->ampdu_state);mt7915_mcu_add_tx_ba (dev, params, false);ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);break ;
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -18
@@ -58,13 +58,6 @@ enum mt7915_rxq_id { MT7915_RXQ_MCU_WA, }; -enum mt7915_ampdu_state { -MT7915_AGGR_STOP , -MT7915_AGGR_PROGRESS , -MT7915_AGGR_START , -MT7915_AGGR_OPERATIONAL -}; -struct mt7915_sta_stats {struct rate_info prob_rate;struct rate_info tx_rate;
@@ -86,8 +79,7 @@ struct mt7915_sta {struct mt7915_sta_stats stats; -spinlock_t ampdu_lock; -enum mt7915_ampdu_state ampdu_state[IEEE80211_NUM_TIDS ]; +unsigned long ampdu_state; };struct mt7915_vif {
@@ -272,15 +264,6 @@ static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac)return lmac_queue_map[ac]; } -static inline void -mt7915_set_aggr_state (struct mt7915_sta *msta,u8 tid, -enum mt7915_ampdu_state state) -{ -spin_lock_bh (&msta->ampdu_lock); - msta->ampdu_state[tid] = state; -spin_unlock_bh (&msta->ampdu_lock); -} -extern const struct ieee80211_ops mt7915_ops;extern struct pci_driver mt7915_pci_driver;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 7/8 mt76: mt7915: add missing flags in WMM parameter settings
In reply to Felix FietkauIndicate the filled parameter to the firmware
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -0
@@ -2939,6 +2939,7 @@ int mt7915_mcu_set_tx(struct mt7915_dev *dev, struct ieee80211_vif *vif)struct ieee80211_tx_queue_params *q = &mvif->queue_params[ac];struct edca *e = &req.edca[ac]; + e->set =WMM_PARAM_SET ; e->queue = ac + mvif->wmm_idx *MT7915_MAX_WMM_SETS ; e->aifs = q->aifs; e->txop =cpu_to_le16 (q->txop);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 8/8 mt76: mt7915: add Tx A-MSDU offloading support
In reply to Felix FietkauFrom: Ryder Lee <[email protected]>
This disables the software A-MSDU aggregation in mac80211 and enables hardware offloading
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +++-- drivers/net/wireless/mediatek/mt76/mt76.h | 2 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 2 + .../net/wireless/mediatek/mt76/mt7915/mcu.c | 42 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 21 ++++++++++ .../net/wireless/mediatek/mt76/mt7915/pci.c | 3 +- 6 files changed, 76 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +7 -4
@@ -304,11 +304,14 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORT_FAST_XMIT );ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS );ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); -ieee80211_hw_set (hw,TX_AMSDU ); -/* TODO: avoid linearization for SDIO */ -if (!mt76_is_sdio (dev)) -ieee80211_hw_set (hw,TX_FRAG_LIST ); +if (!(dev->drv->drv_flags &MT_DRV_AMSDU_OFFLOAD )) { +ieee80211_hw_set (hw,TX_AMSDU ); + +/* TODO: avoid linearization for SDIO */ +if (!mt76_is_sdio (dev)) +ieee80211_hw_set (hw,TX_FRAG_LIST ); + }ieee80211_hw_set (hw,MFP_CAPABLE );ieee80211_hw_set (hw,AP_LINK_PS );
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -216,6 +216,7 @@ struct mt76_wcid { u8 sta:1; u8 ext_phy:1; + u8 amsdu:1;u8 rx_check_pn;u8 rx_key_pn[IEEE80211_NUM_TIDS ][6 ];
@@ -311,6 +312,7 @@ struct mt76_hw_cap {#define MT_DRV_SW_RX_AIRTIME BIT(2)#define MT_DRV_RX_DMA_HDR BIT(3)#define MT_DRV_HW_MGMT_TXQ BIT(4) +#define MT_DRV_AMSDU_OFFLOAD BIT(5)struct mt76_driver_ops {u32 drv_flags;
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +2 -0
@@ -680,6 +680,8 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, val =FIELD_PREP (MT_TXD7_TYPE , fc_type) |FIELD_PREP (MT_TXD7_SUB_TYPE , fc_stype); +if (wcid->amsdu) + val |=MT_TXD7_HW_AMSDU ; txwi[7 ] =cpu_to_le32 (val); val =FIELD_PREP (MT_TXD3_REM_TX_COUNT , tx_count);
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +42 -0
72 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +21 -0
@@ -402,6 +402,16 @@ struct bss_info_ra {__le32 fast_interval; } __packed; +struct bss_info_hw_amsdu { +__le16 tag; +__le16 len; +__le32 cmp_bitmap_0; +__le32 cmp_bitmap_1; +__le16 trig_thres; +u8 enable; +u8 rsv; +} __packed; +struct bss_info_he {__le16 tag;__le16 len;
@@ -736,6 +746,15 @@ struct sta_rec_ba {__le16 winsize; } __packed; +struct sta_rec_amsdu { +__le16 tag; +__le16 len; +u8 max_amsdu_num; +u8 max_mpdu_size; +u8 amsdu_en; +u8 rsv; +} __packed; +struct sec_key {u8 cipher_id;u8 cipher_len;
@@ -963,6 +982,7 @@ enum {sizeof (struct sta_rec_ba ) + \sizeof (struct sta_rec_vht ) + \sizeof (struct sta_rec_uapsd ) + \ +sizeof (struct sta_rec_amsdu ) + \sizeof (struct tlv ) + \ MT7915_WTBL_UPDATE_MAX_SIZE)
@@ -974,6 +994,7 @@ enum {sizeof (struct bss_info_basic ) +\sizeof (struct bss_info_rf_ch ) +\sizeof (struct bss_info_ra ) + \ +sizeof (struct bss_info_hw_amsdu ) +\sizeof (struct bss_info_he ) + \sizeof (struct bss_info_bmc_rate ) +\ sizeof(struct bss_info_ext_bss) +\
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +2 -1
@@ -78,7 +78,8 @@ static int mt7915_pci_probe(struct pci_dev *pdev,static const struct mt76_driver_ops drv_ops = {/* txwi_size = txd size + txp size */ .txwi_size =MT_TXD_SIZE +sizeof (struct mt7915_txp ), - .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ , + .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ | +MT_DRV_AMSDU_OFFLOAD , .survey_flags =SURVEY_INFO_TIME_TX |SURVEY_INFO_TIME_RX |SURVEY_INFO_TIME_BSS_RX ,
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH v2 8/8 mt76: mt7915: add Tx A-MSDU offloading support
From: Ryder Lee <[email protected]>
This disables the software A-MSDU aggregation in mac80211 and enables hardware offloading
---
v2: fix maximum mpdu length MCU message field
drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +++-- drivers/net/wireless/mediatek/mt76/mt76.h | 2 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 2 + .../net/wireless/mediatek/mt76/mt7915/mcu.c | 42 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 21 ++++++++++ .../net/wireless/mediatek/mt76/mt7915/pci.c | 3 +- 6 files changed, 76 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +7 -4
@@ -304,11 +304,14 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORT_FAST_XMIT );ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS );ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); -ieee80211_hw_set (hw,TX_AMSDU ); -/* TODO: avoid linearization for SDIO */ -if (!mt76_is_sdio (dev)) -ieee80211_hw_set (hw,TX_FRAG_LIST ); +if (!(dev->drv->drv_flags &MT_DRV_AMSDU_OFFLOAD )) { +ieee80211_hw_set (hw,TX_AMSDU ); + +/* TODO: avoid linearization for SDIO */ +if (!mt76_is_sdio (dev)) +ieee80211_hw_set (hw,TX_FRAG_LIST ); + }ieee80211_hw_set (hw,MFP_CAPABLE );ieee80211_hw_set (hw,AP_LINK_PS );
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -216,6 +216,7 @@ struct mt76_wcid { u8 sta:1; u8 ext_phy:1; + u8 amsdu:1;u8 rx_check_pn;u8 rx_key_pn[IEEE80211_NUM_TIDS ][6 ];
@@ -311,6 +312,7 @@ struct mt76_hw_cap {#define MT_DRV_SW_RX_AIRTIME BIT(2)#define MT_DRV_RX_DMA_HDR BIT(3)#define MT_DRV_HW_MGMT_TXQ BIT(4) +#define MT_DRV_AMSDU_OFFLOAD BIT(5)struct mt76_driver_ops {u32 drv_flags;
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +2 -0
@@ -680,6 +680,8 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, val =FIELD_PREP (MT_TXD7_TYPE , fc_type) |FIELD_PREP (MT_TXD7_SUB_TYPE , fc_stype); +if (wcid->amsdu) + val |=MT_TXD7_HW_AMSDU ; txwi[7 ] =cpu_to_le32 (val); val =FIELD_PREP (MT_TXD3_REM_TX_COUNT , tx_count);
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +42 -0
72 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +21 -0
@@ -402,6 +402,16 @@ struct bss_info_ra {__le32 fast_interval; } __packed; +struct bss_info_hw_amsdu { +__le16 tag; +__le16 len; +__le32 cmp_bitmap_0; +__le32 cmp_bitmap_1; +__le16 trig_thres; +u8 enable; +u8 rsv; +} __packed; +struct bss_info_he {__le16 tag;__le16 len;
@@ -736,6 +746,15 @@ struct sta_rec_ba {__le16 winsize; } __packed; +struct sta_rec_amsdu { +__le16 tag; +__le16 len; +u8 max_amsdu_num; +u8 max_mpdu_size; +u8 amsdu_en; +u8 rsv; +} __packed; +struct sec_key {u8 cipher_id;u8 cipher_len;
@@ -963,6 +982,7 @@ enum {sizeof (struct sta_rec_ba ) + \sizeof (struct sta_rec_vht ) + \sizeof (struct sta_rec_uapsd ) + \ +sizeof (struct sta_rec_amsdu ) + \sizeof (struct tlv ) + \ MT7915_WTBL_UPDATE_MAX_SIZE)
@@ -974,6 +994,7 @@ enum {sizeof (struct bss_info_basic ) +\sizeof (struct bss_info_rf_ch ) +\sizeof (struct bss_info_ra ) + \ +sizeof (struct bss_info_hw_amsdu ) +\sizeof (struct bss_info_he ) + \sizeof (struct bss_info_bmc_rate ) +\ sizeof(struct bss_info_ext_bss) +\
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +2 -1
@@ -78,7 +78,8 @@ static int mt7915_pci_probe(struct pci_dev *pdev,static const struct mt76_driver_ops drv_ops = {/* txwi_size = txd size + txp size */ .txwi_size =MT_TXD_SIZE +sizeof (struct mt7915_txp ), - .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ , + .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ | +MT_DRV_AMSDU_OFFLOAD , .survey_flags =SURVEY_INFO_TIME_TX |SURVEY_INFO_TIME_RX |SURVEY_INFO_TIME_BSS_RX ,
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH v3 1/1 mt76: mt7915: add Tx A-MSDU offloading support
From: Ryder Lee <[email protected]>
This disables the software A-MSDU aggregation in mac80211 and enables hardware offloading
---
v3: limit to AP and client mode
v2: fix maximum mpdu length MCU message field
drivers/net/wireless/mediatek/mt76/mac80211.c | 11 ++-- drivers/net/wireless/mediatek/mt76/mt76.h | 2 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 2 + .../net/wireless/mediatek/mt76/mt7915/mcu.c | 55 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 21 +++++++ .../net/wireless/mediatek/mt76/mt7915/pci.c | 3 +- 6 files changed, 89 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +7 -4
@@ -304,11 +304,14 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORT_FAST_XMIT );ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS );ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); -ieee80211_hw_set (hw,TX_AMSDU ); -/* TODO: avoid linearization for SDIO */ -if (!mt76_is_sdio (dev)) -ieee80211_hw_set (hw,TX_FRAG_LIST ); +if (!(dev->drv->drv_flags &MT_DRV_AMSDU_OFFLOAD )) { +ieee80211_hw_set (hw,TX_AMSDU ); + +/* TODO: avoid linearization for SDIO */ +if (!mt76_is_sdio (dev)) +ieee80211_hw_set (hw,TX_FRAG_LIST ); + }ieee80211_hw_set (hw,MFP_CAPABLE );ieee80211_hw_set (hw,AP_LINK_PS );
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -216,6 +216,7 @@ struct mt76_wcid { u8 sta:1; u8 ext_phy:1; + u8 amsdu:1;u8 rx_check_pn;u8 rx_key_pn[IEEE80211_NUM_TIDS ][6 ];
@@ -311,6 +312,7 @@ struct mt76_hw_cap {#define MT_DRV_SW_RX_AIRTIME BIT(2)#define MT_DRV_RX_DMA_HDR BIT(3)#define MT_DRV_HW_MGMT_TXQ BIT(4) +#define MT_DRV_AMSDU_OFFLOAD BIT(5)struct mt76_driver_ops {u32 drv_flags;
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +2 -0
@@ -680,6 +680,8 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, val =FIELD_PREP (MT_TXD7_TYPE , fc_type) |FIELD_PREP (MT_TXD7_SUB_TYPE , fc_stype); +if (wcid->amsdu) + val |=MT_TXD7_HW_AMSDU ; txwi[7 ] =cpu_to_le32 (val); val =FIELD_PREP (MT_TXD3_REM_TX_COUNT , tx_count);
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +55 -0
85 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +21 -0
@@ -402,6 +402,16 @@ struct bss_info_ra {__le32 fast_interval; } __packed; +struct bss_info_hw_amsdu { +__le16 tag; +__le16 len; +__le32 cmp_bitmap_0; +__le32 cmp_bitmap_1; +__le16 trig_thres; +u8 enable; +u8 rsv; +} __packed; +struct bss_info_he {__le16 tag;__le16 len;
@@ -736,6 +746,15 @@ struct sta_rec_ba {__le16 winsize; } __packed; +struct sta_rec_amsdu { +__le16 tag; +__le16 len; +u8 max_amsdu_num; +u8 max_mpdu_size; +u8 amsdu_en; +u8 rsv; +} __packed; +struct sec_key {u8 cipher_id;u8 cipher_len;
@@ -963,6 +982,7 @@ enum {sizeof (struct sta_rec_ba ) + \sizeof (struct sta_rec_vht ) + \sizeof (struct sta_rec_uapsd ) + \ +sizeof (struct sta_rec_amsdu ) + \sizeof (struct tlv ) + \ MT7915_WTBL_UPDATE_MAX_SIZE)
@@ -974,6 +994,7 @@ enum {sizeof (struct bss_info_basic ) +\sizeof (struct bss_info_rf_ch ) +\sizeof (struct bss_info_ra ) + \ +sizeof (struct bss_info_hw_amsdu ) +\sizeof (struct bss_info_he ) + \sizeof (struct bss_info_bmc_rate ) +\ sizeof(struct bss_info_ext_bss) +\
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +2 -1
@@ -78,7 +78,8 @@ static int mt7915_pci_probe(struct pci_dev *pdev,static const struct mt76_driver_ops drv_ops = {/* txwi_size = txd size + txp size */ .txwi_size =MT_TXD_SIZE +sizeof (struct mt7915_txp ), - .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ , + .drv_flags =MT_DRV_TXWI_NO_FREE |MT_DRV_HW_MGMT_TXQ | +MT_DRV_AMSDU_OFFLOAD , .survey_flags =SURVEY_INFO_TIME_TX |SURVEY_INFO_TIME_RX |SURVEY_INFO_TIME_BSS_RX ,
Signature · 1 line
2.28.0