blob: 2688d545009768d63dee9c69d6b6f73594d8a8da [file] [log] [blame]
developer7e2761e2023-10-12 08:11:13 +08001From 50c902b8856af271bc5514d623ad09f7c3f2d880 Mon Sep 17 00:00:00 2001
developerc2cfe0f2023-09-22 04:11:09 +08002From: "sujuan.chen" <sujuan.chen@mediatek.com>
3Date: Wed, 19 Jul 2023 10:55:09 +0800
developer7e2761e2023-10-12 08:11:13 +08004Subject: [PATCH 72/98] wifi: mt76: mt7915: wed: find rx token by physical
developerc2cfe0f2023-09-22 04:11:09 +08005 address
6
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.
9Add len == 0 check to drop garbage frames
10
11Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
12---
13 dma.c | 27 +++++++++++++++++++++++++--
14 1 file changed, 25 insertions(+), 2 deletions(-)
15
16diff --git a/dma.c b/dma.c
developer7e2761e2023-10-12 08:11:13 +080017index 141a97b..3983ebb 100644
developerc2cfe0f2023-09-22 04:11:09 +080018--- a/dma.c
19+++ b/dma.c
developer7e2761e2023-10-12 08:11:13 +080020@@ -440,10 +440,33 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
developerc2cfe0f2023-09-22 04:11:09 +080021 }
22
23 if (mt76_queue_is_wed_rx(q)) {
24+ u32 id, find = 0;
25 u32 buf1 = le32_to_cpu(desc->buf1);
26 u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1);
27- struct mt76_rxwi_cache *r = mt76_rx_token_release(dev, token);
28+ struct mt76_rxwi_cache *r;
29+
30+ if (*more) {
31+ spin_lock_bh(&dev->rx_token_lock);
32+
33+ idr_for_each_entry(&dev->rx_token, r, id) {
34+ if (r->dma_addr == le32_to_cpu(desc->buf0)) {
35+ find = 1;
36+ token = id;
37+
38+ /* Write correct id back to DMA*/
39+ u32p_replace_bits(&buf1, id,
40+ MT_DMA_CTL_TOKEN);
41+ WRITE_ONCE(desc->buf1, cpu_to_le32(buf1));
42+ break;
43+ }
44+ }
45
46+ spin_unlock_bh(&dev->rx_token_lock);
47+ if (!find)
48+ return NULL;
49+ }
50+
51+ r = mt76_rx_token_release(dev, token);
52 if (!r)
53 return NULL;
54
developer7e2761e2023-10-12 08:11:13 +080055@@ -965,7 +988,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget)
developerc2cfe0f2023-09-22 04:11:09 +080056 if (!data)
57 break;
58
59- if (drop)
60+ if (drop || (len == 0))
61 goto free_frag;
62
63 if (q->rx_head)
64--
developer7e2761e2023-10-12 08:11:13 +0800652.18.0
developerc2cfe0f2023-09-22 04:11:09 +080066