blob: fcfae5aaab15c6e9f4a5b1f1e8c94fb561c8828d [file] [log] [blame]
developerbbd45e12023-05-19 08:22:06 +08001From 354522be19efd1be1c35b765ebcc5d9ea11bd465 Mon Sep 17 00:00:00 2001
developer144824b2022-11-25 21:27:43 +08002From: Sujuan Chen <sujuan.chen@mediatek.com>
3Date: Fri, 25 Nov 2022 14:32:35 +0800
developerbbd45e12023-05-19 08:22:06 +08004Subject: [PATCH 3003/3012] wifi: mt76: mt7915: wed: find rx token by physical
developerbf24a8a2022-11-30 14:52:20 +08005 address
developer144824b2022-11-25 21:27:43 +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
developerafd75872022-12-14 21:15:46 +080010Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
developer144824b2022-11-25 21:27:43 +080011---
developer4f0d84b2023-03-03 14:21:44 +080012 dma.c | 25 ++++++++++++++++++++++++-
13 1 file changed, 24 insertions(+), 1 deletion(-)
developer144824b2022-11-25 21:27:43 +080014
15diff --git a/dma.c b/dma.c
developerbbd45e12023-05-19 08:22:06 +080016index fc92e39..3047f8b 100644
developer144824b2022-11-25 21:27:43 +080017--- a/dma.c
18+++ b/dma.c
developer4f0d84b2023-03-03 14:21:44 +080019@@ -403,9 +403,32 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
developer144824b2022-11-25 21:27:43 +080020
developerc04f5402023-02-03 09:22:26 +080021 if (mt76_queue_is_wed_rx(q)) {
developer4f0d84b2023-03-03 14:21:44 +080022 u32 buf1 = le32_to_cpu(desc->buf1);
developer144824b2022-11-25 21:27:43 +080023+ u32 id, find = 0;
developer4f0d84b2023-03-03 14:21:44 +080024 u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1);
developer144824b2022-11-25 21:27:43 +080025- struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);
26+ struct mt76_txwi_cache *t;
developer28d04742023-01-18 14:02:40 +080027+
developer144824b2022-11-25 21:27:43 +080028+ if (*more) {
29+ spin_lock_bh(&dev->rx_token_lock);
30+
31+ idr_for_each_entry(&dev->rx_token, t, id) {
32+ if (t->dma_addr == le32_to_cpu(desc->buf0)) {
33+ find = 1;
developer144824b2022-11-25 21:27:43 +080034+ token = id;
developerc04f5402023-02-03 09:22:26 +080035+
36+ /* Write correct id back to DMA*/
developer4f0d84b2023-03-03 14:21:44 +080037+ u32p_replace_bits(&buf1, id,
38+ MT_DMA_CTL_TOKEN);
39+ WRITE_ONCE(desc->buf1, cpu_to_le32(buf1));
developer144824b2022-11-25 21:27:43 +080040+ break;
41+ }
42+ }
43+
44+ spin_unlock_bh(&dev->rx_token_lock);
45+ if (!find)
46+ return NULL;
47+ }
developer28d04742023-01-18 14:02:40 +080048
developer144824b2022-11-25 21:27:43 +080049+ t = mt76_rx_token_release(dev, token);
50 if (!t)
51 return NULL;
52
53--
developer2324aa22023-04-12 11:30:15 +0800542.18.0
developer144824b2022-11-25 21:27:43 +080055