From nobody Sun Feb 8 04:30:41 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.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 2508D2FFDF9 for ; Sat, 25 Oct 2025 17:06:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411980; cv=none; b=jHSqSPk44EODOUbe0NP6oFVf5lIsrkmoasIuHF8iJCjVnhnM4clR9NeZSKi9zXJ44bfRiBOpgqCXemXNSP9DvoCofROfxQizvE7jNbIIDseD3FICIrdaT//aEXqgImQUmHf6ie8cBwd/sgfmkTIms72S9E2Tt/Vn8HThYAClNKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411980; c=relaxed/simple; bh=XPoMqDwwNJLwd6t8oOPZg8CGm6E3Kw7Z8uoFKk912hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m3YflXO75vd7tmIXJ0lPooty5aCg0x4+CapzTc3HfN5PVTDHLkhJOps+/NFpSZXgrLz9PAZDxdm5V0yVgo7pQ7Li+R4G4GiHL2rQeyabXUde6AtnB0wmlU5X83psAyBW3q1Fg+2cA/osHTlVqUuMzRD2Y8JOBVS5wCxFVk3N0qA= 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=h7Lvfv4o; arc=none smtp.client-ip=209.85.216.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="h7Lvfv4o" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-33c4252c3c5so3059986a91.0 for ; Sat, 25 Oct 2025 10:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761411978; x=1762016778; 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=4Kzhu4s+NpOCVTnPevu9VK8eZq5kgkG4j+tx0i0eXd0=; b=h7Lvfv4oVmgMuQCLnbxUOz36SpE45JFOCd3yan6OQwEPCFfXV6BY+baecVkeuQgSdC mBfK4Ouv5JsYM5kgS/QWAL8TQcqO5pbN5I3hSBlnpQUmmzbnQWQvwj2HBtHTde4Lp4g3 b4YVxEV+NKoMt7pYK5pLIHEC7oCtEXg+sKa4oWn6MAofJmw39fJmLR4ik46fM9EsUWhr eQ2mla3AB8U66e8SGZWWoBqQeCMUy82r78NJAmOlnY7tHuGHimBKrcs06oOtUGPGHlA6 ujemapTFrzznxc+79y2PVYrcg5/N8Wpw1qQRkqMhzz6UyXh/6goeVhtVnJz6p4Z0YQla JxTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761411978; x=1762016778; 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=4Kzhu4s+NpOCVTnPevu9VK8eZq5kgkG4j+tx0i0eXd0=; b=pqgz8kEa6Drqn9Usi4WgJOPlD/jm59qMGQQDBCsKwrUKDvalO/B1vwSvV/8MN9slTj 83NOoibH5r0mwfVccCRjoQQo+dsWmNPMVo8alEXFj4ClFW9+7ToJDwm55FVUk1mZQKQM IQm3szTEgG2ZBDwTI3J9VmDrVJeuTPZmme4M0onGECh8gR6rdr0lIiwwWpVvAJlPUscL yL9IORGZxigzEdTjpOjZCdxR/Imzky3mNw7B5NX6Zvo1u3bLmtU0pCg9qGfTOVc2GwOp 4RgQ1Sf84Nkzrwe+Z8A/7dB1DhBMHG6TRjWqHaZM0PiAN0dAc1j2hJF1tYrgjRBqOR8x LujQ== X-Forwarded-Encrypted: i=1; AJvYcCUMUm3RUnCPuFOu9Ln1FP2fcNBprif8wuaW2wC2LsvoYQw3D3hymHX7RdDvmIV+R3iRMrMFtVYtubZI9kg=@vger.kernel.org X-Gm-Message-State: AOJu0YwiVw9JobU4l8AJ55HMuXxEv1aGl+QFoNrAndUk7oMc6Se232LC egzeccY3TGlys2oDY9wvgp7aR2+8gWCSDBwOdWcJJ5iFELok9FlBMqKx X-Gm-Gg: ASbGncs9amNPlV3N/49RN2fxP5p9AOgwU/E+1+qQYwoyvwEhhltHur4f9cly39omf1x bIxtGcFFc0zntgrRXnm/JVzdc0Hv0M2SKx+GlhI5S4hveYBDoiXQTflf4Z4sV2D6/eVz6YaiTNC jP0BfdHbuoQ40TeQYtc16foEIlNtlu9BIgzVjyp3GbPXPqTKgh2numq7+JUgYXC6IoF2QreXcqS ibQAteJ/PTuBFvtR43vhjEO8c9JGSH+XrxuiRpaXE4xzadrTWiWv2m+3afLRAmGVMMfNRi6qgNC x+zI3Jj6+o3RTb+Ec7B0DBzzE7zpH3pnby1rck6Govzd28L5w1IEtyis0aNO6xtyrIvr25lyZqX qZcMRIBs/QFHH19xVV102IvD491Q6zCyE8GXIVnwjDNF9vKXEtQ8sg80SGp6mKVewsVysnLvEHt gbPQyoCpQxwGOAGxtFvg== X-Google-Smtp-Source: AGHT+IHcunpgm/kUmSDaDAkhbrYQGDPGWnTI3si/TQgkka4BpRb5fy72VcvUXELVm0ssffWlf6x+fg== X-Received: by 2002:a17:90b:4d91:b0:32e:389b:8762 with SMTP id 98e67ed59e1d1-33fafa65affmr11410120a91.0.1761411978336; Sat, 25 Oct 2025 10:06:18 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7e70d1sm2857842a91.11.2025.10.25.10.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:06:18 -0700 (PDT) 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 v2 1/4] net: dsa: yt921x: Use *_ULL bitfield macros for VLAN_CTRL Date: Sun, 26 Oct 2025 01:05:24 +0800 Message-ID: <20251025170606.1937327-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025170606.1937327-1-mmyangfl@gmail.com> References: <20251025170606.1937327-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" VLAN_CTRL should be treated as a 64-bit register. GENMASK and BIT macros use unsigned long as the underlying type, which will result in a build error on architectures where sizeof(long) =3D=3D 32. Replace them with unsigned long long variants. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 3e85d90826fb..85d995cdb7c5 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -328,23 +328,23 @@ #define YT921X_FDB_HW_FLUSH_ON_LINKDOWN BIT(0) =20 #define YT921X_VLANn_CTRL(vlan) (0x188000 + 8 * (vlan)) -#define YT921X_VLAN_CTRL_UNTAG_PORTS_M GENMASK(50, 40) +#define YT921X_VLAN_CTRL_UNTAG_PORTS_M GENMASK_ULL(50, 40) #define YT921X_VLAN_CTRL_UNTAG_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRL_UNT= AG_PORTS_M, (x)) -#define YT921X_VLAN_CTRL_UNTAG_PORTn(port) BIT((port) + 40) -#define YT921X_VLAN_CTRL_STP_ID_M GENMASK(39, 36) +#define YT921X_VLAN_CTRL_UNTAG_PORTn(port) BIT_ULL((port) + 40) +#define YT921X_VLAN_CTRL_STP_ID_M GENMASK_ULL(39, 36) #define YT921X_VLAN_CTRL_STP_ID(x) FIELD_PREP(YT921X_VLAN_CTRL_STP_ID_= M, (x)) -#define YT921X_VLAN_CTRL_SVLAN_EN BIT(35) -#define YT921X_VLAN_CTRL_FID_M GENMASK(34, 23) +#define YT921X_VLAN_CTRL_SVLAN_EN BIT_ULL(35) +#define YT921X_VLAN_CTRL_FID_M GENMASK_ULL(34, 23) #define YT921X_VLAN_CTRL_FID(x) FIELD_PREP(YT921X_VLAN_CTRL_FID_M, (x)) -#define YT921X_VLAN_CTRL_LEARN_DIS BIT(22) -#define YT921X_VLAN_CTRL_INT_PRI_EN BIT(21) -#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK(20, 18) -#define YT921X_VLAN_CTRL_PORTS_M GENMASK(17, 7) +#define YT921X_VLAN_CTRL_LEARN_DIS BIT_ULL(22) +#define YT921X_VLAN_CTRL_INT_PRI_EN BIT_ULL(21) +#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK_ULL(20, 18) +#define YT921X_VLAN_CTRL_PORTS_M GENMASK_ULL(17, 7) #define YT921X_VLAN_CTRL_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRL_PORTS_M,= (x)) -#define YT921X_VLAN_CTRL_PORTn(port) BIT((port) + 7) -#define YT921X_VLAN_CTRL_BYPASS_1X_AC BIT(6) -#define YT921X_VLAN_CTRL_METER_EN BIT(5) -#define YT921X_VLAN_CTRL_METER_ID_M GENMASK(4, 0) +#define YT921X_VLAN_CTRL_PORTn(port) BIT_ULL((port) + 7) +#define YT921X_VLAN_CTRL_BYPASS_1X_AC BIT_ULL(6) +#define YT921X_VLAN_CTRL_METER_EN BIT_ULL(5) +#define YT921X_VLAN_CTRL_METER_ID_M GENMASK_ULL(4, 0) =20 #define YT921X_TPID_IGRn(x) (0x210000 + 4 * (x)) /* [0, 3] */ #define YT921X_TPID_IGR_TPID_M GENMASK(15, 0) --=20 2.51.0 From nobody Sun Feb 8 04:30:41 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 06B7A30277D for ; Sat, 25 Oct 2025 17:06:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411984; cv=none; b=Rbxl2PndFIJpp1kCwlF4JP7Emg3/RzD48qu4AN1kdpjtyqm/oN0eQbwOMsDVLbRvUJvYSLOFuyhwJi5Nyd9B5oOW0ylTvhSsn8oPma5M5PRFiM0raDqc1mdPuukH9wwdw6INoyNMb1qXp/OU2CDPOWNaMv7CdNjnTsZHKvyXBhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411984; c=relaxed/simple; bh=XRkMRUGH9V3HDx/c29ZXYZjBq54Z3qgFCBYSabyIUzc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OP5pOD6UwpzO39HiFk9mAx8T0vAhbSQ8ZcCkeSm+BvraBl3/l1mMumkpmTYBgsGqEk3W8YHJ0hykK3ZJ9wacR9bCAWgqYF05O7LtqvZuXeFXwbxNjvg/9zClqnuL2QXFv6INzl74uWUMBqyDXWrjv9ffVDXJVL+LkF6YqORcOjI= 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=LqEvj78h; arc=none smtp.client-ip=209.85.216.51 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="LqEvj78h" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-339e71ccf48so4091441a91.3 for ; Sat, 25 Oct 2025 10:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761411982; x=1762016782; 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=7wBGvtFNZNrLnbX9anfT2JnksQ+oUMM7fEuquROnTOM=; b=LqEvj78hH/G718T8Q18xiEClpOvas+pqBDjcUPCk4fIco7/TWToQG2aBosUAMJ7f6h 43edh0KqvTjsdgEzoLWBbGKVS5VnkqypawlMNvg4Zvlkbbb1sM7n9UanQRMoWKXuctFq af+NTpXxXUdcD2Fpx/Gwm+Zo5pKjTSn1Y4a6f8OrNpIH50/sbZw5tM6ODbyrnXPhTFuI 5tmeI+SqP1puGZi2j3LWChV4YXv62sLaIs8xN+nIYv6G9MIrpekNEmt0gNnPe9m0s515 dx7LcHIFu+lsKy7w9MVbtRXHLf7PHJ9fI74WveVwQiunbHKn/ZFCVagG995MXepGq4tk SYqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761411982; x=1762016782; 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=7wBGvtFNZNrLnbX9anfT2JnksQ+oUMM7fEuquROnTOM=; b=YK8AMMvVcT9Xkel5RaBxtztzEEgZZ/Ma1itVN0LWhiHa+oJuGG/c5Y1DOhP7Xs071b JNhVpgZRar7cUM6N/RWluIyv8pE+vNtBxbXaVNiF/iHFgKZRJiGEfbrW2fPmqYo7hlCw Z1SP2DCjE7/0wfNqucqSE0FM3nXQAz17fxV+3otnrp873ymg4a71KeSckdwokl2Z1WlR gxmCTMLMecDbSzQxQ+41TDwKj69dn7gKmeDEhAH6Yki2xaG8NFj3884C7qyUD57kGT7y 9/mIq/6va8xb4iSt0JxV2Vb2G+TXUYMNLq6EFEBuVuwLkiQ9ZKdmjJsLKgI4s6fOFPiB AZnA== X-Forwarded-Encrypted: i=1; AJvYcCV2o2bv03pR56l8eU6sL95tAVaR18Z3KcUHtnWsMMxCOJ49+SuYCiSFwEv7FiIrqtJdqc5YaL9WqYKwkr4=@vger.kernel.org X-Gm-Message-State: AOJu0YxgxwryO0bcZiWBEFcHMDvSwX7v5t7SPBkHhd6MtMfGFd7Rn1cH YMI/DjTFqto2xS5SJXdGW77TkbDpFzpDQ3T3x7EQOG8qzoC9smXwJnHr X-Gm-Gg: ASbGncvxDmYvLqq3YcQFZn0OQtH98uA3VcaeDSB3ktgj9xz36GzZs4H2F4VeBvihT+U b4hQEcW6kfXTMABTtkxFcq4JD5A5UcOGDOWjDj4u9Kjkw8htiE4n9HmE4ATX+mE0TfVbD89UVZ5 VEJlNVG+CAS69wz1MDP8SScLXX/uSt2YUdSNCN/g6dN7+4vl9UVYB4kOkZ5jYG0gKGMBhYR5sqV L641Ur8KTc/U7oJc+GMX6AYOAjxZ9sNbGOpOizmhzVDtUZ8wMi3n/W81uA+f4MC4O6RxN/JwTLk Atj4aEfvrhcv7VKcQ3tVHm0Z5dnkfEOBIa+fkySsT+Q6sqa0Law5OJqhyFllLhomejHxIJhLh1o r3htSEIEjTQ4kY3/qbUa+rAjC0g4X1miO5RU3TymKzBBaJfT0X7N1C0f1OtMbmq9FOVCEYWN+eM A46Jyc7KQ= X-Google-Smtp-Source: AGHT+IH54DraoDa/f6KZkO4YDbs2eop+rkDoWJ/MneLBsZXLaDppl5Ep0rna4fs7M2rMhR5EUVEIhw== X-Received: by 2002:a17:90b:2692:b0:338:3221:9dc0 with SMTP id 98e67ed59e1d1-33bcf91f1dcmr39131198a91.37.1761411982073; Sat, 25 Oct 2025 10:06:22 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7e70d1sm2857842a91.11.2025.10.25.10.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:06:21 -0700 (PDT) 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 v2 2/4] net: dsa: yt921x: Add STP/MST support Date: Sun, 26 Oct 2025 01:05:25 +0800 Message-ID: <20251025170606.1937327-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025170606.1937327-1-mmyangfl@gmail.com> References: <20251025170606.1937327-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 ab762ffc4661..485fec3ac74f 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 <=3D 0 || 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; @@ -2788,6 +2899,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 From nobody Sun Feb 8 04:30:41 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 D5E45303CB4 for ; Sat, 25 Oct 2025 17:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411988; cv=none; b=uaUZkwkKdvZ8YrTFPSMZDbFNJWGU3jLqA0IxGMW/HmRpQPdbcmoltuCmTv/8zPNgNBwsMzrdLXCc+rRffPqh5Hh20hHRt8ebOGDd/7B69o8L+VK0djJeSxorX85/5YlBDdKonmIY0BVtVl/Kofptox0wWtbz6vxomhdQ0YTJKow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411988; c=relaxed/simple; bh=Y4/7kxOvf+Po4ZQ5WfwfaUNB9yGYyDH1l93lR+I4MvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sjvtqf5x5zj4gF/DnVbnQsiMbsIiiTvP480j0KOhqQHrjf1hBMCEx4UehXKyIXOQJK0hTjxXKsuF68vSMKILs3Sfi4y8ZMDiMm0ASMXAWJdxTWvDHO2tKMX1UGfTjOn5jSYh7+X1ccCjLtxX0OWLyEzIjan+N90vxkq97/YCZIA= 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=i89VBVci; arc=none smtp.client-ip=209.85.216.53 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="i89VBVci" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-33bda2306c5so3008153a91.0 for ; Sat, 25 Oct 2025 10:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761411986; x=1762016786; 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=DqGjoL6ZxqRuvTgBTFhR7XlvSN01n0xXPYNgq1DkmvE=; b=i89VBVcimjRuuNk1j4MPBydGMZcCdOvOy3HTclLn26HdJQXGK6xtZM9ffuj6c5wHZl irvRlpnDbLhLqzzeUmyGTteIc3MzKA2DDoolqjSn8PrpX/JXbH0RYyNq36GI2grj/3kJ dU/Uau+ErHu7ai0QHtWEXXVdeXtxNA01G3qF7ONRVQVHhNMGvIIeHAX8YQdAK0VBjkAF Zk34pErFMnyNVP/sElCRxr8UXxlMOaQhtE+halG+I9ulhDSN6/4YtuusqNVbSS5HVNHK gIs5Q/ZZtIeEze9HsXoHAEYEi/pjj54vT+1mlCQlegEfCaYR705WNgQkBX8RSBcyo39b EaxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761411986; x=1762016786; 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=DqGjoL6ZxqRuvTgBTFhR7XlvSN01n0xXPYNgq1DkmvE=; b=NFrF5a6AamnKxDRiGOZboMbxJptIpSaajIdQKGiSfRm4I4mTo0r2wfBWZm0h6Y1yRX XDuziBzjdI4dhNBxF551TfeG8Ily2NMAKcwb4wbCJba3HYq3mnmQIKh9HldcZ/6bcHDO hhVB5BhOMj4tyhrbVm/PU90vX7hNFGiE3ahSj/ZC+si6fyW89gsCyEKOK5p+NuthjIfn fQ+Td3iZE3RTiNGh/85UhJzGwnfKAm6cW5wPbHvooly53B6j7qFqF/7XW/P7HhrqX9Ii TSz5fwpyp5hCuJKF0VFdU/IikuOhcA0zxeTmhgXY43/PUQQ1zNiykPsGSW6NuL5/+Yxx QDlA== X-Forwarded-Encrypted: i=1; AJvYcCXNXG6zegwZtlV/YNWHWnV1GroMiWnlQsnLIKlZ7xLEhFF/6UBzeXgMrcmhcrYNZFd1RJUdfb+NKNOecHA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy76Er8YPI3wOPzyPG1G4R3zufAyd8l1wt5gy5wVrjjigmcTMNc nKP0cSBXkVl2BzfVMJq3DcWb0Rvu4k/TASxTc3oRcqYSIm5+FvWNhsK8 X-Gm-Gg: ASbGncs8vYwbRkn8L5dWlmeqSmCulu2XF1iVSEIM/QV/lM+KLFmN1u8rXL9sDHHB+rC mIlZR6xLC19FQMkHXy502NW8hnenDj2AbXTpQ6U9IOpQAXeaq2WHq3n9ffumv/cKwrDTMT+f+5v bbsFvGsJH8RFNVKs7nvGYZ3kMzG1nsAajMphmFZp68pHAZuNlLbSX6yoGV6qyvKzbj0sH6sPw8S VB709Y5Iz/29BcKSefFGiwGyFNjjcm4HaUFo02egBSrPPkZfY42suWfKuJRaC+gbXUIeZtNyDKe 1Gaod5W+8LR2OqvLlwaY8PR0wGYldxRx2zQUCFZSGTLLhAB8208W6dNhPCp7pRed7Nk6HYcY2jm xO3PzijDuLCbIOXpkHZGV61bN0NUYCQXSWUklQfSyopSyr554Zt+xuVpAuJFzrzoAXMaDPybcAn 1pmgRxokQ= X-Google-Smtp-Source: AGHT+IFSbP2Zm6lh0Mx2XlzjJZL1IGNrCV+TBRlRJ7TE1VBAFowd7AX7jxf1xCpHgj0YzP2E2TmA2A== X-Received: by 2002:a17:90b:55cf:b0:32e:64ca:e84e with SMTP id 98e67ed59e1d1-33bcf874448mr37650304a91.15.1761411985988; Sat, 25 Oct 2025 10:06:25 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7e70d1sm2857842a91.11.2025.10.25.10.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:06:25 -0700 (PDT) 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 v2 3/4] net: dsa: yt921x: Add HSR offloading support Date: Sun, 26 Oct 2025 01:05:26 +0800 Message-ID: <20251025170606.1937327-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025170606.1937327-1-mmyangfl@gmail.com> References: <20251025170606.1937327-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" Add offloading for packet duplication supported by the YT921x switches. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 24 ++++++++++++++++++++++++ net/dsa/tag_yt921x.c | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 485fec3ac74f..885a63f2b978 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -1038,6 +1038,27 @@ static int yt921x_dsa_port_max_mtu(struct dsa_switch= *ds, int port) return YT921X_FRAME_SIZE_MAX - ETH_HLEN - ETH_FCS_LEN - YT921X_TAG_LEN; } =20 +static int +yt921x_dsa_port_hsr_leave(struct dsa_switch *ds, int port, + struct net_device *hsr) +{ + return 0; +} + +static int +yt921x_dsa_port_hsr_join(struct dsa_switch *ds, int port, + struct net_device *hsr, struct netlink_ext_ack *extack) +{ + struct dsa_port *dp =3D dsa_to_port(ds, port); + struct net_device *user =3D dp->user; + + /* Nothing special here; we natively support tx packet duplication */ + + user->features |=3D NETIF_F_HW_HSR_DUP; + + return 0; +} + static int yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress) { @@ -2879,6 +2900,9 @@ static const struct dsa_switch_ops yt921x_dsa_switch_= ops =3D { /* mtu */ .port_change_mtu =3D yt921x_dsa_port_change_mtu, .port_max_mtu =3D yt921x_dsa_port_max_mtu, + /* hsr */ + .port_hsr_leave =3D yt921x_dsa_port_hsr_leave, + .port_hsr_join =3D yt921x_dsa_port_hsr_join, /* mirror */ .port_mirror_del =3D yt921x_dsa_port_mirror_del, .port_mirror_add =3D yt921x_dsa_port_mirror_add, diff --git a/net/dsa/tag_yt921x.c b/net/dsa/tag_yt921x.c index 995da44f0a2a..0ad83924fda1 100644 --- a/net/dsa/tag_yt921x.c +++ b/net/dsa/tag_yt921x.c @@ -46,6 +46,7 @@ yt921x_tag_xmit(struct sk_buff *skb, struct net_device *n= etdev) { struct dsa_port *dp =3D dsa_user_to_port(netdev); unsigned int port =3D dp->index; + struct dsa_port *partner; __be16 *tag; u16 tx; =20 @@ -59,6 +60,9 @@ yt921x_tag_xmit(struct sk_buff *skb, struct net_device *n= etdev) tag[1] =3D 0; tag[2] =3D 0; tx =3D YT921X_TAG_PORT_EN | YT921X_TAG_TX_PORTn(port); + if (dp->hsr_dev) + dsa_hsr_foreach_port(partner, dp->ds, dp->hsr_dev) + tx |=3D YT921X_TAG_TX_PORTn(partner->index); tag[3] =3D htons(tx); =20 return skb; --=20 2.51.0 From nobody Sun Feb 8 04:30:41 2026 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.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 DDA60304980 for ; Sat, 25 Oct 2025 17:06:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411992; cv=none; b=XMwnB1WrAelA0T2mqxIXLc18+sKT0DmwOh7fRxd6NWOCXOmZrWdMsTsfOBhj43dN6+/TkA+jSdAakXYUoj5b5bqPGdC1Aoyaw0s08Ukthg1pqLwD47S2lFfMQg/C0KOUfdI5KkGpaRq0MJnPdt/woTMRZKjm7hMtvrie7m351PA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761411992; c=relaxed/simple; bh=2dxQC3wyZueaMEnOwoWXRHlFpSs6OgygyE9+UYsElzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XZ6726qXYC2uqKgsB3aSN/hGiqagWKxnSaEGGXmdDgxs6BtiKTzh/A0Eew88VKOgMDLs2yDRPbTIvvnQobp9mQzOxNbrYD3ClV+RUy7iVg18LyqiSI8OQqoVM0E0n7sYNhliR8iEzhaVclkn99KpNPnukHNSAo/8102VNPYq7zU= 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=Ob5jkLdK; arc=none smtp.client-ip=209.85.215.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="Ob5jkLdK" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b49c1c130c9so2134581a12.0 for ; Sat, 25 Oct 2025 10:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761411990; x=1762016790; 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=eM3FTCWkFUdaa4aFlf56htgtPRFQ9+Op0+Uy5qhWdhc=; b=Ob5jkLdKx6Id5iq06NN21xEoAghR9UfQzAfPQczQhW7oR4RgAr3MBi4/Y/Pgtp7cVl n6UgWWgitiSK7AZ73Qo6t8LrsM++vVTkZ7OlP4m0I+RTSISxuy4zQ9NpxfQNRqbVNn/E nUTPMis1U8gQ7Ff1sDkTRNTAOeeJoTu+DKfmYpcJoJYvrbhcvGRdm6CCRJyTMFyN4EsH 8vgIOF+sZZdIht/ycYbE0Kpe6YQJN71DnApvwCByKAh2maABPm7yRq2bm+0sZMcxAuq1 UY0a94NLbwPa87rq0bYBRh+tJdsJPOp2ZtkemTcB1ulUP9vNMW+CVh9AAydwpclIybWq 2F0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761411990; x=1762016790; 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=eM3FTCWkFUdaa4aFlf56htgtPRFQ9+Op0+Uy5qhWdhc=; b=t2ZlKYwHG4LZKqhzoNP08MzpoiHYRp03HQ54YWuI04hZBcLckAlUkvQSfhxRVXw0N+ qLW8nh2en/VP+3CI6NY5wOX+nIGQ/Yr4DhDOxJ2qBvkVJhTUDMtz80FWCY6qY9f6GCJD SQcE8Kw4Wb6gDmpmYasrqPwkm6Jd6owTcrYMunR38fvw0rH892lPgG626K+u5M3xzdK6 gaJ+DUE4TKxQdUYNfRwdRBjPlI8RmYukkc58jjxl5CYg0TJPJj5IFJLiKqTCR+G9g6xi 65gDa4ucVddIlfy2Z/6cQyDaO9Oh/Wqf4jBz6MjusHSr5OmlzZkMIhKmThagsH4uHcqA zoTQ== X-Forwarded-Encrypted: i=1; AJvYcCV9HQehJchUAQTDm9ScJSWF9i+luV8LBfpFmCXaqZzGpeGYzIQEFE1eu6WIPG8bZs5e8YOXJ585aXxmV9M=@vger.kernel.org X-Gm-Message-State: AOJu0YwJebc3DdhJnL/RDUl4IYx24EvGYw/4y3kwWEOe5Z6hw6LCng4Q f+NikBHcDsYi5WryVtT8MTFsWyP8Aa3Sa/p+NVgs3Dec6q2nJzg68mOF X-Gm-Gg: ASbGncuRSPBvwA5ix+TUW9nRHp0GwXjfibqwccQjlXk7fm8E3dcwDDCNE0uhbXUbINF 6Kg7GuRGgEt5e+AZSkh1kdWebtVvRwoWj1Od4tfsi8nrr0Yvg2ECG/0c+jusdEQoc48JXsvIlJl sHEikVN6iE6EelP3u6nGqE4JuovamJVcAlB+yEgMvC/ZaJdIBcCdpk7Ac+pGfyYnY7kaodtwW+Q LwaR2QVePdM6H9V/vrbpulkMNIgyd+BnoV5yOSrWmsHDUhwwaVh2tiEmMLcYEzIOpWJKutCKKyf fFEfqgonXHjNtiNB8LPOO0Gs5bBf4WUd1HJw8s/4pMGMIEv7Uc2yR9zxmCK6bk7EC6N76O62xHg MYGfhTzzzVatQGCfIYwDEifWL56ay5GtzR+L3su39mYlq/QIzkLza7DlwoIHzMsygDndi2urNSW rHfJMUMn42zJw6kf2DbA== X-Google-Smtp-Source: AGHT+IENyejyeawlBEItrvmhxyRV78AAC7HJ7ORCzzVMdYH71cv2wGWnnAwQWzE0xmst5RUKdrjEvQ== X-Received: by 2002:a17:903:38c8:b0:276:76e1:2e87 with SMTP id d9443c01a7336-2946e22bbcfmr114585715ad.44.1761411990123; Sat, 25 Oct 2025 10:06:30 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7e70d1sm2857842a91.11.2025.10.25.10.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:06:29 -0700 (PDT) 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 v2 4/4] net: dsa: yt921x: Add LAG offloading support Date: Sun, 26 Oct 2025 01:05:27 +0800 Message-ID: <20251025170606.1937327-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025170606.1937327-1-mmyangfl@gmail.com> References: <20251025170606.1937327-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" Add offloading for a link aggregation group supported by the YT921x switches. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 185 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 20 +++++ 2 files changed, 205 insertions(+) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 885a63f2b978..1d18d1e89cb8 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -1143,6 +1143,187 @@ yt921x_dsa_port_mirror_add(struct dsa_switch *ds, i= nt port, return res; } =20 +static int +yt921x_dsa_port_lag_check(struct dsa_switch *ds, struct dsa_lag lag, + struct netdev_lag_upper_info *info, + struct netlink_ext_ack *extack) +{ + struct dsa_port *dp; + unsigned int members; + + if (lag.id <=3D 0) + return -EINVAL; + + members =3D 0; + dsa_lag_foreach_port(dp, ds->dst, &lag) + /* Includes the port joining the LAG */ + members++; + + if (members > YT921X_LAG_PORT_NUM) { + NL_SET_ERR_MSG_MOD(extack, + "Cannot offload more than 4 LAG ports"); + return -EOPNOTSUPP; + } + + if (info->tx_type !=3D NETDEV_LAG_TX_TYPE_HASH) { + NL_SET_ERR_MSG_MOD(extack, + "Can only offload LAG using hash TX type"); + return -EOPNOTSUPP; + } + + if (info->hash_type !=3D NETDEV_LAG_HASH_L2 && + info->hash_type !=3D NETDEV_LAG_HASH_L23 && + info->hash_type !=3D NETDEV_LAG_HASH_L34) { + NL_SET_ERR_MSG_MOD(extack, + "Can only offload L2 or L2+L3 or L3+L4 TX hash"); + return -EOPNOTSUPP; + } + + return 0; +} + +static int yt921x_lag_hash(struct yt921x_priv *priv, u32 ctrl, bool unique= _lag) +{ + struct device *dev =3D to_device(priv); + u32 val; + int res; + + /* Hash Mode is global. Make sure the same Hash Mode is set to all the + * 2 possible lags. + * If we are the unique LAG we can set whatever hash mode we want. + * To change hash mode it's needed to remove all LAG and change the mode + * with the latest. + */ + if (unique_lag) { + res =3D yt921x_reg_write(priv, YT921X_LAG_HASH, ctrl); + if (res) + return res; + } else { + res =3D yt921x_reg_read(priv, YT921X_LAG_HASH, &val); + if (res) + return res; + + if (val !=3D ctrl) { + dev_err(dev, + "Mismatched Hash Mode across different lag is not supported\n"); + return -EOPNOTSUPP; + } + } + + return 0; +} + +static int yt921x_lag_leave(struct yt921x_priv *priv, u8 index) +{ + return yt921x_reg_write(priv, YT921X_LAG_GROUPn(index), 0); +} + +static int yt921x_lag_join(struct yt921x_priv *priv, u8 index, u16 ports_m= ask) +{ + unsigned long targets_mask =3D ports_mask; + unsigned int cnt; + u32 ctrl; + int port; + int res; + + cnt =3D 0; + for_each_set_bit(port, &targets_mask, YT921X_PORT_NUM) { + ctrl =3D YT921X_LAG_MEMBER_PORT(port); + res =3D yt921x_reg_write(priv, YT921X_LAG_MEMBERnm(index, cnt), + ctrl); + if (res) + return res; + + cnt++; + } + + ctrl =3D YT921X_LAG_GROUP_PORTS(ports_mask) | + YT921X_LAG_GROUP_MEMBER_NUM(cnt); + return yt921x_reg_write(priv, YT921X_LAG_GROUPn(index), ctrl); +} + +static int +yt921x_dsa_port_lag_leave(struct dsa_switch *ds, int port, struct dsa_lag = lag) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + int res; + + if (lag.id <=3D 0) + return -EINVAL; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_lag_leave(priv, lag.id - 1); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int +yt921x_dsa_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag l= ag, + struct netdev_lag_upper_info *info, + struct netlink_ext_ack *extack) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct dsa_port *dp; + bool unique_lag; + unsigned int i; + u32 ctrl; + int res; + + res =3D yt921x_dsa_port_lag_check(ds, lag, info, extack); + if (res) + return res; + + ctrl =3D 0; + switch (info->hash_type) { + case NETDEV_LAG_HASH_L34: + ctrl |=3D YT921X_LAG_HASH_IP_DST; + ctrl |=3D YT921X_LAG_HASH_IP_SRC; + ctrl |=3D YT921X_LAG_HASH_IP_PROTO; + + ctrl |=3D YT921X_LAG_HASH_L4_DPORT; + ctrl |=3D YT921X_LAG_HASH_L4_SPORT; + break; + case NETDEV_LAG_HASH_L23: + ctrl |=3D YT921X_LAG_HASH_MAC_DA; + ctrl |=3D YT921X_LAG_HASH_MAC_SA; + + ctrl |=3D YT921X_LAG_HASH_IP_DST; + ctrl |=3D YT921X_LAG_HASH_IP_SRC; + ctrl |=3D YT921X_LAG_HASH_IP_PROTO; + break; + case NETDEV_LAG_HASH_L2: + ctrl |=3D YT921X_LAG_HASH_MAC_DA; + ctrl |=3D YT921X_LAG_HASH_MAC_SA; + break; + default: + return -EOPNOTSUPP; + } + + /* Check if we are the unique configured LAG */ + unique_lag =3D true; + dsa_lags_foreach_id(i, ds->dst) + if (i !=3D lag.id && dsa_lag_by_id(ds->dst, i)) { + unique_lag =3D false; + break; + } + + mutex_lock(&priv->reg_lock); + do { + res =3D yt921x_lag_hash(priv, ctrl, unique_lag); + if (res) + break; + + ctrl =3D 0; + dsa_lag_foreach_port(dp, ds->dst, &lag) + ctrl |=3D BIT(dp->index); + res =3D yt921x_lag_join(priv, lag.id - 1, ctrl); + } while (0); + mutex_unlock(&priv->reg_lock); + + return res; +} + static int yt921x_fdb_wait(struct yt921x_priv *priv, u32 *valp) { struct device *dev =3D to_device(priv); @@ -2906,6 +3087,9 @@ static const struct dsa_switch_ops yt921x_dsa_switch_= ops =3D { /* mirror */ .port_mirror_del =3D yt921x_dsa_port_mirror_del, .port_mirror_add =3D yt921x_dsa_port_mirror_add, + /* lag */ + .port_lag_leave =3D yt921x_dsa_port_lag_leave, + .port_lag_join =3D yt921x_dsa_port_lag_join, /* fdb */ .port_fdb_dump =3D yt921x_dsa_port_fdb_dump, .port_fast_age =3D yt921x_dsa_port_fast_age, @@ -3000,6 +3184,7 @@ static int yt921x_mdio_probe(struct mdio_device *mdio= dev) ds->priv =3D priv; ds->ops =3D &yt921x_dsa_switch_ops; ds->phylink_mac_ops =3D &yt921x_phylink_mac_ops; + ds->num_lag_ids =3D YT921X_LAG_NUM; ds->num_ports =3D YT921X_PORT_NUM; =20 mdiodev_set_drvdata(mdiodev, priv); diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 2a986b219080..0afd90461108 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -316,6 +316,14 @@ #define YT921X_FILTER_PORTn(port) BIT(port) #define YT921X_VLAN_EGR_FILTER 0x180598 #define YT921X_VLAN_EGR_FILTER_PORTn(port) BIT(port) +#define YT921X_LAG_GROUPn(n) (0x1805a8 + 4 * (n)) +#define YT921X_LAG_GROUP_PORTS_M GENMASK(13, 3) +#define YT921X_LAG_GROUP_PORTS(x) FIELD_PREP(YT921X_LAG_GROUP_PORTS_M,= (x)) +#define YT921X_LAG_GROUP_MEMBER_NUM_M GENMASK(2, 0) +#define YT921X_LAG_GROUP_MEMBER_NUM(x) FIELD_PREP(YT921X_LAG_GROUP_MEMB= ER_NUM_M, (x)) +#define YT921X_LAG_MEMBERnm(n, m) (0x1805b0 + 4 * (4 * (n) + (m))) +#define YT921X_LAG_MEMBER_PORT_M GENMASK(3, 0) +#define YT921X_LAG_MEMBER_PORT(x) FIELD_PREP(YT921X_LAG_MEMBER_PORT_M,= (x)) #define YT921X_CPU_COPY 0x180690 #define YT921X_CPU_COPY_FORCE_INT_PORT BIT(2) #define YT921X_CPU_COPY_TO_INT_CPU BIT(1) @@ -360,6 +368,15 @@ #define YT921X_PORT_IGR_TPIDn_STAG(x) BIT((x) + 4) #define YT921X_PORT_IGR_TPIDn_CTAG_M GENMASK(3, 0) #define YT921X_PORT_IGR_TPIDn_CTAG(x) BIT(x) +#define YT921X_LAG_HASH 0x210090 +#define YT921X_LAG_HASH_L4_SPORT BIT(7) +#define YT921X_LAG_HASH_L4_DPORT BIT(6) +#define YT921X_LAG_HASH_IP_PROTO BIT(5) +#define YT921X_LAG_HASH_IP_SRC BIT(4) +#define YT921X_LAG_HASH_IP_DST BIT(3) +#define YT921X_LAG_HASH_MAC_SA BIT(2) +#define YT921X_LAG_HASH_MAC_DA BIT(1) +#define YT921X_LAG_HASH_SRC_PORT BIT(0) =20 #define YT921X_PORTn_VLAN_CTRL(port) (0x230010 + 4 * (port)) #define YT921X_PORT_VLAN_CTRL_SVLAN_PRI_EN BIT(31) @@ -404,6 +421,9 @@ enum yt921x_fdb_entry_status { =20 #define YT921X_MSTI_NUM 16 =20 +#define YT921X_LAG_NUM 2 +#define YT921X_LAG_PORT_NUM 4 + #define YT9215_MAJOR 0x9002 #define YT9218_MAJOR 0x9001 =20 --=20 2.51.0