From nobody Tue Dec 2 00:05:23 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 AD3202F0C63 for ; Wed, 26 Nov 2025 09:33:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149604; cv=none; b=WF86DOQBdAVi6SinKo/MsSZklauOX6fb+RoI+PAN8dOCZs8LU5ULU3jkN6Sw9qmcbnu+d6PXYZv/AH6+GwVsTI1CkpQn1TBor6acRn+sFk/WgEcDjtNjudCYjUx4FAgOcGPLRsSIsdcf8lctsKVoUF49osEQpxKWsHoOgqOxdaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149604; c=relaxed/simple; bh=gNUpBA9c2Pz02hjTEKFBL5eTpwkIvueigCWLibEbcbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kJtbAGKSo7JJhk6yhqZVVINIJ2I554cDl8+maAMH8sTKH8JXMQe8TTdybtMwSGRdRgwEWrg/kmOLqO46n8Wg2cEkL8nxyMj3vva6fm3PfKYqP2ODNTyb5G5WIZXmFVMdE7NB3UUGpSYLZgnyThkvl67rAekvJxq3iOUj0QKexkg= 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=bz16Cttr; arc=none smtp.client-ip=209.85.214.169 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="bz16Cttr" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2953e415b27so76724975ad.2 for ; Wed, 26 Nov 2025 01:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764149602; x=1764754402; 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=6EBg/2pwllvFAyTVpIevNOA+M/71rW550rNi/OLZk/g=; b=bz16Cttrd7UTfS6qPJWYhMTJKQlImWXABsRa00JO7sqzwS8UUn/goZly0oRdLJr/Fw nc/cpUMwMoC7pDHhQfD86ga7vuika8L4Rz9RqzujMY3gT0p0CdEQW54ucDDQVT7sEYHQ n2JktmCg466sfpQDTvdxeLb1q4Z1PJBN5vzp4cltfenJ0S3nTsGT+3ZvF0542S63mnvg IZhBPqLXNXmeAj2q0ve8KXk2cVX3SgTocHQneIO/PlyGjKLr3H6RVpiSwsdhrbGtOzms zYtKVc0aKD6L695++S7MSlBQLsdEH0rsS4Pm531GpW2Q7QR1DmbFgFGeSVDBXb5JeZHe zJgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764149602; x=1764754402; 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=6EBg/2pwllvFAyTVpIevNOA+M/71rW550rNi/OLZk/g=; b=KzBZIEeHNqyNQ7vfRcdpkZ+1iVleK3ZH1JvoAonWYbykekw1c+2Nofh69hHJS6vfpW GScXgQYPPz3lg8mIbuWzzJ5p2vj26e/RRHJRYQw9Y40yMTIe4+w/CcmjT6JJDhYEVlvQ Xj8pXt6kS7s+tyDVyBfpDh/wQoGxcE79yR5OiAhu4Sn9XCpZpSMxFgPFlUEfZdRzOdtL qCfz4sETQzGJE0FnWqchwzRVlnfQM4+xNESbotedUAphJiZbOHJmxutM+jxX/2G8BNxb zBbhtis8V/3muebX3sl/Rx1CQt8E2rgKMckpK694BOUazCGNJiy/tFRqdStQ7adNCCDZ 5okw== X-Forwarded-Encrypted: i=1; AJvYcCWyy3+H++u4EN5ev9wFHlYO1YiC4ob69wRV5/1rTEdeKZ4uVdKBOcrK/jRzKSKtnWf1/QwGFr3Sb7o0AVk=@vger.kernel.org X-Gm-Message-State: AOJu0YxVas6DNzHp6VRNLxfM7r7sfwAmVQI6Jk6Jfk3gbDBGHmQ1GPqv zVDUhCWlFI3a5oyrELhqtS3vxjd9MFwvTkhSti7BON7uS5sURHN3G5yx X-Gm-Gg: ASbGncscWnKhOmCXnOlHEx1V0qrS/Hc3MaMU5EWJStBWZJ4V31cu9QXwS8r8RuvUjWM J52RD6M0Br8SfIJ+YH0RXzh1DCmq34Xg6F88gArmvlS7RvfszLD3Mdt8MmCyKaIAvjERHEzxJ3a OdhyzlFKIpsiep4HeKfPp05Q3FdCJsvCM4nc/pLT79egmHaIhe3Lqapoq9La0pCDxP1JgR94K8f 7yMl429GAbzOrskeic5YJHkUj6LIGesm0bN8MjG3/T3faW7U73OL6MSiOY0jSiXwWpsJV/KHm+z SYp2QSmThrA52Ko0C6ouItDvTMXW3jfH2jBn8UvmgRMFpamxCx9VK6rzNvZBCgDKVDjl9IMbm4e FFWKGpZ/btHjnZBqE+12hrHnXd0S7qilAwHNZZ44adUGUKS875lKEqlzqyFytbvTnzbmhQVbjMW l+aHs0I9PHvO8RCxJT2Ihxog== X-Google-Smtp-Source: AGHT+IGJS56hE7pO81m3GboXB35g8h493eEZ8hMW1if/mdrBxij0tMBmVoe2DI2V50W5trjrljaPaQ== X-Received: by 2002:a17:903:17c4:b0:27d:6f49:febc with SMTP id d9443c01a7336-29baae42203mr69158525ad.1.1764149602055; Wed, 26 Nov 2025 01:33:22 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b78740791sm132101735ad.56.2025.11.26.01.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 01:33:21 -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 , Simon Horman , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 2/4] net: dsa: yt921x: Add STP/MST support Date: Wed, 26 Nov 2025 17:32:35 +0800 Message-ID: <20251126093240.2853294-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251126093240.2853294-1-mmyangfl@gmail.com> References: <20251126093240.2853294-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 --- 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 133151abef8b..e88b4037ee80 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -2103,6 +2103,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; @@ -2789,6 +2900,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 85d995cdb7c5..2a986b219080 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -220,6 +220,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) @@ -395,6 +402,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