| Message ID | 20210403114848.30528-5-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ar9331: mainline some parts of switch functionality | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: rmk+kernel@armlinux.org.uk linux@rempel-privat.de |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 81 exceeds 80 columns WARNING: networking block comments don't use an empty /* line, use /* Comment... |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Sat, Apr 03, 2021 at 01:48:43PM +0200, Oleksij Rempel wrote: > Make sure that all external port are actually isolated from each other, > so no packets are leaked. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/dsa/qca/ar9331.c | 145 ++++++++++++++++++++++++++++++++++- > 1 file changed, 143 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c > index 9a5035b2f0ff..a3de3598fbf5 100644 > --- a/drivers/net/dsa/qca/ar9331.c > +++ b/drivers/net/dsa/qca/ar9331.c > @@ -60,10 +60,19 @@ > > #define AR9331_SW_REG_FLOOD_MASK 0x2c > #define AR9331_SW_FLOOD_MASK_BROAD_TO_CPU BIT(26) > +#define AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP GENMASK(20, 16) > +#define AR9331_SW_FLOOD_MASK_UNI_FLOOD_DP GENMASK(4, 0) > > #define AR9331_SW_REG_GLOBAL_CTRL 0x30 > #define AR9331_SW_GLOBAL_CTRL_MFS_M GENMASK(13, 0) > > +#define AR9331_SW_REG_ADDR_TABLE_CTRL 0x5c > +#define AR9331_SW_AT_ARP_EN BIT(20) > +#define AR9331_SW_AT_LEARN_CHANGE_EN BIT(18) > +#define AR9331_SW_AT_AGE_EN BIT(17) > +#define AR9331_SW_AT_AGE_TIME GENMASK(15, 0) > +#define AR9331_SW_AT_AGE_TIME_COEF 6900 /* Not documented */ > + > #define AR9331_SW_REG_MDIO_CTRL 0x98 > #define AR9331_SW_MDIO_CTRL_BUSY BIT(31) > #define AR9331_SW_MDIO_CTRL_MASTER_EN BIT(30) > @@ -101,6 +110,46 @@ > AR9331_SW_PORT_STATUS_RX_FLOW_EN | AR9331_SW_PORT_STATUS_TX_FLOW_EN | \ > AR9331_SW_PORT_STATUS_SPEED_M) > > +#define AR9331_SW_REG_PORT_CTRL(_port) (0x104 + (_port) * 0x100) > +#define AR9331_SW_PORT_CTRL_ING_MIRROR_EN BIT(17) > +#define AR9331_SW_PORT_CTRL_EG_MIRROR_EN BIT(16) > +#define AR9331_SW_PORT_CTRL_DOUBLE_TAG_VLAN BIT(15) > +#define AR9331_SW_PORT_CTRL_LEARN_EN BIT(14) > +#define AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN BIT(13) > +#define AR9331_SW_PORT_CTRL_MAC_LOOP_BACK BIT(12) > +#define AR9331_SW_PORT_CTRL_HEAD_EN BIT(11) > +#define AR9331_SW_PORT_CTRL_IGMP_MLD_EN BIT(10) > +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE GENMASK(9, 8) > +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_KEEP 0 > +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_STRIP 1 > +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_ADD 2 > +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_DOUBLE 3 > +#define AR9331_SW_PORT_CTRL_LEARN_ONE_LOCK BIT(7) > +#define AR9331_SW_PORT_CTRL_PORT_LOCK_EN BIT(6) > +#define AR9331_SW_PORT_CTRL_LOCK_DROP_EN BIT(5) > +#define AR9331_SW_PORT_CTRL_PORT_STATE GENMASK(2, 0) > +#define AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED 0 > +#define AR9331_SW_PORT_CTRL_PORT_STATE_BLOCKING 1 > +#define AR9331_SW_PORT_CTRL_PORT_STATE_LISTENING 2 > +#define AR9331_SW_PORT_CTRL_PORT_STATE_LEARNING 3 > +#define AR9331_SW_PORT_CTRL_PORT_STATE_FORWARD 4 > + > +#define AR9331_SW_REG_PORT_VLAN(_port) (0x108 + (_port) * 0x100) > +#define AR9331_SW_PORT_VLAN_8021Q_MODE GENMASK(31, 30) > +#define AR9331_SW_8021Q_MODE_SECURE 3 > +#define AR9331_SW_8021Q_MODE_CHECK 2 > +#define AR9331_SW_8021Q_MODE_FALLBACK 1 > +#define AR9331_SW_8021Q_MODE_NONE 0 > +#define AR9331_SW_PORT_VLAN_ING_PORT_PRI GENMASK(29, 27) > +#define AR9331_SW_PORT_VLAN_FORCE_PORT_VLAN_EN BIT(26) > +#define AR9331_SW_PORT_VLAN_PORT_VID_MEMBER GENMASK(25, 16) > +#define AR9331_SW_PORT_VLAN_ARP_LEAKY_EN BIT(15) > +#define AR9331_SW_PORT_VLAN_UNI_LEAKY_EN BIT(14) > +#define AR9331_SW_PORT_VLAN_MULTI_LEAKY_EN BIT(13) > +#define AR9331_SW_PORT_VLAN_FORCE_DEFALUT_VID_EN BIT(12) > +#define AR9331_SW_PORT_VLAN_PORT_VID GENMASK(11, 0) > +#define AR9331_SW_PORT_VLAN_PORT_VID_DEF 1 > + > /* MIB registers */ > #define AR9331_MIB_COUNTER(x) (0x20000 + ((x) * 0x100)) > > @@ -229,6 +278,7 @@ struct ar9331_sw_priv { > struct regmap *regmap; > struct reset_control *sw_reset; > struct ar9331_sw_port port[AR9331_SW_PORTS]; > + int cpu_port; > }; > > static struct ar9331_sw_priv *ar9331_sw_port_to_priv(struct ar9331_sw_port *port) > @@ -371,12 +421,72 @@ static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv) > return 0; > } > > -static int ar9331_sw_setup(struct dsa_switch *ds) > +static int ar9331_sw_setup_port(struct dsa_switch *ds, int port) > { > struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; > struct regmap *regmap = priv->regmap; > + u32 port_mask, port_ctrl, val; > int ret; > > + /* Generate default port settings */ > + port_ctrl = FIELD_PREP(AR9331_SW_PORT_CTRL_PORT_STATE, > + AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED); > + > + if (dsa_is_cpu_port(ds, port)) { > + /* > + * CPU port should be allowed to communicate with all user > + * ports. > + */ > + //port_mask = dsa_user_ports(ds); Please cleanup dead code. > + port_mask = 0; Is 0 the correct value here? It is the same as default, i.e. unused ports? > + /* > + * Enable atheros header on CPU port. This will allow us > + * communicate with each port separately > + */ > + port_ctrl |= AR9331_SW_PORT_CTRL_HEAD_EN; > + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN; > + } else if (dsa_is_user_port(ds, port)) { > + /* > + * User ports should communicate only with the CPU port. > + */ > + port_mask = BIT(priv->cpu_port); > + /* Enable unicast address learning by default */ > + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN > + /* IGMP snooping seems to work correctly, let's use it */ > + | AR9331_SW_PORT_CTRL_IGMP_MLD_EN > + | AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN; There was a discussion a couple of months ago about if there should be address learning on the CPU port. Having it enabled allows for devices which move from behind the CPU onto the switched network. There is a software workaround in place now, so it might not be needed. > + } else { > + /* Other ports do not need to communicate at all */ > + port_mask = 0; > + } > + > + val = FIELD_PREP(AR9331_SW_PORT_VLAN_8021Q_MODE, > + AR9331_SW_8021Q_MODE_NONE) | > + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask) | > + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID, > + AR9331_SW_PORT_VLAN_PORT_VID_DEF); > + > + ret = regmap_write(regmap, AR9331_SW_REG_PORT_VLAN(port), val); > + if (ret) > + goto error; > + > + ret = regmap_write(regmap, AR9331_SW_REG_PORT_CTRL(port), port_ctrl); > + if (ret) > + goto error; > + > + return 0; > +error: > + dev_err_ratelimited(priv->dev, "%s: error: %i\n", __func__, ret); Typically this function is only called during probe. Do i don't think it needs rate limiting. > + > + return ret; > +} > + > +static int ar9331_sw_setup(struct dsa_switch *ds) > +{ > + struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; > + struct regmap *regmap = priv->regmap; > + int ret, i; > + > ret = ar9331_sw_reset(priv); > if (ret) > return ret; > @@ -390,7 +500,8 @@ static int ar9331_sw_setup(struct dsa_switch *ds) > > /* Do not drop broadcast frames */ > ret = regmap_write_bits(regmap, AR9331_SW_REG_FLOOD_MASK, > - AR9331_SW_FLOOD_MASK_BROAD_TO_CPU, > + AR9331_SW_FLOOD_MASK_BROAD_TO_CPU > + | AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP, > AR9331_SW_FLOOD_MASK_BROAD_TO_CPU); > if (ret) > goto error; > @@ -402,6 +513,36 @@ static int ar9331_sw_setup(struct dsa_switch *ds) > if (ret) > goto error; > > + /* > + * Configure the ARL: > + * AR9331_SW_AT_ARP_EN - why? > + * AR9331_SW_AT_LEARN_CHANGE_EN - why? > + */ > + ret = regmap_set_bits(regmap, AR9331_SW_REG_ADDR_TABLE_CTRL, > + AR9331_SW_AT_ARP_EN | > + AR9331_SW_AT_LEARN_CHANGE_EN); > + if (ret) > + goto error; > + > + /* find the CPU port */ > + priv->cpu_port = -1; > + for (i = 0; i < ds->num_ports; i++) { > + if (!dsa_is_cpu_port(ds, i)) > + continue; > + > + if (priv->cpu_port != -1) > + dev_err_ratelimited(priv->dev, "%s: more then one CPU port. Already set: %i, trying to add: %i\n", > + __func__, priv->cpu_port, i); Another rate limiting i would not do. > + else > + priv->cpu_port = i; > + } Andrew
On Sat, Apr 03, 2021 at 01:48:43PM +0200, Oleksij Rempel wrote: > Make sure that all external port are actually isolated from each other, > so no packets are leaked. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/dsa/qca/ar9331.c | 145 ++++++++++++++++++++++++++++++++++- > 1 file changed, 143 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c > index 9a5035b2f0ff..a3de3598fbf5 100644 > --- a/drivers/net/dsa/qca/ar9331.c > +++ b/drivers/net/dsa/qca/ar9331.c > @@ -60,10 +60,19 @@ > > /* MIB registers */ > #define AR9331_MIB_COUNTER(x) (0x20000 + ((x) * 0x100)) > > @@ -229,6 +278,7 @@ struct ar9331_sw_priv { > struct regmap *regmap; > struct reset_control *sw_reset; > struct ar9331_sw_port port[AR9331_SW_PORTS]; > + int cpu_port; > }; > > static struct ar9331_sw_priv *ar9331_sw_port_to_priv(struct ar9331_sw_port *port) > @@ -371,12 +421,72 @@ static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv) > return 0; > } > > -static int ar9331_sw_setup(struct dsa_switch *ds) > +static int ar9331_sw_setup_port(struct dsa_switch *ds, int port) > { > struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; > struct regmap *regmap = priv->regmap; > + u32 port_mask, port_ctrl, val; > int ret; > > + /* Generate default port settings */ > + port_ctrl = FIELD_PREP(AR9331_SW_PORT_CTRL_PORT_STATE, > + AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED); > + > + if (dsa_is_cpu_port(ds, port)) { > + /* > + * CPU port should be allowed to communicate with all user > + * ports. > + */ > + //port_mask = dsa_user_ports(ds); Code commented out should ideally not be part of a submitted patch. And the networking comment style is: /* CPU port should be allowed to communicate with all user * ports. */ > + port_mask = 0; > + /* > + * Enable atheros header on CPU port. This will allow us > + * communicate with each port separately > + */ > + port_ctrl |= AR9331_SW_PORT_CTRL_HEAD_EN; > + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN; > + } else if (dsa_is_user_port(ds, port)) { > + /* > + * User ports should communicate only with the CPU port. > + */ > + port_mask = BIT(priv->cpu_port); For all you care, the CPU port here is dsa_to_port(ds, port)->cpu_dp->index, no need to go to those lengths in order to find it. DSA does not have a fixed number for the CPU port but a CPU port pointer per port in order to not close the door for the future support of multiple CPU ports. > + /* Enable unicast address learning by default */ > + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN > + /* IGMP snooping seems to work correctly, let's use it */ > + | AR9331_SW_PORT_CTRL_IGMP_MLD_EN I don't really like this ad-hoc enablement of IGMP/MLD snooping from the driver, please add the pass-through in DSA for SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED (dsa_slave_port_attr_set, dsa_port_switchdev_sync, dsa_port_switchdev_unsync should all call a dsa_switch_ops :: port_snoop_igmp_mld function) and then toggle this bit from there. > + | AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN; > + } else { > + /* Other ports do not need to communicate at all */ > + port_mask = 0; > + } > + > + val = FIELD_PREP(AR9331_SW_PORT_VLAN_8021Q_MODE, > + AR9331_SW_8021Q_MODE_NONE) | > + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask) | > + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID, > + AR9331_SW_PORT_VLAN_PORT_VID_DEF); > + > + ret = regmap_write(regmap, AR9331_SW_REG_PORT_VLAN(port), val); > + if (ret) > + goto error; > + > + ret = regmap_write(regmap, AR9331_SW_REG_PORT_CTRL(port), port_ctrl); > + if (ret) > + goto error; > + > + return 0; > +error: > + dev_err_ratelimited(priv->dev, "%s: error: %i\n", __func__, ret); > + > + return ret; > +} > + > +static int ar9331_sw_setup(struct dsa_switch *ds) > +{ > + struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; > + struct regmap *regmap = priv->regmap; > + int ret, i; > + > ret = ar9331_sw_reset(priv); > if (ret) > return ret; > @@ -390,7 +500,8 @@ static int ar9331_sw_setup(struct dsa_switch *ds) > > /* Do not drop broadcast frames */ > ret = regmap_write_bits(regmap, AR9331_SW_REG_FLOOD_MASK, > - AR9331_SW_FLOOD_MASK_BROAD_TO_CPU, > + AR9331_SW_FLOOD_MASK_BROAD_TO_CPU > + | AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP, > AR9331_SW_FLOOD_MASK_BROAD_TO_CPU); > if (ret) > goto error; > @@ -402,6 +513,36 @@ static int ar9331_sw_setup(struct dsa_switch *ds) > if (ret) > goto error; > > + /* > + * Configure the ARL: > + * AR9331_SW_AT_ARP_EN - why? > + * AR9331_SW_AT_LEARN_CHANGE_EN - why? > + */ Good question, why? > + ret = regmap_set_bits(regmap, AR9331_SW_REG_ADDR_TABLE_CTRL, > + AR9331_SW_AT_ARP_EN | > + AR9331_SW_AT_LEARN_CHANGE_EN); > + if (ret) > + goto error; > + > + /* find the CPU port */ > + priv->cpu_port = -1; > + for (i = 0; i < ds->num_ports; i++) { > + if (!dsa_is_cpu_port(ds, i)) > + continue; > + > + if (priv->cpu_port != -1) > + dev_err_ratelimited(priv->dev, "%s: more then one CPU port. Already set: %i, trying to add: %i\n", than, not then > + __func__, priv->cpu_port, i); > + else > + priv->cpu_port = i; > + } > + > + for (i = 0; i < ds->num_ports; i++) { > + ret = ar9331_sw_setup_port(ds, i); > + if (ret) > + goto error; > + } > + > ds->configure_vlan_while_not_filtering = false; > > return 0; > -- > 2.29.2 >
Am 04.04.21 um 02:16 schrieb Vladimir Oltean: > On Sat, Apr 03, 2021 at 01:48:43PM +0200, Oleksij Rempel wrote: >> Make sure that all external port are actually isolated from each other, >> so no packets are leaked. >> >> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> >> --- >> drivers/net/dsa/qca/ar9331.c | 145 ++++++++++++++++++++++++++++++++++- >> 1 file changed, 143 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c >> index 9a5035b2f0ff..a3de3598fbf5 100644 >> --- a/drivers/net/dsa/qca/ar9331.c >> +++ b/drivers/net/dsa/qca/ar9331.c >> @@ -60,10 +60,19 @@ >> >> /* MIB registers */ >> #define AR9331_MIB_COUNTER(x) (0x20000 + ((x) * 0x100)) >> >> @@ -229,6 +278,7 @@ struct ar9331_sw_priv { >> struct regmap *regmap; >> struct reset_control *sw_reset; >> struct ar9331_sw_port port[AR9331_SW_PORTS]; >> + int cpu_port; >> }; >> >> static struct ar9331_sw_priv *ar9331_sw_port_to_priv(struct ar9331_sw_port *port) >> @@ -371,12 +421,72 @@ static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv) >> return 0; >> } >> >> -static int ar9331_sw_setup(struct dsa_switch *ds) >> +static int ar9331_sw_setup_port(struct dsa_switch *ds, int port) >> { >> struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; >> struct regmap *regmap = priv->regmap; >> + u32 port_mask, port_ctrl, val; >> int ret; >> >> + /* Generate default port settings */ >> + port_ctrl = FIELD_PREP(AR9331_SW_PORT_CTRL_PORT_STATE, >> + AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED); >> + >> + if (dsa_is_cpu_port(ds, port)) { >> + /* >> + * CPU port should be allowed to communicate with all user >> + * ports. >> + */ >> + //port_mask = dsa_user_ports(ds); > > Code commented out should ideally not be part of a submitted patch. Sorry I overlooked this one > And the networking comment style is: > > /* CPU port should be allowed to communicate with all user > * ports. > */ Aaa... networking part of kernel code... >> + port_mask = 0; >> + /* >> + * Enable atheros header on CPU port. This will allow us >> + * communicate with each port separately >> + */ >> + port_ctrl |= AR9331_SW_PORT_CTRL_HEAD_EN; >> + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN; >> + } else if (dsa_is_user_port(ds, port)) { >> + /* >> + * User ports should communicate only with the CPU port. >> + */ >> + port_mask = BIT(priv->cpu_port); > > For all you care, the CPU port here is dsa_to_port(ds, port)->cpu_dp->index, > no need to go to those lengths in order to find it. DSA does not have > fixed number for the CPU port but a CPU port pointer per port in order > to not close the door for the future support of multiple CPU ports. ok. >> + /* Enable unicast address learning by default */ >> + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN >> + /* IGMP snooping seems to work correctly, let's use it */ >> + | AR9331_SW_PORT_CTRL_IGMP_MLD_EN > > I don't really like this ad-hoc enablement of IGMP/MLD snooping from the driver, > please add the pass-through in DSA for SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED > (dsa_slave_port_attr_set, dsa_port_switchdev_sync, dsa_port_switchdev_unsync > should all call a dsa_switch_ops :: port_snoop_igmp_mld function) and then > toggle this bit from there. sounds good. Looks like there are few more driver need to be fixed: drivers/net/dsa/lan9303-core.c drivers/net/dsa/mv88e6xxx/chip.c > >> + | AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN; >> + } else { >> + /* Other ports do not need to communicate at all */ >> + port_mask = 0; >> + } >> + >> + val = FIELD_PREP(AR9331_SW_PORT_VLAN_8021Q_MODE, >> + AR9331_SW_8021Q_MODE_NONE) | >> + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask) | >> + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID, >> + AR9331_SW_PORT_VLAN_PORT_VID_DEF); >> + >> + ret = regmap_write(regmap, AR9331_SW_REG_PORT_VLAN(port), val); >> + if (ret) >> + goto error; >> + >> + ret = regmap_write(regmap, AR9331_SW_REG_PORT_CTRL(port), port_ctrl); >> + if (ret) >> + goto error; >> + >> + return 0; >> +error: >> + dev_err_ratelimited(priv->dev, "%s: error: %i\n", __func__, ret); >> + >> + return ret; >> +} >> + >> +static int ar9331_sw_setup(struct dsa_switch *ds) >> +{ >> + struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; >> + struct regmap *regmap = priv->regmap; >> + int ret, i; >> + >> ret = ar9331_sw_reset(priv); >> if (ret) >> return ret; >> @@ -390,7 +500,8 @@ static int ar9331_sw_setup(struct dsa_switch *ds) >> >> /* Do not drop broadcast frames */ >> ret = regmap_write_bits(regmap, AR9331_SW_REG_FLOOD_MASK, >> - AR9331_SW_FLOOD_MASK_BROAD_TO_CPU, >> + AR9331_SW_FLOOD_MASK_BROAD_TO_CPU >> + | AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP, >> AR9331_SW_FLOOD_MASK_BROAD_TO_CPU); >> if (ret) >> goto error; >> @@ -402,6 +513,36 @@ static int ar9331_sw_setup(struct dsa_switch *ds) >> if (ret) >> goto error; >> >> + /* >> + * Configure the ARL: >> + * AR9331_SW_AT_ARP_EN - why? >> + * AR9331_SW_AT_LEARN_CHANGE_EN - why? >> + */ > > Good question, why? I still do not know if it is a good idea. This bits are enabled by default. May be you can help me understand it. Datasheet says: ARP_EN: ARP frame acknowledge enable. Setting this bit to 1 is an acknowledgement by the hardware of a received ARP frame and allows it to be copied to the CPU port. LEARN_CHANGE_EN: 0 - If a hash violation occurs during learning, no new address will be learned in the ARL 1 - Enables a new MAC address change if a hash violation occurs during learning -- Regards, Oleksij
diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c index 9a5035b2f0ff..a3de3598fbf5 100644 --- a/drivers/net/dsa/qca/ar9331.c +++ b/drivers/net/dsa/qca/ar9331.c @@ -60,10 +60,19 @@ #define AR9331_SW_REG_FLOOD_MASK 0x2c #define AR9331_SW_FLOOD_MASK_BROAD_TO_CPU BIT(26) +#define AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP GENMASK(20, 16) +#define AR9331_SW_FLOOD_MASK_UNI_FLOOD_DP GENMASK(4, 0) #define AR9331_SW_REG_GLOBAL_CTRL 0x30 #define AR9331_SW_GLOBAL_CTRL_MFS_M GENMASK(13, 0) +#define AR9331_SW_REG_ADDR_TABLE_CTRL 0x5c +#define AR9331_SW_AT_ARP_EN BIT(20) +#define AR9331_SW_AT_LEARN_CHANGE_EN BIT(18) +#define AR9331_SW_AT_AGE_EN BIT(17) +#define AR9331_SW_AT_AGE_TIME GENMASK(15, 0) +#define AR9331_SW_AT_AGE_TIME_COEF 6900 /* Not documented */ + #define AR9331_SW_REG_MDIO_CTRL 0x98 #define AR9331_SW_MDIO_CTRL_BUSY BIT(31) #define AR9331_SW_MDIO_CTRL_MASTER_EN BIT(30) @@ -101,6 +110,46 @@ AR9331_SW_PORT_STATUS_RX_FLOW_EN | AR9331_SW_PORT_STATUS_TX_FLOW_EN | \ AR9331_SW_PORT_STATUS_SPEED_M) +#define AR9331_SW_REG_PORT_CTRL(_port) (0x104 + (_port) * 0x100) +#define AR9331_SW_PORT_CTRL_ING_MIRROR_EN BIT(17) +#define AR9331_SW_PORT_CTRL_EG_MIRROR_EN BIT(16) +#define AR9331_SW_PORT_CTRL_DOUBLE_TAG_VLAN BIT(15) +#define AR9331_SW_PORT_CTRL_LEARN_EN BIT(14) +#define AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN BIT(13) +#define AR9331_SW_PORT_CTRL_MAC_LOOP_BACK BIT(12) +#define AR9331_SW_PORT_CTRL_HEAD_EN BIT(11) +#define AR9331_SW_PORT_CTRL_IGMP_MLD_EN BIT(10) +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE GENMASK(9, 8) +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_KEEP 0 +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_STRIP 1 +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_ADD 2 +#define AR9331_SW_PORT_CTRL_EG_VLAN_MODE_DOUBLE 3 +#define AR9331_SW_PORT_CTRL_LEARN_ONE_LOCK BIT(7) +#define AR9331_SW_PORT_CTRL_PORT_LOCK_EN BIT(6) +#define AR9331_SW_PORT_CTRL_LOCK_DROP_EN BIT(5) +#define AR9331_SW_PORT_CTRL_PORT_STATE GENMASK(2, 0) +#define AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED 0 +#define AR9331_SW_PORT_CTRL_PORT_STATE_BLOCKING 1 +#define AR9331_SW_PORT_CTRL_PORT_STATE_LISTENING 2 +#define AR9331_SW_PORT_CTRL_PORT_STATE_LEARNING 3 +#define AR9331_SW_PORT_CTRL_PORT_STATE_FORWARD 4 + +#define AR9331_SW_REG_PORT_VLAN(_port) (0x108 + (_port) * 0x100) +#define AR9331_SW_PORT_VLAN_8021Q_MODE GENMASK(31, 30) +#define AR9331_SW_8021Q_MODE_SECURE 3 +#define AR9331_SW_8021Q_MODE_CHECK 2 +#define AR9331_SW_8021Q_MODE_FALLBACK 1 +#define AR9331_SW_8021Q_MODE_NONE 0 +#define AR9331_SW_PORT_VLAN_ING_PORT_PRI GENMASK(29, 27) +#define AR9331_SW_PORT_VLAN_FORCE_PORT_VLAN_EN BIT(26) +#define AR9331_SW_PORT_VLAN_PORT_VID_MEMBER GENMASK(25, 16) +#define AR9331_SW_PORT_VLAN_ARP_LEAKY_EN BIT(15) +#define AR9331_SW_PORT_VLAN_UNI_LEAKY_EN BIT(14) +#define AR9331_SW_PORT_VLAN_MULTI_LEAKY_EN BIT(13) +#define AR9331_SW_PORT_VLAN_FORCE_DEFALUT_VID_EN BIT(12) +#define AR9331_SW_PORT_VLAN_PORT_VID GENMASK(11, 0) +#define AR9331_SW_PORT_VLAN_PORT_VID_DEF 1 + /* MIB registers */ #define AR9331_MIB_COUNTER(x) (0x20000 + ((x) * 0x100)) @@ -229,6 +278,7 @@ struct ar9331_sw_priv { struct regmap *regmap; struct reset_control *sw_reset; struct ar9331_sw_port port[AR9331_SW_PORTS]; + int cpu_port; }; static struct ar9331_sw_priv *ar9331_sw_port_to_priv(struct ar9331_sw_port *port) @@ -371,12 +421,72 @@ static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv) return 0; } -static int ar9331_sw_setup(struct dsa_switch *ds) +static int ar9331_sw_setup_port(struct dsa_switch *ds, int port) { struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; struct regmap *regmap = priv->regmap; + u32 port_mask, port_ctrl, val; int ret; + /* Generate default port settings */ + port_ctrl = FIELD_PREP(AR9331_SW_PORT_CTRL_PORT_STATE, + AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED); + + if (dsa_is_cpu_port(ds, port)) { + /* + * CPU port should be allowed to communicate with all user + * ports. + */ + //port_mask = dsa_user_ports(ds); + port_mask = 0; + /* + * Enable atheros header on CPU port. This will allow us + * communicate with each port separately + */ + port_ctrl |= AR9331_SW_PORT_CTRL_HEAD_EN; + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN; + } else if (dsa_is_user_port(ds, port)) { + /* + * User ports should communicate only with the CPU port. + */ + port_mask = BIT(priv->cpu_port); + /* Enable unicast address learning by default */ + port_ctrl |= AR9331_SW_PORT_CTRL_LEARN_EN + /* IGMP snooping seems to work correctly, let's use it */ + | AR9331_SW_PORT_CTRL_IGMP_MLD_EN + | AR9331_SW_PORT_CTRL_SINGLE_VLAN_EN; + } else { + /* Other ports do not need to communicate at all */ + port_mask = 0; + } + + val = FIELD_PREP(AR9331_SW_PORT_VLAN_8021Q_MODE, + AR9331_SW_8021Q_MODE_NONE) | + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask) | + FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID, + AR9331_SW_PORT_VLAN_PORT_VID_DEF); + + ret = regmap_write(regmap, AR9331_SW_REG_PORT_VLAN(port), val); + if (ret) + goto error; + + ret = regmap_write(regmap, AR9331_SW_REG_PORT_CTRL(port), port_ctrl); + if (ret) + goto error; + + return 0; +error: + dev_err_ratelimited(priv->dev, "%s: error: %i\n", __func__, ret); + + return ret; +} + +static int ar9331_sw_setup(struct dsa_switch *ds) +{ + struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; + struct regmap *regmap = priv->regmap; + int ret, i; + ret = ar9331_sw_reset(priv); if (ret) return ret; @@ -390,7 +500,8 @@ static int ar9331_sw_setup(struct dsa_switch *ds) /* Do not drop broadcast frames */ ret = regmap_write_bits(regmap, AR9331_SW_REG_FLOOD_MASK, - AR9331_SW_FLOOD_MASK_BROAD_TO_CPU, + AR9331_SW_FLOOD_MASK_BROAD_TO_CPU + | AR9331_SW_FLOOD_MASK_MULTI_FLOOD_DP, AR9331_SW_FLOOD_MASK_BROAD_TO_CPU); if (ret) goto error; @@ -402,6 +513,36 @@ static int ar9331_sw_setup(struct dsa_switch *ds) if (ret) goto error; + /* + * Configure the ARL: + * AR9331_SW_AT_ARP_EN - why? + * AR9331_SW_AT_LEARN_CHANGE_EN - why? + */ + ret = regmap_set_bits(regmap, AR9331_SW_REG_ADDR_TABLE_CTRL, + AR9331_SW_AT_ARP_EN | + AR9331_SW_AT_LEARN_CHANGE_EN); + if (ret) + goto error; + + /* find the CPU port */ + priv->cpu_port = -1; + for (i = 0; i < ds->num_ports; i++) { + if (!dsa_is_cpu_port(ds, i)) + continue; + + if (priv->cpu_port != -1) + dev_err_ratelimited(priv->dev, "%s: more then one CPU port. Already set: %i, trying to add: %i\n", + __func__, priv->cpu_port, i); + else + priv->cpu_port = i; + } + + for (i = 0; i < ds->num_ports; i++) { + ret = ar9331_sw_setup_port(ds, i); + if (ret) + goto error; + } + ds->configure_vlan_while_not_filtering = false; return 0;
Make sure that all external port are actually isolated from each other, so no packets are leaked. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/dsa/qca/ar9331.c | 145 ++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 2 deletions(-)