* [PATCH 1/2] mt76: mt7622: fix DMA unmap length
2020-04-09 8:46 [PATCH 0/2] fix TXP DMA unmap for mt7622/mt7623 Lorenzo Bianconi
@ 2020-04-09 8:46 ` Lorenzo Bianconi
2020-04-09 8:46 ` [PATCH 2/2] mt76: mt7663: " Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Bianconi @ 2020-04-09 8:46 UTC (permalink / raw)
To: nbd
Cc: ryder.lee, sean.wang, linux-wireless, linux-mediatek, soul.huang,
lorenzo.bianconi
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>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 8 ++++----
drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 1 +
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c | 3 +--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index c4a81bde5cf9..e7db7f17c37b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -662,16 +662,16 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp)
u16 len;
len = le16_to_cpu(ptr->len0);
- last = len & MT_TXD_LEN_MSDU_LAST;
- len &= ~MT_TXD_LEN_MSDU_LAST;
+ last = len & MT_TXD_LAST_MASK;
+ len &= ~MT_TXD_LAST_MASK;
dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,
DMA_TO_DEVICE);
if (last)
break;
len = le16_to_cpu(ptr->len1);
- last = len & MT_TXD_LEN_MSDU_LAST;
- len &= ~MT_TXD_LEN_MSDU_LAST;
+ last = len & MT_TXD_LAST_MASK;
+ len &= ~MT_TXD_LAST_MASK;
dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,
DMA_TO_DEVICE);
if (last)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
index b540a8cca1e1..d9b2fdfb4c8b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
@@ -258,6 +258,7 @@ enum tx_phy_bandwidth {
#define MT_TXD_LEN_MSDU_LAST BIT(14)
#define MT_TXD_LEN_AMSDU_LAST BIT(15)
+#define MT_TXD_LAST_MASK GENMASK(15, 14)
struct mt7615_txp_ptr {
__le32 buf0;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
index 7fba1c39060f..6dfd03a8869b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
@@ -67,8 +67,7 @@ mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,
u16 len = tx_info->buf[i + 1].len;
if (i == nbuf - 1)
- len |= MT_TXD_LEN_MSDU_LAST |
- MT_TXD_LEN_AMSDU_LAST;
+ len |= MT_TXD_LAST_MASK;
if (i & 1) {
ptr->buf1 = cpu_to_le32(addr);
--
2.25.2
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] mt76: mt7663: fix DMA unmap length
2020-04-09 8:46 [PATCH 0/2] fix TXP DMA unmap for mt7622/mt7623 Lorenzo Bianconi
2020-04-09 8:46 ` [PATCH 1/2] mt76: mt7622: fix DMA unmap length Lorenzo Bianconi
@ 2020-04-09 8:46 ` Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Bianconi @ 2020-04-09 8:46 UTC (permalink / raw)
To: nbd
Cc: ryder.lee, sean.wang, linux-wireless, linux-mediatek, soul.huang,
lorenzo.bianconi
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>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 17 +++++++++++++----
drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 2 ++
.../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 15 ++++++++++++---
3 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index e7db7f17c37b..11d161d278e4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -654,24 +654,33 @@ 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, len_mask;
int i;
+ if (is_mt7663(dev)) {
+ last_mask = MT_TXD_LEN_AMSDU_LAST;
+ len_mask = MT7663_TXD_LEN_MASK;
+ } else {
+ last_mask = MT_TXD_LAST_MASK;
+ len_mask = MT_TXD_LEN_MASK;
+ }
+
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_LAST_MASK;
- len &= ~MT_TXD_LAST_MASK;
+ last = len & last_mask;
+ len &= len_mask;
dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,
DMA_TO_DEVICE);
if (last)
break;
len = le16_to_cpu(ptr->len1);
- last = len & MT_TXD_LAST_MASK;
- len &= ~MT_TXD_LAST_MASK;
+ last = len & last_mask;
+ len &= len_mask;
dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,
DMA_TO_DEVICE);
if (last)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
index d9b2fdfb4c8b..2b08abb82b73 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
@@ -256,8 +256,10 @@ enum tx_phy_bandwidth {
#define MT_MSDU_ID_VALID BIT(15)
+#define MT7663_TXD_LEN_MASK GENMASK(11, 0)
#define MT_TXD_LEN_MSDU_LAST BIT(14)
#define MT_TXD_LEN_AMSDU_LAST BIT(15)
+#define MT_TXD_LEN_MASK GENMASK(13, 0)
#define MT_TXD_LAST_MASK GENMASK(15, 14)
struct mt7615_txp_ptr {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
index 6dfd03a8869b..f2db396bfae3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
@@ -54,20 +54,29 @@ 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, len_mask;
tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp);
tx_info->nbuf = 1;
+ if (is_mt7663(&dev->mt76)) {
+ last_mask = MT_TXD_LEN_AMSDU_LAST;
+ len_mask = MT7663_TXD_LEN_MASK;
+ } else {
+ last_mask = MT_TXD_LAST_MASK;
+ len_mask = MT_TXD_LEN_MASK;
+ }
+
txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);
for (i = 0; i < nbuf; i++) {
u32 addr = tx_info->buf[i + 1].addr;
u16 len = tx_info->buf[i + 1].len;
+ len &= len_mask;
if (i == nbuf - 1)
- len |= MT_TXD_LAST_MASK;
+ len |= last_mask;
if (i & 1) {
ptr->buf1 = cpu_to_le32(addr);
--
2.25.2
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 3+ messages in thread