mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 07:04:00 +08:00
net: dsa: let the core manage the tag_8021q context
The basic problem description is as follows:
Be there 3 switches in a daisy chain topology:
|
sw0p0 sw0p1 sw0p2 sw0p3 sw0p4
[ user ] [ user ] [ user ] [ dsa ] [ cpu ]
|
+---------+
|
sw1p0 sw1p1 sw1p2 sw1p3 sw1p4
[ user ] [ user ] [ user ] [ dsa ] [ dsa ]
|
+---------+
|
sw2p0 sw2p1 sw2p2 sw2p3 sw2p4
[ user ] [ user ] [ user ] [ user ] [ dsa ]
The CPU will not be able to ping through the user ports of the
bottom-most switch (like for example sw2p0), simply because tag_8021q
was not coded up for this scenario - it has always assumed DSA switch
trees with a single switch.
To add support for the topology above, we must admit that the RX VLAN of
sw2p0 must be added on some ports of switches 0 and 1 as well. This is
in fact a textbook example of thing that can use the cross-chip notifier
framework that DSA has set up in switch.c.
There is only one problem: core DSA (switch.c) is not able right now to
make the connection between a struct dsa_switch *ds and a struct
dsa_8021q_context *ctx. Right now, it is drivers who call into
tag_8021q.c and always provide a struct dsa_8021q_context *ctx pointer,
and tag_8021q.c calls them back with the .tag_8021q_vlan_{add,del}
methods.
But with cross-chip notifiers, it is possible for tag_8021q to call
drivers without drivers having ever asked for anything. A good example
is right above: when sw2p0 wants to set itself up for tag_8021q,
the .tag_8021q_vlan_add method needs to be called for switches 1 and 0,
so that they transport sw2p0's VLANs towards the CPU without dropping
them.
So instead of letting drivers manage the tag_8021q context, add a
tag_8021q_ctx pointer inside of struct dsa_switch, which will be
populated when dsa_tag_8021q_register() returns success.
The patch is fairly long-winded because we are partly reverting commit
5899ee367a
("net: dsa: tag_8021q: add a context structure") which made
the driver-facing tag_8021q API use "ctx" instead of "ds". Now that we
can access "ctx" directly from "ds", this is no longer needed.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8b6e638b4b
commit
d7b1fd520d
@ -425,14 +425,14 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
|
||||
ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_MC);
|
||||
ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_BC);
|
||||
|
||||
felix->dsa_8021q_ctx = dsa_tag_8021q_register(ds, &felix_tag_8021q_ops,
|
||||
htons(ETH_P_8021AD));
|
||||
if (!felix->dsa_8021q_ctx)
|
||||
return -ENOMEM;
|
||||
|
||||
err = dsa_8021q_setup(felix->dsa_8021q_ctx, true);
|
||||
err = dsa_tag_8021q_register(ds, &felix_tag_8021q_ops,
|
||||
htons(ETH_P_8021AD));
|
||||
if (err)
|
||||
goto out_free_dsa_8021_ctx;
|
||||
return err;
|
||||
|
||||
err = dsa_8021q_setup(ds, true);
|
||||
if (err)
|
||||
goto out_tag_8021q_unregister;
|
||||
|
||||
err = felix_setup_mmio_filtering(felix);
|
||||
if (err)
|
||||
@ -441,9 +441,9 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
|
||||
return 0;
|
||||
|
||||
out_teardown_dsa_8021q:
|
||||
dsa_8021q_setup(felix->dsa_8021q_ctx, false);
|
||||
out_free_dsa_8021_ctx:
|
||||
dsa_tag_8021q_unregister(felix->dsa_8021q_ctx);
|
||||
dsa_8021q_setup(ds, false);
|
||||
out_tag_8021q_unregister:
|
||||
dsa_tag_8021q_unregister(ds);
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -458,11 +458,11 @@ static void felix_teardown_tag_8021q(struct dsa_switch *ds, int cpu)
|
||||
dev_err(ds->dev, "felix_teardown_mmio_filtering returned %d",
|
||||
err);
|
||||
|
||||
err = dsa_8021q_setup(felix->dsa_8021q_ctx, false);
|
||||
err = dsa_8021q_setup(ds, false);
|
||||
if (err)
|
||||
dev_err(ds->dev, "dsa_8021q_setup returned %d", err);
|
||||
|
||||
dsa_tag_8021q_unregister(felix->dsa_8021q_ctx);
|
||||
dsa_tag_8021q_unregister(ds);
|
||||
|
||||
for (port = 0; port < ds->num_ports; port++) {
|
||||
if (dsa_is_unused_port(ds, port))
|
||||
|
@ -60,7 +60,6 @@ struct felix {
|
||||
struct lynx_pcs **pcs;
|
||||
resource_size_t switch_base;
|
||||
resource_size_t imdio_base;
|
||||
struct dsa_8021q_context *dsa_8021q_ctx;
|
||||
enum dsa_tag_protocol tag_proto;
|
||||
};
|
||||
|
||||
|
@ -257,7 +257,6 @@ struct sja1105_private {
|
||||
* the switch doesn't confuse them with one another.
|
||||
*/
|
||||
struct mutex mgmt_lock;
|
||||
struct dsa_8021q_context *dsa_8021q_ctx;
|
||||
struct devlink_region **regions;
|
||||
struct sja1105_cbs_entry *cbs;
|
||||
struct mii_bus *mdio_base_t1;
|
||||
|
@ -1995,8 +1995,6 @@ static int sja1105_crosschip_bridge_join(struct dsa_switch *ds,
|
||||
int other_port, struct net_device *br)
|
||||
{
|
||||
struct dsa_switch *other_ds = dsa_switch_find(tree_index, sw_index);
|
||||
struct sja1105_private *other_priv = other_ds->priv;
|
||||
struct sja1105_private *priv = ds->priv;
|
||||
int port, rc;
|
||||
|
||||
if (other_ds->ops != &sja1105_switch_ops)
|
||||
@ -2008,17 +2006,13 @@ static int sja1105_crosschip_bridge_join(struct dsa_switch *ds,
|
||||
if (dsa_to_port(ds, port)->bridge_dev != br)
|
||||
continue;
|
||||
|
||||
rc = dsa_8021q_crosschip_bridge_join(priv->dsa_8021q_ctx,
|
||||
port,
|
||||
other_priv->dsa_8021q_ctx,
|
||||
rc = dsa_8021q_crosschip_bridge_join(ds, port, other_ds,
|
||||
other_port);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = dsa_8021q_crosschip_bridge_join(other_priv->dsa_8021q_ctx,
|
||||
other_port,
|
||||
priv->dsa_8021q_ctx,
|
||||
port);
|
||||
rc = dsa_8021q_crosschip_bridge_join(other_ds, other_port,
|
||||
ds, port);
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
@ -2032,8 +2026,6 @@ static void sja1105_crosschip_bridge_leave(struct dsa_switch *ds,
|
||||
struct net_device *br)
|
||||
{
|
||||
struct dsa_switch *other_ds = dsa_switch_find(tree_index, sw_index);
|
||||
struct sja1105_private *other_priv = other_ds->priv;
|
||||
struct sja1105_private *priv = ds->priv;
|
||||
int port;
|
||||
|
||||
if (other_ds->ops != &sja1105_switch_ops)
|
||||
@ -2045,22 +2037,19 @@ static void sja1105_crosschip_bridge_leave(struct dsa_switch *ds,
|
||||
if (dsa_to_port(ds, port)->bridge_dev != br)
|
||||
continue;
|
||||
|
||||
dsa_8021q_crosschip_bridge_leave(priv->dsa_8021q_ctx, port,
|
||||
other_priv->dsa_8021q_ctx,
|
||||
dsa_8021q_crosschip_bridge_leave(ds, port, other_ds,
|
||||
other_port);
|
||||
|
||||
dsa_8021q_crosschip_bridge_leave(other_priv->dsa_8021q_ctx,
|
||||
other_port,
|
||||
priv->dsa_8021q_ctx, port);
|
||||
dsa_8021q_crosschip_bridge_leave(other_ds, other_port,
|
||||
ds, port);
|
||||
}
|
||||
}
|
||||
|
||||
static int sja1105_setup_8021q_tagging(struct dsa_switch *ds, bool enabled)
|
||||
{
|
||||
struct sja1105_private *priv = ds->priv;
|
||||
int rc;
|
||||
|
||||
rc = dsa_8021q_setup(priv->dsa_8021q_ctx, enabled);
|
||||
rc = dsa_8021q_setup(ds, enabled);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
@ -2233,6 +2222,7 @@ static int sja1105_build_vlan_table(struct sja1105_private *priv, bool notify);
|
||||
|
||||
static int sja1105_notify_crosschip_switches(struct sja1105_private *priv)
|
||||
{
|
||||
struct dsa_8021q_context *ctx = priv->ds->tag_8021q_ctx;
|
||||
struct sja1105_crosschip_switch *s, *pos;
|
||||
struct list_head crosschip_switches;
|
||||
struct dsa_8021q_crosschip_link *c;
|
||||
@ -2240,7 +2230,7 @@ static int sja1105_notify_crosschip_switches(struct sja1105_private *priv)
|
||||
|
||||
INIT_LIST_HEAD(&crosschip_switches);
|
||||
|
||||
list_for_each_entry(c, &priv->dsa_8021q_ctx->crosschip_links, list) {
|
||||
list_for_each_entry(c, &ctx->crosschip_links, list) {
|
||||
bool already_added = false;
|
||||
|
||||
list_for_each_entry(s, &crosschip_switches, list) {
|
||||
@ -3306,10 +3296,10 @@ static int sja1105_probe(struct spi_device *spi)
|
||||
mutex_init(&priv->ptp_data.lock);
|
||||
mutex_init(&priv->mgmt_lock);
|
||||
|
||||
priv->dsa_8021q_ctx = dsa_tag_8021q_register(ds, &sja1105_dsa_8021q_ops,
|
||||
htons(ETH_P_8021Q));
|
||||
if (!priv->dsa_8021q_ctx)
|
||||
return -ENOMEM;
|
||||
rc = dsa_tag_8021q_register(ds, &sja1105_dsa_8021q_ops,
|
||||
htons(ETH_P_8021Q));
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
INIT_LIST_HEAD(&priv->bridge_vlans);
|
||||
INIT_LIST_HEAD(&priv->dsa_8021q_vlans);
|
||||
@ -3373,7 +3363,7 @@ out_destroy_workers:
|
||||
out_unregister_switch:
|
||||
dsa_unregister_switch(ds);
|
||||
out_tag_8021q_unregister:
|
||||
dsa_tag_8021q_unregister(priv->dsa_8021q_ctx);
|
||||
dsa_tag_8021q_unregister(ds);
|
||||
|
||||
return rc;
|
||||
}
|
||||
@ -3384,7 +3374,7 @@ static int sja1105_remove(struct spi_device *spi)
|
||||
struct dsa_switch *ds = priv->ds;
|
||||
|
||||
dsa_unregister_switch(ds);
|
||||
dsa_tag_8021q_unregister(priv->dsa_8021q_ctx);
|
||||
dsa_tag_8021q_unregister(ds);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -34,20 +34,20 @@ struct dsa_8021q_context {
|
||||
__be16 proto;
|
||||
};
|
||||
|
||||
struct dsa_8021q_context *dsa_tag_8021q_register(struct dsa_switch *ds,
|
||||
const struct dsa_8021q_ops *ops,
|
||||
__be16 proto);
|
||||
int dsa_tag_8021q_register(struct dsa_switch *ds,
|
||||
const struct dsa_8021q_ops *ops,
|
||||
__be16 proto);
|
||||
|
||||
void dsa_tag_8021q_unregister(struct dsa_8021q_context *ctx);
|
||||
void dsa_tag_8021q_unregister(struct dsa_switch *ds);
|
||||
|
||||
int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled);
|
||||
int dsa_8021q_setup(struct dsa_switch *ds, bool enabled);
|
||||
|
||||
int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
int dsa_8021q_crosschip_bridge_join(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port);
|
||||
|
||||
int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
int dsa_8021q_crosschip_bridge_leave(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port);
|
||||
|
||||
struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,
|
||||
|
@ -352,6 +352,9 @@ struct dsa_switch {
|
||||
unsigned int ageing_time_min;
|
||||
unsigned int ageing_time_max;
|
||||
|
||||
/* Storage for drivers using tag_8021q */
|
||||
struct dsa_8021q_context *tag_8021q_ctx;
|
||||
|
||||
/* devlink used to represent this switch device */
|
||||
struct devlink *devlink;
|
||||
|
||||
|
@ -113,10 +113,11 @@ EXPORT_SYMBOL_GPL(vid_is_dsa_8021q);
|
||||
* user explicitly configured this @vid through the bridge core, then the @vid
|
||||
* is installed again, but this time with the flags from the bridge layer.
|
||||
*/
|
||||
static int dsa_8021q_vid_apply(struct dsa_8021q_context *ctx, int port, u16 vid,
|
||||
static int dsa_8021q_vid_apply(struct dsa_switch *ds, int port, u16 vid,
|
||||
u16 flags, bool enabled)
|
||||
{
|
||||
struct dsa_port *dp = dsa_to_port(ctx->ds, port);
|
||||
struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
|
||||
struct dsa_port *dp = dsa_to_port(ds, port);
|
||||
|
||||
if (enabled)
|
||||
return ctx->ops->vlan_add(ctx->ds, dp->index, vid, flags);
|
||||
@ -176,29 +177,29 @@ static int dsa_8021q_vid_apply(struct dsa_8021q_context *ctx, int port, u16 vid,
|
||||
* +-+-----+-+-----+-+-----+-+-----+-+ +-+-----+-+-----+-+-----+-+-----+-+
|
||||
* swp0 swp1 swp2 swp3 swp0 swp1 swp2 swp3
|
||||
*/
|
||||
static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
|
||||
bool enabled)
|
||||
static int dsa_8021q_setup_port(struct dsa_switch *ds, int port, bool enabled)
|
||||
{
|
||||
int upstream = dsa_upstream_port(ctx->ds, port);
|
||||
u16 rx_vid = dsa_8021q_rx_vid(ctx->ds, port);
|
||||
u16 tx_vid = dsa_8021q_tx_vid(ctx->ds, port);
|
||||
struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
|
||||
int upstream = dsa_upstream_port(ds, port);
|
||||
u16 rx_vid = dsa_8021q_rx_vid(ds, port);
|
||||
u16 tx_vid = dsa_8021q_tx_vid(ds, port);
|
||||
struct net_device *master;
|
||||
int i, err;
|
||||
|
||||
/* The CPU port is implicitly configured by
|
||||
* configuring the front-panel ports
|
||||
*/
|
||||
if (!dsa_is_user_port(ctx->ds, port))
|
||||
if (!dsa_is_user_port(ds, port))
|
||||
return 0;
|
||||
|
||||
master = dsa_to_port(ctx->ds, port)->cpu_dp->master;
|
||||
master = dsa_to_port(ds, port)->cpu_dp->master;
|
||||
|
||||
/* Add this user port's RX VID to the membership list of all others
|
||||
* (including itself). This is so that bridging will not be hindered.
|
||||
* L2 forwarding rules still take precedence when there are no VLAN
|
||||
* restrictions, so there are no concerns about leaking traffic.
|
||||
*/
|
||||
for (i = 0; i < ctx->ds->num_ports; i++) {
|
||||
for (i = 0; i < ds->num_ports; i++) {
|
||||
u16 flags;
|
||||
|
||||
if (i == upstream)
|
||||
@ -211,9 +212,9 @@ static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
|
||||
/* The RX VID is a regular VLAN on all others */
|
||||
flags = BRIDGE_VLAN_INFO_UNTAGGED;
|
||||
|
||||
err = dsa_8021q_vid_apply(ctx, i, rx_vid, flags, enabled);
|
||||
err = dsa_8021q_vid_apply(ds, i, rx_vid, flags, enabled);
|
||||
if (err) {
|
||||
dev_err(ctx->ds->dev,
|
||||
dev_err(ds->dev,
|
||||
"Failed to apply RX VID %d to port %d: %pe\n",
|
||||
rx_vid, port, ERR_PTR(err));
|
||||
return err;
|
||||
@ -223,9 +224,9 @@ static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
|
||||
/* CPU port needs to see this port's RX VID
|
||||
* as tagged egress.
|
||||
*/
|
||||
err = dsa_8021q_vid_apply(ctx, upstream, rx_vid, 0, enabled);
|
||||
err = dsa_8021q_vid_apply(ds, upstream, rx_vid, 0, enabled);
|
||||
if (err) {
|
||||
dev_err(ctx->ds->dev,
|
||||
dev_err(ds->dev,
|
||||
"Failed to apply RX VID %d to port %d: %pe\n",
|
||||
rx_vid, port, ERR_PTR(err));
|
||||
return err;
|
||||
@ -238,17 +239,17 @@ static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
|
||||
vlan_vid_del(master, ctx->proto, rx_vid);
|
||||
|
||||
/* Finally apply the TX VID on this port and on the CPU port */
|
||||
err = dsa_8021q_vid_apply(ctx, port, tx_vid, BRIDGE_VLAN_INFO_UNTAGGED,
|
||||
err = dsa_8021q_vid_apply(ds, port, tx_vid, BRIDGE_VLAN_INFO_UNTAGGED,
|
||||
enabled);
|
||||
if (err) {
|
||||
dev_err(ctx->ds->dev,
|
||||
dev_err(ds->dev,
|
||||
"Failed to apply TX VID %d on port %d: %pe\n",
|
||||
tx_vid, port, ERR_PTR(err));
|
||||
return err;
|
||||
}
|
||||
err = dsa_8021q_vid_apply(ctx, upstream, tx_vid, 0, enabled);
|
||||
err = dsa_8021q_vid_apply(ds, upstream, tx_vid, 0, enabled);
|
||||
if (err) {
|
||||
dev_err(ctx->ds->dev,
|
||||
dev_err(ds->dev,
|
||||
"Failed to apply TX VID %d on port %d: %pe\n",
|
||||
tx_vid, upstream, ERR_PTR(err));
|
||||
return err;
|
||||
@ -257,16 +258,16 @@ static int dsa_8021q_setup_port(struct dsa_8021q_context *ctx, int port,
|
||||
return err;
|
||||
}
|
||||
|
||||
int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled)
|
||||
int dsa_8021q_setup(struct dsa_switch *ds, bool enabled)
|
||||
{
|
||||
int err, port;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
for (port = 0; port < ctx->ds->num_ports; port++) {
|
||||
err = dsa_8021q_setup_port(ctx, port, enabled);
|
||||
for (port = 0; port < ds->num_ports; port++) {
|
||||
err = dsa_8021q_setup_port(ds, port, enabled);
|
||||
if (err < 0) {
|
||||
dev_err(ctx->ds->dev,
|
||||
dev_err(ds->dev,
|
||||
"Failed to setup VLAN tagging for port %d: %pe\n",
|
||||
port, ERR_PTR(err));
|
||||
return err;
|
||||
@ -277,24 +278,25 @@ int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_8021q_setup);
|
||||
|
||||
static int dsa_8021q_crosschip_link_apply(struct dsa_8021q_context *ctx,
|
||||
int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
static int dsa_8021q_crosschip_link_apply(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port, bool enabled)
|
||||
{
|
||||
u16 rx_vid = dsa_8021q_rx_vid(ctx->ds, port);
|
||||
u16 rx_vid = dsa_8021q_rx_vid(ds, port);
|
||||
|
||||
/* @rx_vid of local @ds port @port goes to @other_port of
|
||||
* @other_ds
|
||||
*/
|
||||
return dsa_8021q_vid_apply(other_ctx, other_port, rx_vid,
|
||||
return dsa_8021q_vid_apply(other_ds, other_port, rx_vid,
|
||||
BRIDGE_VLAN_INFO_UNTAGGED, enabled);
|
||||
}
|
||||
|
||||
static int dsa_8021q_crosschip_link_add(struct dsa_8021q_context *ctx, int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
static int dsa_8021q_crosschip_link_add(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port)
|
||||
{
|
||||
struct dsa_8021q_context *other_ctx = other_ds->tag_8021q_ctx;
|
||||
struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
|
||||
struct dsa_8021q_crosschip_link *c;
|
||||
|
||||
list_for_each_entry(c, &ctx->crosschip_links, list) {
|
||||
@ -305,9 +307,9 @@ static int dsa_8021q_crosschip_link_add(struct dsa_8021q_context *ctx, int port,
|
||||
}
|
||||
}
|
||||
|
||||
dev_dbg(ctx->ds->dev,
|
||||
dev_dbg(ds->dev,
|
||||
"adding crosschip link from port %d to %s port %d\n",
|
||||
port, dev_name(other_ctx->ds->dev), other_port);
|
||||
port, dev_name(other_ds->dev), other_port);
|
||||
|
||||
c = kzalloc(sizeof(*c), GFP_KERNEL);
|
||||
if (!c)
|
||||
@ -323,7 +325,7 @@ static int dsa_8021q_crosschip_link_add(struct dsa_8021q_context *ctx, int port,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dsa_8021q_crosschip_link_del(struct dsa_8021q_context *ctx,
|
||||
static void dsa_8021q_crosschip_link_del(struct dsa_switch *ds,
|
||||
struct dsa_8021q_crosschip_link *c,
|
||||
bool *keep)
|
||||
{
|
||||
@ -332,7 +334,7 @@ static void dsa_8021q_crosschip_link_del(struct dsa_8021q_context *ctx,
|
||||
if (*keep)
|
||||
return;
|
||||
|
||||
dev_dbg(ctx->ds->dev,
|
||||
dev_dbg(ds->dev,
|
||||
"deleting crosschip link from port %d to %s port %d\n",
|
||||
c->port, dev_name(c->other_ctx->ds->dev), c->other_port);
|
||||
|
||||
@ -347,8 +349,8 @@ static void dsa_8021q_crosschip_link_del(struct dsa_8021q_context *ctx,
|
||||
* or untagged: it doesn't matter, since it should never egress a frame having
|
||||
* our @rx_vid.
|
||||
*/
|
||||
int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
int dsa_8021q_crosschip_bridge_join(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port)
|
||||
{
|
||||
/* @other_upstream is how @other_ds reaches us. If we are part
|
||||
@ -356,49 +358,50 @@ int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port,
|
||||
* our CPU ports. If we're part of the same tree though, we should
|
||||
* probably use dsa_towards_port.
|
||||
*/
|
||||
int other_upstream = dsa_upstream_port(other_ctx->ds, other_port);
|
||||
int other_upstream = dsa_upstream_port(other_ds, other_port);
|
||||
int err;
|
||||
|
||||
err = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_port);
|
||||
err = dsa_8021q_crosschip_link_add(ds, port, other_ds, other_port);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = dsa_8021q_crosschip_link_apply(ctx, port, other_ctx,
|
||||
err = dsa_8021q_crosschip_link_apply(ds, port, other_ds,
|
||||
other_port, true);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = dsa_8021q_crosschip_link_add(ctx, port, other_ctx, other_upstream);
|
||||
err = dsa_8021q_crosschip_link_add(ds, port, other_ds, other_upstream);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
return dsa_8021q_crosschip_link_apply(ctx, port, other_ctx,
|
||||
return dsa_8021q_crosschip_link_apply(ds, port, other_ds,
|
||||
other_upstream, true);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_8021q_crosschip_bridge_join);
|
||||
|
||||
int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port,
|
||||
struct dsa_8021q_context *other_ctx,
|
||||
int dsa_8021q_crosschip_bridge_leave(struct dsa_switch *ds, int port,
|
||||
struct dsa_switch *other_ds,
|
||||
int other_port)
|
||||
{
|
||||
int other_upstream = dsa_upstream_port(other_ctx->ds, other_port);
|
||||
struct dsa_8021q_context *other_ctx = other_ds->tag_8021q_ctx;
|
||||
int other_upstream = dsa_upstream_port(other_ds, other_port);
|
||||
struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
|
||||
struct dsa_8021q_crosschip_link *c, *n;
|
||||
|
||||
list_for_each_entry_safe(c, n, &ctx->crosschip_links, list) {
|
||||
if (c->port == port && c->other_ctx == other_ctx &&
|
||||
(c->other_port == other_port ||
|
||||
c->other_port == other_upstream)) {
|
||||
struct dsa_8021q_context *other_ctx = c->other_ctx;
|
||||
int other_port = c->other_port;
|
||||
bool keep;
|
||||
int err;
|
||||
|
||||
dsa_8021q_crosschip_link_del(ctx, c, &keep);
|
||||
dsa_8021q_crosschip_link_del(ds, c, &keep);
|
||||
if (keep)
|
||||
continue;
|
||||
|
||||
err = dsa_8021q_crosschip_link_apply(ctx, port,
|
||||
other_ctx,
|
||||
err = dsa_8021q_crosschip_link_apply(ds, port,
|
||||
other_ds,
|
||||
other_port,
|
||||
false);
|
||||
if (err)
|
||||
@ -410,15 +413,15 @@ int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port,
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_8021q_crosschip_bridge_leave);
|
||||
|
||||
struct dsa_8021q_context *dsa_tag_8021q_register(struct dsa_switch *ds,
|
||||
const struct dsa_8021q_ops *ops,
|
||||
__be16 proto)
|
||||
int dsa_tag_8021q_register(struct dsa_switch *ds,
|
||||
const struct dsa_8021q_ops *ops,
|
||||
__be16 proto)
|
||||
{
|
||||
struct dsa_8021q_context *ctx;
|
||||
|
||||
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
|
||||
if (!ctx)
|
||||
return NULL;
|
||||
return -ENOMEM;
|
||||
|
||||
ctx->ops = ops;
|
||||
ctx->proto = proto;
|
||||
@ -426,12 +429,15 @@ struct dsa_8021q_context *dsa_tag_8021q_register(struct dsa_switch *ds,
|
||||
|
||||
INIT_LIST_HEAD(&ctx->crosschip_links);
|
||||
|
||||
return ctx;
|
||||
ds->tag_8021q_ctx = ctx;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_tag_8021q_register);
|
||||
|
||||
void dsa_tag_8021q_unregister(struct dsa_8021q_context *ctx)
|
||||
void dsa_tag_8021q_unregister(struct dsa_switch *ds)
|
||||
{
|
||||
struct dsa_8021q_context *ctx = ds->tag_8021q_ctx;
|
||||
struct dsa_8021q_crosschip_link *c, *n;
|
||||
|
||||
list_for_each_entry_safe(c, n, &ctx->crosschip_links, list) {
|
||||
@ -439,6 +445,8 @@ void dsa_tag_8021q_unregister(struct dsa_8021q_context *ctx)
|
||||
kfree(c);
|
||||
}
|
||||
|
||||
ds->tag_8021q_ctx = NULL;
|
||||
|
||||
kfree(ctx);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dsa_tag_8021q_unregister);
|
||||
|
Loading…
Reference in New Issue
Block a user