From: <sean.wang@mediatek.com>
To: <andrew@lunn.ch>, <f.fainelli@gmail.com>,
<vivien.didelot@savoirfairelinux.com>, <matthias.bgg@gmail.com>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>
Cc: <devicetree@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <davem@davemloft.net>,
<sean.wang@mediatek.com>, <Landen.Chao@mediatek.com>,
<keyhaede@gmail.com>, <objelf@gmail.com>
Subject: [PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA
Date: Tue, 14 Mar 2017 00:11:27 +0800 [thread overview]
Message-ID: <1489421488-300-4-git-send-email-sean.wang@mediatek.com> (raw)
In-Reply-To: <1489421488-300-1-git-send-email-sean.wang@mediatek.com>
From: Sean Wang <sean.wang@mediatek.com>
Allowing CDM can recognize these packets with carrying port-distinguishing
tag when CONFIG_NET_DSA_TAG_MTK is enabled. Otherwise, these packets will
be dropped by CDM ingress.
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Landen Chao <Landen.Chao@mediatek.com>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 ++++++++
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 5 +++++
2 files changed, 13 insertions(+)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 3dd8788..19944e0 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1848,6 +1848,14 @@ static int mtk_hw_init(struct mtk_eth *eth)
/* GE2, Force 1000M/FD, FC ON */
mtk_w32(eth, MAC_MCR_FIXED_LINK, MTK_MAC_MCR(1));
+#if defined(CONFIG_NET_DSA_TAG_MTK)
+ /* Tell CDMQ to parse the MTK special tag from CPU */
+ /* QDMA Tx Use CDMQ */
+ u32 val2 = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
+
+ mtk_w32(eth, val2 | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
+#endif
+
/* Enable RX VLan Offloading */
mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 99b1c8e..79606db 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -70,11 +70,16 @@
/* Frame Engine Interrupt Grouping Register */
#define MTK_FE_INT_GRP 0x20
+/* CDMP Ingress Control Register */
+#define MTK_CDMQ_IG_CTRL 0x1400
+#define MTK_CDMQ_STAG_EN BIT(0)
+
/* CDMP Exgress Control Register */
#define MTK_CDMP_EG_CTRL 0x404
/* GDM Exgress Control Register */
#define MTK_GDMA_FWD_CFG(x) (0x500 + (x * 0x1000))
+#define MTK_GDMA_STAG_EN BIT(24)
#define MTK_GDMA_ICS_EN BIT(22)
#define MTK_GDMA_TCS_EN BIT(21)
#define MTK_GDMA_UCS_EN BIT(20)
--
1.9.1
next prev parent reply other threads:[~2017-03-13 16:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 16:11 [PATCH net-next 0/4] net-next: dsa: add Mediatek MT7530 support sean.wang
2017-03-13 16:11 ` [PATCH net-next 1/4] dt-bindings: net: dsa: add Mediatek MT7530 binding sean.wang
2017-03-13 16:36 ` Andrew Lunn
2017-03-14 6:06 ` Sean Wang
2017-03-13 16:47 ` Florian Fainelli
2017-03-14 6:52 ` Sean Wang
2017-03-14 11:58 ` Andrew Lunn
2017-03-13 16:11 ` [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler sean.wang
2017-03-13 16:27 ` Andrew Lunn
2017-03-13 16:35 ` Florian Fainelli
2017-03-14 6:16 ` Sean Wang
2017-03-13 16:59 ` Vivien Didelot
2017-03-14 6:22 ` Sean Wang
2017-03-14 13:38 ` Vivien Didelot
2017-03-13 16:11 ` sean.wang [this message]
2017-03-13 16:30 ` [PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA Andrew Lunn
2017-03-13 16:39 ` Florian Fainelli
2017-03-13 16:11 ` [PATCH net-next 4/4] net-next: dsa: add dsa support for Mediatek MT7530 switch sean.wang
2017-03-13 16:41 ` Andrew Lunn
2017-03-13 23:11 ` Andrew Lunn
2017-03-14 7:03 ` Sean Wang
2017-03-15 2:20 ` kbuild test robot
2017-03-15 2:30 ` kbuild test robot
2017-03-13 16:25 ` [PATCH net-next 0/4] net-next: dsa: add Mediatek MT7530 support John Crispin
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=1489421488-300-4-git-send-email-sean.wang@mediatek.com \
--to=sean.wang@mediatek.com \
--cc=Landen.Chao@mediatek.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=keyhaede@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=objelf@gmail.com \
--cc=robh+dt@kernel.org \
--cc=vivien.didelot@savoirfairelinux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).