developer | abdbf25 | 2023-02-06 16:02:21 +0800 | [diff] [blame] | 1 | From 6767bcfec5f48f14fdf63c9699c63e6bc741ad74 Mon Sep 17 00:00:00 2001 |
| 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Fri, 3 Feb 2023 11:00:59 +0800 |
| 4 | Subject: [PATCH 1/7] Revert "wifi: mt76: mt7996: rely on |
| 5 | mt76_connac_tx_complete_skb" |
| 6 | |
| 7 | This reverts commit 8688756305c643b8a296c16d0626732aaae1d02a. |
| 8 | --- |
| 9 | mt7996/mac.c | 21 +++++++++++++++++++++ |
| 10 | mt7996/mac.h | 13 +++++++++++++ |
| 11 | mt7996/mmio.c | 2 +- |
| 12 | mt7996/mt7996.h | 1 + |
| 13 | 4 files changed, 36 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/mt7996/mac.c b/mt7996/mac.c |
| 16 | index c9a9f0e3..0d718598 100644 |
| 17 | --- a/mt7996/mac.c |
| 18 | +++ b/mt7996/mac.c |
| 19 | @@ -1565,6 +1565,27 @@ void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, |
| 20 | } |
| 21 | } |
| 22 | |
| 23 | +void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) |
| 24 | +{ |
| 25 | + if (!e->txwi) { |
| 26 | + dev_kfree_skb_any(e->skb); |
| 27 | + return; |
| 28 | + } |
| 29 | + |
| 30 | + /* error path */ |
| 31 | + if (e->skb == DMA_DUMMY_DATA) { |
| 32 | + struct mt76_connac_txp_common *txp; |
| 33 | + struct mt76_txwi_cache *t; |
| 34 | + |
| 35 | + txp = mt7996_txwi_to_txp(mdev, e->txwi); |
| 36 | + t = mt76_token_put(mdev, le16_to_cpu(txp->fw.token)); |
| 37 | + e->skb = t ? t->skb : NULL; |
| 38 | + } |
| 39 | + |
| 40 | + if (e->skb) |
| 41 | + mt76_tx_complete_skb(mdev, e->wcid, e->skb); |
| 42 | +} |
| 43 | + |
| 44 | void mt7996_mac_cca_stats_reset(struct mt7996_phy *phy) |
| 45 | { |
| 46 | struct mt7996_dev *dev = phy->dev; |
| 47 | diff --git a/mt7996/mac.h b/mt7996/mac.h |
| 48 | index 27184cba..10e08d66 100644 |
| 49 | --- a/mt7996/mac.h |
| 50 | +++ b/mt7996/mac.h |
| 51 | @@ -371,4 +371,17 @@ struct mt7996_dfs_radar_spec { |
| 52 | struct mt7996_dfs_pattern radar_pattern[16]; |
| 53 | }; |
| 54 | |
| 55 | +static inline struct mt76_connac_txp_common * |
| 56 | +mt7996_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t) |
| 57 | +{ |
| 58 | + u8 *txwi; |
| 59 | + |
| 60 | + if (!t) |
| 61 | + return NULL; |
| 62 | + |
| 63 | + txwi = mt76_get_txwi_ptr(dev, t); |
| 64 | + |
| 65 | + return (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE); |
| 66 | +} |
| 67 | + |
| 68 | #endif |
| 69 | diff --git a/mt7996/mmio.c b/mt7996/mmio.c |
| 70 | index 902370a2..2237f50a 100644 |
| 71 | --- a/mt7996/mmio.c |
| 72 | +++ b/mt7996/mmio.c |
| 73 | @@ -326,7 +326,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, |
| 74 | SURVEY_INFO_TIME_BSS_RX, |
| 75 | .token_size = MT7996_TOKEN_SIZE, |
| 76 | .tx_prepare_skb = mt7996_tx_prepare_skb, |
| 77 | - .tx_complete_skb = mt76_connac_tx_complete_skb, |
| 78 | + .tx_complete_skb = mt7996_tx_complete_skb, |
| 79 | .rx_skb = mt7996_queue_rx_skb, |
| 80 | .rx_check = mt7996_rx_check, |
| 81 | .rx_poll_complete = mt7996_rx_poll_complete, |
| 82 | diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
| 83 | index 018dfd2b..13f22432 100644 |
| 84 | --- a/mt7996/mt7996.h |
| 85 | +++ b/mt7996/mt7996.h |
| 86 | @@ -508,6 +508,7 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
| 87 | enum mt76_txq_id qid, struct mt76_wcid *wcid, |
| 88 | struct ieee80211_sta *sta, |
| 89 | struct mt76_tx_info *tx_info); |
| 90 | +void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); |
| 91 | void mt7996_tx_token_put(struct mt7996_dev *dev); |
| 92 | void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, |
| 93 | struct sk_buff *skb, u32 *info); |
| 94 | -- |
| 95 | 2.25.1 |
| 96 | |