mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
102 lines
2.9 KiB
Diff
102 lines
2.9 KiB
Diff
From 8325a7cbf9648725163a7596ba3381775039fe69 Mon Sep 17 00:00:00 2001
|
|
From: Frank Wunderlich <frank-w@public-files.de>
|
|
Date: Thu, 29 Nov 2018 11:38:27 +0100
|
|
Subject: [PATCH 21/77] net: dsa: adding handling of second CPU-Port
|
|
|
|
this patch adds the core-functionality of multiple cpu-ports
|
|
|
|
currently it uses definition in dts to make connection between cpu and user-port
|
|
|
|
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>
|
|
---
|
|
net/dsa/dsa2.c | 18 ++++++++++++++++++
|
|
net/dsa/slave.c | 3 ++-
|
|
2 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
|
|
index b7c6da2f1f08..8f64535fd2a0 100644
|
|
--- a/net/dsa/dsa2.c
|
|
+++ b/net/dsa/dsa2.c
|
|
@@ -303,6 +303,8 @@ static int dsa_port_setup(struct dsa_port *dp)
|
|
ds->index, dp->index);
|
|
return err;
|
|
}
|
|
+ if (dp->master)
|
|
+ dp->master->dsa_ptr = dp;
|
|
break;
|
|
case DSA_PORT_TYPE_DSA:
|
|
/* dp->index is used now as port_number. However
|
|
@@ -323,12 +325,17 @@ static int dsa_port_setup(struct dsa_port *dp)
|
|
devlink_port_attrs_set(&dp->devlink_port,
|
|
DEVLINK_PORT_FLAVOUR_PHYSICAL,
|
|
dp->index, false, 0);
|
|
+ err = dsa_user_parse(dp, dp->index, ds);
|
|
+ if (err)
|
|
+ return err;
|
|
+
|
|
err = dsa_slave_create(dp);
|
|
if (err)
|
|
dev_err(ds->dev, "failed to create slave for port %d.%d\n",
|
|
ds->index, dp->index);
|
|
else
|
|
devlink_port_type_eth_set(&dp->devlink_port, dp->slave);
|
|
+
|
|
break;
|
|
}
|
|
|
|
@@ -344,6 +351,14 @@ static void dsa_port_teardown(struct dsa_port *dp)
|
|
case DSA_PORT_TYPE_UNUSED:
|
|
break;
|
|
case DSA_PORT_TYPE_CPU:
|
|
+ dsa_port_link_unregister_of(dp);
|
|
+ if (dp->master)
|
|
+ dp->master->dsa_ptr = NULL;
|
|
+ if (dp->ethernet) {
|
|
+ dev_put(dp->ethernet);
|
|
+ dp->ethernet = NULL;
|
|
+ }
|
|
+ break;
|
|
case DSA_PORT_TYPE_DSA:
|
|
dsa_port_link_unregister_of(dp);
|
|
break;
|
|
@@ -598,6 +613,9 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master)
|
|
dp->master = master;
|
|
dp->dst = dst;
|
|
|
|
+ dev_hold(master);
|
|
+ ds->ports[dp->index].ethernet = master;
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
|
|
index 1c45c1d6d241..3bdbd53d3420 100644
|
|
--- a/net/dsa/slave.c
|
|
+++ b/net/dsa/slave.c
|
|
@@ -1291,11 +1291,11 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val)
|
|
int dsa_slave_create(struct dsa_port *port)
|
|
{
|
|
const struct dsa_port *cpu_dp = port->cpu_dp;
|
|
- struct net_device *master = cpu_dp->master;
|
|
struct dsa_switch *ds = port->ds;
|
|
const char *name = port->name;
|
|
struct net_device *slave_dev;
|
|
struct dsa_slave_priv *p;
|
|
+ struct net_device *master = ds->ports[port->upstream].ethernet;
|
|
int ret;
|
|
|
|
if (!ds->num_tx_queues)
|
|
@@ -1334,6 +1334,7 @@ int dsa_slave_create(struct dsa_port *port)
|
|
p->dp = port;
|
|
INIT_LIST_HEAD(&p->mall_tc_list);
|
|
p->xmit = cpu_dp->tag_ops->xmit;
|
|
+ p->master = master;
|
|
port->slave = slave_dev;
|
|
|
|
netif_carrier_off(slave_dev);
|
|
--
|
|
2.19.1
|
|
|