From nobody Thu Feb 12 15:46:15 2026 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA2621534EA; Tue, 11 Jun 2024 19:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718135463; cv=none; b=Xcw5KNFWAn5sjfWtxft07USxjiZhuDCk8vqk4HxkDMSt7/NEutb7//s7u+Oqueg4xy7YJu9db8olpgeoIJH8i2EKCqvAh7euGPyXqg92YH/qHWbBDevPhiU4pBVHSZTe4y2dQkNRXl/va2YWr2NVyWVe1Pfq9CzRYLnoOr85DDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718135463; c=relaxed/simple; bh=MuiG8AjfkDOJYyP8PAX6pDf8PzjRMpV+WgtH4FRb9Hg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XZCMC5tasZLsyRpymKAnpU0Dqz5OA41cW9BnaCvz+2i6/LD5fu25MuA6W2YPtpaV/5oOyQiVEejUqEn7MpAaVR0CdBl5J6mg6iWN3qaSdDEC/2L8FLFuljyLCBIFSG+WLhLGN0CM6PxKI4tsOEv+SzMWnxp4yXXN3cyag/HEpyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XFgODGf7; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XFgODGf7" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a6f1f33486eso158177766b.3; Tue, 11 Jun 2024 12:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718135460; x=1718740260; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cpHorWpFXkyaD7lGP655nNnlrJvJ0HHxDtEJDmoiKB8=; b=XFgODGf7ER3NnYETT5WmyreYA5A4F9G4hJsMa8RWqvGhYIwRs96ggii6bIM0itZ4gU 4L3FQGkN+ZwZ0ktCI4D6b4xN2C+h5/h9o+4YHfjxeCNMuiWdVgTV/OsRo2HMjz6X4+Q6 /ZX6wVfFf62Hs/3zQXcNUvQ6arfZWfbZsSTbnTcLUAjJGjm4YQODcXXBJtyh2n9sPg3o Qdp12hMfAeaWimy5mDh0gKgiNW6fa/p8z0DqlEyMEaJC8CAPkmiUY7cPVgH7RIetgX4E uClZr+ddGbzJ5wlUDLYiZrvM3Df56lRu6F5kal8YjU1EAF7qA0CuhYPHh9X/4P5tMyQM lSWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718135460; x=1718740260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpHorWpFXkyaD7lGP655nNnlrJvJ0HHxDtEJDmoiKB8=; b=pzz63td9ok28IZa0i5gsmBf4mhu0BrsD7Al2LT6uvl/X5CGvEaUysz/+5jLh7nQDsn zGwCq5bSJW4MjtYiRqmDLYEYClPcm0YBAq/d06MjIvlRX4c+ckq+NKpCzlKsp+B96+4F gRyEHJ+Q2LY1ZaY/7Fvn4P7jW32VOU2u9s+TOSb24pOr20ZKDK7Ah8/zgC/Dxf6d/Fy2 BxRG/3QNcNAKV4UdLn//uYg6ILYNnQQ5m6s8g8ZxbOpafB7ueFF603zXkcByNiO/no8o Bw4OycDWCxh4HCT4NRNZgkgsApPOBbGEVi3pJaWZ96GtcReNNB/fqEH71eXXukpMCWbA tf3Q== X-Forwarded-Encrypted: i=1; AJvYcCV2pIfEE3Pj2C63cSTGXHi2I/hKk2QMVrypz1YgterYrZ2Zs/qpVZ8NBvJcczxKmUwBYXavXDtHfgNbuOKzA4GjZYsDlR5H1VtiYwgy X-Gm-Message-State: AOJu0YzlbXjcKK9OqK3b8bd57gb++D691SZ938gBoB3p8ISE3QOEiVLW SJ/ogO6ia+l5izEPUAvSm4b9P3UVGjJuc/xwoc1wxMjVFdwQErJf5qPxpbOpHcA= X-Google-Smtp-Source: AGHT+IHM+9kcFfX6O+6VrNVJVUu0E1wOP2WB5lGNlNvHmG2ABQPobNr4CJpxqr+191aMPjvlerf4Mw== X-Received: by 2002:a50:bb28:0:b0:57a:4c22:b3 with SMTP id 4fb4d7f45d1cf-57c5085e6ecmr11924082a12.1.1718135459464; Tue, 11 Jun 2024 12:50:59 -0700 (PDT) Received: from WBEC325.dom.lan ([185.188.71.122]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57c7650b371sm5286737a12.76.2024.06.11.12.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 12:50:59 -0700 (PDT) From: Pawel Dembicki To: netdev@vger.kernel.org Cc: Pawel Dembicki , Linus Walleij , Florian Fainelli , Vladimir Oltean , Andrew Lunn , Florian Fainelli , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next 01/12] net: dsa: vsc73xx: add port_stp_state_set function Date: Tue, 11 Jun 2024 21:49:53 +0200 Message-Id: <20240611195007.486919-2-paweldembicki@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611195007.486919-1-paweldembicki@gmail.com> References: <20240611195007.486919-1-paweldembicki@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This isn't a fully functional implementation of 802.1D, but port_stp_state_set is required for a future tag8021q operations. This implementation handles properly all states, but vsc73xx doesn't forward STP packets. Reviewed-by: Linus Walleij Reviewed-by: Florian Fainelli Reviewed-by: Vladimir Oltean Signed-off-by: Pawel Dembicki --- v1: - resend only --- Before patch series split: https://patchwork.kernel.org/project/netdevbpf/list/?series=3D841034&state= =3D%2A&archive=3Dboth v7: - implement 'vsc73xx_refresh_fwd_map' simplification v6: - fix inconsistent indenting v5: - remove unneeded 'RECVMASK' operations - reorganise vsc73xx_refresh_fwd_map function v4: - fully reworked port_stp_state_set v3: - use 'VSC73XX_MAX_NUM_PORTS' define - add 'state =3D=3D BR_STATE_DISABLED' condition - fix style issues v2: - fix kdoc drivers/net/dsa/vitesse-vsc73xx-core.c | 96 +++++++++++++++++++++++--- 1 file changed, 85 insertions(+), 11 deletions(-) diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vites= se-vsc73xx-core.c index 4b031fefcec6..ebeea259f019 100644 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c +++ b/drivers/net/dsa/vitesse-vsc73xx-core.c @@ -164,6 +164,10 @@ #define VSC73XX_AGENCTRL 0xf0 #define VSC73XX_CAPRST 0xff =20 +#define VSC73XX_SRCMASKS_CPU_COPY BIT(27) +#define VSC73XX_SRCMASKS_MIRROR BIT(26) +#define VSC73XX_SRCMASKS_PORTS_MASK GENMASK(7, 0) + #define VSC73XX_MACACCESS_CPU_COPY BIT(14) #define VSC73XX_MACACCESS_FWD_KILL BIT(13) #define VSC73XX_MACACCESS_IGNORE_VLAN BIT(12) @@ -623,9 +627,6 @@ static int vsc73xx_setup(struct dsa_switch *ds) vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GMIIDELAY, VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS | VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS); - /* Enable reception of frames on all ports */ - vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_RECVMASK, - 0x5f); /* IP multicast flood mask (table 144) */ vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_IFLODMSK, 0xff); @@ -788,10 +789,6 @@ static void vsc73xx_mac_link_down(struct phylink_confi= g *config, /* Allow backward dropping of frames from this port */ vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0, VSC73XX_SBACKWDROP, BIT(port), BIT(port)); - - /* Receive mask (disable forwarding) */ - vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, - VSC73XX_RECVMASK, BIT(port), 0); } =20 static void vsc73xx_mac_link_up(struct phylink_config *config, @@ -844,10 +841,6 @@ static void vsc73xx_mac_link_up(struct phylink_config = *config, vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0, VSC73XX_ARBDISC, BIT(port), 0); =20 - /* Enable port (forwarding) in the receive mask */ - vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, - VSC73XX_RECVMASK, BIT(port), BIT(port)); - /* Disallow backward dropping of frames from this port */ vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0, VSC73XX_SBACKWDROP, BIT(port), 0); @@ -1039,6 +1032,86 @@ static void vsc73xx_phylink_get_caps(struct dsa_swit= ch *dsa, int port, config->mac_capabilities =3D MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000; } =20 +static void vsc73xx_refresh_fwd_map(struct dsa_switch *ds, int port, u8 st= ate) +{ + struct dsa_port *other_dp, *dp =3D dsa_to_port(ds, port); + struct vsc73xx *vsc =3D ds->priv; + u16 mask; + + if (state !=3D BR_STATE_FORWARDING) { + /* Ports that aren't in the forwarding state must not + * forward packets anywhere. + */ + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_SRCMASKS + port, + VSC73XX_SRCMASKS_PORTS_MASK, 0); + + dsa_switch_for_each_available_port(other_dp, ds) { + if (other_dp =3D=3D dp) + continue; + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_SRCMASKS + other_dp->index, + BIT(port), 0); + } + + return; + } + + /* Forwarding ports must forward to the CPU and to other ports + * in the same bridge + */ + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_SRCMASKS + CPU_PORT, BIT(port), BIT(port)); + + mask =3D BIT(CPU_PORT); + + dsa_switch_for_each_user_port(other_dp, ds) { + int other_port =3D other_dp->index; + + if (port =3D=3D other_port || !dsa_port_bridge_same(dp, other_dp) || + other_dp->stp_state !=3D BR_STATE_FORWARDING) + continue; + + mask |=3D BIT(other_port); + + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_SRCMASKS + other_port, + BIT(port), BIT(port)); + } + + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_SRCMASKS + port, + VSC73XX_SRCMASKS_PORTS_MASK, mask); +} + +/* FIXME: STP frames aren't forwarded at this moment. BPDU frames are + * forwarded only from and to PI/SI interface. For more info see chapter + * 2.7.1 (CPU Forwarding) in datasheet. + * This function is required for tag_8021q operations. + */ +static void vsc73xx_port_stp_state_set(struct dsa_switch *ds, int port, + u8 state) +{ + struct vsc73xx *vsc =3D ds->priv; + u32 val; + + val =3D (state =3D=3D BR_STATE_BLOCKING || state =3D=3D BR_STATE_DISABLED= ) ? + 0 : BIT(port); + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_RECVMASK, BIT(port), val); + + val =3D (state =3D=3D BR_STATE_LEARNING || state =3D=3D BR_STATE_FORWARDI= NG) ? + BIT(port) : 0; + vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, + VSC73XX_LEARNMASK, BIT(port), val); + + /* CPU Port should always forward packets when user ports are forwarding + * so let's configure it from other ports only. + */ + if (port !=3D CPU_PORT) + vsc73xx_refresh_fwd_map(ds, port, state); +} + static const struct phylink_mac_ops vsc73xx_phylink_mac_ops =3D { .mac_config =3D vsc73xx_mac_config, .mac_link_down =3D vsc73xx_mac_link_down, @@ -1057,6 +1130,7 @@ static const struct dsa_switch_ops vsc73xx_ds_ops =3D= { .port_disable =3D vsc73xx_port_disable, .port_change_mtu =3D vsc73xx_change_mtu, .port_max_mtu =3D vsc73xx_get_max_mtu, + .port_stp_state_set =3D vsc73xx_port_stp_state_set, .phylink_get_caps =3D vsc73xx_phylink_get_caps, }; =20 --=20 2.34.1