From: John Crispin <john@phrozen.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: nbd@nbd.name, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
John Crispin <john@phrozen.org>
Subject: [PATCH 06/12] net-next: mediatek: add next data pointer coherency protection
Date: Thu, 5 May 2016 11:26:19 +0200 [thread overview]
Message-ID: <1462440385-51939-7-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1462440385-51939-1-git-send-email-john@phrozen.org>
The QDMA engine can fail to update the register pointing to the next TX
descriptor if this bit does not get set in the QDMA configuration register.
Not setting this bit can result in invalid values inside the TX rings
registers which will causes TX stalls.
Signed-off-by: John Crispin <john@phrozen.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 2e79af9..60095be 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1277,7 +1277,7 @@ static int mtk_start_dma(struct mtk_eth *eth)
mtk_w32(eth,
MTK_TX_WB_DDONE | MTK_RX_DMA_EN | MTK_TX_DMA_EN |
MTK_RX_2B_OFFSET | MTK_DMA_SIZE_16DWORDS |
- MTK_RX_BT_32DWORDS,
+ MTK_RX_BT_32DWORDS | MTK_NDP_CO_PRO,
MTK_QDMA_GLO_CFG);
return 0;
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 57f7e8a..a5eb7c6 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -91,6 +91,7 @@
#define MTK_QDMA_GLO_CFG 0x1A04
#define MTK_RX_2B_OFFSET BIT(31)
#define MTK_RX_BT_32DWORDS (3 << 11)
+#define MTK_NDP_CO_PRO BIT(10)
#define MTK_TX_WB_DDONE BIT(6)
#define MTK_DMA_SIZE_16DWORDS (2 << 4)
#define MTK_RX_DMA_BUSY BIT(3)
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
To: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
nbd-Vt+b4OUoWG0@public.gmane.org
Subject: [PATCH 06/12] net-next: mediatek: add next data pointer coherency protection
Date: Thu, 5 May 2016 11:26:19 +0200 [thread overview]
Message-ID: <1462440385-51939-7-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1462440385-51939-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
The QDMA engine can fail to update the register pointing to the next TX
descriptor if this bit does not get set in the QDMA configuration register.
Not setting this bit can result in invalid values inside the TX rings
registers which will causes TX stalls.
Signed-off-by: John Crispin <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 2e79af9..60095be 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1277,7 +1277,7 @@ static int mtk_start_dma(struct mtk_eth *eth)
mtk_w32(eth,
MTK_TX_WB_DDONE | MTK_RX_DMA_EN | MTK_TX_DMA_EN |
MTK_RX_2B_OFFSET | MTK_DMA_SIZE_16DWORDS |
- MTK_RX_BT_32DWORDS,
+ MTK_RX_BT_32DWORDS | MTK_NDP_CO_PRO,
MTK_QDMA_GLO_CFG);
return 0;
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 57f7e8a..a5eb7c6 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -91,6 +91,7 @@
#define MTK_QDMA_GLO_CFG 0x1A04
#define MTK_RX_2B_OFFSET BIT(31)
#define MTK_RX_BT_32DWORDS (3 << 11)
+#define MTK_NDP_CO_PRO BIT(10)
#define MTK_TX_WB_DDONE BIT(6)
#define MTK_DMA_SIZE_16DWORDS (2 << 4)
#define MTK_RX_DMA_BUSY BIT(3)
--
1.7.10.4
next prev parent reply other threads:[~2016-05-05 9:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 9:26 [PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes John Crispin
2016-05-05 9:26 ` [PATCH 01/12] net-next: mediatek: fix DQL support John Crispin
2016-05-05 9:26 ` [PATCH 02/12] net-next: mediatek: add missing return code check John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` [PATCH 03/12] net-next: mediatek: fix missing free of scratch memory John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` [PATCH 04/12] net-next: mediatek: invalid buffer lookup in mtk_tx_map() John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` [PATCH 05/12] net-next: mediatek: dropped rx packets are not being counted properly John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` John Crispin [this message]
2016-05-05 9:26 ` [PATCH 06/12] net-next: mediatek: add next data pointer coherency protection John Crispin
2016-05-05 9:26 ` [PATCH 07/12] net-next: mediatek: disable all interrupts during probe John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` [PATCH 08/12] net-next: mediatek: fix threshold value John Crispin
2016-05-05 9:26 ` John Crispin
2016-05-05 9:26 ` [PATCH 09/12] net-next: mediatek: increase watchdog_timeo John Crispin
2016-05-05 9:26 ` [PATCH 10/12] net-next: mediatek: fix off by one in the TX ring allocation John Crispin
2016-05-05 9:26 ` [PATCH 11/12] net-next: mediatek: only wake the queue if it is stopped John Crispin
2016-05-05 9:26 ` [PATCH 12/12] net-next: mediatek: remove superfluous queue wake up call John Crispin
2016-05-05 12:25 ` [PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes Andrew Lunn
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=1462440385-51939-7-git-send-email-john@phrozen.org \
--to=john@phrozen.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
/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.