mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-13 20:01:55 +00:00
121 lines
3.8 KiB
Diff
121 lines
3.8 KiB
Diff
From 954b359077f770bdbb376db571a4710965684dc9 Mon Sep 17 00:00:00 2001
|
|
From: Frank Wunderlich <frank-w@public-files.de>
|
|
Date: Sat, 8 Dec 2018 19:25:57 +0100
|
|
Subject: [PATCH 23/77] net: dsa: dsa multi cpu (mt7530.c)
|
|
|
|
implementing changes to mt7530 switch driver for supporting multiple (2)
|
|
cpu-ports
|
|
|
|
based on
|
|
https://github.com/openwrt/openwrt/blob/master/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch
|
|
|
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 34 +++++++++++++++++++---------------
|
|
1 file changed, 19 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
|
|
index 8ed0af6abe7d..fda1b67dfeac 100644
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -678,6 +678,9 @@ static int
|
|
mt7530_cpu_port_enable(struct mt7530_priv *priv,
|
|
int port)
|
|
{
|
|
+ u8 port_mask = 0;
|
|
+ int i;
|
|
+
|
|
/* Enable Mediatek header mode on the cpu port */
|
|
mt7530_write(priv, MT7530_PVC_P(port),
|
|
PORT_SPEC_TAG);
|
|
@@ -694,8 +697,14 @@ mt7530_cpu_port_enable(struct mt7530_priv *priv,
|
|
/* CPU port gets connected to all user ports of
|
|
* the switch
|
|
*/
|
|
+
|
|
+ for (i = 0; i < MT7530_NUM_PORTS; i++)
|
|
+ if ((priv->ds->ports[port].type == DSA_PORT_TYPE_USER) &&
|
|
+ (dsa_port_upstream_port(priv->ds, i) == port))
|
|
+ port_mask |= BIT(i);
|
|
+
|
|
mt7530_write(priv, MT7530_PCR_P(port),
|
|
- PCR_MATRIX(dsa_user_ports(priv->ds)));
|
|
+ PCR_MATRIX(port_mask));
|
|
|
|
return 0;
|
|
}
|
|
@@ -705,6 +714,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port,
|
|
struct phy_device *phy)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
+ u8 upstream = dsa_port_upstream_port(ds, port);
|
|
|
|
mutex_lock(&priv->reg_mutex);
|
|
|
|
@@ -715,7 +725,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port,
|
|
* restore the port matrix if the port is the member of a certain
|
|
* bridge.
|
|
*/
|
|
- priv->ports[port].pm |= PCR_MATRIX(BIT(MT7530_CPU_PORT));
|
|
+ priv->ports[port].pm |= PCR_MATRIX(BIT(upstream));
|
|
priv->ports[port].enable = true;
|
|
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
|
|
priv->ports[port].pm);
|
|
@@ -778,7 +788,8 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port,
|
|
struct net_device *bridge)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
- u32 port_bitmap = BIT(MT7530_CPU_PORT);
|
|
+ u8 upstream = dsa_port_upstream_port(ds, port);
|
|
+ u32 port_bitmap = BIT(upstream);
|
|
int i;
|
|
|
|
mutex_lock(&priv->reg_mutex);
|
|
@@ -879,6 +890,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
|
|
struct net_device *bridge)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
+ u8 upstream = dsa_port_upstream_port(ds, port);
|
|
int i;
|
|
|
|
mutex_lock(&priv->reg_mutex);
|
|
@@ -906,8 +918,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
|
|
*/
|
|
if (priv->ports[port].enable)
|
|
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
|
|
- PCR_MATRIX(BIT(MT7530_CPU_PORT)));
|
|
- priv->ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT));
|
|
+ PCR_MATRIX(BIT(upstream)));
|
|
+ priv->ports[port].pm = PCR_MATRIX(BIT(upstream));
|
|
|
|
mt7530_port_set_vlan_unaware(ds, port);
|
|
|
|
@@ -1198,15 +1210,7 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port,
|
|
static enum dsa_tag_protocol
|
|
mtk_get_tag_protocol(struct dsa_switch *ds, int port)
|
|
{
|
|
- struct mt7530_priv *priv = ds->priv;
|
|
-
|
|
- if (port != MT7530_CPU_PORT) {
|
|
- dev_warn(priv->dev,
|
|
- "port not matched with tagging CPU port\n");
|
|
- return DSA_TAG_PROTO_NONE;
|
|
- } else {
|
|
- return DSA_TAG_PROTO_MTK;
|
|
- }
|
|
+ return DSA_TAG_PROTO_MTK;
|
|
}
|
|
|
|
static int
|
|
@@ -1279,7 +1283,7 @@ mt7530_setup(struct dsa_switch *ds)
|
|
|
|
/* Enable Port 6 only; P5 as GMAC5 which currently is not supported */
|
|
val = mt7530_read(priv, MT7530_MHWTRAP);
|
|
- val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS;
|
|
+ val &= ~MHWTRAP_P5_DIS & ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS;
|
|
val |= MHWTRAP_MANUAL;
|
|
if (!dsa_is_cpu_port(ds, 5)) {
|
|
val |= MHWTRAP_P5_DIS;
|
|
--
|
|
2.19.1
|
|
|