From nobody Mon Dec 1 22:03:54 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 224463016F0 for ; Mon, 1 Dec 2025 09:43:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582196; cv=none; b=YnCX1Ow67aomVJPxaRtYUbKU+YHNd/HgUmsJ63dVJsvoDv1kteyClJz8Nbqwt+rZMUzWmQjIAh33hETg+g4X5IF3A2xVf1ZWAIML1fnvMNh+wPAamzUTzfDMJECuSADIIzMqZc4UoQUsi2U/GddgD4SCtTn/3DYQ6VeL2RFzxPM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582196; c=relaxed/simple; bh=/6POPplqXgF8+/AVfKQSG/ycrJEwE/5D6VNhle+33lU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qxIwWHY7u7q3DLJRvVhMgVMqaJtXu7zWwMyKEb5D+2MINp0uRdKKgV1iRSdEltr8++sZCSYN0DLyaIkaXUzA1fnCEtFsOMMoz+30r+eIn6UzAIUk9hqEJw7/fyHdNjmB0BnYKkCqAWROuclIZ8O1CooALFgCeoYrz7l7nD/cMc4= 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=K3VlwMX1; arc=none smtp.client-ip=209.85.210.180 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="K3VlwMX1" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7bc0cd6a13aso2364909b3a.0 for ; Mon, 01 Dec 2025 01:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764582194; x=1765186994; 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=xsdPz6R0L8wJxtolMW9vVXyoDczdkbYFtBrrwl976Ec=; b=K3VlwMX1dMug8j2SWDmtJ1CiI6wOTOiWE1wz6qJEKFg9yzjQNslh5vkGmCNYDBGiJ9 eMMryUSPKvPtcOH8p9p91iPWRpGyMxPUtjhIgmExjxx09462h2tXOPxPr/Jst835nQ60 Lr8Y7u8AlpKubMAxd9XIDoW9/7BLDCHZ++e0AvxLoSNjfKxmrJNvmWClwX/tsvaeiiHH ic9iPXsIhEtW1/2IPQZ4Mz3nJg+VBVySSFYqh8BnP9+kb2mgImhpCH9tzCYqBTRZ3VwC MBbLluI2MqjHtfNphMKuUfPlFHJvFDrs8/IzXqzTSbEkpfBGQEppGQyRkgbhvPIab7fW MdsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764582194; x=1765186994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xsdPz6R0L8wJxtolMW9vVXyoDczdkbYFtBrrwl976Ec=; b=AvxR/a54nO2+RPhgVH3Can3cjeyGt4OyKLhy3+Uaphs4OiC9gjHohoJsrbhOUtQR8M cV4fsOD1QwiKQA5yWuVe6JoSYkqbFZtWb7HBBV9DfhhaJQiC4PhmykAQ4pmWtW3Dki9q Zi5DfafMDPQgarNbodQrjVMYneN+VDzU4Nb3yfk5ROD96HtcJqCC2add/zMxVocZ8IdV GCXHdrSmj/USF6w61IHIFUlgRPb5yOKbSvKlg2LqQjKLaOKFEUy1/ARCfkrv3L44NelR t0x0A+95yYiJHSHAviP0mR74B+NPUgv7n8tUhMDkl1eaeeI9jfTjR9Dt/AhFNPzEUrE3 FLIg== X-Forwarded-Encrypted: i=1; AJvYcCUyQZuThaXtTci2fvyS6e8xErZAv51yzkgY5nLawanw26D25FSH7VTutKPHBwr+nTeunlxkZUnJwf6Y7u4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1TruiT+E8FMr/YhoP1UPAGbMvwctTmxAToldjWZhByJxDoFQb I6R4v4wc5jP5Bj31mWi0YY7kuIlxR9quD6PVhs6WFxVstCZVitrlx99d X-Gm-Gg: ASbGncuvveTZGAP46Nmczvb+MCXW+JjqBFPBx3mxATYrEvk5UFXifCKFGcNENxo9pFk QlCzcY10gGjEWc3Z5nG1aCPM8PvPAfNbwW2qeSVZxXqG5UEfG4dotodPvA9zeDUjbHD4jUzlnhs ERWyVE2aLH/auhX/9CEgPBleHlpk1ZOzFbnjVrm1hIT3pwlLB7c8YCVVLilGPFIhVo6pl9O1b+B shKv60OkOUSerdthOicy6njA/vIiBtfRME0wXeWiq9hispVFNDhzspVllRNM0RQsRBUkCQRw6o9 n8ysqu/sqy4plDW8flSXdZ1mSCQ41nzNZXT5ky2kPYII9lJoE6JmqMZrAPzuIzVDzd4xvwzYmqu qSHCvpPKNMxl++p75xDWJ58XL4LiJyJTsXGnRgU4GCPKtpNAkztY+s8po2xyKXPIjIbxJ/uINZo ByaQJjEuOZ+Y4O8mEJscXUmA== X-Google-Smtp-Source: AGHT+IE84q3npyCQcgx8/3FEbWc9DdLWLiU4Ktu/rPdQv2B65VWqYy4gmG+r5whTMUtlTsG0/ZXBtA== X-Received: by 2002:a05:6a00:a1f:b0:7b8:8d43:fcde with SMTP id d2e1a72fcca58-7c568934bdfmr36246135b3a.8.1764582194127; Mon, 01 Dec 2025 01:43:14 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d15f9260a4sm12928333b3a.58.2025.12.01.01.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 01:43:13 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 2/2] net: dsa: yt921x: Add STP/MST support Date: Mon, 1 Dec 2025 17:42:29 +0800 Message-ID: <20251201094232.3155105-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251201094232.3155105-1-mmyangfl@gmail.com> References: <20251201094232.3155105-1-mmyangfl@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" Support for STP/MST was deferred from the initial submission of the driver. Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- drivers/net/dsa/yt921x.c | 115 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 9 +++ 2 files changed, 124 insertions(+) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 675e24575834..bd19e9edd8cb 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -2098,6 +2098,117 @@ yt921x_dsa_port_bridge_join(struct dsa_switch *ds, = int port, return res; } =20 +static int +yt921x_dsa_port_mst_state_set(struct dsa_switch *ds, int port, + const struct switchdev_mst_state *st) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 mask; + u32 ctrl; + int res; + + mask =3D YT921X_STP_PORTn_M(port); + switch (st->state) { + case BR_STATE_DISABLED: + ctrl =3D YT921X_STP_PORTn_DISABLED(port); + break; + case BR_STATE_LISTENING: + case BR_STATE_LEARNING: + ctrl =3D YT921X_STP_PORTn_LEARNING(port); + break; + case BR_STATE_FORWARDING: + default: + ctrl =3D YT921X_STP_PORTn_FORWARD(port); + break; + case BR_STATE_BLOCKING: + ctrl =3D YT921X_STP_PORTn_BLOCKING(port); + break; + } + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_update_bits(priv, YT921X_STPn(st->msti), mask, ctrl); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int +yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struct dsa_bridge bridge, + const struct switchdev_vlan_msti *msti) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u64 mask64; + u64 ctrl64; + int res; + + if (!msti->vid) + return -EINVAL; + if (!msti->msti || msti->msti >=3D YT921X_MSTI_NUM) + return -EINVAL; + + mask64 =3D YT921X_VLAN_CTRL_STP_ID_M; + ctrl64 =3D YT921X_VLAN_CTRL_STP_ID(msti->msti); + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg64_update_bits(priv, YT921X_VLANn_CTRL(msti->vid), + mask64, ctrl64); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static void +yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct dsa_port *dp =3D dsa_to_port(ds, port); + struct device *dev =3D to_device(priv); + bool learning; + u32 mask; + u32 ctrl; + int res; + + mask =3D YT921X_STP_PORTn_M(port); + learning =3D false; + switch (state) { + case BR_STATE_DISABLED: + ctrl =3D YT921X_STP_PORTn_DISABLED(port); + break; + case BR_STATE_LISTENING: + ctrl =3D YT921X_STP_PORTn_LEARNING(port); + break; + case BR_STATE_LEARNING: + ctrl =3D YT921X_STP_PORTn_LEARNING(port); + learning =3D dp->learning; + break; + case BR_STATE_FORWARDING: + default: + ctrl =3D YT921X_STP_PORTn_FORWARD(port); + learning =3D dp->learning; + break; + case BR_STATE_BLOCKING: + ctrl =3D YT921X_STP_PORTn_BLOCKING(port); + break; + } + + mutex_lock(&priv->reg_lock); + do { + res =3D yt921x_reg_update_bits(priv, YT921X_STPn(0), mask, ctrl); + if (res) + break; + + mask =3D YT921X_PORT_LEARN_DIS; + ctrl =3D !learning ? YT921X_PORT_LEARN_DIS : 0; + res =3D yt921x_reg_update_bits(priv, YT921X_PORTn_LEARN(port), + mask, ctrl); + } while (0); + mutex_unlock(&priv->reg_lock); + + if (res) + dev_err(dev, "Failed to %s port %d: %i\n", "set STP state for", + port, res); +} + static int yt921x_port_down(struct yt921x_priv *priv, int port) { u32 mask; @@ -2784,6 +2895,10 @@ static const struct dsa_switch_ops yt921x_dsa_switch= _ops =3D { .port_bridge_flags =3D yt921x_dsa_port_bridge_flags, .port_bridge_leave =3D yt921x_dsa_port_bridge_leave, .port_bridge_join =3D yt921x_dsa_port_bridge_join, + /* mst */ + .port_mst_state_set =3D yt921x_dsa_port_mst_state_set, + .vlan_msti_set =3D yt921x_dsa_vlan_msti_set, + .port_stp_state_set =3D yt921x_dsa_port_stp_state_set, /* port */ .get_tag_protocol =3D yt921x_dsa_get_tag_protocol, .phylink_get_caps =3D yt921x_dsa_phylink_get_caps, diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 01ef623946fd..61bb0ab3b09a 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -274,6 +274,13 @@ #define YT921X_VLAN_IGR_FILTER_PORTn(port) BIT(port) #define YT921X_PORTn_ISOLATION(port) (0x180294 + 4 * (port)) #define YT921X_PORT_ISOLATION_BLOCKn(port) BIT(port) +#define YT921X_STPn(n) (0x18038c + 4 * (n)) +#define YT921X_STP_PORTn_M(port) GENMASK(2 * (port) + 1, 2 * (port)) +#define YT921X_STP_PORTn(port, x) ((x) << (2 * (port))) +#define YT921X_STP_PORTn_DISABLED(port) YT921X_STP_PORTn(port, 0) +#define YT921X_STP_PORTn_LEARNING(port) YT921X_STP_PORTn(port, 1) +#define YT921X_STP_PORTn_BLOCKING(port) YT921X_STP_PORTn(port, 2) +#define YT921X_STP_PORTn_FORWARD(port) YT921X_STP_PORTn(port, 3) #define YT921X_PORTn_LEARN(port) (0x1803d0 + 4 * (port)) #define YT921X_PORT_LEARN_VID_LEARN_MULTI_EN BIT(22) #define YT921X_PORT_LEARN_VID_LEARN_MODE BIT(21) @@ -449,6 +456,8 @@ enum yt921x_fdb_entry_status { YT921X_FDB_ENTRY_STATUS_STATIC =3D 7, }; =20 +#define YT921X_MSTI_NUM 16 + #define YT9215_MAJOR 0x9002 #define YT9218_MAJOR 0x9001 =20 --=20 2.51.0