mt76: mt7622: fix DMA unmap length

[ Upstream commit c0f8055b3986f9c9f990268b578173259769ba1c ]

Fix DMA unmap length estimation in mt7615_txp_skb_unmap_hw for mt7622
chipset

Fixes: 6aa4ed7927f1 ("mt76: mt7615: implement DMA support for MT7622")
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 656231786d554d4eaf7a25e2fb767e1e5c8599c4..b5249d08564c58daa1919ee342054308c8b4716d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -675,7 +675,7 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)
 
                len = le16_to_cpu(ptr->len0);
                last = len & MT_TXD_LEN_MSDU_LAST;
-               len &= ~MT_TXD_LEN_MSDU_LAST;
+               len &= MT_TXD_LEN_MASK;
                dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,
                                 DMA_TO_DEVICE);
                if (last)
@@ -683,7 +683,7 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)
 
                len = le16_to_cpu(ptr->len1);
                last = len & MT_TXD_LEN_MSDU_LAST;
-               len &= ~MT_TXD_LEN_MSDU_LAST;
+               len &= MT_TXD_LEN_MASK;
                dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,
                                 DMA_TO_DEVICE);
                if (last)
@@ -1107,8 +1107,8 @@ mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,
        txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);
 
        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;
-               u16 len = tx_info->buf[i + 1].len;
 
                if (i == nbuf - 1)
                        len |= MT_TXD_LEN_MSDU_LAST |

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
index e0b89257db90d1acc0419b9bb2fcd308bab0656e..53ac184ab2d68346759996490de50f6dd87f749d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
@@ -252,6 +252,7 @@ enum tx_phy_bandwidth {
 
 #define MT_MSDU_ID_VALID               BIT(15)
 
+#define MT_TXD_LEN_MASK                        GENMASK(11, 0)
 #define MT_TXD_LEN_MSDU_LAST           BIT(14)
 #define MT_TXD_LEN_AMSDU_LAST          BIT(15)