Skip to content

Commit

Permalink
net: dsa: Remove master_netdev and use dst->cpu_dp->netdev
Browse files Browse the repository at this point in the history 
In preparation for supporting multiple CPU ports, remove
dst->master_netdev and ds->master_netdev and replace them with only one
instance of the common object we have for a port: struct
dsa_port::netdev. ds->master_netdev is currently write only and would be
helpful in the case where we have two switches, both with CPU ports, and
also connected within each other, which the multi-CPU port patch series
would address.

While at it, introduce a helper function used in net/dsa/slave.c to
immediately get a reference on the master network device called
dsa_master_netdev().

Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
@ffainelli @davem330
ffainelli authored and davem330 committed Jun 13, 2017
1 parent 38b6ec5 commit 6d3c8c0
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 48 deletions.
4 changes: 2 additions & 2 deletions drivers/net/dsa/bcm_sf2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)
static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
struct ethtool_wolinfo *wol)
{
struct net_device *p = ds->dst[ds->index].master_netdev;
struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
struct ethtool_wolinfo pwol;

Expand All @@ -829,7 +829,7 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,
struct ethtool_wolinfo *wol)
{
struct net_device *p = ds->dst[ds->index].master_netdev;
struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
s8 cpu_port = ds->dst->cpu_dp->index;
struct ethtool_wolinfo pwol;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/dsa/mt7530.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -912,11 +912,11 @@ mt7530_setup(struct dsa_switch *ds)
struct device_node *dn;
struct mt7530_dummy_poll p;

/* The parent node of master_netdev which holds the common system
/* The parent node of cpu_dp->netdev which holds the common system
* controller also is the container for two GMACs nodes representing
* as two netdev instances.
*/
dn = ds->master_netdev->dev.of_node->parent;
dn = ds->dst->cpu_dp->netdev->dev.of_node->parent;
priv->ethernet = syscon_node_to_regmap(dn);
if (IS_ERR(priv->ethernet))
return PTR_ERR(priv->ethernet);
Expand Down
5 changes: 0 additions & 5 deletions include/net/dsa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,6 @@ struct dsa_switch {
*/
s8 rtable[DSA_MAX_SWITCHES];

/*
* The lower device this switch uses to talk to the host
*/
struct net_device *master_netdev;

/*
* Slave mii_bus and devices for the individual ports.
*/
Expand Down
9 changes: 2 additions & 7 deletions net/dsa/dsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,7 @@ int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp)
struct net_device *master;
struct ethtool_ops *cpu_ops;

master = ds->dst->master_netdev;
if (ds->master_netdev)
master = ds->master_netdev;

master = ds->dst->cpu_dp->netdev;
cpu_ops = devm_kzalloc(ds->dev, sizeof(*cpu_ops), GFP_KERNEL);
if (!cpu_ops)
return -ENOMEM;
Expand All @@ -142,9 +139,7 @@ void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp)
struct dsa_switch *ds = cpu_dp->ds;
struct net_device *master;

master = ds->dst->master_netdev;
if (ds->master_netdev)
master = ds->master_netdev;
master = ds->dst->cpu_dp->netdev;

master->ethtool_ops = ds->dst->master_orig_ethtool_ops;
}
Expand Down
18 changes: 7 additions & 11 deletions net/dsa/dsa2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
return err;

if (ds->ops->set_addr) {
err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
err = ds->ops->set_addr(ds, dst->cpu_dp->netdev->dev_addr);
if (err < 0)
return err;
}
Expand Down Expand Up @@ -444,7 +444,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
* sent to the tag format's receive function.
*/
wmb();
dst->master_netdev->dsa_ptr = dst;
dst->cpu_dp->netdev->dsa_ptr = dst;
dst->applied = true;

return 0;
Expand All @@ -458,7 +458,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
if (!dst->applied)
return;

dst->master_netdev->dsa_ptr = NULL;
dst->cpu_dp->netdev->dsa_ptr = NULL;

/* If we used a tagging format that doesn't have an ethertype
* field, make sure that all packets from this point get sent
Expand Down Expand Up @@ -504,14 +504,10 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
if (!ethernet_dev)
return -EPROBE_DEFER;

if (!ds->master_netdev)
ds->master_netdev = ethernet_dev;

if (!dst->master_netdev)
dst->master_netdev = ethernet_dev;

if (!dst->cpu_dp)
if (!dst->cpu_dp) {
dst->cpu_dp = port;
dst->cpu_dp->netdev = ethernet_dev;
}

tag_protocol = ds->ops->get_tag_protocol(ds);
dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
Expand Down Expand Up @@ -578,7 +574,7 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst)
return err;
}

if (!dst->master_netdev) {
if (!dst->cpu_dp->netdev) {
pr_warn("Tree has no master device\n");
return -EINVAL;
}
Expand Down
5 changes: 5 additions & 0 deletions net/dsa/dsa_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,9 @@ extern const struct dsa_device_ops qca_netdev_ops;
/* tag_trailer.c */
extern const struct dsa_device_ops trailer_netdev_ops;

static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p)
{
return p->dp->ds->dst->cpu_dp->netdev;
}

#endif
22 changes: 13 additions & 9 deletions net/dsa/legacy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,12 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
struct dsa_switch_tree *dst = ds->dst;
struct dsa_chip_data *cd = ds->cd;
bool valid_name_found = false;
struct net_device *master;
int index = ds->index;
int i, ret;

