mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 13:41:51 +00:00
64dba236a1
Now that the switchdev bridge ageing time attribute is propagated to all
switch chips of the fabric, each switch can check if the requested value
is valid and program itself, so that the whole fabric shares a common
ageing time setting.
This is especially needed for switch chips in between others, containing
no bridge port members but evidently used in the data path.
To achieve that, remove the condition which skips the other switches. We
also don't need to identify the target switch anymore, thus remove the
sw_index member of the dsa_notifier_ageing_time_info notifier structure.
On ZII Dev Rev B (with two 88E6352 and one 88E6185) and ZII Dev Rev C
(with two 88E6390X), we have the following hardware configuration:
# ip link add name br0 type bridge
# ip link set master br0 dev lan6
br0: port 1(lan6) entered blocking state
br0: port 1(lan6) entered disabled state
# echo 2000 > /sys/class/net/br0/bridge/ageing_time
Before this patch:
zii-rev-b# cat /sys/kernel/debug/mv88e6xxx/sw*/age_time
300000
300000
15000
zii-rev-c# cat /sys/kernel/debug/mv88e6xxx/sw*/age_time
300000
18750
After this patch:
zii-rev-b# cat /sys/kernel/debug/mv88e6xxx/sw*/age_time
15000
15000
15000
zii-rev-c# cat /sys/kernel/debug/mv88e6xxx/sw*/age_time
18750
18750
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
183 lines
5.2 KiB
C
183 lines
5.2 KiB
C
/*
|
|
* net/dsa/dsa_priv.h - Hardware switch handling
|
|
* Copyright (c) 2008-2009 Marvell Semiconductor
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef __DSA_PRIV_H
|
|
#define __DSA_PRIV_H
|
|
|
|
#include <linux/phy.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/netpoll.h>
|
|
#include <net/dsa.h>
|
|
|
|
enum {
|
|
DSA_NOTIFIER_AGEING_TIME,
|
|
DSA_NOTIFIER_BRIDGE_JOIN,
|
|
DSA_NOTIFIER_BRIDGE_LEAVE,
|
|
DSA_NOTIFIER_FDB_ADD,
|
|
DSA_NOTIFIER_FDB_DEL,
|
|
DSA_NOTIFIER_MDB_ADD,
|
|
DSA_NOTIFIER_MDB_DEL,
|
|
DSA_NOTIFIER_VLAN_ADD,
|
|
DSA_NOTIFIER_VLAN_DEL,
|
|
};
|
|
|
|
/* DSA_NOTIFIER_AGEING_TIME */
|
|
struct dsa_notifier_ageing_time_info {
|
|
struct switchdev_trans *trans;
|
|
unsigned int ageing_time;
|
|
};
|
|
|
|
/* DSA_NOTIFIER_BRIDGE_* */
|
|
struct dsa_notifier_bridge_info {
|
|
struct net_device *br;
|
|
int sw_index;
|
|
int port;
|
|
};
|
|
|
|
/* DSA_NOTIFIER_FDB_* */
|
|
struct dsa_notifier_fdb_info {
|
|
const struct switchdev_obj_port_fdb *fdb;
|
|
struct switchdev_trans *trans;
|
|
int sw_index;
|
|
int port;
|
|
};
|
|
|
|
/* DSA_NOTIFIER_MDB_* */
|
|
struct dsa_notifier_mdb_info {
|
|
const struct switchdev_obj_port_mdb *mdb;
|
|
struct switchdev_trans *trans;
|
|
int sw_index;
|
|
int port;
|
|
};
|
|
|
|
/* DSA_NOTIFIER_VLAN_* */
|
|
struct dsa_notifier_vlan_info {
|
|
const struct switchdev_obj_port_vlan *vlan;
|
|
struct switchdev_trans *trans;
|
|
int sw_index;
|
|
int port;
|
|
};
|
|
|
|
struct dsa_device_ops {
|
|
struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
|
|
struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
|
|
struct packet_type *pt,
|
|
struct net_device *orig_dev);
|
|
};
|
|
|
|
struct dsa_slave_priv {
|
|
struct sk_buff * (*xmit)(struct sk_buff *skb,
|
|
struct net_device *dev);
|
|
|
|
/* DSA port data, such as switch, port index, etc. */
|
|
struct dsa_port *dp;
|
|
|
|
/*
|
|
* The phylib phy_device pointer for the PHY connected
|
|
* to this port.
|
|
*/
|
|
struct phy_device *phy;
|
|
phy_interface_t phy_interface;
|
|
int old_link;
|
|
int old_pause;
|
|
int old_duplex;
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
struct netpoll *netpoll;
|
|
#endif
|
|
|
|
/* TC context */
|
|
struct list_head mall_tc_list;
|
|
};
|
|
|
|
/* dsa.c */
|
|
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
|
|
struct dsa_port *dport, int port);
|
|
void dsa_cpu_dsa_destroy(struct dsa_port *dport);
|
|
const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
|
|
int dsa_cpu_port_ethtool_setup(struct dsa_switch *ds);
|
|
void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds);
|
|
|
|
/* legacy.c */
|
|
int dsa_legacy_register(void);
|
|
void dsa_legacy_unregister(void);
|
|
|
|
/* port.c */
|
|
int dsa_port_set_state(struct dsa_port *dp, u8 state,
|
|
struct switchdev_trans *trans);
|
|
void dsa_port_set_state_now(struct dsa_port *dp, u8 state);
|
|
int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);
|
|
void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);
|
|
int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
|
|
struct switchdev_trans *trans);
|
|
int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
|
|
struct switchdev_trans *trans);
|
|
int dsa_port_fdb_add(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_fdb *fdb,
|
|
struct switchdev_trans *trans);
|
|
int dsa_port_fdb_del(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_fdb *fdb);
|
|
int dsa_port_fdb_dump(struct dsa_port *dp, struct switchdev_obj_port_fdb *fdb,
|
|
switchdev_obj_dump_cb_t *cb);
|
|
int dsa_port_mdb_add(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_mdb *mdb,
|
|
struct switchdev_trans *trans);
|
|
int dsa_port_mdb_del(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_mdb *mdb);
|
|
int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,
|
|
switchdev_obj_dump_cb_t *cb);
|
|
int dsa_port_vlan_add(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_vlan *vlan,
|
|
struct switchdev_trans *trans);
|
|
int dsa_port_vlan_del(struct dsa_port *dp,
|
|
const struct switchdev_obj_port_vlan *vlan);
|
|
int dsa_port_vlan_dump(struct dsa_port *dp,
|
|
struct switchdev_obj_port_vlan *vlan,
|
|
switchdev_obj_dump_cb_t *cb);
|
|
|
|
/* slave.c */
|
|
extern const struct dsa_device_ops notag_netdev_ops;
|
|
void dsa_slave_mii_bus_init(struct dsa_switch *ds);
|
|
void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops);
|
|
int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
|
|
int port, const char *name);
|
|
void dsa_slave_destroy(struct net_device *slave_dev);
|
|
int dsa_slave_suspend(struct net_device *slave_dev);
|
|
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_brcm.c */
|
|
extern const struct dsa_device_ops brcm_netdev_ops;
|
|
|
|
/* tag_dsa.c */
|
|
extern const struct dsa_device_ops dsa_netdev_ops;
|
|
|
|
/* tag_edsa.c */
|
|
extern const struct dsa_device_ops edsa_netdev_ops;
|
|
|
|
/* tag_lan9303.c */
|
|
extern const struct dsa_device_ops lan9303_netdev_ops;
|
|
|
|
/* tag_mtk.c */
|
|
extern const struct dsa_device_ops mtk_netdev_ops;
|
|
|
|
/* tag_qca.c */
|
|
extern const struct dsa_device_ops qca_netdev_ops;
|
|
|
|
/* tag_trailer.c */
|
|
extern const struct dsa_device_ops trailer_netdev_ops;
|
|
|
|
#endif
|