Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa3cb24b authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo
Browse files

mt76: mt7603: fix sequence number assignment 



If the MT_TXD3_SN_VALID flag is not set in the tx descriptor, the hardware
assigns the sequence number. However, the rest of the code assumes that the
sequence number specified in the 802.11 header gets transmitted.
This was causing issues with the aggregation setup, which worked for the
initial one (where the sequence numbers were still close), but not for
further teardown/re-establishing of sessions.

Additionally, the overwrite of the TID sequence number in WTBL2 was resetting
the hardware assigned sequence numbers, causing them to drift further apart.

Fix this by using the software assigned sequence numbers

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2170e215

drivers/net/wireless/mediatek/mt76/mt7603/mac.c

+14 −39
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void mt7603_mac_rx_ba_reset(struct mt7603_dev *dev, void *addr, u8 tid) 
		 MT_BA_CONTROL_1_RESET));

}



void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,

void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid,

			    int ba_size)

{

	u32 addr = mt7603_wtbl2_addr(wcid);
@@ -358,43 +358,6 @@ void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn, 
		mt76_clear(dev, addr + (15 * 4), tid_mask);

		return;

	}

	mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000);



	mt7603_mac_stop(dev);

	switch (tid) {

	case 0:

		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID0_SN, ssn);

		break;

	case 1:

		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID1_SN, ssn);

		break;

	case 2:

		mt76_rmw_field(dev, addr + (2 * 4), MT_WTBL2_W2_TID2_SN_LO,

			       ssn);

		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID2_SN_HI,

			       ssn >> 8);

		break;

	case 3:

		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID3_SN, ssn);

		break;

	case 4:

		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID4_SN, ssn);

		break;

	case 5:

		mt76_rmw_field(dev, addr + (3 * 4), MT_WTBL2_W3_TID5_SN_LO,

			       ssn);

		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID5_SN_HI,

			       ssn >> 4);

		break;

	case 6:

		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID6_SN, ssn);

		break;

	case 7:

		mt76_rmw_field(dev, addr + (4 * 4), MT_WTBL2_W4_TID7_SN, ssn);

		break;

	}

	mt7603_wtbl_update(dev, wcid, MT_WTBL_UPDATE_WTBL2);

	mt7603_mac_start(dev);



	for (i = 7; i > 0; i--) {

		if (ba_size >= MT_AGG_SIZE_LIMIT(i))
@@ -827,6 +790,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *rate = &info->control.rates[0];

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;

	struct ieee80211_vif *vif = info->control.vif;

	struct mt7603_vif *mvif;

	int wlan_idx;
@@ -834,6 +798,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
	int tx_count = 8;

	u8 frame_type, frame_subtype;

	u16 fc = le16_to_cpu(hdr->frame_control);

	u16 seqno = 0;

	u8 vif_idx = 0;

	u32 val;

	u8 bw;
@@ -919,7 +884,17 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
		tx_count = 0x1f;



	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count) |

	      FIELD_PREP(MT_TXD3_SEQ, le16_to_cpu(hdr->seq_ctrl));

		  MT_TXD3_SN_VALID;



	if (ieee80211_is_data_qos(hdr->frame_control))

		seqno = le16_to_cpu(hdr->seq_ctrl);

	else if (ieee80211_is_back_req(hdr->frame_control))

		seqno = le16_to_cpu(bar->start_seq_num);

	else

		val &= ~MT_TXD3_SN_VALID;



	val |= FIELD_PREP(MT_TXD3_SEQ, seqno >> 4);



	txwi[3] = cpu_to_le32(val);



	if (key) {

drivers/net/wireless/mediatek/mt76/mt7603/main.c

+3 −3
Original line number Diff line number Diff line
@@ -584,13 +584,13 @@ mt7603_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	case IEEE80211_AMPDU_TX_OPERATIONAL:

		mtxq->aggr = true;

		mtxq->send_bar = false;

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, *ssn, ba_size);

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, ba_size);

		break;

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		mtxq->aggr = false;

		ieee80211_send_bar(vif, sta->addr, tid, mtxq->agg_ssn);

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, *ssn, -1);

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, -1);

		break;

	case IEEE80211_AMPDU_TX_START:

		mtxq->agg_ssn = *ssn << 4;
@@ -598,7 +598,7 @@ mt7603_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		break;

	case IEEE80211_AMPDU_TX_STOP_CONT:

		mtxq->aggr = false;

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, *ssn, -1);

		mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, -1);

		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval); 
int mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb);

void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data);

void mt7603_mac_rx_ba_reset(struct mt7603_dev *dev, void *addr, u8 tid);

void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,

void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid,

			    int ba_size);



void mt7603_pse_client_reset(struct mt7603_dev *dev);