master = dst->cpu_dp->netdev;

/*
* Validate supplied switch configuration.
*/
Expand All @@ -116,7 +119,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)

if (!strcmp(name, "cpu")) {
if (dst->cpu_dp) {
netdev_err(dst->master_netdev,
netdev_err(master,
"multiple cpu ports?!\n");
return -EINVAL;
}
Expand Down Expand Up @@ -168,7 +171,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
return ret;

if (ops->set_addr) {
ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
ret = ops->set_addr(ds, master->dev_addr);
if (ret < 0)
return ret;
}
Expand All @@ -195,14 +198,14 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)

ret = dsa_slave_create(ds, parent, i, cd->port_names[i]);
if (ret < 0)
netdev_err(dst->master_netdev, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
index, i, cd->port_names[i], ret);
}

/* Perform configuration of the CPU and DSA ports */
ret = dsa_cpu_dsa_setups(ds, parent);
if (ret < 0)
netdev_err(dst->master_netdev, "[%d] : can't configure CPU and DSA ports\n",
netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",
index);

ret = dsa_cpu_port_ethtool_setup(ds->dst->cpu_dp);
Expand All @@ -217,6 +220,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
struct device *parent, struct device *host_dev)
{
struct dsa_chip_data *cd = dst->pd->chip + index;
struct net_device *master = dst->cpu_dp->netdev;
const struct dsa_switch_ops *ops;
struct dsa_switch *ds;
int ret;
Expand All @@ -228,11 +232,11 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
*/
ops = dsa_switch_probe(parent, host_dev, cd->sw_addr, &name, &priv);
if (!ops) {
netdev_err(dst->master_netdev, "[%d]: could not detect attached switch\n",
netdev_err(master, "[%d]: could not detect attached switch\n",
index);
return ERR_PTR(-EINVAL);
}
netdev_info(dst->master_netdev, "[%d]: detected a %s switch\n",
netdev_info(master, "[%d]: detected a %s switch\n",
index, name);


Expand Down Expand Up @@ -575,7 +579,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
unsigned configured = 0;

dst->pd = pd;
dst->master_netdev = dev;
dst->cpu_dp->netdev = dev;

for (i = 0; i < pd->nr_chips; i++) {
struct dsa_switch *ds;
Expand Down Expand Up @@ -671,7 +675,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
{
int i;

dst->master_netdev->dsa_ptr = NULL;
dst->cpu_dp->netdev->dsa_ptr = NULL;

/* If we used a tagging format that doesn't have an ethertype
* field, make sure that all packets from this point get sent
Expand All @@ -688,7 +692,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)

dsa_cpu_port_ethtool_restore(dst->cpu_dp);

dev_put(dst->master_netdev);
dev_put(dst->cpu_dp->netdev);
}

static int dsa_remove(struct platform_device *pdev)
Expand Down
21 changes: 9 additions & 12 deletions net/dsa/slave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ static int dsa_slave_get_iflink(const struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);

return p->dp->ds->dst->master_netdev->ifindex;
return dsa_master_netdev(p)->ifindex;
}

static int dsa_slave_open(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_port *dp = p->dp;
struct dsa_switch *ds = dp->ds;
struct net_device *master = ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);
u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;
int err;

Expand Down Expand Up @@ -127,7 +127,7 @@ static int dsa_slave_open(struct net_device *dev)
static int dsa_slave_close(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct net_device *master = p->dp->ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);
struct dsa_switch *ds = p->dp->ds;

if (p->phy)
Expand All @@ -154,7 +154,7 @@ static int dsa_slave_close(struct net_device *dev)
static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct net_device *master = p->dp->ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);

if (change & IFF_ALLMULTI)
dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1);
Expand All @@ -165,7 +165,7 @@ static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
static void dsa_slave_set_rx_mode(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct net_device *master = p->dp->ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);

dev_mc_sync(master, dev);
dev_uc_sync(master, dev);
Expand All @@ -174,7 +174,7 @@ static void dsa_slave_set_rx_mode(struct net_device *dev)
static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct net_device *master = p->dp->ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);
struct sockaddr *addr = a;
int err;

Expand Down Expand Up @@ -375,7 +375,7 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
/* Queue the SKB for transmission on the parent interface, but
* do not modify its EtherType
*/
nskb->dev = p->dp->ds->dst->master_netdev;
nskb->dev = dsa_master_netdev(p);
dev_queue_xmit(nskb);

return NETDEV_TX_OK;
Expand Down Expand Up @@ -684,8 +684,7 @@ static int dsa_slave_netpoll_setup(struct net_device *dev,
struct netpoll_info *ni)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->dp->ds;
struct net_device *master = ds->dst->master_netdev;
struct net_device *master = dsa_master_netdev(p);
struct netpoll *netpoll;
int err = 0;

Expand Down Expand Up @@ -1143,9 +1142,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
struct dsa_slave_priv *p;
int ret;

master = ds->dst->master_netdev;
if (ds->master_netdev)
master = ds->master_netdev;
master = ds->dst->cpu_dp->netdev;

slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
NET_NAME_UNKNOWN, ether_setup);
Expand Down

0 comments on commit 6d3c8c0

Please sign in to comment.