1 From cce5dd6034ed1651ee25c910edee708e6b84a44a Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Thu, 10 Aug 2017 14:45:08 +0200
4 Subject: [PATCH 33/57] net: dsa: add multi gmac support
6 Signed-off-by: John Crispin <john@phrozen.org>
8 drivers/net/dsa/mt7530.c | 10 +---------
9 include/net/dsa.h | 21 ++++++++++++++++++++-
10 net/dsa/dsa2.c | 40 +++++++++++++++++++++++++++++++++-------
11 net/dsa/dsa_priv.h | 1 +
12 net/dsa/slave.c | 26 ++++++++++++++++----------
13 5 files changed, 71 insertions(+), 27 deletions(-)
15 --- a/drivers/net/dsa/mt7530.c
16 +++ b/drivers/net/dsa/mt7530.c
17 @@ -996,15 +996,7 @@ err:
18 static enum dsa_tag_protocol
19 mtk_get_tag_protocol(struct dsa_switch *ds)
21 - struct mt7530_priv *priv = ds->priv;
23 - if (!dsa_is_cpu_port(ds, MT7530_CPU_PORT)) {
25 - "port not matched with tagging CPU port\n");
26 - return DSA_TAG_PROTO_NONE;
28 - return DSA_TAG_PROTO_MTK;
30 + return DSA_TAG_PROTO_MTK;
33 static struct dsa_switch_ops mt7530_switch_ops = {
34 --- a/include/net/dsa.h
35 +++ b/include/net/dsa.h
36 @@ -145,6 +145,8 @@ struct dsa_port {
37 struct device_node *dn;
38 unsigned int ageing_time;
40 + struct net_device *ethernet;
45 @@ -205,7 +207,7 @@ struct dsa_switch {
47 static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
49 - return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
50 + return !!(ds->cpu_port_mask & (1 << p));
53 static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p)
54 @@ -218,6 +220,11 @@ static inline bool dsa_is_port_initializ
55 return ds->enabled_port_mask & (1 << p) && ds->ports[p].netdev;
58 +static inline bool dsa_is_upstream_port(struct dsa_switch *ds, int p)
60 + return dsa_is_cpu_port(ds, p) || dsa_is_dsa_port(ds, p);
63 static inline u8 dsa_upstream_port(struct dsa_switch *ds)
65 struct dsa_switch_tree *dst = ds->dst;
66 @@ -234,6 +241,18 @@ static inline u8 dsa_upstream_port(struc
67 return ds->rtable[dst->cpu_switch];
70 +static inline u8 dsa_port_upstream_port(struct dsa_switch *ds, int port)
73 + * If this port has a specific upstream cpu port, use it,
74 + * otherwise use the switch default.
76 + if (ds->ports[port].upstream)
77 + return ds->ports[port].upstream;
79 + return dsa_upstream_port(ds);
82 struct switchdev_trans;
84 struct switchdev_obj_port_fdb;
87 @@ -248,8 +248,6 @@ static int dsa_cpu_port_apply(struct dev
91 - ds->cpu_port_mask |= BIT(index);
96 @@ -259,6 +257,10 @@ static void dsa_cpu_port_unapply(struct
97 dsa_cpu_dsa_destroy(port);
98 ds->cpu_port_mask &= ~BIT(index);
100 + if (ds->ports[index].ethernet) {
101 + dev_put(ds->ports[index].ethernet);
102 + ds->ports[index].ethernet = NULL;
106 static int dsa_user_port_apply(struct device_node *port, u32 index,
107 @@ -479,6 +481,29 @@ static int dsa_cpu_parse(struct device_n
109 dst->rcv = dst->tag_ops->rcv;
111 + dev_hold(ethernet_dev);
112 + ds->ports[index].ethernet = ethernet_dev;
113 + ds->cpu_port_mask |= BIT(index);
118 +static int dsa_user_parse(struct device_node *port, u32 index,
119 + struct dsa_switch *ds)
121 + struct device_node *cpu_port;
122 + const unsigned int *cpu_port_reg;
123 + int cpu_port_index;
125 + cpu_port = of_parse_phandle(port, "cpu", 0);
127 + cpu_port_reg = of_get_property(cpu_port, "reg", NULL);
130 + cpu_port_index = be32_to_cpup(cpu_port_reg);
131 + ds->ports[index].upstream = cpu_port_index;
137 @@ -486,18 +511,19 @@ static int dsa_ds_parse(struct dsa_switc
139 struct device_node *port;
144 for (index = 0; index < DSA_MAX_PORTS; index++) {
145 port = ds->ports[index].dn;
149 - if (dsa_port_is_cpu(port)) {
150 + if (dsa_port_is_cpu(port))
151 err = dsa_cpu_parse(port, index, dst, ds);
155 + else if (!dsa_port_is_dsa(port))
156 + err = dsa_user_parse(port, index, ds);
161 pr_info("DSA: switch %d %d parsed\n", dst->tree, ds->index);
162 --- a/net/dsa/dsa_priv.h
163 +++ b/net/dsa/dsa_priv.h
164 @@ -43,6 +43,7 @@ struct dsa_slave_priv {
167 struct net_device *bridge_dev;
168 + struct net_device *master;
169 #ifdef CONFIG_NET_POLL_CONTROLLER
170 struct netpoll *netpoll;
172 --- a/net/dsa/slave.c
173 +++ b/net/dsa/slave.c
174 @@ -61,7 +61,7 @@ static int dsa_slave_get_iflink(const st
176 struct dsa_slave_priv *p = netdev_priv(dev);
178 - return p->parent->dst->master_netdev->ifindex;
179 + return p->master->ifindex;
182 static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p)
183 @@ -96,7 +96,7 @@ static void dsa_port_set_stp_state(struc
184 static int dsa_slave_open(struct net_device *dev)
186 struct dsa_slave_priv *p = netdev_priv(dev);
187 - struct net_device *master = p->parent->dst->master_netdev;
188 + struct net_device *master = p->master;
189 struct dsa_switch *ds = p->parent;
190 u8 stp_state = dsa_port_is_bridged(p) ?
191 BR_STATE_BLOCKING : BR_STATE_FORWARDING;
192 @@ -151,7 +151,7 @@ out:
193 static int dsa_slave_close(struct net_device *dev)
195 struct dsa_slave_priv *p = netdev_priv(dev);
196 - struct net_device *master = p->parent->dst->master_netdev;
197 + struct net_device *master = p->master;
198 struct dsa_switch *ds = p->parent;
201 @@ -178,7 +178,7 @@ static int dsa_slave_close(struct net_de
202 static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
204 struct dsa_slave_priv *p = netdev_priv(dev);
205 - struct net_device *master = p->parent->dst->master_netdev;
206 + struct net_device *master = p->master;
208 if (change & IFF_ALLMULTI)
209 dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1);
210 @@ -189,7 +189,7 @@ static void dsa_slave_change_rx_flags(st
211 static void dsa_slave_set_rx_mode(struct net_device *dev)
213 struct dsa_slave_priv *p = netdev_priv(dev);
214 - struct net_device *master = p->parent->dst->master_netdev;
215 + struct net_device *master = p->master;
217 dev_mc_sync(master, dev);
218 dev_uc_sync(master, dev);
219 @@ -198,7 +198,7 @@ static void dsa_slave_set_rx_mode(struct
220 static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
222 struct dsa_slave_priv *p = netdev_priv(dev);
223 - struct net_device *master = p->parent->dst->master_netdev;
224 + struct net_device *master = p->master;
225 struct sockaddr *addr = a;
228 @@ -633,7 +633,7 @@ static netdev_tx_t dsa_slave_xmit(struct
229 /* Queue the SKB for transmission on the parent interface, but
230 * do not modify its EtherType
232 - nskb->dev = p->parent->dst->master_netdev;
233 + nskb->dev = p->master;
234 dev_queue_xmit(nskb);
237 @@ -945,7 +945,7 @@ static int dsa_slave_netpoll_setup(struc
239 struct dsa_slave_priv *p = netdev_priv(dev);
240 struct dsa_switch *ds = p->parent;
241 - struct net_device *master = ds->dst->master_netdev;
242 + struct net_device *master = p->master;
243 struct netpoll *netpoll;
246 @@ -1233,11 +1233,16 @@ int dsa_slave_create(struct dsa_switch *
247 struct net_device *master;
248 struct net_device *slave_dev;
249 struct dsa_slave_priv *p;
250 + int port_cpu = ds->ports[port].upstream;
253 - master = ds->dst->master_netdev;
254 - if (ds->master_netdev)
255 + if (port_cpu && ds->ports[port_cpu].ethernet)
256 + master = ds->ports[port_cpu].ethernet;
257 + else if (ds->master_netdev)
258 master = ds->master_netdev;
260 + master = ds->dst->master_netdev;
261 + master->dsa_ptr = (void *)ds->dst;
263 slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
264 NET_NAME_UNKNOWN, ether_setup);
265 @@ -1263,6 +1268,7 @@ int dsa_slave_create(struct dsa_switch *
268 p->xmit = dst->tag_ops->xmit;
269 + p->master = master;