| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220228145255.x6en5rldy2efkztc@skbuf>
Date: Mon, 28 Feb 2022 16:52:55 +0200
From: Vladimir Oltean <olteanv@...il.com>
To: Luiz Angelo Daros de Luca <luizluca@...il.com>
Cc: netdev@...r.kernel.org, linus.walleij@...aro.org, andrew@...n.ch,
vivien.didelot@...il.com, f.fainelli@...il.com,
davem@...emloft.net, kuba@...nel.org, alsi@...g-olufsen.dk,
arinc.unal@...nc9.com
Subject: Re: [PATCH net-next v4 3/3] net: dsa: realtek: rtl8365mb: add
support for rtl8_4t
On Sun, Feb 27, 2022 at 12:59:20AM -0300, Luiz Angelo Daros de Luca wrote:
> The trailing tag is also supported by this family. The default is still
> rtl8_4 but now the switch supports changing the tag to rtl8_4t.
>
> Reintroduce the dropped cpu in struct rtl8365mb (removed by 6147631).
>
> Reviewed-by: Alvin Šipraga <alsi@...g-olufsen.dk>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@...il.com>
> ---
> drivers/net/dsa/realtek/rtl8365mb.c | 82 +++++++++++++++++++++++------
> 1 file changed, 67 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
> index 2ed592147c20..ff865af65d55 100644
> --- a/drivers/net/dsa/realtek/rtl8365mb.c
> +++ b/drivers/net/dsa/realtek/rtl8365mb.c
> @@ -566,6 +566,7 @@ struct rtl8365mb_port {
> * @chip_ver: chip silicon revision
> * @port_mask: mask of all ports
> * @learn_limit_max: maximum number of L2 addresses the chip can learn
> + * @cpu: CPU tagging and CPU port configuration for this chip
> * @mib_lock: prevent concurrent reads of MIB counters
> * @ports: per-port data
> * @jam_table: chip-specific initialization jam table
> @@ -580,6 +581,7 @@ struct rtl8365mb {
> u32 chip_ver;
> u32 port_mask;
> u32 learn_limit_max;
> + struct rtl8365mb_cpu cpu;
> struct mutex mib_lock;
> struct rtl8365mb_port ports[RTL8365MB_MAX_NUM_PORTS];
> const struct rtl8365mb_jam_tbl_entry *jam_table;
> @@ -770,6 +772,16 @@ static enum dsa_tag_protocol
> rtl8365mb_get_tag_protocol(struct dsa_switch *ds, int port,
> enum dsa_tag_protocol mp)
> {
> + struct realtek_priv *priv = ds->priv;
> + struct rtl8365mb_cpu *cpu;
> + struct rtl8365mb *mb;
> +
> + mb = priv->chip_data;
> + cpu = &mb->cpu;
> +
> + if (cpu->position == RTL8365MB_CPU_POS_BEFORE_CRC)
> + return DSA_TAG_PROTO_RTL8_4T;
> +
> return DSA_TAG_PROTO_RTL8_4;
> }
>
> @@ -1725,8 +1737,10 @@ static void rtl8365mb_irq_teardown(struct realtek_priv *priv)
> }
> }
>
> -static int rtl8365mb_cpu_config(struct realtek_priv *priv, const struct rtl8365mb_cpu *cpu)
> +static int rtl8365mb_cpu_config(struct realtek_priv *priv)
> {
> + struct rtl8365mb *mb = priv->chip_data;
> + struct rtl8365mb_cpu *cpu = &mb->cpu;
> u32 val;
> int ret;
>
> @@ -1752,6 +1766,42 @@ static int rtl8365mb_cpu_config(struct realtek_priv *priv, const struct rtl8365m
> return 0;
> }
>
> +static int rtl8365mb_change_tag_protocol(struct dsa_switch *ds, int cpu_index,
> + enum dsa_tag_protocol proto)
> +{
> + struct realtek_priv *priv = ds->priv;
> + struct rtl8365mb_cpu *cpu;
> + struct rtl8365mb *mb;
> + int ret;
> +
> + mb = priv->chip_data;
> + cpu = &mb->cpu;
> +
> + switch (proto) {
> + case DSA_TAG_PROTO_RTL8_4:
> + cpu->format = RTL8365MB_CPU_FORMAT_8BYTES;
> + cpu->position = RTL8365MB_CPU_POS_AFTER_SA;
> + break;
> + case DSA_TAG_PROTO_RTL8_4T:
> + cpu->format = RTL8365MB_CPU_FORMAT_8BYTES;
> + cpu->position = RTL8365MB_CPU_POS_BEFORE_CRC;
> + break;
> + /* The switch also supports a 4-byte format, similar to rtl4a but with
> + * the same 0x04 8-bit version and probably 8-bit port source/dest.
> + * There is no public doc about it. Not supported yet and it will probably
> + * never be.
> + */
> + default:
> + return -EPROTONOSUPPORT;
> + }
> +
> + ret = rtl8365mb_cpu_config(priv);
> + if (ret)
> + return ret;
return rtl8365mb_cpu_config(...)
Don't forget to remove the "ret" variable when you update this.
> +
> + return 0;
> +}
> +
> static int rtl8365mb_switch_init(struct realtek_priv *priv)
> {
> struct rtl8365mb *mb = priv->chip_data;
> @@ -1798,13 +1848,14 @@ static int rtl8365mb_reset_chip(struct realtek_priv *priv)
> static int rtl8365mb_setup(struct dsa_switch *ds)
> {
> struct realtek_priv *priv = ds->priv;
> - struct rtl8365mb_cpu cpu = {0};
> + struct rtl8365mb_cpu *cpu;
> struct dsa_port *cpu_dp;
> struct rtl8365mb *mb;
> int ret;
> int i;
>
> mb = priv->chip_data;
> + cpu = &mb->cpu;
>
> ret = rtl8365mb_reset_chip(priv);
> if (ret) {
> @@ -1827,21 +1878,14 @@ static int rtl8365mb_setup(struct dsa_switch *ds)
> dev_info(priv->dev, "no interrupt support\n");
>
> /* Configure CPU tagging */
> - cpu.trap_port = RTL8365MB_MAX_NUM_PORTS;
> dsa_switch_for_each_cpu_port(cpu_dp, priv->ds) {
> - cpu.mask |= BIT(cpu_dp->index);
> + cpu->mask |= BIT(cpu_dp->index);
>
> - if (cpu.trap_port == RTL8365MB_MAX_NUM_PORTS)
> - cpu.trap_port = cpu_dp->index;
> + if (cpu->trap_port == RTL8365MB_MAX_NUM_PORTS)
> + cpu->trap_port = cpu_dp->index;
> }
> -
> - cpu.enable = cpu.mask > 0;
> - cpu.insert = RTL8365MB_CPU_INSERT_TO_ALL;
> - cpu.position = RTL8365MB_CPU_POS_AFTER_SA;
> - cpu.rx_length = RTL8365MB_CPU_RXLEN_64BYTES;
> - cpu.format = RTL8365MB_CPU_FORMAT_8BYTES;
> -
> - ret = rtl8365mb_cpu_config(priv, &cpu);
> + cpu->enable = cpu->mask > 0;
> + ret = rtl8365mb_cpu_config(priv);
> if (ret)
> goto out_teardown_irq;
>
> @@ -1853,7 +1897,7 @@ static int rtl8365mb_setup(struct dsa_switch *ds)
> continue;
>
> /* Forward only to the CPU */
> - ret = rtl8365mb_port_set_isolation(priv, i, cpu.mask);
> + ret = rtl8365mb_port_set_isolation(priv, i, cpu->mask);
> if (ret)
> goto out_teardown_irq;
>
> @@ -1983,6 +2027,12 @@ static int rtl8365mb_detect(struct realtek_priv *priv)
> mb->jam_table = rtl8365mb_init_jam_8365mb_vc;
> mb->jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc);
>
> + mb->cpu.trap_port = RTL8365MB_MAX_NUM_PORTS;
> + mb->cpu.insert = RTL8365MB_CPU_INSERT_TO_ALL;
> + mb->cpu.position = RTL8365MB_CPU_POS_AFTER_SA;
> + mb->cpu.rx_length = RTL8365MB_CPU_RXLEN_64BYTES;
> + mb->cpu.format = RTL8365MB_CPU_FORMAT_8BYTES;
> +
> break;
> default:
> dev_err(priv->dev,
> @@ -1996,6 +2046,7 @@ static int rtl8365mb_detect(struct realtek_priv *priv)
>
> static const struct dsa_switch_ops rtl8365mb_switch_ops_smi = {
> .get_tag_protocol = rtl8365mb_get_tag_protocol,
> + .change_tag_protocol = rtl8365mb_change_tag_protocol,
> .setup = rtl8365mb_setup,
> .teardown = rtl8365mb_teardown,
> .phylink_get_caps = rtl8365mb_phylink_get_caps,
> @@ -2014,6 +2065,7 @@ static const struct dsa_switch_ops rtl8365mb_switch_ops_smi = {
>
> static const struct dsa_switch_ops rtl8365mb_switch_ops_mdio = {
> .get_tag_protocol = rtl8365mb_get_tag_protocol,
> + .change_tag_protocol = rtl8365mb_change_tag_protocol,
> .setup = rtl8365mb_setup,
> .teardown = rtl8365mb_teardown,
> .phylink_get_caps = rtl8365mb_phylink_get_caps,
> --
> 2.35.1
>
Powered by blists - more mailing lists