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: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c5d35cb32c
commit
f515f192ab
6 changed files with 77 additions and 0 deletions
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
#include <linux/if_ether.h>
|
#include <linux/if_ether.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
|
#include <linux/notifier.h>
|
||||||
#include <linux/timer.h>
|
#include <linux/timer.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
@ -92,6 +93,9 @@ struct packet_type;
|
||||||
struct dsa_switch_tree {
|
struct dsa_switch_tree {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
|
||||||
|
/* Notifier chain for switch-wide events */
|
||||||
|
struct raw_notifier_head nh;
|
||||||
|
|
||||||
/* Tree identifier */
|
/* Tree identifier */
|
||||||
u32 tree;
|
u32 tree;
|
||||||
|
|
||||||
|
@ -182,6 +186,9 @@ struct dsa_switch {
|
||||||
struct dsa_switch_tree *dst;
|
struct dsa_switch_tree *dst;
|
||||||
int index;
|
int index;
|
||||||
|
|
||||||
|
/* Listener for switch fabric events */
|
||||||
|
struct notifier_block nb;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Give the switch driver somewhere to hang its private data
|
* Give the switch driver somewhere to hang its private data
|
||||||
* structure.
|
* structure.
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# the core
|
# the core
|
||||||
obj-$(CONFIG_NET_DSA) += dsa_core.o
|
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
|
||||||
|
dsa_core-y += dsa.o slave.o dsa2.o switch.o
|
||||||
|
|
||||||
# tagging formats
|
# tagging formats
|
||||||
dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o
|
dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o
|
||||||
|
|
|
@ -275,6 +275,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
ret = dsa_switch_register_notifier(ds);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (ops->set_addr) {
|
if (ops->set_addr) {
|
||||||
ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
|
ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
|
||||||
if (ret < 0)
|
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)
|
if (ds->slave_mii_bus && ds->ops->phy_read)
|
||||||
mdiobus_unregister(ds->slave_mii_bus);
|
mdiobus_unregister(ds->slave_mii_bus);
|
||||||
|
|
||||||
|
dsa_switch_unregister_notifier(ds);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
|
|
@ -294,6 +294,10 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
err = dsa_switch_register_notifier(ds);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
if (ds->ops->set_addr) {
|
if (ds->ops->set_addr) {
|
||||||
err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
|
err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
|
||||||
if (err < 0)
|
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)
|
if (ds->slave_mii_bus && ds->ops->phy_read)
|
||||||
mdiobus_unregister(ds->slave_mii_bus);
|
mdiobus_unregister(ds->slave_mii_bus);
|
||||||
|
|
||||||
|
dsa_switch_unregister_notifier(ds);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dsa_dst_apply(struct dsa_switch_tree *dst)
|
static int dsa_dst_apply(struct dsa_switch_tree *dst)
|
||||||
|
|
|
@ -66,6 +66,10 @@ int dsa_slave_resume(struct net_device *slave_dev);
|
||||||
int dsa_slave_register_notifier(void);
|
int dsa_slave_register_notifier(void);
|
||||||
void dsa_slave_unregister_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 */
|
/* tag_dsa.c */
|
||||||
extern const struct dsa_device_ops dsa_netdev_ops;
|
extern const struct dsa_device_ops dsa_netdev_ops;
|
||||||
|
|
||||||
|
|
53
net/dsa/switch.c
Normal file
53
net/dsa/switch.c
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
/*
|
||||||
|
* Handling of a single switch chip, part of a switch fabric
|
||||||
|
*
|
||||||
|
* Copyright (c) 2017 Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/netdevice.h>
|
||||||
|
#include <linux/notifier.h>
|
||||||
|
#include <net/dsa.h>
|
||||||
|
|
||||||
|
static int dsa_switch_event(struct notifier_block *nb,
|
||||||
|
unsigned long event, void *info)
|
||||||
|
{
|
||||||
|
struct dsa_switch *ds = container_of(nb, struct dsa_switch, nb);
|
||||||
|
int err;
|
||||||
|
|
||||||
|
switch (event) {
|
||||||
|
default:
|
||||||
|
err = -EOPNOTSUPP;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Non-switchdev operations cannot be rolled back. If a DSA driver
|
||||||
|
* returns an error during the chained call, switch chips may be in an
|
||||||
|
* inconsistent state.
|
||||||
|
*/
|
||||||
|
if (err)
|
||||||
|
dev_dbg(ds->dev, "breaking chain for DSA event %lu (%d)\n",
|
||||||
|
event, err);
|
||||||
|
|
||||||
|
return notifier_from_errno(err);
|
||||||
|
}
|
||||||
|
|
||||||
|
int dsa_switch_register_notifier(struct dsa_switch *ds)
|
||||||
|
{
|
||||||
|
ds->nb.notifier_call = dsa_switch_event;
|
||||||
|
|
||||||
|
return raw_notifier_chain_register(&ds->dst->nh, &ds->nb);
|
||||||
|
}
|
||||||
|
|
||||||
|
void dsa_switch_unregister_notifier(struct dsa_switch *ds)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = raw_notifier_chain_unregister(&ds->dst->nh, &ds->nb);
|
||||||
|
if (err)
|
||||||
|
dev_err(ds->dev, "failed to unregister notifier (%d)\n", err);
|
||||||
|
}
|
Loading…
Reference in a new issue