blob: ea151cb129d8384c75d4c27c62880b665d9cdfe5 [file] [log] [blame]
developer60a3d662023-02-07 15:24:34 +08001From e27abd8471cfe265afd0061cc86f85cce5b37773 Mon Sep 17 00:00:00 2001
developer3609d782022-11-29 18:07:22 +08002From: Sujuan Chen <sujuan.chen@mediatek.com>
3Date: Fri, 25 Nov 2022 14:32:35 +0800
developer60a3d662023-02-07 15:24:34 +08004Subject: [PATCH 3004/3010] mt76: mt7915: wed: find rx token by physical
developer4eb49d92022-12-05 11:29:56 +08005 address
developer3609d782022-11-29 18:07:22 +08006
7The token id in RxDMAD may be incorrect when it is not the last frame due to
8WED HW bug. Lookup correct token id by physical address in sdp0.
9
developer57c8f1a2022-12-15 14:09:45 +080010Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
developer3609d782022-11-29 18:07:22 +080011---
developer60a3d662023-02-07 15:24:34 +080012 dma.c | 27 ++++++++++++++++++++++++++-
13 1 file changed, 26 insertions(+), 1 deletion(-)
developer3609d782022-11-29 18:07:22 +080014
15diff --git a/dma.c b/dma.c
developer60a3d662023-02-07 15:24:34 +080016index a6bb3730..b58579c5 100644
developer3609d782022-11-29 18:07:22 +080017--- a/dma.c
18+++ b/dma.c
developer60a3d662023-02-07 15:24:34 +080019@@ -402,10 +402,35 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
20 *info = le32_to_cpu(desc->info);
developer3609d782022-11-29 18:07:22 +080021
developer60a3d662023-02-07 15:24:34 +080022 if (mt76_queue_is_wed_rx(q)) {
23+ __le32 buf1;
developer3609d782022-11-29 18:07:22 +080024+ u32 id, find = 0;
25 u32 token = FIELD_GET(MT_DMA_CTL_TOKEN,
26 le32_to_cpu(desc->buf1));
27- struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);
28+ struct mt76_txwi_cache *t;
developer765f1892023-01-30 14:02:51 +080029+
developer3609d782022-11-29 18:07:22 +080030+ if (*more) {
31+ spin_lock_bh(&dev->rx_token_lock);
32+
33+ idr_for_each_entry(&dev->rx_token, t, id) {
34+ if (t->dma_addr == le32_to_cpu(desc->buf0)) {
35+ find = 1;
developer3609d782022-11-29 18:07:22 +080036+ token = id;
developer60a3d662023-02-07 15:24:34 +080037+
38+ /* Write correct id back to DMA*/
39+ buf1 = desc->buf1;
40+ buf1 = le32_replace_bits(buf1, id,
41+ MT_DMA_CTL_TOKEN);
42+ WRITE_ONCE(desc->buf1, buf1);
developer3609d782022-11-29 18:07:22 +080043+ break;
44+ }
45+ }
46+
47+ spin_unlock_bh(&dev->rx_token_lock);
48+ if (!find)
49+ return NULL;
50+ }
developer765f1892023-01-30 14:02:51 +080051
developer3609d782022-11-29 18:07:22 +080052+ t = mt76_rx_token_release(dev, token);
53 if (!t)
54 return NULL;
55
56--
developer23c22342023-01-09 13:57:39 +0800572.18.0
developer3609d782022-11-29 18:07:22 +080058