wifi: mt76: drop the incorrect scatter and gather frame

The scatter and gather frame may be incorrect because WED and WO may
send frames to host driver interleaved.

Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index da281cd..738d7e1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -402,8 +402,8 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
                *info = le32_to_cpu(desc->info);
 
        if (mt76_queue_is_wed_rx(q)) {
-               u32 token = FIELD_GET(MT_DMA_CTL_TOKEN,
-                                     le32_to_cpu(desc->buf1));
+               u32 buf1 = le32_to_cpu(desc->buf1);
+               u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1);
                struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);
 
                if (!t)
@@ -424,6 +424,8 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
 
                        *drop = !!(ctrl & (MT_DMA_CTL_TO_HOST_A |
                                           MT_DMA_CTL_DROP));
+
+                       *drop |= !!(buf1 & MT_DMA_CTL_WO_DROP);
                }
        } else {
                buf = e->buf;

diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h
index 4b9bc7f..1b090d7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.h
+++ b/drivers/net/wireless/mediatek/mt76/dma.h
@@ -19,6 +19,7 @@
 #define MT_DMA_CTL_TO_HOST_A           BIT(12)
 #define MT_DMA_CTL_DROP                        BIT(14)
 #define MT_DMA_CTL_TOKEN               GENMASK(31, 16)
+#define MT_DMA_CTL_WO_DROP             BIT(8)
 
 #define MT_DMA_PPE_CPU_REASON          GENMASK(15, 11)
 #define MT_DMA_PPE_ENTRY               GENMASK(30, 16)