From: Lorenzo Bianconi <lorenzo@kernel.org>
To: nbd@nbd.name
Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com,
sean.wang@mediatek.com, ryder.lee@mediatek.com,
soul.huang@mediatek.com, linux-mediatek@lists.infradead.org
Subject: [PATCH 2/2] mt76: mt7663: fix DMA unmap length
Date: Thu, 9 Apr 2020 10:46:39 +0200 [thread overview]
Message-ID: <20f6c8304fb911d31780ad2b1d8fa768b7b1eda2.1586421673.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1586421673.git.lorenzo@kernel.org>
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
WARNING: multiple messages have this Message-ID (diff)
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: nbd@nbd.name
Cc: ryder.lee@mediatek.com, sean.wang@mediatek.com,
linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org, soul.huang@mediatek.com,
lorenzo.bianconi@redhat.com
Subject: [PATCH 2/2] mt76: mt7663: fix DMA unmap length
Date: Thu, 9 Apr 2020 10:46:39 +0200 [thread overview]
Message-ID: <20f6c8304fb911d31780ad2b1d8fa768b7b1eda2.1586421673.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1586421673.git.lorenzo@kernel.org>
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
next prev parent reply other threads:[~2020-04-09 8:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 1/2] mt76: mt7622: fix DMA unmap length Lorenzo Bianconi
2020-04-09 8:46 ` Lorenzo Bianconi
2020-04-09 8:46 ` Lorenzo Bianconi [this message]
2020-04-09 8:46 ` [PATCH 2/2] mt76: mt7663: " Lorenzo Bianconi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20f6c8304fb911d31780ad2b1d8fa768b7b1eda2.1586421673.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=soul.huang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.