mt76: mt7663: fix DMA unmap length

[ Upstream commit 89829c9e65ab680f7e5a1658cb74bc6316ab036e ]

Fix DMA unmap length for mt7663e devices in mt7615_txp_skb_unmap_hw

Fixes: f40ac0f3d3c0 ("mt76: mt7615: introduce mt7663e support")
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Co-developed-by: Soul Huang <soul.huang@mediatek.com>
Signed-off-by: Soul Huang <soul.huang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index b5249d08564c58daa1919ee342054308c8b4716d..f66b76ff2978d4006f9954ab6f88e755215b15b0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -666,15 +666,18 @@ mt7615_txp_skb_unmap_fw(struct mt76_dev *dev, struct mt7615_fw_txp *txp)
 static void
 mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)
 {
+       u32 last_mask;
        int i;
 
+       last_mask = is_mt7663(dev) ? MT_TXD_LEN_LAST : MT_TXD_LEN_MSDU_LAST;
+
        for (i = 0; i < ARRAY_SIZE(txp->ptr); i++) {
                struct mt7615_txp_ptr *ptr = &txp->ptr[i];
                bool last;
                u16 len;
 
                len = le16_to_cpu(ptr->len0);
-               last = len & MT_TXD_LEN_MSDU_LAST;
+               last = len & last_mask;
                len &= MT_TXD_LEN_MASK;
                dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,
                                 DMA_TO_DEVICE);
@@ -682,7 +685,7 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)
                        break;
 
                len = le16_to_cpu(ptr->len1);
-               last = len & MT_TXD_LEN_MSDU_LAST;
+               last = len & last_mask;
                len &= MT_TXD_LEN_MASK;
                dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,
                                 DMA_TO_DEVICE);
@@ -1098,21 +1101,26 @@ mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,
 {
        struct mt7615_hw_txp *txp = txp_ptr;
        struct mt7615_txp_ptr *ptr = &txp->ptr[0];
-       int nbuf = tx_info->nbuf - 1;
-       int i;
+       int i, nbuf = tx_info->nbuf - 1;
+       u32 last_mask;
 
        tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp);
        tx_info->nbuf = 1;
 
        txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);
 
+       if (is_mt7663(&dev->mt76))
+               last_mask = MT_TXD_LEN_LAST;
+       else
+               last_mask = MT_TXD_LEN_AMSDU_LAST |
+                           MT_TXD_LEN_MSDU_LAST;
+
        for (i = 0; i < nbuf; i++) {
                u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK;
                u32 addr = tx_info->buf[i + 1].addr;
 
                if (i == nbuf - 1)
-                       len |= MT_TXD_LEN_MSDU_LAST |
-                              MT_TXD_LEN_AMSDU_LAST;
+                       len |= last_mask;
 
                if (i & 1) {
                        ptr->buf1 = cpu_to_le32(addr);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
index 53ac184ab2d68346759996490de50f6dd87f749d..d3da40df7f32582d6fafc069a4a3081f030186be 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
@@ -255,6 +255,8 @@ enum tx_phy_bandwidth {
 #define MT_TXD_LEN_MASK                        GENMASK(11, 0)
 #define MT_TXD_LEN_MSDU_LAST           BIT(14)
 #define MT_TXD_LEN_AMSDU_LAST          BIT(15)
+/* mt7663 */
+#define MT_TXD_LEN_LAST                        BIT(15)
 
 struct mt7615_txp_ptr {
        __le32 buf0;