mt76: mt7615: re-enable offloading of sequence number assignment
Subsystems (2)
Felix Fietkau
maintainerPATCH v2 1/1 mt76: mt7615: re-enable offloading of sequence number assignment
Preparation for supporting more offload features
Signed-off-by Felix Fietkau <[email protected]>
---
v2: fix WTBL address offset
.../net/wireless/mediatek/mt76/mt7615/mac.c | 44 +++++++++++++++---- .../net/wireless/mediatek/mt76/mt7615/main.c | 5 +++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 1 + 3 files changed, 41 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +35 -9
@@ -617,16 +617,19 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, } val =FIELD_PREP (MT_TXD3_REM_TX_COUNT , tx_count); -if (ieee80211_is_data_qos (hdr->frame_control)) { - seqno =IEEE80211_SEQ_TO_SN (le16_to_cpu (hdr->seq_ctrl)); - val |=MT_TXD3_SN_VALID ; - }else if (ieee80211_is_back_req (hdr->frame_control)) { -struct ieee80211_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);
@@ -893,6 +896,29 @@ mt7615_mac_queue_rate_update(struct mt7615_phy *phy, struct mt7615_sta *sta,return 0 ; } +u32 mt7615_mac_get_sta_tid_sn (struct mt7615_dev *dev,int wcid,u8 tid) +{ +u32 addr, val, val2; +u8 offset; + + addr =mt7615_mac_wtbl_addr (dev, wcid) +11 *4 ; + + offset = tid *12 ; + addr +=4 * (offset /32 ); + offset %=32 ; + + val =mt76_rr (dev, addr); + val >>= (tid %32 ); + +if (offset >20 ) { + addr +=4 ; + val2 =mt76_rr (dev, addr); + val |= val2 << (32 - offset); + } + +return val &GENMASK (11 ,0 ); +} +void mt7615_mac_set_rates (struct mt7615_phy *phy,struct mt7615_sta *sta,struct ieee80211_tx_rate *probe_rate,struct ieee80211_tx_rate *rates)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +5 -0
@@ -660,6 +660,9 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, mtxq->aggr = true; mtxq->send_bar = false;mt7615_mcu_add_tx_ba (dev, params, true); + ssn =mt7615_mac_get_sta_tid_sn (dev, msta->wcid.idx, tid); +ieee80211_send_bar (vif, sta->addr, tid, +IEEE80211_SN_TO_SEQ (ssn));break ;case IEEE80211_AMPDU_TX_STOP_FLUSH :case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT :
@@ -667,6 +670,8 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mt7615_mcu_add_tx_ba (dev, params, false);break ;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 ;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -516,6 +516,7 @@ int mt7615_mac_wtbl_update_key(struct mt7615_dev *dev,enum mt7615_cipher_type cipher, enum set_key_cmd cmd);void mt7615_mac_reset_work (struct work_struct *work); +u32 mt7615_mac_get_sta_tid_sn (struct mt7615_dev *dev,int wcid,u8 tid);int mt7615_mcu_wait_response (struct mt7615_dev *dev,int cmd,int seq); int mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
Signature · 1 line
2.24.0