From nobody Tue Dec 2 00:05:29 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