blob: 1b985cfc2b313920131cebdbcd40312d127fc910 [file] [log] [blame]
developer356ecec2022-11-14 10:25:04 +08001From b584c123edfe2965d753d4fc7e77c1ec08f147ea Mon Sep 17 00:00:00 2001
developer964926c2022-09-29 13:32:51 +08002From: Peter Chiu <chui-hao.chiu@mediatek.com>
3Date: Wed, 28 Sep 2022 18:52:54 +0800
developer356ecec2022-11-14 10:25:04 +08004Subject: [PATCH 3010/3011] mt76: mt7915: drop scatter and gather frame
developer964926c2022-09-29 13:32:51 +08005
6The scatter and gather frame may be incorrect because WED and WO may
7send frames to host driver interleaved.
8
9Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
10---
11 dma.c | 9 +++++++++
12 dma.h | 1 +
13 mt76.h | 1 +
14 3 files changed, 11 insertions(+)
15
16diff --git a/dma.c b/dma.c
developer356ecec2022-11-14 10:25:04 +080017index a7a4538a..c106ae42 100644
developer964926c2022-09-29 13:32:51 +080018--- a/dma.c
19+++ b/dma.c
developerc226de82022-10-03 12:24:57 +080020@@ -419,6 +419,15 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
21
developer964926c2022-09-29 13:32:51 +080022 if (desc->ctrl & (MT_DMA_CTL_TO_HOST_A | MT_DMA_CTL_DROP))
23 *drop = true;
24+
25+ if (*more || (q->flags & MT_QFLAG_WED_FRAG)) {
26+ *drop = true;
27+
28+ if (!(*more) && FIELD_GET(MT_DMA_CTL_WO, desc->buf1))
29+ q->flags &= ~MT_QFLAG_WED_FRAG;
30+ else
31+ q->flags |= MT_QFLAG_WED_FRAG;
32+ }
33 } else {
34 buf_addr = e->dma_addr[0];
35 e->buf = NULL;
36diff --git a/dma.h b/dma.h
developer356ecec2022-11-14 10:25:04 +080037index 083cbca4..221fcc8e 100644
developer964926c2022-09-29 13:32:51 +080038--- a/dma.h
39+++ b/dma.h
40@@ -21,6 +21,7 @@
41 #define MT_DMA_CTL_DROP BIT(14)
developerc226de82022-10-03 12:24:57 +080042
developer964926c2022-09-29 13:32:51 +080043 #define MT_DMA_CTL_TOKEN GENMASK(31, 16)
44+#define MT_DMA_CTL_WO BIT(8)
developerc226de82022-10-03 12:24:57 +080045
developer964926c2022-09-29 13:32:51 +080046 #define MT_DMA_PPE_CPU_REASON GENMASK(15, 11)
47 #define MT_DMA_PPE_ENTRY GENMASK(30, 16)
48diff --git a/mt76.h b/mt76.h
developer356ecec2022-11-14 10:25:04 +080049index 8011d4ca..9b225510 100644
developer964926c2022-09-29 13:32:51 +080050--- a/mt76.h
51+++ b/mt76.h
52@@ -32,6 +32,7 @@
53 #define MT_QFLAG_WED_RING GENMASK(1, 0)
54 #define MT_QFLAG_WED_TYPE GENMASK(3, 2)
55 #define MT_QFLAG_WED BIT(4)
56+#define MT_QFLAG_WED_FRAG BIT(5)
developerc226de82022-10-03 12:24:57 +080057
developer964926c2022-09-29 13:32:51 +080058 #define __MT_WED_Q(_type, _n) (MT_QFLAG_WED | \
59 FIELD_PREP(MT_QFLAG_WED_TYPE, _type) | \
developerc226de82022-10-03 12:24:57 +080060--
developer887da632022-10-28 09:35:38 +0800612.18.0
developer964926c2022-09-29 13:32:51 +080062