On 2/23/2021 10:12 PM, DENG Qingfang wrote:
> Use port isolation registers to configure bridge offloading.
> Remove the VLAN init, as we have proper CPU tag and bridge offloading
> support now.
>
> Signed-off-by: DENG Qingfang <dqf...@gmail.com>
> ---
> This is not tested, as I don't have a RTL8366RB board. And I think there
> is potential race condition in port_bridge_{join,leave}.
>
> drivers/net/dsa/rtl8366rb.c | 73 ++++++++++++++++++++++++++++++++++---
> 1 file changed, 67 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c
> index a89093bc6c6a..9f6e2b361216 100644
> --- a/drivers/net/dsa/rtl8366rb.c
> +++ b/drivers/net/dsa/rtl8366rb.c
> @@ -300,6 +300,12 @@
> #define RTL8366RB_INTERRUPT_STATUS_REG 0x0442
> #define RTL8366RB_NUM_INTERRUPT 14 /* 0..13 */
>
> +/* Port isolation registers */
> +#define RTL8366RB_PORT_ISO_BASE 0x0F08
> +#define RTL8366RB_PORT_ISO(pnum) (RTL8366RB_PORT_ISO_BASE + (pnum))
> +#define RTL8366RB_PORT_ISO_EN BIT(0)
> +#define RTL8366RB_PORT_ISO_PORTS_MASK GENMASK(7, 1)
> +
> /* bits 0..5 enable force when cleared */
> #define RTL8366RB_MAC_FORCE_CTRL_REG 0x0F11
>
> @@ -835,6 +841,15 @@ static int rtl8366rb_setup(struct dsa_switch *ds)
> if (ret)
> return ret;
>
> + /* Isolate user ports */
> + for (i = 0; i < RTL8366RB_PORT_NUM_CPU; i++) {
> + ret = regmap_write(smi->map, RTL8366RB_PORT_ISO(i),
> + RTL8366RB_PORT_ISO_EN |
> + BIT(RTL8366RB_PORT_NUM_CPU + 1));
> + if (ret)
> + return ret;
> + }
> +
> /* Set up the "green ethernet" feature */
> ret = rtl8366rb_jam_table(rtl8366rb_green_jam,
> ARRAY_SIZE(rtl8366rb_green_jam), smi, false);
> @@ -963,10 +978,6 @@ static int rtl8366rb_setup(struct dsa_switch *ds)
> return ret;
> }
>
> - ret = rtl8366_init_vlan(smi);
> - if (ret)
> - return ret;
> -
> ret = rtl8366rb_setup_cascaded_irq(smi);
> if (ret)
> dev_info(smi->dev, "no interrupt support\n");
> @@ -977,8 +988,6 @@ static int rtl8366rb_setup(struct dsa_switch *ds)
> return -ENODEV;
> }
>
> - ds->configure_vlan_while_not_filtering = false;
If you have a configuration with ports that are part of a bridge with
VLAN filtering enabled, what happens to the standalone ports, are they a
member of a default VLAN entry still?
--
Florian
