developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame^] | 1 | From aa5ba9b452355d0bd7d76868753c66a88464318c Mon Sep 17 00:00:00 2001 |
| 2 | From: "sujuan.chen" <sujuan.chen@mediatek.com> |
| 3 | Date: Wed, 19 Jul 2023 10:55:09 +0800 |
| 4 | Subject: [PATCH 2009/2012] wifi: mt76: mt7915: wed: find rx token by physical |
| 5 | address |
| 6 | |
| 7 | The token id in RxDMAD may be incorrect when it is not the last frame due to |
| 8 | WED HW bug. Lookup correct token id by physical address in sdp0. |
| 9 | Add len == 0 check to drop garbage frames |
| 10 | |
| 11 | Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 12 | --- |
| 13 | dma.c | 27 +++++++++++++++++++++++++-- |
| 14 | 1 file changed, 25 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/dma.c b/dma.c |
| 17 | index bfe188134..415121f74 100644 |
| 18 | --- a/dma.c |
| 19 | +++ b/dma.c |
| 20 | @@ -441,10 +441,33 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx, |
| 21 | } |
| 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 | |
| 55 | @@ -972,7 +995,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) |
| 56 | if (!data) |
| 57 | break; |
| 58 | |
| 59 | - if (drop) |
| 60 | + if (drop || (len == 0)) |
| 61 | goto free_frag; |
| 62 | |
| 63 | if (q->rx_head) |
| 64 | -- |
| 65 | 2.39.2 |
| 66 | |