From nobody Mon Dec 1 23:34:11 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 6D1462E6CD2 for ; Wed, 26 Nov 2025 09:33:19 +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=1764149600; cv=none; b=PjCeZ9VVkXinb1JJ9lSQ5zwoglGV8GP7F7MW/1UqrtV6g3cJia1K2uneb0gT62iuqtMcFTaxLt/IWM/xV8rW1Um3IIi7iajVTCSHWeVL2vsktDabQ1cZqL4vkZb0Tcmja1WNjDKof/nbVWoHLJ72+cbHINKVU8GaxLul+zR7dY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149600; c=relaxed/simple; bh=XPoMqDwwNJLwd6t8oOPZg8CGm6E3Kw7Z8uoFKk912hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oHunIBmcU8zYk1hbEcBNAbG/IpWQpGo7Myx8HCy+oPRYbTSK2M//5Mn7t2dIp+ufLESMY9KXsWAU3Uim/jZ2CB9RBtm31TgFRFTagRYvEHCPIcGuUVAD+GokMDrZC7t4fs5AmD1pjLrcc8HVUFnHIs5ljv6lDJF9Yk9gF0e3xLU= 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=GlcKbJlE; 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="GlcKbJlE" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-298144fb9bcso72016085ad.0 for ; Wed, 26 Nov 2025 01:33:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764149599; x=1764754399; 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=GlcKbJlEL5w+RBR0xvfZ1N5NXypyABe4gv4TsuzffZgPPVldv2vnsEI4U7+Q15CyZM FVaQ0v2YtRuUmd5rl0UCDW6OH9v1S4fqPeRZ/leylQxtIAuxbhmi7syXNJaMsImbs9/e gDdqrxg8Ehlc5nwv+ISAKPCSH3dmzxJ6sZ0NVFCZ/GUJb0U58EEuNgMA8Em+6o+21VLL 7ny+fSTzxXAtP89AB+1IaOmT0wtveGkdDPhwLc0kOW1pfRPdDDQgyJ7cTTogSCxYhRpL b7jXkg4+KIcfTCN0W5cmR36nleEdiR/j8KUodPkHqOG4UKpImFlWv868TqEh5rMWwhkz WTfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764149599; x=1764754399; 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=4Kzhu4s+NpOCVTnPevu9VK8eZq5kgkG4j+tx0i0eXd0=; b=ZCdTbn/gLIV6f2iIIiK0bcngts1IxgUX0HIdGHQAXz5I1rox0xZIdjoxZoB4vMInNy +nSBkIzlvdVnTiQKD3MGf9Wi/NLZoUBtMRmpVHSBJGC5H0daq6eGoReVBhEGGHDtjn3H wjG81ZiuDDPKSaCLw0AV4jZ7DHsutEU/Er+2u1eih6KLjHr9Kr5VnQZM05Fc57kVTMtI EVNp0Ywr2UlW9dkTV8dxQONFAvFN3CAGrXQqQPNhIqdsUJfc6Ht20Q52x4r+oSVL5tyy uvG+MUSTAWSZuCp8UHf+3F881THIVye6hZh2Oq5jzriWc63Dmz3wA6ICgEqq6WPejNV7 8PUw== X-Forwarded-Encrypted: i=1; AJvYcCV/t5BW/IcYXpyaKIsAvfQyAV4Nbc/M0QraeoaPXbiiiD5h86vhWr1dMdNbCYpCsjfxRG6c0kYCOZ72EfI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6OkP0J5dOIy3z+L65ZiEDWM9YP0u2nbI7txebVrxCCb66haBb e6sWDWyxXu36o5z9iFRrLPqlM5ows3U+s5eMc+NtSQTmhtRQkrHEUokG X-Gm-Gg: ASbGncvsuC6F9zoZGUDifH/bDx1tG4AufheTM63JizATPQb2qbE54pvBzGV3Srr/+ZC t8y4P/bObg46k36p94WYvQODwah48myqX7o2sNLVi8EoTGH0lP6YJrxpkGgM4qR71f3hXqHOjrg dZV38XeTVoTeFn7xUMd/TJ5j8ajaJJRpGd9rpHhGss4I2tQ+FSs8AHeq/iDZBmrfY/jgghExv4a qKPfJj2EPf1K0R8O2TuiuaDH8O+dcOjl4oy5GyBkHkbZq1BQpxb9xEPH/Lhbnjn02DyRcmQu8yi 7u0IlfKTH+pfboJjqFTGvjswslCn/Z3L4pkVodT8B2l97qkyWYB0JUAWLTd7O547UpqHBNEkkF/ KsUOZsXLVUG7X6bj6xRmZ9Zt1H1XZpsF8jlLck/pLWsJJsHdbIDvAyTbcD/tTHwSzN+lf2spyC5 Ts6g3xb7IrRr8VbOrSIZY0Ug== X-Google-Smtp-Source: AGHT+IGo+I83jQTyCTIgOsCfJ4GacZwmPf3nL6qIKqhJnmm5dWUuwf6NZgkroxSms0bf3/Wv/y+ySw== X-Received: by 2002:a17:903:fa4:b0:295:8dbb:b3cc with SMTP id d9443c01a7336-29bab1947admr65396955ad.42.1764149598751; Wed, 26 Nov 2025 01:33:18 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 01:33:18 -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 1/4] net: dsa: yt921x: Use *_ULL bitfield macros for VLAN_CTRL Date: Wed, 26 Nov 2025 17:32:34 +0800 Message-ID: <20251126093240.2853294-2-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" 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 Mon Dec 1 23:34:11 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 From nobody Mon Dec 1 23:34:11 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 0B7CC303A15 for ; Wed, 26 Nov 2025 09:33:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149607; cv=none; b=oUtbGDyqEjJvB5m2efWAYx887LEfUjDHs4Hr9yKn+Nu3Rj2X8KN7yNxIRaLudhIRemZSk32PjpEqJVvJTNN5uRW45lR8K8tvmPpwYfL6+9viEUyEe6vxRuFQT24b/vIpYN08HSu/ZDPIJtmYN9+2rJev1ULN89vC5vf6jQNf5G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149607; c=relaxed/simple; bh=4zzbOxMPkXe/4tQNGglH4QUKmNDWx66LWV4v8+bILg0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KglLxkfFgypvWxKT9pgZEJRhZERgb3+Yj7QUSGq5UJZJQTOuSf+VGcMcjCTWrQSZFqR3U1qmalQV35nOggMa4bQx/h0AAkx46PpXMEWKaN7kKLfpC4Y2qSqzbO9uRbWeiwYhwNYOgifhMhLQJCXddYN7ENSv6tMZuubgaW+jyaU= 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=AhEKEeJl; arc=none smtp.client-ip=209.85.214.176 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="AhEKEeJl" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-298250d7769so48999185ad.0 for ; Wed, 26 Nov 2025 01:33:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764149605; x=1764754405; 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=YqJqJrlMSLkRydDrXYGtfXhQQqVvrofmZY18LI6Fuv8=; b=AhEKEeJlxL0o7+HB3M6y+jOjaJGGW81APaahUBZ/wS9QwRfyKlWBwe8Nx+F4DE6wWV RvqlnMgsjHeqwBEiZzLAvd84tBvtXiOCGqqgcbp7Imbg1xytO65rgn1WsCsGrn033iqB QCCES0+rIWxhwK7rYGbJhORCL+Hri4LUk+murJ5m1wfw3/EznFsRlIlU+D6kkiUAaZh/ OhgRBYG2+qQPIoZP+MnPRYXAjxQPQgQXyJMcaE4Dxl+NeWYrJYn00YCqGqt1pAG8ue+U MXKIBgJIiUNqDSYCHM/NqX7MhuqlCc4fd5kR58UFRt2SEsewbaxvB2eT3C6kQqZra3M0 iiTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764149605; x=1764754405; 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=YqJqJrlMSLkRydDrXYGtfXhQQqVvrofmZY18LI6Fuv8=; b=ItoZL4z1F/ILw1GkR5Wdi+/MAhm29nVMMbGvmazIaY/ODnZOe54Awigdo56BdCKalV n/ollyedDXen1wRBihXv3aMcaBWSuuTQwo1+zSPt00TkVzT2gtxsBEfTDFhDoVU5xGF1 pEZeqf+drK6UmXMmBIjbhfk1H5EGEccO3v6QAwmNe8exLpxOI9qjEotiPA05WxKRrQBi Ed84UTvMDJ1r0L+m27ym7NtkVgk9QIqobR9PCszXSJMxBtGVDjpiVkhGFwnkBj0frB5F PFEPEozbhikgJMhCQhV+qrev/pmuD5tWG5qZI+bvFP44wQANWu1ryi0lWDAh1lo8NRZ0 +XAw== X-Forwarded-Encrypted: i=1; AJvYcCUfU4z8p1gzdpPF6P67BtOdmO+GHOwu9XG3NeUs/+lUy8fS5cPOU9TsfWA+CmzGzsH9ZxnLLY1zWmwoClA=@vger.kernel.org X-Gm-Message-State: AOJu0YxqCE7gexVbyjvORr0bJm5yOiilbad76PISWSXBp2nXP1YgumNl FkZ5pOeM9OauS5W1Sq2srqyr+t46ps85CzaL40VZpTTVQtU7CJCyQosE X-Gm-Gg: ASbGncumRbb0n1UiJ+eoSIY5r1rRbKC8hhzY0Pe4uSiwhs/YeBSczjAImdNl6/mS2nn gnWL/TJkXrM3ZG1NLQqed0+z96Xr9RCrqpU0Pgh5RyrWxExDEBqziX59zD4qnsqB6TCzVTz6W+y Fdb6dOu0ABa7/LvntF0UzaHjN6KI46GCqky1W+aeDK+nSvu2xfyiH8Ae/xSpTiMeV3e9p8m9PQO RL6sfggOgIf607M6t/iQv6djl1hMG0DDz7UdXrO5Jxy1j0rjlXUGcQQipqPPPlXAVlIzMRxxDyW 0mRwz9S78BGvXMDiHFNNtF+Gb5Bri4Q3iSFYt7HvW/rAdu5enVTiPeMIRY5NoQNeSbqcQkx9p7a WHdPGHlFkc8k0bbdFHzFoP8BvGLuwy2Y74AU0tCHTwQE6QwbsPo2lKaVy6dyPpjovdegyFdP1LZ zLfVLL9u9XjrtbDp3bdU+9sg== X-Google-Smtp-Source: AGHT+IF/RoDT8rwgc3IB6KW/nYWFdGo0AqNDeggqp19LPhS/Wh+ftCZ152rxFYdHGwXisLmNw82dSQ== X-Received: by 2002:a17:903:2349:b0:299:dea1:e795 with SMTP id d9443c01a7336-29b6c693f84mr210052655ad.44.1764149605346; Wed, 26 Nov 2025 01:33:25 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 01:33:25 -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 3/4] net: dsa: yt921x: Add HSR offloading support Date: Wed, 26 Nov 2025 17:32:36 +0800 Message-ID: <20251126093240.2853294-4-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" 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 e88b4037ee80..e7b416719b58 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) { @@ -2880,6 +2901,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 Mon Dec 1 23:34:11 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 5A06F309F02 for ; Wed, 26 Nov 2025 09:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149611; cv=none; b=PElhLrE7Gh+EGrKlDLa6S+Xkwrbuf7P+MtZ02P+O97blV1ATsFH1PZBF9aUFEf5IQE7au2G7G3dhxIDQkju7jXuu5JIBrStjiDyzmHxen2dQQGX2sqWQpaZeTSjqWHjBX8R4q3ENDAyDpmb/lzKn3sk6UHsErhWF2pkQKoYuzuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764149611; c=relaxed/simple; bh=ZTM0QJuUZycfuLi8Cz6pRi9vK6GKp41jf/OVUW+nA/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gXDQsjTmWfFC/+gF9lzS5fY0jEo3LjID9fEd0lsbQUBH/Jrrmc1v7nGrhah79Qu6T9YqED4inAE/u5lS8nuxBc67fW6owIrcOsP60+vQO8pVRjcvSuuIE0VWxXIFNCq2fvlOn1Fl4HIg37dLdvntcJRGvDgx7rC4R6IlTX2rGtU= 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=nI/y+fVf; arc=none smtp.client-ip=209.85.214.179 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="nI/y+fVf" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2956d816c10so75620635ad.1 for ; Wed, 26 Nov 2025 01:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764149609; x=1764754409; 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=vJRzhSEBj40vJG51qMX+dPArFTafJMlPn4v/oTWTn98=; b=nI/y+fVfkdyvyvZfR0G5W5OZkj/L8ofLZno9L/uK97EIEocYp3NLPoCkg9rxZSSKVf lv3J/0vO5tugkJBt/+RPQd9N5kMrARJjD+sUdp41YvnhHDzLpPYELp1k8mXimtlGmQxN Jx/R82nT5DrJRm57KPpA6z9/GARHvBhZ/mSv3JzaHV49vwt4D5hTO/MFE1Dj8K+4bBID p31hL9WHHVlshhwRYqHAnjRa/+XZHjQSHyp1h9ifcw2pW7Ozu6bO7sCQ0lmgI60M1tdx VO2B5wBSDyXY9IdPWE1v8ZXD2vLg+ntHYFPVjaXtzjSEDrlN3izIwT8OiUSoafsxxz6Y Qfag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764149609; x=1764754409; 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=vJRzhSEBj40vJG51qMX+dPArFTafJMlPn4v/oTWTn98=; b=sBq9i5UIEPN59n9W8caRQIcPrHP6Qnv3aMQRgNALnMboEd6ctjNGVs+RRI00PTQjqL YAO0YX5X/B06Sb6RdMQ5ZRaGwUytnUssp0FTOkCeYC/z6n6hQtDI+ftqbu+5/doC2vde /HifP0H2rFV0Wdwx16lFz4EsdeJ0FVSOYB7v/gnGkPYihotUsQbdh4GZtYTT+LY1pINN W8lyn3xN+lX23qNARFmtXIn/EhTqLB7QBJhrMcoPbYElLHI0e1hiTBNGOsVkSUfHut5w VtNWUGVfKCi7ERD/20iaRPi1TRKfFKlZtdJr+tTo8etWB1A/5+c28aj116767Hi6Sy7d DqyQ== X-Forwarded-Encrypted: i=1; AJvYcCUmf0rxu/ex4OKjmPVDFwWGWJiefmG8pWEUNJHg34DWpfxDEodvoFJn2asZQ+2nIvAVqxGxJdRkImIn76w=@vger.kernel.org X-Gm-Message-State: AOJu0YwG5KfiQ783cTWgnO+gwI7zNGh/f85OgsQhSzpueEGZxT5Y+OGQ dotyi8znD5cdlB+w8QNWc/mVYEDBbQ1/fckEzmt/pd25pfHz7ZYIuWvq X-Gm-Gg: ASbGnctdPoFERbgHIG+0pISajOVKIlvPAWQVdbWGOfxj5swl0KVoQHHM+DExBA6SPEy BelNEqaGCAE4yc0Apz5fR4Mv4Ot71BfJ+HiFn7cGBqgdQCHxCTi6UBl1QXgy4hufpuhmEAEaXMr UMpSPTiEtF+ToaK9KAfvaTKph9etbNYtKr55CQnLknqzTSJVQrz01eewcRQdVL/FaaRuObwtPDo /Smsy37G+prC7BC0T2Z1iQKVyQBElZ68aDa7IRUuwpgwaXyPS+XTirw8KQfgNki08Lppbure4Pz D/+S7Bo2jjxeNiyKqQ2j+3HQbrrkrvH1i7pUAoOvfWSutpdbxjX3Tt1ZyJLfs3UPzlVoEl8WvEx 3/9blyuyPM10d9u5rvHa7pDBaG2YNQKjISIAInph3f0St2uxbdQzbJpEvNEBcOIneABXd0VtS5g DwNgYijvh9YeI+WhPqU4DoZw== X-Google-Smtp-Source: AGHT+IE8UZZry4bkrIVBcjhFkIMJ/aRCCU5sVXGFT+PnLVbKlRefFAAUuCa7f3nJaWxw+2KFAmBjrg== X-Received: by 2002:a17:903:8cb:b0:295:70b1:edc8 with SMTP id d9443c01a7336-29b6be917a2mr223905635ad.2.1764149608678; Wed, 26 Nov 2025 01:33:28 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 01:33:28 -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 4/4] net: dsa: yt921x: Add LAG offloading support Date: Wed, 26 Nov 2025 17:32:37 +0800 Message-ID: <20251126093240.2853294-5-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" 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 e7b416719b58..609dd38adefc 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_lag_hash(struct yt921x_priv *priv, u32 ctrl, bool unique= _lag, + struct netlink_ext_ack *extack) +{ + 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) { + NL_SET_ERR_MSG_MOD(extack, + "Mismatched Hash Mode across different lags is not supported"); + 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) + 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_check(struct dsa_switch *ds, struct dsa_lag lag, + struct netdev_lag_upper_info *info, + struct netlink_ext_ack *extack) +{ + unsigned int members; + struct dsa_port *dp; + + if (!lag.id) + 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_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, extack); + 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); @@ -2907,6 +3088,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, @@ -3001,6 +3185,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