Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f515f192 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: add switch notifier 



Add a notifier block per DSA switch, registered against a notifier head
in the switch fabric they belong to.

This infrastructure will allow to propagate fabric-wide events such as
port bridging, VLAN configuration, etc. If a DSA switch driver cares
about cross-chip configuration, such events can be caught.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5d35cb3

include/net/dsa.h

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/if_ether.h>

#include <linux/list.h>

#include <linux/notifier.h>

#include <linux/timer.h>

#include <linux/workqueue.h>

#include <linux/of.h>
@@ -92,6 +93,9 @@ struct packet_type; 
struct dsa_switch_tree {

	struct list_head	list;



	/* Notifier chain for switch-wide events */

	struct raw_notifier_head	nh;



	/* Tree identifier */

	u32 tree;
@@ -182,6 +186,9 @@ struct dsa_switch { 
	struct dsa_switch_tree	*dst;

	int			index;



	/* Listener for switch fabric events */

	struct notifier_block	nb;



	/*

	 * Give the switch driver somewhere to hang its private data

	 * structure.

net/dsa/Makefile

+1 −0
Original line number Diff line number Diff line 
# the core

obj-$(CONFIG_NET_DSA) += dsa_core.o

dsa_core-y += dsa.o slave.o dsa2.o

dsa_core-y += dsa.o slave.o dsa2.o switch.o



# tagging formats

dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o

net/dsa/dsa.c

+6 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) 
	if (ret < 0)

		return ret;



	ret = dsa_switch_register_notifier(ds);

	if (ret)

		return ret;



	if (ops->set_addr) {

		ret = ops->set_addr(ds, dst->master_netdev->dev_addr);

		if (ret < 0)
@@ -400,6 +404,8 @@ static void dsa_switch_destroy(struct dsa_switch *ds) 


	if (ds->slave_mii_bus && ds->ops->phy_read)

		mdiobus_unregister(ds->slave_mii_bus);



	dsa_switch_unregister_notifier(ds);

}



#ifdef CONFIG_PM_SLEEP

net/dsa/dsa2.c

+6 −0
Original line number Diff line number Diff line
@@ -294,6 +294,10 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds) 
	if (err < 0)

		return err;



	err = dsa_switch_register_notifier(ds);

	if (err)

		return err;



	if (ds->ops->set_addr) {

		err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);

		if (err < 0)
@@ -364,6 +368,8 @@ static void dsa_ds_unapply(struct dsa_switch_tree *dst, struct dsa_switch *ds) 


	if (ds->slave_mii_bus && ds->ops->phy_read)

		mdiobus_unregister(ds->slave_mii_bus);



	dsa_switch_unregister_notifier(ds);

}



static int dsa_dst_apply(struct dsa_switch_tree *dst)

net/dsa/dsa_priv.h

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ int dsa_slave_resume(struct net_device *slave_dev); 
int dsa_slave_register_notifier(void);

void dsa_slave_unregister_notifier(void);



/* switch.c */

int dsa_switch_register_notifier(struct dsa_switch *ds);

void dsa_switch_unregister_notifier(struct dsa_switch *ds);



/* tag_dsa.c */

extern const struct dsa_device_ops dsa_netdev_ops;