developer | 0443cd3 | 2023-09-19 14:11:49 +0800 | [diff] [blame] | 1 | From 42bd7d9fbb234b9765983a0fc30926a0df2d1c51 Mon Sep 17 00:00:00 2001 |
developer | 22ed7c7 | 2023-09-06 16:51:41 +0800 | [diff] [blame] | 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Wed, 6 Sep 2023 16:27:25 +0800 |
developer | 0443cd3 | 2023-09-19 14:11:49 +0800 | [diff] [blame] | 4 | Subject: [PATCH 7/7] wifi: mt76: disable HW AMSDU when using fixed rate |
developer | 22ed7c7 | 2023-09-06 16:51:41 +0800 | [diff] [blame] | 5 | |
| 6 | When using fixed rate, HW uses txd DW9 to store tx arrivial time if VTA |
| 7 | is ture. It would overwrite the msdu_id in txd and lead to token pending |
| 8 | if amsdu is enable. |
| 9 | |
| 10 | Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 11 | --- |
| 12 | mt76_connac_mac.c | 4 +++- |
| 13 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c |
developer | 0443cd3 | 2023-09-19 14:11:49 +0800 | [diff] [blame] | 16 | index 93402d2..e26fcf8 100644 |
developer | 22ed7c7 | 2023-09-06 16:51:41 +0800 | [diff] [blame] | 17 | --- a/mt76_connac_mac.c |
| 18 | +++ b/mt76_connac_mac.c |
developer | 0443cd3 | 2023-09-19 14:11:49 +0800 | [diff] [blame] | 19 | @@ -543,7 +543,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, |
developer | 22ed7c7 | 2023-09-06 16:51:41 +0800 | [diff] [blame] | 20 | val = FIELD_PREP(MT_TXD5_PID, pid); |
| 21 | if (pid >= MT_PACKET_ID_FIRST) { |
| 22 | val |= MT_TXD5_TX_STATUS_HOST; |
| 23 | - amsdu_en = amsdu_en && !is_mt7921(dev); |
| 24 | + amsdu_en = 0; |
| 25 | } |
| 26 | |
| 27 | txwi[5] = cpu_to_le32(val); |
developer | 0443cd3 | 2023-09-19 14:11:49 +0800 | [diff] [blame] | 28 | @@ -578,6 +578,8 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, |
developer | 22ed7c7 | 2023-09-06 16:51:41 +0800 | [diff] [blame] | 29 | spe_idx = 24 + phy_idx; |
| 30 | txwi[7] |= cpu_to_le32(FIELD_PREP(MT_TXD7_SPE_IDX, spe_idx)); |
| 31 | } |
| 32 | + |
| 33 | + txwi[7] &= ~cpu_to_le32(MT_TXD7_HW_AMSDU); |
| 34 | } |
| 35 | } |
| 36 | EXPORT_SYMBOL_GPL(mt76_connac2_mac_write_txwi); |
| 37 | -- |
| 38 | 2.18.0 |
| 39 | |