niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: dsa: sja1105: keep the VLAN awareness state in a driver variable

Browse source 
Soon we'll add a third operating mode to the driver. Introduce a
vlan_state to make things more easy to manage, and use it where
applicable.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2020-05-12 20:20:27 +03:00 • committed by David S. Miller
parent 1f66b0f0ae
commit 7f14937fac
3 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/dsa/sja1105/sja1105.h
View file

@ -178,6 +178,11 @@ struct sja1105_flow_block {
int num_virtual_links; int num_virtual_links;
}; };
enum sja1105_vlan_state {
SJA1105_VLAN_UNAWARE,
SJA1105_VLAN_FILTERING_FULL,
};
struct sja1105_private { struct sja1105_private {
struct sja1105_static_config static_config; struct sja1105_static_config static_config;
bool rgmii_rx_delay[SJA1105_NUM_PORTS]; bool rgmii_rx_delay[SJA1105_NUM_PORTS];
@ -193,6 +198,7 @@ struct sja1105_private {
* the switch doesn't confuse them with one another. * the switch doesn't confuse them with one another.
*/ */
struct mutex mgmt_lock; struct mutex mgmt_lock;
enum sja1105_vlan_state vlan_state;
struct sja1105_tagger_data tagger_data; struct sja1105_tagger_data tagger_data;
struct sja1105_ptp_data ptp_data; struct sja1105_ptp_data ptp_data;
struct sja1105_tas_data tas_data; struct sja1105_tas_data tas_data;

18
drivers/net/dsa/sja1105/sja1105_main.c
View file

@ -1303,7 +1303,7 @@ int sja1105pqrs_fdb_add(struct dsa_switch *ds, int port,
l2_lookup.vlanid = vid; l2_lookup.vlanid = vid;
l2_lookup.iotag = SJA1105_S_TAG; l2_lookup.iotag = SJA1105_S_TAG;
l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0); l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0);
if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port))) { if (priv->vlan_state != SJA1105_VLAN_UNAWARE) {
l2_lookup.mask_vlanid = VLAN_VID_MASK; l2_lookup.mask_vlanid = VLAN_VID_MASK;
l2_lookup.mask_iotag = BIT(0); l2_lookup.mask_iotag = BIT(0);
} else { } else {
@ -1366,7 +1366,7 @@ int sja1105pqrs_fdb_del(struct dsa_switch *ds, int port,
l2_lookup.vlanid = vid; l2_lookup.vlanid = vid;
l2_lookup.iotag = SJA1105_S_TAG; l2_lookup.iotag = SJA1105_S_TAG;
l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0); l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0);
if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port))) { if (priv->vlan_state != SJA1105_VLAN_UNAWARE) {
l2_lookup.mask_vlanid = VLAN_VID_MASK; l2_lookup.mask_vlanid = VLAN_VID_MASK;
l2_lookup.mask_iotag = BIT(0); l2_lookup.mask_iotag = BIT(0);
} else { } else {
@ -1412,7 +1412,7 @@ static int sja1105_fdb_add(struct dsa_switch *ds, int port,
* for what gets printed in 'bridge fdb show'. In the case of zero, * for what gets printed in 'bridge fdb show'. In the case of zero,
* no VID gets printed at all. * no VID gets printed at all.
*/ */
if (!dsa_port_is_vlan_filtering(dsa_to_port(ds, port))) if (priv->vlan_state != SJA1105_VLAN_FILTERING_FULL)
vid = 0; vid = 0;
return priv->info->fdb_add_cmd(ds, port, addr, vid); return priv->info->fdb_add_cmd(ds, port, addr, vid);
@ -1423,7 +1423,7 @@ static int sja1105_fdb_del(struct dsa_switch *ds, int port,
{ {
struct sja1105_private *priv = ds->priv; struct sja1105_private *priv = ds->priv;
if (!dsa_port_is_vlan_filtering(dsa_to_port(ds, port))) if (priv->vlan_state != SJA1105_VLAN_FILTERING_FULL)
vid = 0; vid = 0;
return priv->info->fdb_del_cmd(ds, port, addr, vid); return priv->info->fdb_del_cmd(ds, port, addr, vid);
@ -1462,7 +1462,7 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port,
u64_to_ether_addr(l2_lookup.macaddr, macaddr); u64_to_ether_addr(l2_lookup.macaddr, macaddr);
/* We need to hide the dsa_8021q VLANs from the user. */ /* We need to hide the dsa_8021q VLANs from the user. */
if (!dsa_port_is_vlan_filtering(dsa_to_port(ds, port))) if (priv->vlan_state == SJA1105_VLAN_UNAWARE)
l2_lookup.vlanid = 0; l2_lookup.vlanid = 0;
cb(macaddr, l2_lookup.vlanid, l2_lookup.lockeds, data); cb(macaddr, l2_lookup.vlanid, l2_lookup.lockeds, data);
} }
@ -1917,6 +1917,7 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
struct sja1105_l2_lookup_params_entry *l2_lookup_params; struct sja1105_l2_lookup_params_entry *l2_lookup_params;
struct sja1105_general_params_entry *general_params; struct sja1105_general_params_entry *general_params;
struct sja1105_private *priv = ds->priv; struct sja1105_private *priv = ds->priv;
enum sja1105_vlan_state state;
struct sja1105_table *table; struct sja1105_table *table;
struct sja1105_rule *rule; struct sja1105_rule *rule;
u16 tpid, tpid2; u16 tpid, tpid2;
@ -1940,6 +1941,13 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)
tpid2 = ETH_P_SJA1105; tpid2 = ETH_P_SJA1105;
} }
if (!enabled)
state = SJA1105_VLAN_UNAWARE;
else
state = SJA1105_VLAN_FILTERING_FULL;
priv->vlan_state = state;
table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS]; table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS];
general_params = table->entries; general_params = table->entries;
/* EtherType used to identify inner tagged (C-tag) VLAN traffic */ /* EtherType used to identify inner tagged (C-tag) VLAN traffic */

