2019-05-27 08:55:01 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2017-02-03 19:20:20 +01:00
|
|
|
/*
|
|
|
|
* Handling of a single switch chip, part of a switch fabric
|
|
|
|
*
|
2017-03-28 21:10:36 +02:00
|
|
|
* Copyright (c) 2017 Savoir-faire Linux Inc.
|
|
|
|
* Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
2017-02-03 19:20:20 +01:00
|
|
|
*/
|
|
|
|
|
net: dsa: Unset vlan_filtering when ports leave the bridge
When ports are standalone (after they left the bridge), they should have
no VLAN filtering semantics (they should pass all traffic to the CPU).
Currently this is not true for switchdev drivers, because the bridge
"forgets" to unset that.
Normally one would think that doing this at the bridge layer would be a
better idea, i.e. call br_vlan_filter_toggle() from br_del_if(), similar
to how nbp_vlan_init() is called from br_add_if().
However what complicates that approach, and makes this one preferable,
is the fact that for the bridge core, vlan_filtering is a per-bridge
setting, whereas for switchdev/DSA it is per-port. Also there are
switches where the setting is per the entire device, and unsetting
vlan_filtering one by one, for each leaving port, would not be possible
from the bridge core without a certain level of awareness. So do this in
DSA and let drivers be unaware of it.
Signed-off-by: Vladimir Oltean <olteanv@gmail.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>
2019-04-28 20:45:46 +02:00
|
|
|
#include <linux/if_bridge.h>
|
2017-02-03 19:20:20 +01:00
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/notifier.h>
|
2019-02-20 23:35:39 +01:00
|
|
|
#include <linux/if_vlan.h>
|
2017-05-19 23:00:52 +02:00
|
|
|
#include <net/switchdev.h>
|
2017-05-17 21:46:03 +02:00
|
|
|
|
|
|
|
#include "dsa_priv.h"
|
2017-02-03 19:20:20 +01:00
|
|
|
|
2017-05-19 23:00:52 +02:00
|
|
|
static unsigned int dsa_switch_fastest_ageing_time(struct dsa_switch *ds,
|
|
|
|
unsigned int ageing_time)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ds->num_ports; ++i) {
|
|
|
|
struct dsa_port *dp = &ds->ports[i];
|
|
|
|
|
|
|
|
if (dp->ageing_time && dp->ageing_time < ageing_time)
|
|
|
|
ageing_time = dp->ageing_time;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ageing_time;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_ageing_time(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_ageing_time_info *info)
|
|
|
|
{
|
|
|
|
unsigned int ageing_time = info->ageing_time;
|
|
|
|
struct switchdev_trans *trans = info->trans;
|
|
|
|
|
|
|
|
if (switchdev_trans_ph_prepare(trans)) {
|
|
|
|
if (ds->ageing_time_min && ageing_time < ds->ageing_time_min)
|
|
|
|
return -ERANGE;
|
|
|
|
if (ds->ageing_time_max && ageing_time > ds->ageing_time_max)
|
|
|
|
return -ERANGE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Program the fastest ageing time in case of multiple bridges */
|
|
|
|
ageing_time = dsa_switch_fastest_ageing_time(ds, ageing_time);
|
|
|
|
|
|
|
|
if (ds->ops->set_ageing_time)
|
|
|
|
return ds->ops->set_ageing_time(ds, ageing_time);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-03 19:20:21 +01:00
|
|
|
static int dsa_switch_bridge_join(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_bridge_info *info)
|
|
|
|
{
|
|
|
|
if (ds->index == info->sw_index && ds->ops->port_bridge_join)
|
|
|
|
return ds->ops->port_bridge_join(ds, info->port, info->br);
|
|
|
|
|
2017-03-30 23:37:14 +02:00
|
|
|
if (ds->index != info->sw_index && ds->ops->crosschip_bridge_join)
|
|
|
|
return ds->ops->crosschip_bridge_join(ds, info->sw_index,
|
|
|
|
info->port, info->br);
|
2017-02-03 19:20:21 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_bridge_leave(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_bridge_info *info)
|
|
|
|
{
|
net: dsa: Unset vlan_filtering when ports leave the bridge
When ports are standalone (after they left the bridge), they should have
no VLAN filtering semantics (they should pass all traffic to the CPU).
Currently this is not true for switchdev drivers, because the bridge
"forgets" to unset that.
Normally one would think that doing this at the bridge layer would be a
better idea, i.e. call br_vlan_filter_toggle() from br_del_if(), similar
to how nbp_vlan_init() is called from br_add_if().
However what complicates that approach, and makes this one preferable,
is the fact that for the bridge core, vlan_filtering is a per-bridge
setting, whereas for switchdev/DSA it is per-port. Also there are
switches where the setting is per the entire device, and unsetting
vlan_filtering one by one, for each leaving port, would not be possible
from the bridge core without a certain level of awareness. So do this in
DSA and let drivers be unaware of it.
Signed-off-by: Vladimir Oltean <olteanv@gmail.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>
2019-04-28 20:45:46 +02:00
|
|
|
bool unset_vlan_filtering = br_vlan_enabled(info->br);
|
|
|
|
int err, i;
|
|
|
|
|
2017-02-03 19:20:21 +01:00
|
|
|
if (ds->index == info->sw_index && ds->ops->port_bridge_leave)
|
|
|
|
ds->ops->port_bridge_leave(ds, info->port, info->br);
|
|
|
|
|
2017-03-30 23:37:14 +02:00
|
|
|
if (ds->index != info->sw_index && ds->ops->crosschip_bridge_leave)
|
|
|
|
ds->ops->crosschip_bridge_leave(ds, info->sw_index, info->port,
|
|
|
|
info->br);
|
2017-02-03 19:20:21 +01:00
|
|
|
|
net: dsa: Unset vlan_filtering when ports leave the bridge
When ports are standalone (after they left the bridge), they should have
no VLAN filtering semantics (they should pass all traffic to the CPU).
Currently this is not true for switchdev drivers, because the bridge
"forgets" to unset that.
Normally one would think that doing this at the bridge layer would be a
better idea, i.e. call br_vlan_filter_toggle() from br_del_if(), similar
to how nbp_vlan_init() is called from br_add_if().
However what complicates that approach, and makes this one preferable,
is the fact that for the bridge core, vlan_filtering is a per-bridge
setting, whereas for switchdev/DSA it is per-port. Also there are
switches where the setting is per the entire device, and unsetting
vlan_filtering one by one, for each leaving port, would not be possible
from the bridge core without a certain level of awareness. So do this in
DSA and let drivers be unaware of it.
Signed-off-by: Vladimir Oltean <olteanv@gmail.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>
2019-04-28 20:45:46 +02:00
|
|
|
/* If the bridge was vlan_filtering, the bridge core doesn't trigger an
|
|
|
|
* event for changing vlan_filtering setting upon slave ports leaving
|
|
|
|
* it. That is a good thing, because that lets us handle it and also
|
|
|
|
* handle the case where the switch's vlan_filtering setting is global
|
|
|
|
* (not per port). When that happens, the correct moment to trigger the
|
|
|
|
* vlan_filtering callback is only when the last port left this bridge.
|
|
|
|
*/
|
|
|
|
if (unset_vlan_filtering && ds->vlan_filtering_is_global) {
|
|
|
|
for (i = 0; i < ds->num_ports; i++) {
|
|
|
|
if (i == info->port)
|
|
|
|
continue;
|
|
|
|
if (dsa_to_port(ds, i)->bridge_dev == info->br) {
|
|
|
|
unset_vlan_filtering = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (unset_vlan_filtering) {
|
|
|
|
struct switchdev_trans trans = {0};
|
|
|
|
|
|
|
|
err = dsa_port_vlan_filtering(&ds->ports[info->port],
|
|
|
|
false, &trans);
|
|
|
|
if (err && err != EOPNOTSUPP)
|
|
|
|
return err;
|
|
|
|
}
|
2017-02-03 19:20:21 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-19 23:00:53 +02:00
|
|
|
static int dsa_switch_fdb_add(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_fdb_info *info)
|
|
|
|
{
|
2017-11-30 18:56:43 +01:00
|
|
|
int port = dsa_towards_port(ds, info->sw_index, info->port);
|
2017-05-19 23:00:53 +02:00
|
|
|
|
2017-08-06 15:15:40 +02:00
|
|
|
if (!ds->ops->port_fdb_add)
|
|
|
|
return -EOPNOTSUPP;
|
2017-05-19 23:00:53 +02:00
|
|
|
|
2017-11-30 18:56:43 +01:00
|
|
|
return ds->ops->port_fdb_add(ds, port, info->addr, info->vid);
|
2017-05-19 23:00:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_fdb_del(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_fdb_info *info)
|
|
|
|
{
|
2017-11-30 18:56:43 +01:00
|
|
|
int port = dsa_towards_port(ds, info->sw_index, info->port);
|
2017-05-19 23:00:53 +02:00
|
|
|
|
|
|
|
if (!ds->ops->port_fdb_del)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2017-11-30 18:56:43 +01:00
|
|
|
return ds->ops->port_fdb_del(ds, port, info->addr, info->vid);
|
2017-05-19 23:00:53 +02:00
|
|
|
}
|
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
static bool dsa_switch_mdb_match(struct dsa_switch *ds, int port,
|
|
|
|
struct dsa_notifier_mdb_info *info)
|
|
|
|
{
|
|
|
|
if (ds->index == info->sw_index && port == info->port)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (dsa_is_dsa_port(ds, port))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_mdb_prepare(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_mdb_info *info)
|
2017-11-30 17:24:00 +01:00
|
|
|
{
|
|
|
|
int port, err;
|
|
|
|
|
|
|
|
if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
for (port = 0; port < ds->num_ports; port++) {
|
|
|
|
if (dsa_switch_mdb_match(ds, port, info)) {
|
|
|
|
err = ds->ops->port_mdb_prepare(ds, port, info->mdb);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2017-11-30 17:24:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-19 23:00:54 +02:00
|
|
|
static int dsa_switch_mdb_add(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_mdb_info *info)
|
|
|
|
{
|
2017-11-30 17:24:00 +01:00
|
|
|
int port;
|
2017-05-19 23:00:54 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
if (switchdev_trans_ph_prepare(info->trans))
|
|
|
|
return dsa_switch_mdb_prepare(ds, info);
|
2017-05-19 23:00:54 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
if (!ds->ops->port_mdb_add)
|
|
|
|
return 0;
|
2017-05-19 23:00:54 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
for (port = 0; port < ds->num_ports; port++)
|
|
|
|
if (dsa_switch_mdb_match(ds, port, info))
|
|
|
|
ds->ops->port_mdb_add(ds, port, info->mdb);
|
2017-05-19 23:00:54 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_mdb_del(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_mdb_info *info)
|
|
|
|
{
|
|
|
|
if (!ds->ops->port_mdb_del)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2017-06-15 22:14:48 +02:00
|
|
|
if (ds->index == info->sw_index)
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
return ds->ops->port_mdb_del(ds, info->port, info->mdb);
|
2017-06-15 22:14:48 +02:00
|
|
|
|
|
|
|
return 0;
|
2017-05-19 23:00:54 +02:00
|
|
|
}
|
|
|
|
|
2019-02-20 23:35:39 +01:00
|
|
|
static int dsa_port_vlan_device_check(struct net_device *vlan_dev,
|
|
|
|
int vlan_dev_vid,
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
struct switchdev_obj_port_vlan *vlan = arg;
|
|
|
|
u16 vid;
|
|
|
|
|
|
|
|
for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) {
|
|
|
|
if (vid == vlan_dev_vid)
|
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_port_vlan_check(struct dsa_switch *ds, int port,
|
|
|
|
const struct switchdev_obj_port_vlan *vlan)
|
|
|
|
{
|
|
|
|
const struct dsa_port *dp = dsa_to_port(ds, port);
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
/* Device is not bridged, let it proceed with the VLAN device
|
|
|
|
* creation.
|
|
|
|
*/
|
|
|
|
if (!dp->bridge_dev)
|
|
|
|
return err;
|
|
|
|
|
2019-04-28 20:45:42 +02:00
|
|
|
/* dsa_slave_vlan_rx_{add,kill}_vid() cannot use the prepare phase and
|
2019-02-20 23:35:39 +01:00
|
|
|
* already checks whether there is an overlapping bridge VLAN entry
|
|
|
|
* with the same VID, so here we only need to check that if we are
|
|
|
|
* adding a bridge VLAN entry there is not an overlapping VLAN device
|
|
|
|
* claiming that VID.
|
|
|
|
*/
|
|
|
|
return vlan_for_each(dp->slave, dsa_port_vlan_device_check,
|
|
|
|
(void *)vlan);
|
|
|
|
}
|
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
static bool dsa_switch_vlan_match(struct dsa_switch *ds, int port,
|
|
|
|
struct dsa_notifier_vlan_info *info)
|
|
|
|
{
|
|
|
|
if (ds->index == info->sw_index && port == info->port)
|
|
|
|
return true;
|
|
|
|
|
2019-08-25 19:25:19 +02:00
|
|
|
if (dsa_is_dsa_port(ds, port))
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_vlan_prepare(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_vlan_info *info)
|
2017-11-30 17:23:59 +01:00
|
|
|
{
|
|
|
|
int port, err;
|
|
|
|
|
|
|
|
if (!ds->ops->port_vlan_prepare || !ds->ops->port_vlan_add)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
for (port = 0; port < ds->num_ports; port++) {
|
|
|
|
if (dsa_switch_vlan_match(ds, port, info)) {
|
|
|
|
err = dsa_port_vlan_check(ds, port, info->vlan);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2019-02-20 23:35:39 +01:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
err = ds->ops->port_vlan_prepare(ds, port, info->vlan);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2017-11-30 17:23:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-19 23:00:55 +02:00
|
|
|
static int dsa_switch_vlan_add(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_vlan_info *info)
|
|
|
|
{
|
2017-11-30 17:23:59 +01:00
|
|
|
int port;
|
2017-05-19 23:00:55 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
if (switchdev_trans_ph_prepare(info->trans))
|
|
|
|
return dsa_switch_vlan_prepare(ds, info);
|
2017-05-19 23:00:55 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
if (!ds->ops->port_vlan_add)
|
|
|
|
return 0;
|
2017-05-19 23:00:55 +02:00
|
|
|
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
for (port = 0; port < ds->num_ports; port++)
|
|
|
|
if (dsa_switch_vlan_match(ds, port, info))
|
|
|
|
ds->ops->port_vlan_add(ds, port, info->vlan);
|
2017-05-19 23:00:55 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dsa_switch_vlan_del(struct dsa_switch *ds,
|
|
|
|
struct dsa_notifier_vlan_info *info)
|
|
|
|
{
|
|
|
|
if (!ds->ops->port_vlan_del)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2017-06-08 00:12:14 +02:00
|
|
|
if (ds->index == info->sw_index)
|
net: dsa: remove bitmap operations
The bitmap operations were introduced to simplify the switch drivers
in the future, since most of them could implement the common VLAN and
MDB operations (add, del, dump) with simple functions taking all target
ports at once, and thus limiting the number of hardware accesses.
Programming an MDB or VLAN this way in a single operation would clearly
simplify the drivers a lot but would require a new get-set interface
in DSA. The usage of such bitmap from the stack also raised concerned
in the past, leading to the dynamic allocation of a new ds->_bitmap
member in the dsa_switch structure. So let's get rid of them for now.
This commit nicely wraps the ds->ops->port_{mdb,vlan}_{prepare,add}
switch operations into new dsa_switch_{mdb,vlan}_{prepare,add}
variants not using any bitmap argument anymore.
New dsa_switch_{mdb,vlan}_match helpers have been introduced to make
clear which local port of a switch must be programmed with the target
object. While the targeted user port is an obvious candidate, the
DSA links must also be programmed, as well as the CPU port for VLANs.
While at it, also remove local variables that are only used once.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-25 19:25:15 +02:00
|
|
|
return ds->ops->port_vlan_del(ds, info->port, info->vlan);
|
2017-06-08 00:12:14 +02:00
|
|
|
|
2019-08-25 19:25:19 +02:00
|
|
|
/* Do not deprogram the DSA links as they may be used as conduit
|
|
|
|
* for other VLAN members in the fabric.
|
|
|
|
*/
|
2017-06-08 00:12:14 +02:00
|
|
|
return 0;
|
2017-05-19 23:00:55 +02:00
|
|
|
}
|
|
|
|
|
2017-02-03 19:20:20 +01:00
|
|
|
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) {
|
2017-05-19 23:00:52 +02:00
|
|
|
case DSA_NOTIFIER_AGEING_TIME:
|
|
|
|
err = dsa_switch_ageing_time(ds, info);
|
|
|
|
break;
|
2017-02-03 19:20:21 +01:00
|
|
|
case DSA_NOTIFIER_BRIDGE_JOIN:
|
|
|
|
err = dsa_switch_bridge_join(ds, info);
|
|
|
|
break;
|
|
|
|
case DSA_NOTIFIER_BRIDGE_LEAVE:
|
|
|
|
err = dsa_switch_bridge_leave(ds, info);
|
|
|
|
break;
|
2017-05-19 23:00:53 +02:00
|
|
|
case DSA_NOTIFIER_FDB_ADD:
|
|
|
|
err = dsa_switch_fdb_add(ds, info);
|
|
|
|
break;
|
|
|
|
case DSA_NOTIFIER_FDB_DEL:
|
|
|
|
err = dsa_switch_fdb_del(ds, info);
|
|
|
|
break;
|
2017-05-19 23:00:54 +02:00
|
|
|
case DSA_NOTIFIER_MDB_ADD:
|
|
|
|
err = dsa_switch_mdb_add(ds, info);
|
|
|
|
break;
|
|
|
|
case DSA_NOTIFIER_MDB_DEL:
|
|
|
|
err = dsa_switch_mdb_del(ds, info);
|
|
|
|
break;
|
2017-05-19 23:00:55 +02:00
|
|
|
case DSA_NOTIFIER_VLAN_ADD:
|
|
|
|
err = dsa_switch_vlan_add(ds, info);
|
|
|
|
break;
|
|
|
|
case DSA_NOTIFIER_VLAN_DEL:
|
|
|
|
err = dsa_switch_vlan_del(ds, info);
|
|
|
|
break;
|
2017-02-03 19:20:20 +01:00
|
|
|
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);
|
|
|
|
}
|