diff options
| author | John Crispin <john@phrozen.org> | 2017-04-07 17:42:08 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-04-07 17:42:08 +0200 |
| commit | 64175ffb7911f5fcd3907df09fdb9bfab53ee641 (patch) | |
| tree | cf466db6e64c3365609e98d4ec9dcd4d27c1a835 /target/linux/mediatek/patches-4.9/0092-dsa3.patch | |
| parent | 43d06ec2c75199591f33943eb2f70e8aae80fd45 (diff) | |
| download | upstream-64175ffb7911f5fcd3907df09fdb9bfab53ee641.tar.gz upstream-64175ffb7911f5fcd3907df09fdb9bfab53ee641.tar.bz2 upstream-64175ffb7911f5fcd3907df09fdb9bfab53ee641.zip | |
mediatek: various fixes for v4.9
* adds MT7530 DSA support
* backport latest ethernet driver
* add PMIC leds
* add auxadc support
* add efuse support
* add thermal sensor support
* add irq affinity support for ethernet
still todo
* DSA multi cpu support
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.9/0092-dsa3.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.9/0092-dsa3.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.9/0092-dsa3.patch b/target/linux/mediatek/patches-4.9/0092-dsa3.patch new file mode 100644 index 0000000000..7c4dc4f35c --- /dev/null +++ b/target/linux/mediatek/patches-4.9/0092-dsa3.patch @@ -0,0 +1,67 @@ +From patchwork Wed Mar 29 09:38:21 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [net-next, v3, + 3/5] net-next: ethernet: mediatek: add CDM able to recognize the tag + for DSA +From: sean.wang@mediatek.com +X-Patchwork-Id: 9651091 +Message-Id: <1490780303-18598-4-git-send-email-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, Landen.Chao@mediatek.com, keyhaede@gmail.com, + netdev@vger.kernel.org, sean.wang@mediatek.com, + linux-kernel@vger.kernel.org, + linux-mediatek@lists.infradead.org, objelf@gmail.com, davem@davemloft.net +Date: Wed, 29 Mar 2017 17:38:21 +0800 + +From: Sean Wang <sean.wang@mediatek.com> + +The patch adds the setup for allowing CDM can recognize these packets with +carrying port-distinguishing tag. Otherwise, these tagging packets will be +handled incorrectly by CDM. The setup is also working out for general +untag packets as well. + +Signed-off-by: Sean Wang <sean.wang@mediatek.com> +Signed-off-by: Landen Chao <Landen.Chao@mediatek.com> +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 ++++++ + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index 9e75768..c21ed99 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -1846,6 +1846,12 @@ 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)); + ++ /* Indicates CDM to parse the MTK special tag from CPU ++ * which also is working out for untag packets. ++ */ ++ val = mtk_r32(eth, MTK_CDMQ_IG_CTRL); ++ mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL); ++ + /* 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..996024d 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h +@@ -70,6 +70,10 @@ + /* 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 + |