28
drivers/net/dsa/sja1105/sja1105_vl.c
View file

@ -353,15 +353,15 @@ int sja1105_vl_redirect(struct sja1105_private *priv, int port,
struct sja1105_rule *rule = sja1105_rule_find(priv, cookie); struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);
int rc; int rc;
if (dsa_port_is_vlan_filtering(dsa_to_port(priv->ds, port)) && if (priv->vlan_state == SJA1105_VLAN_UNAWARE &&
key->type != SJA1105_KEY_VLAN_AWARE_VL) { key->type != SJA1105_KEY_VLAN_UNAWARE_VL) {
NL_SET_ERR_MSG_MOD(extack,
"Can only redirect based on {DMAC, VID, PCP}");
return -EOPNOTSUPP;
} else if (key->type != SJA1105_KEY_VLAN_UNAWARE_VL) {
NL_SET_ERR_MSG_MOD(extack, NL_SET_ERR_MSG_MOD(extack,
"Can only redirect based on DMAC"); "Can only redirect based on DMAC");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} else if (key->type != SJA1105_KEY_VLAN_AWARE_VL) {
NL_SET_ERR_MSG_MOD(extack,
"Can only redirect based on {DMAC, VID, PCP}");
return -EOPNOTSUPP;
} }
if (!rule) { if (!rule) {
@ -602,15 +602,19 @@ int sja1105_vl_gate(struct sja1105_private *priv, int port,
return -ERANGE; return -ERANGE;
} }
if (dsa_port_is_vlan_filtering(dsa_to_port(priv->ds, port)) && if (priv->vlan_state == SJA1105_VLAN_UNAWARE &&
key->type != SJA1105_KEY_VLAN_AWARE_VL) { key->type != SJA1105_KEY_VLAN_UNAWARE_VL) {
NL_SET_ERR_MSG_MOD(extack, dev_err(priv->ds->dev, "1: vlan state %d key type %d\n",
"Can only gate based on {DMAC, VID, PCP}"); priv->vlan_state, key->type);
return -EOPNOTSUPP;
} else if (key->type != SJA1105_KEY_VLAN_UNAWARE_VL) {
NL_SET_ERR_MSG_MOD(extack, NL_SET_ERR_MSG_MOD(extack,
"Can only gate based on DMAC"); "Can only gate based on DMAC");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} else if (key->type != SJA1105_KEY_VLAN_AWARE_VL) {
dev_err(priv->ds->dev, "2: vlan state %d key type %d\n",
priv->vlan_state, key->type);
NL_SET_ERR_MSG_MOD(extack,
"Can only gate based on {DMAC, VID, PCP}");
return -EOPNOTSUPP;
} }
if (!rule) { if (!rule) {