Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1599573
| From | <sean.wang@mediatek.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA |
| Date | 2017-03-13 17:20 +0100 |
| Message-ID | <tkARs-34n-39@gated-at.bofh.it> (permalink) |
| References | <tkARr-34n-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next 0/4] net-next: dsa: add Mediatek MT7530 support <sean.wang@mediatek.com> - 2017-03-13 17:20 +0100
[PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler <sean.wang@mediatek.com> - 2017-03-13 17:20 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Andrew Lunn <andrew@lunn.ch> - 2017-03-13 17:40 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Florian Fainelli <f.fainelli@gmail.com> - 2017-03-13 17:50 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Sean Wang <sean.wang@mediatek.com> - 2017-03-14 07:20 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-03-13 18:10 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Sean Wang <sean.wang@mediatek.com> - 2017-03-14 07:30 +0100
Re: [PATCH net-next 2/4] net-next: dsa: add Mediatek tag RX/TX handler Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-03-14 14:50 +0100
[PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA <sean.wang@mediatek.com> - 2017-03-13 17:20 +0100
Re: [PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA Andrew Lunn <andrew@lunn.ch> - 2017-03-13 17:40 +0100
Re: [PATCH net-next 3/4] net-next: ethernet: mediatek: add CDM able to recognize the tag for DSA Florian Fainelli <f.fainelli@gmail.com> - 2017-03-13 17:50 +0100
Re: [PATCH net-next 4/4] net-next: dsa: add dsa support for Mediatek MT7530 switch Andrew Lunn <andrew@lunn.ch> - 2017-03-13 17:50 +0100
Re: [PATCH net-next 0/4] net-next: dsa: add Mediatek MT7530 support John Crispin <john@phrozen.org> - 2017-03-13 18:00 +0100
Re: [PATCH net-next 4/4] net-next: dsa: add dsa support for Mediatek MT7530 switch Andrew Lunn <andrew@lunn.ch> - 2017-03-14 00:20 +0100
Re: [PATCH net-next 4/4] net-next: dsa: add dsa support for Mediatek MT7530 switch Sean Wang <sean.wang@mediatek.com> - 2017-03-14 08:10 +0100
csiph-web