From nobody Sun Jun 14 12:43:49 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 0F5553D4120 for ; Thu, 2 Apr 2026 22:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169300; cv=none; b=JY8Em2hUVspkrmyoLV0tRSbVZqtdzSQZ/nrcpurITdGqvBETCF6smxlcSn0AZtJTvnOPV60pU5RuMLtBYFv53DRZj8RmnLVt9oZeUqU3FfZABwkNIhH9vX4iXAnhgn9iTEB9sgaRWWhKAEBeCKx97CRzNvUY1HZcmS7plb41xkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169300; c=relaxed/simple; bh=KPexC333eb34zS3PfEVcKAKyFzm53MCuqOBlOePmQX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oKxBsLfu5tUgUcl4TchIxRdiKzie1/843Y1Dwrv5mfdTuCbdhujqeiRPKViVJQcyKvuPJ7r/KTLGAwPE+okuq3bRH3g10XJky1i9+WLi1KPcQImgDXEerVvuluLsOD3gauiZC7VWH3CFJtc/tyW35szmieO/MWGAlg9+oe0yLCI= 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=RAFlTRjh; arc=none smtp.client-ip=209.85.210.173 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="RAFlTRjh" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-82cf976ecacso590605b3a.1 for ; Thu, 02 Apr 2026 15:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775169298; x=1775774098; 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=lW/VlXUdeFCkUi3iqS6PQC/Ta0LMb5eS11dnPAhYywc=; b=RAFlTRjhUqTPXpEo9lHke3NAdnI5sTFXsAlZzttBr92mdv4CUmM1AkZKFgk8Dwxxvk J7+yFS7IAa09j8tZQW6bUE6rWkai/HJ2T0AXcaZG5YM9NoHJuCB8vKL3jV0M2R4l4cgT Vfi4iJ2xA4ZoySQWrjhe3gKw8LxsnlAeONllnYgU/Eoa6q6s0QuAuB11mfrdA98OGMH0 zaI1uDp3nWLom1H6jQKY6WBTeS/zbX/hUFldl84pb1RgymcHPH2pde7dpKj2jNHhfnhw UCHpA0f2U2DIrc2pwTAFOgLtvaVpJkO8gFDdGxlhzNjTHP0iDyE5fDyepHttxXQ3fitA ubEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775169298; x=1775774098; 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=lW/VlXUdeFCkUi3iqS6PQC/Ta0LMb5eS11dnPAhYywc=; b=HpgNGPzmfTGwS7yzXuWLMP9n4cx3uflN/lIAblEFgP+9fXl8gIU4heAFG0oVaRXhwS XHuViiG9TaSdA96uwgALcflhSy0v1J61uj5VLn9MLdZioqNJ0ADlvHfIKV85ZD9J7RgN jqD0tE1EkWYAMglCBtoNq9PeT2oAINBYylERPDaEqrl1ogiFsIOmADAtzjORg6icxCLK vA/qovwUizjQYbV4iSQWEmH1VPRbF4C9I7Dzz4gWYG/MRBIzlccEz+PjL8kJ7g4GGPJC FYy7OTS9sVHbT67r/lUxrv1ddPJ8+UzQl7aoNuZVvo2zeR/pxvMSnS9IEhn6u5RNGkoo RwzQ== X-Forwarded-Encrypted: i=1; AJvYcCXi4qZggwmbrVSyxevh4cjfLEaZzCYclZowbk1t2K8cQCzbQyCy4MTf8dFBTCdvYEH7FzpuoSCG+7AIz1o=@vger.kernel.org X-Gm-Message-State: AOJu0YzP7dSxwn+HsbaTuyGCKxE1FdwKfbM6sh14wseaYHlyiya1MEVa l697qx17dDR5jlgqYbduXNqyMQUhzmibiTUqHNFCmMok8cXoWl8mkBDa X-Gm-Gg: ATEYQzytrXp+VXvLHJn136jjgjVxjh5k4n/jec/BjHWGJEic4TuKyT4wBIJX+bT0/oo qHvsygcKPeUt1dGQ1oB2IsUXIkxm6yvIZNoVugvVB4x0ak8Aosi2fp1rlZft82F+EPvtrjl4y2K WLKTXZ87RSFdQ8ZL7IIxkraKI4VHcayp+gmR3dSexDFeQARaaeElLqdiSMROYJ+vIL+IdQQOu22 Reiw8IB60hfOJHmGnNTJGfmB/8hSaU+PpG6R+7RfpZiOyXBw2KjrcgSVDaHmq5+ENwl2ej/lQDP EybtWEcBkIJEn1fcOtMyj06zZtNQWPAIjEh+3wdu+RZqNgwpVJfM9PUbzd02Qc/SR/OsHW7AbDB 9u8ZnRYBU0QLivDQPvtHHUFhtLzhcfHm8wC5PZ+JIz+ZHzctfHAkCiwqV8R0thn1U9E0JfXuJP5 fP6283bck/7t75sDbXG/LB+mQla98avWIpuXDvKOsaSHxC8bhJ3A== X-Received: by 2002:a05:6a00:3902:b0:81e:ef16:b288 with SMTP id d2e1a72fcca58-82d0da53a40mr721497b3a.22.1775169298313; Thu, 02 Apr 2026 15:34:58 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661f:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca1f28sm4294291b3a.57.2026.04.02.15.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 15:34:58 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Vladimir Oltean , UNGLinuxDriver@microchip.com, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org, Vladimir Oltean Subject: [PATCH net-next v2 1/4] net: dsa: pass extack to user tc policers Date: Fri, 3 Apr 2026 06:34:29 +0800 Message-ID: <20260402223437.109097-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402223437.109097-1-mmyangfl@gmail.com> References: <20260402223437.109097-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" Users may use extack for a friendly error message instead of dumping everything into dmesg. Make the according transformations to the two users (sja1105 and felix). Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- drivers/net/dsa/ocelot/felix.c | 3 ++- drivers/net/dsa/sja1105/sja1105_main.c | 3 ++- include/net/dsa.h | 3 ++- net/dsa/user.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 84cf8e7fb17a..4272ea6e9ca8 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -2001,7 +2001,8 @@ static int felix_cls_flower_stats(struct dsa_switch *= ds, int port, } =20 static int felix_port_policer_add(struct dsa_switch *ds, int port, - const struct flow_action_police *policer) + const struct flow_action_police *policer, + struct netlink_ext_ack *extack) { struct ocelot *ocelot =3D ds->priv; struct ocelot_policer pol =3D { diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja11= 05/sja1105_main.c index c72c2bfdcffb..dbfa45064747 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -2847,7 +2847,8 @@ static void sja1105_mirror_del(struct dsa_switch *ds,= int port, } =20 static int sja1105_port_policer_add(struct dsa_switch *ds, int port, - const struct flow_action_police *policer) + const struct flow_action_police *policer, + struct netlink_ext_ack *extack) { struct sja1105_l2_policing_entry *policing; struct sja1105_private *priv =3D ds->priv; diff --git a/include/net/dsa.h b/include/net/dsa.h index 6c17446f3dcc..1cc627e23c07 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -1106,7 +1106,8 @@ struct dsa_switch_ops { void (*port_mirror_del)(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror); int (*port_policer_add)(struct dsa_switch *ds, int port, - const struct flow_action_police *policer); + const struct flow_action_police *policer, + struct netlink_ext_ack *extack); void (*port_policer_del)(struct dsa_switch *ds, int port); int (*port_setup_tc)(struct dsa_switch *ds, int port, enum tc_setup_type type, void *type_data); diff --git a/net/dsa/user.c b/net/dsa/user.c index c4bd6fe90b45..8704c1a3a5b7 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -1499,7 +1499,7 @@ dsa_user_add_cls_matchall_police(struct net_device *d= ev, policer =3D &mall_tc_entry->policer; *policer =3D act->police; =20 - err =3D ds->ops->port_policer_add(ds, dp->index, policer); + err =3D ds->ops->port_policer_add(ds, dp->index, policer, extack); if (err) { kfree(mall_tc_entry); return err; --=20 2.53.0 From nobody Sun Jun 14 12:43:49 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 197D8373BE0 for ; Thu, 2 Apr 2026 22:35:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169304; cv=none; b=XMjLiIiB/wTVqZN2taqEOTkTBUAjPEryPNgSEG6Ql37sXedqjzbigDMJWMwetQffmM2UGAWb89XX1S4rQjbXpfj42bvJkUq/O/0tjICs6n/19vq9SGtVavTkCfeKNC7SmrUcmuOGKjB+8iSmtTp5vZxCLRKuPwkeywxcgUXBtUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169304; c=relaxed/simple; bh=8664y8cG0Y8jHMa8gmUxSrwPtfptyp7UCIx/NjC+2hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U2+SHLQ892KfK12ubtDiuayIYonRiDLRNOyzjtUr7tTR+fbd9j6WEKcCV6ZopXbIyGbEnMqxgNZR2WTTy22H9Sj/pyfeUsSMDZoQEBY7o2+kzl7S+iHRD9JBoNKQNhpNnIMgNLHX9RCnvIr+a/AUF435+6WFLEhsDglvV8+TOAo= 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=qP5i9e3F; arc=none smtp.client-ip=209.85.215.173 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="qP5i9e3F" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c76b9efc299so579835a12.0 for ; Thu, 02 Apr 2026 15:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775169301; x=1775774101; 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=ZxxElz2z75O8uK3swC1/pSDaDliMYAl/MAT7c1dnOFI=; b=qP5i9e3FK3UF88e7hg/JBeOi7cDrX+e9TSFi2LoNJYRN/7m9YpgtWAs3ekyU15/sNP AR/NrNlMz9+MB0FJkg5NIwNfksEK1GJICUWvzJuCunhCGF+gDI0FQZSm22irDkBkjIQv +H7flzbztbyuMbcUDAJ+ZqGith9UOOKHYGPofBFSYz7yLB7aTxgbKkqknRC/9nddlxdd SaT9ct3NcqnwljQmIiKtNk+s8ZO+MwdYj3C2g6WeHKVbkGYT009wOg01CowjnpWQfK5w +vYRNEFUKNApu/rfgI1k0ebPxQgDmcW745+0py61FKBtwlZecMB6AcmT1FZXX90T+XOr lKYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775169301; x=1775774101; 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=ZxxElz2z75O8uK3swC1/pSDaDliMYAl/MAT7c1dnOFI=; b=PYrYC7wiCMDCZaKwzr9QfqR7YFBC65IAUPuOC0dsDIhjZIaC6nHpAqvp9pVeutXxdn HsjxSGlMI0D/UQiINmvo/VrvkCFRh26jgAJlMiMAUyUq7S5iaTsrBw+AMjp7K645N5zG vbzQkWyabq9dijteqwYrl3WoZmshIIzfNHqRzAi7JAR4KcDmq3UPRI7Nxlh/qflJWPf1 MXX+tK+7oY/+xsfJ1CRqNhvtbM6eY5GnltjIUJ6AGu381zt0XJB8Zbu3AToJiXYaYSvS r4TgDanc+02f8dMmNj7Yux0rE8E1BNT08UzfRaCTxRX60siPJdf1Bmrmu5VUAxvpTgYV DjTQ== X-Forwarded-Encrypted: i=1; AJvYcCUTdw/iB9UVrg+fQSBV7+kPqG9eWMcCF/Fr568CVcMKjM+xQ0oIDYwE92qTBlKHO7lO++KQKAzIH+vA/Lg=@vger.kernel.org X-Gm-Message-State: AOJu0YwV3HNWla7fLCMPB36kLOvpfB7MS9I6vGS2t+hxokQ/BgzmVor+ M0hi+iPNC4wz6PKenHBX6oePBWvNINxixHCAutYk+zLoSdkTtDCDrB8d X-Gm-Gg: ATEYQzynMZr7h5VYV0Vwc4gKP8+0IyDHY0UG44eg7oegQ9YjXgwdyb5fzre8+s0+VP4 2kibE2IHneFpdBkFAXTO6lv0NRPFFUxA5cSK1D2UKO8Jd7yoAHMQeNZbmMfyHM6zdBHDSAjiHlh QwXaVpVgnf7VICHkOE+/WO3LHxlj1N91Fwg5ZTygdvIPvjc48ELhDQK6z9Xhsqaei7+FZ6KneZA X67ImvLRxp62xk7Z+MiBxwedYP7dlwlSKMlZMTabVRtQ/p/FCjDsZoOWvcwtV7wA/qpjrBHLJK3 hOtMTscDP4yMjliTNH1oR/uahNTkL9snkmWBQPNYzGfbih22Dj8qJDHrL7r+ilp+cIZoVXUnw2G vwGHKDyj5JczHxwG2y+cROgc4wOQu6/gDXpFmAvGDdPrQ0oY4G2EzGPi09+0QLVOefTG43RPCuF /pg2DGECMr0XVjSQDW35Fn158yelIW6V0lO0dJ7FJqPukNQOcAa3PY5GmODX3U X-Received: by 2002:a05:6a21:33a7:b0:39f:1f92:2a4 with SMTP id adf61e73a8af0-39f2ee63d62mr619622637.26.1775169301314; Thu, 02 Apr 2026 15:35:01 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661f:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca1f28sm4294291b3a.57.2026.04.02.15.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 15:35:01 -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 , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/4] net: dsa: yt921x: Refactor long register helpers Date: Fri, 3 Apr 2026 06:34:30 +0800 Message-ID: <20260402223437.109097-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402223437.109097-1-mmyangfl@gmail.com> References: <20260402223437.109097-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" Dealing long registers with u64 is good, until you realize there are longer 96-bit registers. Introduce yt921x_regs_*() helpers and refactor yt921x_reg64_*() as their wrappers. yt921x_reg96_*() should be added when used to avoid unused function warnings. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 161 ++++++++++++++++++++++++++------------- drivers/net/dsa/yt921x.h | 36 ++++----- 2 files changed, 128 insertions(+), 69 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 98e8915dd6c2..e5b3ab94f8a6 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -255,63 +255,121 @@ yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32= reg, u32 mask, bool set) return yt921x_reg_update_bits(priv, reg, mask, !set ? 0 : mask); } =20 -/* Some registers, like VLANn_CTRL, should always be written in 64-bit, ev= en if - * you are to write only the lower / upper 32 bits. +/* Some registers, like VLANn_CTRL, should always be written whole, even i= f you + * only want to write parts of 32 bits. * - * There is no such restriction for reading, but we still provide 64-bit r= ead - * wrappers so that we always handle u64 values. + * There is no such restriction for reading, but we still provide the read + * wrapper so that we can handle them consistently. */ =20 -static int yt921x_reg64_read(struct yt921x_priv *priv, u32 reg, u64 *valp) +static int +yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, + unsigned int num_regs) { - u32 lo; - u32 hi; int res; =20 - res =3D yt921x_reg_read(priv, reg, &lo); - if (res) - return res; - res =3D yt921x_reg_read(priv, reg + 4, &hi); - if (res) - return res; + for (unsigned int i =3D 0; i < num_regs; i++) { + res =3D yt921x_reg_read(priv, reg + 4 * i, &vals[i]); + if (res) + return res; + } + + return 0; +} + +static int +yt921x_regs_write(struct yt921x_priv *priv, u32 reg, const u32 *vals, + unsigned int num_regs) +{ + int res; + + for (unsigned int i =3D 0; i < num_regs; i++) { + res =3D yt921x_reg_write(priv, reg + 4 * i, vals[i]); + if (res) + return res; + } =20 - *valp =3D ((u64)hi << 32) | lo; return 0; } =20 -static int yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, u64 val) +static int +yt921x_regs_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s, + const u32 *vals, unsigned int num_regs) { + bool changed =3D false; + u32 vs[4]; int res; =20 - res =3D yt921x_reg_write(priv, reg, (u32)val); + BUILD_BUG_ON(num_regs > ARRAY_SIZE(vs)); + + res =3D yt921x_regs_read(priv, reg, vs, num_regs); if (res) return res; - return yt921x_reg_write(priv, reg + 4, (u32)(val >> 32)); + + for (unsigned int i =3D 0; i < num_regs; i++) { + u32 u =3D vs[i]; + + u &=3D ~masks[i]; + u |=3D vals[i]; + if (u !=3D vs[i]) + changed =3D true; + + vs[i] =3D u; + } + + if (!changed) + return 0; + + return yt921x_regs_write(priv, reg, vs, num_regs); } =20 static int -yt921x_reg64_update_bits(struct yt921x_priv *priv, u32 reg, u64 mask, u64 = val) +yt921x_regs_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *masks, + unsigned int num_regs) { + bool changed =3D false; + u32 vs[4]; int res; - u64 v; - u64 u; =20 - res =3D yt921x_reg64_read(priv, reg, &v); + BUILD_BUG_ON(num_regs > ARRAY_SIZE(vs)); + + res =3D yt921x_regs_read(priv, reg, vs, num_regs); if (res) return res; =20 - u =3D v; - u &=3D ~mask; - u |=3D val; - if (u =3D=3D v) + for (unsigned int i =3D 0; i < num_regs; i++) { + u32 u =3D vs[i]; + + u &=3D ~masks[i]; + if (u !=3D vs[i]) + changed =3D true; + + vs[i] =3D u; + } + + if (!changed) return 0; =20 - return yt921x_reg64_write(priv, reg, u); + return yt921x_regs_write(priv, reg, vs, num_regs); +} + +static int +yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{ + return yt921x_regs_write(priv, reg, vals, 2); } =20 -static int yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, u64 = mask) +static int +yt921x_reg64_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mas= ks, + const u32 *vals) { - return yt921x_reg64_update_bits(priv, reg, mask, 0); + return yt921x_regs_update_bits(priv, reg, masks, vals, 2); +} + +static int +yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s) +{ + return yt921x_regs_clear_bits(priv, reg, masks, 2); } =20 static int yt921x_reg_mdio_read(void *context, u32 reg, u32 *valp) @@ -1844,33 +1902,31 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int= port, bool vlan_filtering) return 0; } =20 -static int -yt921x_vlan_del(struct yt921x_priv *priv, int port, u16 vid) +static int yt921x_vlan_del(struct yt921x_priv *priv, int port, u16 vid) { - u64 mask64; + u32 masks[2]; =20 - mask64 =3D YT921X_VLAN_CTRL_PORTS(port) | - YT921X_VLAN_CTRL_UNTAG_PORTn(port); + masks[0] =3D YT921X_VLAN_CTRLa_PORTn(port); + masks[1] =3D YT921X_VLAN_CTRLb_UNTAG_PORTn(port); =20 - return yt921x_reg64_clear_bits(priv, YT921X_VLANn_CTRL(vid), mask64); + return yt921x_reg64_clear_bits(priv, YT921X_VLANn_CTRL(vid), masks); } =20 static int yt921x_vlan_add(struct yt921x_priv *priv, int port, u16 vid, bool untagged) { - u64 mask64; - u64 ctrl64; + u32 masks[2]; + u32 ctrls[2]; =20 - mask64 =3D YT921X_VLAN_CTRL_PORTn(port) | - YT921X_VLAN_CTRL_PORTS(priv->cpu_ports_mask); - ctrl64 =3D mask64; + masks[0] =3D YT921X_VLAN_CTRLa_PORTn(port) | + YT921X_VLAN_CTRLa_PORTS(priv->cpu_ports_mask); + ctrls[0] =3D masks[0]; =20 - mask64 |=3D YT921X_VLAN_CTRL_UNTAG_PORTn(port); - if (untagged) - ctrl64 |=3D YT921X_VLAN_CTRL_UNTAG_PORTn(port); + masks[1] =3D YT921X_VLAN_CTRLb_UNTAG_PORTn(port); + ctrls[1] =3D untagged ? masks[1] : 0; =20 return yt921x_reg64_update_bits(priv, YT921X_VLANn_CTRL(vid), - mask64, ctrl64); + masks, ctrls); } =20 static int @@ -2331,8 +2387,8 @@ yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struc= t dsa_bridge bridge, const struct switchdev_vlan_msti *msti) { struct yt921x_priv *priv =3D to_yt921x_priv(ds); - u64 mask64; - u64 ctrl64; + u32 masks[2]; + u32 ctrls[2]; int res; =20 if (!msti->vid) @@ -2340,12 +2396,14 @@ yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, str= uct dsa_bridge bridge, if (!msti->msti || msti->msti >=3D YT921X_MSTI_NUM) return -EINVAL; =20 - mask64 =3D YT921X_VLAN_CTRL_STP_ID_M; - ctrl64 =3D YT921X_VLAN_CTRL_STP_ID(msti->msti); + masks[0] =3D 0; + ctrls[0] =3D 0; + masks[1] =3D YT921X_VLAN_CTRLb_STP_ID_M; + ctrls[1] =3D YT921X_VLAN_CTRLb_STP_ID(msti->msti); =20 mutex_lock(&priv->reg_lock); res =3D yt921x_reg64_update_bits(priv, YT921X_VLANn_CTRL(msti->vid), - mask64, ctrl64); + masks, ctrls); mutex_unlock(&priv->reg_lock); =20 return res; @@ -3097,7 +3155,7 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *= priv) { struct dsa_switch *ds =3D &priv->ds; unsigned long cpu_ports_mask; - u64 ctrl64; + u32 ctrls[2]; u32 ctrl; int port; int res; @@ -3158,8 +3216,9 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *= priv) /* Tagged VID 0 should be treated as untagged, which confuses the * hardware a lot */ - ctrl64 =3D YT921X_VLAN_CTRL_LEARN_DIS | YT921X_VLAN_CTRL_PORTS_M; - res =3D yt921x_reg64_write(priv, YT921X_VLANn_CTRL(0), ctrl64); + ctrls[0] =3D YT921X_VLAN_CTRLa_LEARN_DIS | YT921X_VLAN_CTRLa_PORTS_M; + ctrls[1] =3D 0; + res =3D yt921x_reg64_write(priv, YT921X_VLANn_CTRL(0), ctrls); if (res) return res; =20 diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 3f129b8d403f..4989d87c2492 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -429,24 +429,24 @@ enum yt921x_app_selector { #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_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_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_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_ULL(22) -#define YT921X_VLAN_CTRL_PRIO_EN BIT_ULL(21) -#define YT921X_VLAN_CTRL_PRIO_M GENMASK_ULL(20, 18) -#define YT921X_VLAN_CTRL_PRIO(x) FIELD_PREP(YT921X_VLAN_CTRL_PRIO_M, (= x)) -#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_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) +#define YT921X_VLAN_CTRLb_UNTAG_PORTS_M GENMASK(18, 8) +#define YT921X_VLAN_CTRLb_UNTAG_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRLb_U= NTAG_PORTS_M, (x)) +#define YT921X_VLAN_CTRLb_UNTAG_PORTn(port) BIT((port) + 8) +#define YT921X_VLAN_CTRLb_STP_ID_M GENMASK(7, 4) +#define YT921X_VLAN_CTRLb_STP_ID(x) FIELD_PREP(YT921X_VLAN_CTRLb_STP_I= D_M, (x)) +#define YT921X_VLAN_CTRLb_SVLAN_EN BIT(3) +#define YT921X_VLAN_CTRLab_FID_M GENMASK_ULL(34, 23) +#define YT921X_VLAN_CTRLab_FID(x) FIELD_PREP(YT921X_VLAN_CTRLab_FID_M,= (x)) +#define YT921X_VLAN_CTRLa_LEARN_DIS BIT(22) +#define YT921X_VLAN_CTRLa_PRIO_EN BIT(21) +#define YT921X_VLAN_CTRLa_PRIO_M GENMASK(20, 18) +#define YT921X_VLAN_CTRLa_PRIO(x) FIELD_PREP(YT921X_VLAN_CTRLa_PRIO_M,= (x)) +#define YT921X_VLAN_CTRLa_PORTS_M GENMASK(17, 7) +#define YT921X_VLAN_CTRLa_PORTS(x) FIELD_PREP(YT921X_VLAN_CTRLa_PORTS_= M, (x)) +#define YT921X_VLAN_CTRLa_PORTn(port) BIT((port) + 7) +#define YT921X_VLAN_CTRLa_BYPASS_1X_AC BIT(6) +#define YT921X_VLAN_CTRLa_METER_EN BIT(5) +#define YT921X_VLAN_CTRLa_METER_ID_M GENMASK(4, 0) =20 #define YT921X_TPID_IGRn(x) (0x210000 + 4 * (x)) /* [0, 3] */ #define YT921X_TPID_IGR_TPID_M GENMASK(15, 0) --=20 2.53.0 From nobody Sun Jun 14 12:43:49 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.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 19DE2361DD5 for ; Thu, 2 Apr 2026 22:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169306; cv=none; b=g9Lc9feCfcJPXpvvcj7X/yafZ//y3DpLEtQvGmSXliXFNPPyFPDJeDUg+eSObescnJfhmQH5xgXHfcJ8o0GvU3fWQEVmX7iSdrML/hVd1qeoPrVj6nP92qEpK2V5SwlDlfcpK5TR8tR8qRK9aSteX63hlJXgbDivq03NWEJb7go= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169306; c=relaxed/simple; bh=auexzyhN5jNJx2UnledgqO+6NHUl+JofecMg5kf0u50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oLe2myxAZdCqR/UKnoueb9JQLcKu3qXuBMm7hf4lSiP8OzyMzk4tx1aAX/azpX2dykuwECSFQqc0GjWEalp89Ge/OAaHKYdK+0POv0SNxVvlD+39EmMhtbz9t5Y1vahwCAdhIUf8p2HDXjLbWZYdvwkrEbgIq8MFnCdUGPoxfsw= 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=UM6ME4xt; arc=none smtp.client-ip=209.85.215.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="UM6ME4xt" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c766a95a72dso789759a12.1 for ; Thu, 02 Apr 2026 15:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775169304; x=1775774104; 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=s0qVq6InpSE0KoKEzh4GGSjlh46PBbCDgyL149jzusg=; b=UM6ME4xt5vIkwWCtS/FLURnPqUTOb3kYB+1fmEOmDiZYkB8uNg5gpngUbThHjJNv8A zUfrJY6MYha42/Ld7OiK14I3ejCNwNxtFn8JjyZpkdQpcXsW97REiuhU1fgRsZXvoBD6 9+VgwsIVWFtLCtUNGBfEmFyaQ/Bni3JGtP+rJY6RizAOepp/IVUAM7BAVRwcMdPyDKxK ROZxuogJfJELOHMmbs/CSqReTKgANRb3BF3zM2/+KA+hF1Z6p2Ec8wPqhI+OuUmq+mQg 79yDYA7ICk/erpL9fpB6f9YuWEGMWI+HfhSA/s7vu3OvNggVO2yAObQJo55H3HAoESpx TEhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775169304; x=1775774104; 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=s0qVq6InpSE0KoKEzh4GGSjlh46PBbCDgyL149jzusg=; b=lnkekrfhjByXd44rmsL5g56RI5N1SXyRbIbg2uQrqC5IjeaWcgnbnPjd3AwomLLkdB enXBaZrpcgKcXbCWJ3RnzFU+qocQX9QbVw3MGBPW9iXdKjr+pqC5MsKL9dRcRxL/yIsr fzb3QdQ+NlJvRlwoP2wbheONtF20eIS0p0ADlGyuskhUYbxhZW3X/oF5QZ83nLiobHu5 y3VS4I5RuYIZDJcy027VsYCtXbShKom/d1dES1sT/dGzL0y4iSEfUyrLW8imZtuPfONK jmHqTE+oJ9/OuSrU11wakCz/aDv7XXn/tJ40BebFgujlf/U5Tcc/oDBJJ1qeFbYxNwYW YFBw== X-Forwarded-Encrypted: i=1; AJvYcCV21e/UisXEOUUXdd2eBuMHYzt2uOYc7dml0Ur8t76t4BBmp+mPeBjGzItf23Fv5vdPuWNqFt2Dxonik+Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxAuT5NxuNhxYSntPrlK+2cX39ky0bZm8ubUHiOyQonypbU+lBi aCUQfjgt053S6DN5g8OXhtoO9r2xeYaGNRQ7xTMMvG3eaYAN6BC2kS9N X-Gm-Gg: ATEYQzz4jJQKjJRTMoYmtLcPD+IZC9mYGOg2hulKp7SYeQNdFjw/5eeo4K2cEU13ISS PQgUpfG2uz8eiXK2k4C8C5O+CMPJ9ZQteJMGaXbAj4WbWKyGcu7vjBWawBL0mgcQlOIcLAlmlLf KQ76+pDiC30p3KwZLisZlfAKq9/XcBVyjnJMYZi29DFAjrimrb9ncMYsV8h6nWmEf2O/3Uk3l5a ILObfIZxuwN+FvZjlFwT6c0VAdaTql59xiubVFUWwLAFp+FJQjsIdbpdlLlM/ykQdhQ+CdiuBcT UztXu4hAZW8gmamkGrLcfXRyGFb8G/4tdGpqx/+PubCazulu5dg65DO5SqD5oDqfBEiv2BNYKk4 iTADQWMnnvMD9AwyzR+EhQHHIxNbFrPu9qPAfwN08C9FDBikXw/pecrfJwbMiN3KETWcOaZCA6N zqOpbAyKtd1WPog6vMLs+jA71k63aEHo0Dx2qOHPl7Nhc4Jp7/SQ== X-Received: by 2002:a05:6a00:4193:b0:82c:dd02:8b88 with SMTP id d2e1a72fcca58-82d0da517cbmr818287b3a.6.1775169304345; Thu, 02 Apr 2026 15:35:04 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661f:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca1f28sm4294291b3a.57.2026.04.02.15.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 15:35:04 -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 , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 3/4] net: dsa: yt921x: Add port police support Date: Fri, 3 Apr 2026 06:34:31 +0800 Message-ID: <20260402223437.109097-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402223437.109097-1-mmyangfl@gmail.com> References: <20260402223437.109097-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" Enable rate meter ability and support limiting the rate of incoming traffic. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 286 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 54 ++++++++ 2 files changed, 339 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index e5b3ab94f8a6..54d99e54dda7 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -262,6 +262,14 @@ yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 r= eg, u32 mask, bool set) * wrapper so that we can handle them consistently. */ =20 +static void update_ctrls_unaligned(u32 *ctrls, u64 mask, u64 val) +{ + ctrls[0] &=3D ~((u32)mask); + ctrls[1] &=3D ~((u32)(mask >> 32)); + ctrls[0] |=3D (u32)val; + ctrls[1] |=3D (u32)(val >> 32); +} + static int yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, unsigned int num_regs) @@ -372,6 +380,12 @@ yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 = reg, const u32 *masks) return yt921x_regs_clear_bits(priv, reg, masks, 2); } =20 +static int +yt921x_reg96_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{ + return yt921x_regs_write(priv, reg, vals, 3); +} + static int yt921x_reg_mdio_read(void *context, u32 reg, u32 *valp) { struct yt921x_reg_mdio *mdio =3D context; @@ -1065,6 +1079,13 @@ yt921x_dsa_set_mac_eee(struct dsa_switch *ds, int po= rt, struct ethtool_keee *e) return res; } =20 +static int yt921x_mtu_fetch(struct yt921x_priv *priv, int port) +{ + struct dsa_port *dp =3D dsa_to_port(&priv->ds, port); + + return dp->user ? READ_ONCE(dp->user->mtu) : ETH_DATA_LEN; +} + static int yt921x_dsa_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { @@ -1096,6 +1117,229 @@ static int yt921x_dsa_port_max_mtu(struct dsa_switc= h *ds, int port) return YT921X_FRAME_SIZE_MAX - ETH_HLEN - ETH_FCS_LEN - YT921X_TAG_LEN; } =20 +/* v * 2^e */ +static u64 ldexpu64(u64 v, int e) +{ + return e >=3D 0 ? v << e : v >> -e; +} + +/* slot (ns) * rate (/s) / 10^9 (ns/s) =3D 2^C * token * 4^unit */ +static u32 rate2token(u64 rate, unsigned int slot_ns, int unit, int C) +{ + int e =3D 2 * unit + C + YT921X_TOKEN_RATE_C; + + return div_u64(ldexpu64(slot_ns * rate, -e), 1000000000); +} + +static u64 token2rate(u32 token, unsigned int slot_ns, int unit, int C) +{ + int e =3D 2 * unit + C + YT921X_TOKEN_RATE_C; + + return div_u64(ldexpu64(mul_u32_u32(1000000000, token), e), slot_ns); +} + +/* burst =3D 2^C * token * 4^unit */ +static u32 burst2token(u64 burst, int unit, int C) +{ + return ldexpu64(burst, -(2 * unit + C)); +} + +static u64 token2burst(u32 token, int unit, int C) +{ + return ldexpu64(token, 2 * unit + C); +} + +struct yt921x_meter { + u32 cir; + u32 cbs; + u32 ebs; + int unit; +}; + +#define YT921X_METER_PKT_MODE BIT(0) +#define YT921X_METER_SINGLE_BUCKET BIT(1) + +static int +yt921x_meter_tfm(struct yt921x_priv *priv, int port, unsigned int slot_ns, + u64 rate, u64 burst, unsigned int flags, + u32 cir_max, u32 cbs_max, int unit_max, + struct yt921x_meter *meterp) +{ + const int C =3D flags & YT921X_METER_PKT_MODE ? YT921X_TOKEN_PKT_C : + YT921X_TOKEN_BYTE_C; + struct device *dev =3D to_device(priv); + struct yt921x_meter meter; + bool distorted; + u64 burst_est; + u64 burst_sug; + u64 burst_max; + u64 rate_max; + + meter.unit =3D unit_max; + rate_max =3D token2rate(cir_max, slot_ns, meter.unit, C); + burst_max =3D token2burst(cbs_max, meter.unit, C); + + /* Check for unusual values */ + if (rate > rate_max || burst > burst_max) + return -ERANGE; + + /* Check for matching burst */ + burst_est =3D div_u64(slot_ns * rate, 1000000000); + burst_sug =3D burst_est; + if (flags & YT921X_METER_PKT_MODE) + burst_sug++; + else + burst_sug +=3D ETH_HLEN + yt921x_mtu_fetch(priv, port) + + ETH_FCS_LEN; + if (burst_sug > burst) + dev_warn(dev, + "Consider burst at least %llu to match rate %llu\n", + burst_sug, rate); + + /* Select unit */ + for (; meter.unit > 0; meter.unit--) { + if (rate > (rate_max >> 2) || burst > (burst_max >> 2)) + break; + rate_max >>=3D 2; + burst_max >>=3D 2; + } + + /* Calculate information rate and bucket size */ + distorted =3D false; + meter.cir =3D rate2token(rate, slot_ns, meter.unit, C); + if (!meter.cir) { + distorted =3D true; + meter.cir =3D 1; + } else if (WARN_ON(meter.cir > cir_max)) { + meter.cir =3D cir_max; + } + meter.cbs =3D burst2token(burst, meter.unit, C); + if (!meter.cbs) { + distorted =3D true; + meter.cbs =3D 1; + } else if (WARN_ON(meter.cbs > cbs_max)) { + meter.cbs =3D cbs_max; + } + if (distorted) + dev_dbg(dev, + "Have to increase rate %llu, burst %llu to %llu, %llu\n", + rate, burst, + token2rate(meter.cir, slot_ns, meter.unit, C), + token2burst(meter.cbs, meter.unit, C)); + + /* Cut EBS */ + meter.ebs =3D 0; + if (!(flags & YT921X_METER_SINGLE_BUCKET)) { + /* We don't have a chance to adjust rate when MTU is changed */ + if (flags & YT921X_METER_PKT_MODE) + burst_est++; + else + burst_est +=3D YT921X_FRAME_SIZE_MAX; + + if (burst_est < burst) { + u32 pbs =3D meter.cbs; + + meter.cbs =3D burst2token(burst_est, meter.unit, C); + if (!meter.cbs) { + meter.cbs =3D 1; + } else if (meter.cbs > cbs_max) { + WARN_ON(1); + meter.cbs =3D cbs_max; + } + + if (pbs > meter.cbs) + meter.ebs =3D pbs - meter.cbs; + } + } + + dev_dbg(dev, + "slot %u ns, rate %llu, burst %llu -> unit %d, cir %u, cbs %u, ebs %u\n", + slot_ns, rate, burst, + meter.unit, meter.cir, meter.cbs, meter.ebs); + + *meterp =3D meter; + return 0; +} + +static void yt921x_dsa_port_policer_del(struct dsa_switch *ds, int port) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct device *dev =3D to_device(priv); + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg_write(priv, YT921X_PORTn_METER(port), 0); + mutex_unlock(&priv->reg_lock); + + if (res) + dev_err(dev, "Failed to %s port %d: %i\n", "delete policer on", + port, res); +} + +static int +yt921x_dsa_port_policer_add(struct dsa_switch *ds, int port, + const struct flow_action_police *policer, + struct netlink_ext_ack *extack) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct yt921x_meter meter; + bool pkt_mode; + u32 ctrls[3]; + u64 burst; + u64 rate; + u32 ctrl; + int res; + + /* mtu defaults to unlimited but we got 2040 here, don't know why */ + if (policer->peakrate_bytes_ps || policer->avrate || policer->overhead) { + NL_SET_ERR_MSG_MOD(extack, + "peakrate / avrate / overhead not supported"); + return -EOPNOTSUPP; + } + if (policer->exceed.act_id !=3D FLOW_ACTION_DROP || + policer->notexceed.act_id !=3D FLOW_ACTION_ACCEPT) { + NL_SET_ERR_MSG_MOD(extack, + "conform-exceed other than drop/ok not supported"); + return -EOPNOTSUPP; + } + + pkt_mode =3D !!policer->rate_pkt_ps; + rate =3D pkt_mode ? policer->rate_pkt_ps : policer->rate_bytes_ps; + burst =3D pkt_mode ? policer->burst_pkt : policer->burst; + res =3D yt921x_meter_tfm(priv, port, priv->meter_slot_ns, rate, burst, + pkt_mode ? YT921X_METER_PKT_MODE : 0, + YT921X_METER_RATE_MAX, YT921X_METER_BURST_MAX, + YT921X_METER_UNIT_MAX, &meter); + if (res) { + NL_SET_ERR_MSG_MOD(extack, "Unexpected tremendous rate"); + return res; + } + + mutex_lock(&priv->reg_lock); + ctrl =3D YT921X_PORT_METER_ID(port) | YT921X_PORT_METER_EN; + res =3D yt921x_reg_write(priv, YT921X_PORTn_METER(port), ctrl); + if (res) + goto end; + + ctrls[0] =3D 0; + ctrls[1] =3D YT921X_METER_CTRLb_CIR(meter.cir); + ctrls[2] =3D YT921X_METER_CTRLc_UNIT(meter.unit) | + YT921X_METER_CTRLc_DROP_R | + YT921X_METER_CTRLc_TOKEN_OVERFLOW_EN | + YT921X_METER_CTRLc_METER_EN; + update_ctrls_unaligned(&ctrls[0], YT921X_METER_CTRLab_EBS_M, + YT921X_METER_CTRLab_EBS(meter.ebs)); + update_ctrls_unaligned(&ctrls[1], YT921X_METER_CTRLbc_CBS_M, + YT921X_METER_CTRLbc_CBS(meter.cbs)); + res =3D yt921x_reg96_write(priv, + YT921X_METERn_CTRL(port + YT921X_METER_NUM), + ctrls); +end: + mutex_unlock(&priv->reg_lock); + + return res; +} + static int yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress) { @@ -3064,6 +3308,7 @@ static int yt921x_chip_detect(struct yt921x_priv *pri= v) u32 chipid; u32 major; u32 mode; + u32 val; int res; =20 res =3D yt921x_reg_read(priv, YT921X_CHIP_ID, &chipid); @@ -3098,12 +3343,27 @@ static int yt921x_chip_detect(struct yt921x_priv *p= riv) return -ENODEV; } =20 + res =3D yt921x_reg_read(priv, YT921X_SYS_CLK, &val); + if (res) + return res; + switch (FIELD_GET(YT921X_SYS_CLK_SEL_M, val)) { + case 0: + priv->cycle_ns =3D info->major =3D=3D YT9215_MAJOR ? 8 : 6; + break; + case YT921X_SYS_CLK_143M: + priv->cycle_ns =3D 7; + break; + default: + priv->cycle_ns =3D 8; + } + /* Print chipid here since we are interested in lower 16 bits */ dev_info(dev, "Motorcomm %s ethernet switch, chipid: 0x%x, chipmode: 0x%x 0x%x\n", info->name, chipid, mode, extmode); =20 priv->info =3D info; + return 0; } =20 @@ -3225,6 +3485,23 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv = *priv) return 0; } =20 +static int yt921x_chip_setup_tc(struct yt921x_priv *priv) +{ + unsigned int op_ns; + u32 ctrl; + int res; + + op_ns =3D 8 * priv->cycle_ns; + + ctrl =3D max(priv->meter_slot_ns / op_ns, YT921X_METER_SLOT_MIN); + res =3D yt921x_reg_write(priv, YT921X_METER_SLOT, ctrl); + if (res) + return res; + priv->meter_slot_ns =3D ctrl * op_ns; + + return 0; +} + static int __maybe_unused yt921x_chip_setup_qos(struct yt921x_priv *priv) { u32 ctrl; @@ -3271,7 +3548,7 @@ static int yt921x_chip_setup(struct yt921x_priv *priv) u32 ctrl; int res; =20 - ctrl =3D YT921X_FUNC_MIB; + ctrl =3D YT921X_FUNC_MIB | YT921X_FUNC_METER; res =3D yt921x_reg_set_bits(priv, YT921X_FUNC, ctrl); if (res) return res; @@ -3280,6 +3557,10 @@ static int yt921x_chip_setup(struct yt921x_priv *pri= v) if (res) return res; =20 + res =3D yt921x_chip_setup_tc(priv); + if (res) + return res; + #if IS_ENABLED(CONFIG_DCB) res =3D yt921x_chip_setup_qos(priv); if (res) @@ -3371,6 +3652,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, + /* rate */ + .port_policer_del =3D yt921x_dsa_port_policer_del, + .port_policer_add =3D yt921x_dsa_port_policer_add, /* hsr */ .port_hsr_leave =3D dsa_port_simple_hsr_leave, .port_hsr_join =3D dsa_port_simple_hsr_join, diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 4989d87c2492..e7022657c994 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -23,6 +23,7 @@ #define YT921X_RST_HW BIT(31) #define YT921X_RST_SW BIT(1) #define YT921X_FUNC 0x80004 +#define YT921X_FUNC_METER BIT(4) #define YT921X_FUNC_MIB BIT(1) #define YT921X_CHIP_ID 0x80008 #define YT921X_CHIP_ID_MAJOR GENMASK(31, 16) @@ -239,6 +240,11 @@ #define YT921X_EDATA_DATA_STATUS_M GENMASK(3, 0) #define YT921X_EDATA_DATA_STATUS(x) FIELD_PREP(YT921X_EDATA_DATA_STATU= S_M, (x)) #define YT921X_EDATA_DATA_IDLE YT921X_EDATA_DATA_STATUS(3) +#define YT921X_SYS_CLK 0xe0040 +#define YT921X_SYS_CLK_SEL_M GENMASK(1, 0) /* unknown: 167M */ +#define YT9215_SYS_CLK_125M 0 +#define YT9218_SYS_CLK_167M 0 +#define YT921X_SYS_CLK_143M 1 =20 #define YT921X_EXT_MBUS_OP 0x6a000 #define YT921X_INT_MBUS_OP 0xf0000 @@ -465,6 +471,42 @@ enum yt921x_app_selector { #define YT921X_LAG_HASH_MAC_DA BIT(1) #define YT921X_LAG_HASH_SRC_PORT BIT(0) =20 +#define YT921X_PORTn_RATE(port) (0x220000 + 4 * (port)) +#define YT921X_PORT_RATE_GAP_VALUE GENMASK(4, 0) /* default 20 */ +#define YT921X_METER_SLOT 0x220104 +#define YT921X_METER_SLOT_SLOT_M GENMASK(11, 0) +#define YT921X_PORTn_METER(port) (0x220108 + 4 * (port)) +#define YT921X_PORT_METER_EN BIT(4) +#define YT921X_PORT_METER_ID_M GENMASK(3, 0) +#define YT921X_PORT_METER_ID(x) FIELD_PREP(YT921X_PORT_METER_ID_M, (x)) +#define YT921X_METERn_CTRL(x) (0x220800 + 0x10 * (x)) +#define YT921X_METER_CTRLc_METER_EN BIT(14) +#define YT921X_METER_CTRLc_TOKEN_OVERFLOW_EN BIT(13) /* RFC4115: yellow u= se unused green bw */ +#define YT921X_METER_CTRLc_DROP_M GENMASK(12, 11) +#define YT921X_METER_CTRLc_DROP(x) FIELD_PREP(YT921X_METER_CTRLc_DROP_= M, (x)) +#define YT921X_METER_CTRLc_DROP_GYR YT921X_METER_CTRLc_DROP(0) +#define YT921X_METER_CTRLc_DROP_YR YT921X_METER_CTRLc_DROP(1) +#define YT921X_METER_CTRLc_DROP_R YT921X_METER_CTRLc_DROP(2) +#define YT921X_METER_CTRLc_DROP_NONE YT921X_METER_CTRLc_DROP(3) +#define YT921X_METER_CTRLc_COLOR_BLIND BIT(10) +#define YT921X_METER_CTRLc_UNIT_M GENMASK(9, 7) +#define YT921X_METER_CTRLc_UNIT(x) FIELD_PREP(YT921X_METER_CTRLc_UNIT_= M, (x)) +#define YT921X_METER_CTRLc_BYTE_MODE_INCLUDE_GAP BIT(6) /* +GAP_VALUE byt= es each packet */ +#define YT921X_METER_CTRLc_PKT_MODE BIT(5) /* 0: byte rate mode */ +#define YT921X_METER_CTRLc_RFC2698 BIT(4) /* 0: RFC4115 */ +#define YT921X_METER_CTRLbc_CBS_M GENMASK_ULL(35, 20) +#define YT921X_METER_CTRLbc_CBS(x) FIELD_PREP(YT921X_METER_CTRLbc_CBS_= M, (x)) +#define YT921X_METER_CTRLb_CIR_M GENMASK(19, 2) +#define YT921X_METER_CTRLb_CIR(x) FIELD_PREP(YT921X_METER_CTRLb_CIR_M,= (x)) +#define YT921X_METER_CTRLab_EBS_M GENMASK_ULL(33, 18) +#define YT921X_METER_CTRLab_EBS(x) FIELD_PREP(YT921X_METER_CTRLab_EBS_= M, (x)) +#define YT921X_METER_CTRLa_EIR_M GENMASK(17, 0) +#define YT921X_METER_CTRLa_EIR(x) FIELD_PREP(YT921X_METER_CTRLa_EIR_M,= (x)) +#define YT921X_METERn_STAT_EXCESS(x) (0x221000 + 8 * (x)) +#define YT921X_METERn_STAT_COMMITTED(x) (0x221004 + 8 * (x)) +#define YT921X_METER_STAT_TOKEN_M GENMASK(30, 15) +#define YT921X_METER_STAT_QUEUE_M GENMASK(14, 0) + #define YT921X_PORTn_VLAN_CTRL(port) (0x230010 + 4 * (port)) #define YT921X_PORT_VLAN_CTRL_SVLAN_PRIO_EN BIT(31) #define YT921X_PORT_VLAN_CTRL_CVLAN_PRIO_EN BIT(30) @@ -508,6 +550,16 @@ enum yt921x_fdb_entry_status { =20 #define YT921X_MSTI_NUM 16 =20 +#define YT921X_TOKEN_BYTE_C 1 /* 1 token =3D 2^1 byte */ +#define YT921X_TOKEN_PKT_C -6 /* 1 token =3D 2^-6 packets */ +#define YT921X_TOKEN_RATE_C -15 +/* for VLAN only, not including port meters */ +#define YT921X_METER_NUM 64 +#define YT921X_METER_SLOT_MIN 80 +#define YT921X_METER_UNIT_MAX ((1 << 3) - 1) +#define YT921X_METER_BURST_MAX ((1 << 16) - 1) +#define YT921X_METER_RATE_MAX ((1 << 18) - 1) + #define YT921X_LAG_NUM 2 #define YT921X_LAG_PORT_NUM 4 =20 @@ -602,8 +654,10 @@ struct yt921x_priv { struct dsa_switch ds; =20 const struct yt921x_info *info; + unsigned int meter_slot_ns; /* cache of dsa_cpu_ports(ds) */ u16 cpu_ports_mask; + u8 cycle_ns; =20 /* protect the access to the switch registers */ struct mutex reg_lock; --=20 2.53.0 From nobody Sun Jun 14 12:43:49 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.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 26EF43C5DDC for ; Thu, 2 Apr 2026 22:35:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169309; cv=none; b=rIOfKUjV6owcrjGak99JZhxqsAafUcUZ+vWIqzSH+R4SZHO9tWUHu0W3glZ05kT7S09oJ2khNOm7mXFUGibP2Gej9AAz4gFlQ3IH/RM8HtSaE07x4JSsh5DgTHI2erc+7QuuwCJp03VLmqUVe5mOrKfg0LNz/Q1vH/NGY2Putug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775169309; c=relaxed/simple; bh=q9D4v4DiLbfopMD597VLIizyXwdamEPtJut/pHfserM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TED7PvZwYTxl7QB9utoc0MHgSLbShgBTKBLa/gb611BsuK9TyOzhY9fqSBeEQ63lQ7KXvL90FxUtWHB6izs6Vw5IM7n0ZcSS+l7RnEpQ6JJVmsZnr8A2EdAHlzxZD5kifNJ/RBadkKbdw5095nuCw7wf27DfiFj/7SXIhvgO/oQ= 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=FgrjnXCm; arc=none smtp.client-ip=209.85.215.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="FgrjnXCm" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c76b0cda2aeso535143a12.2 for ; Thu, 02 Apr 2026 15:35:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775169307; x=1775774107; 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=aBBb0dSCbw/VgdEeWJ3io/3ohDhEz9KduwD7tGY/ZSs=; b=FgrjnXCmtrfVxC+71KhnWY7KkQZD5Za2E7pBHehJ6oWUHFCI6SsVMwthJayBwJ2wO/ Y9lfQgITGapzmHCAWXaBvrZWamWC9gtxYMs7KamZB8Wwz/wu1J71MqXNsArdPGdyYft3 r90iBAMJmhC+JCOWO7AGqJgxHGEtF9xd1boOSvbV3/+N9xztla4U/68Cg2gV5FKZD130 7AWz8BwuEKsuUBMShg/zgL0Yz3Ipt6VLcecA4RaVD75PkN8cd911MLbObVkg4CXew+pp AkXYJcDSz6a+4DMuSPjicPIFQs4dtcN9ZHtqXRAaI1sb4HhycRnY84/9pHuZ1CMZVhuY vWKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775169307; x=1775774107; 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=aBBb0dSCbw/VgdEeWJ3io/3ohDhEz9KduwD7tGY/ZSs=; b=UUbXXWX7oVkLxmJUMZOohTHNKVegbunlhbkaScUngAbZW4mQ95sJ/iYoYWL3lyqyw9 NEvlwzknQ7JLP4kPVblM0FvZGScd/uSGB955X3nmVaGH12qIvl0deio/oO6LeHdxaLvo 9Kl/bOOIQoEWLHpMjGDY+AiU/0iToxYALTziIXniCkzyDf7fnS8soQKzi/KK75VRHltv VVVzdzrqNos6wSyV8oLzrIZhToKKPVcr9VYguTZ5JvgBT0nrX9TiEUW2cD6htDhIE6tT Wt0n+TbDoZa9+8tRGYOacov4YroPSQg4iLRIQJ7tpwQfHROHpp+CE9V4iUe9Rg4gdLgg suAQ== X-Forwarded-Encrypted: i=1; AJvYcCVo8vc/QMlsAzpz0h/rtsEqwOh0LwzizqxANI+3ZpdtrfK2EzvHtDXYjWI8sxavXRxgJl7UDghjmz3brSY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+eFo/xHY4dCXPmD6h3b7y+H4oPOyiTDdvMTj7gd8SszjKYJWR SX5j3NI86wlOlMuI7NqoP0owmYyPkwrw2S5dv1+0ERnJz/lwj9/2KnnK X-Gm-Gg: ATEYQzw0TCyd9Wz775nb0M89zSd4Gt+Ugz1fGse//+zHABN6epoc5xS2hZqp6WpWX4q w4ous8HqvWBja4U1h1Kp4YakLeBvBBGcncMha2aFFccI/hJAv3YhP0qUmjkbR6FlanAreYvi+Fm hmHkSPiuI7auSuFO//bbieZEHegL04LzbmUQ9jksu/2PR6P25GwRLOU/AvszaD/qGL6BpujyODm MnJWJn+UueGTy8c1qFOz5wN6Fpe/QjH16KXffEGSJr/iy3C9mK3zuKBggtQb03kfWMdZL7/OtrZ /8ltr7tjWGjMYK5S8UT2pjW0EvjizErCXa6/WJfDMo/SgFshFLXfEFQ0tHTzMkqbx+92HotbecE vU4oECKNAUHiCyys7xZkcOSkR8rU+2Ka5O2Il9W/BVPegj3npeLCfXsGUK6WxyME2o5DCsDO+4q fpNVuwgXxQQ+oYOV8Jr7Kaq1U7iiWHobxgFPHtvmPV4UjbXHFPxw== X-Received: by 2002:a05:6a21:99a3:b0:39b:e789:7d06 with SMTP id adf61e73a8af0-39f2f0f7b40mr508358637.51.1775169307482; Thu, 02 Apr 2026 15:35:07 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661f:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca1f28sm4294291b3a.57.2026.04.02.15.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 15:35:07 -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 , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 4/4] net: dsa: yt921x: Add port qdisc tbf support Date: Fri, 3 Apr 2026 06:34:32 +0800 Message-ID: <20260402223437.109097-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402223437.109097-1-mmyangfl@gmail.com> References: <20260402223437.109097-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" Enable port shaping and support limiting the rate of outgoing traffic. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 122 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 65 ++++++++++++++++++++- 2 files changed, 186 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 54d99e54dda7..0f97d0a4f042 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -24,6 +24,7 @@ #include #include #include +#include =20 #include "yt921x.h" =20 @@ -1340,6 +1341,112 @@ yt921x_dsa_port_policer_add(struct dsa_switch *ds, = int port, return res; } =20 +static int +yt921x_tbf_validate(struct yt921x_priv *priv, + const struct tc_tbf_qopt_offload *qopt, int *queuep) +{ + struct device *dev =3D to_device(priv); + int queue =3D -1; + + if (qopt->parent !=3D TC_H_ROOT) { + dev_err(dev, "Parent should be \"root\"\n"); + return -EOPNOTSUPP; + } + + switch (qopt->command) { + case TC_TBF_REPLACE: { + const struct tc_tbf_qopt_offload_replace_params *p; + + p =3D &qopt->replace_params; + + if (!p->rate.mpu) { + dev_info(dev, "Assuming you want mpu =3D 64\n"); + } else if (p->rate.mpu !=3D 64) { + dev_err(dev, "mpu other than 64 not supported\n"); + return -EINVAL; + } + break; + } + default: + break; + } + + *queuep =3D queue; + return 0; +} + +static int +yt921x_dsa_port_setup_tc_tbf_port(struct dsa_switch *ds, int port, + const struct tc_tbf_qopt_offload *qopt) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + u32 ctrls[2]; + int res; + + switch (qopt->command) { + case TC_TBF_DESTROY: + ctrls[0] =3D 0; + ctrls[1] =3D 0; + break; + case TC_TBF_REPLACE: { + const struct tc_tbf_qopt_offload_replace_params *p; + struct yt921x_meter meter; + u64 burst; + + p =3D &qopt->replace_params; + + /* where is burst??? */ + burst =3D div_u64(priv->port_shape_slot_ns * p->rate.rate_bytes_ps, + 1000000000) + 10000; + res =3D yt921x_meter_tfm(priv, port, priv->port_shape_slot_ns, + p->rate.rate_bytes_ps, burst, + YT921X_METER_SINGLE_BUCKET, + YT921X_SHAPE_RATE_MAX, + YT921X_SHAPE_BURST_MAX, + YT921X_SHAPE_UNIT_MAX, &meter); + if (res) + return res; + + ctrls[0] =3D YT921X_PORT_SHAPE_CTRLa_CIR(meter.cir) | + YT921X_PORT_SHAPE_CTRLa_CBS(meter.cbs); + ctrls[1] =3D YT921X_PORT_SHAPE_CTRLb_UNIT(meter.unit) | + YT921X_PORT_SHAPE_CTRLb_EN; + break; + } + default: + return -EOPNOTSUPP; + } + + mutex_lock(&priv->reg_lock); + res =3D yt921x_reg64_write(priv, YT921X_PORTn_SHAPE_CTRL(port), ctrls); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int +yt921x_dsa_port_setup_tc(struct dsa_switch *ds, int port, + enum tc_setup_type type, void *type_data) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + int res; + + switch (type) { + case TC_SETUP_QDISC_TBF: { + const struct tc_tbf_qopt_offload *qopt =3D type_data; + int queue; + + res =3D yt921x_tbf_validate(priv, qopt, &queue); + if (res) + return res; + + return yt921x_dsa_port_setup_tc_tbf_port(ds, port, qopt); + } + default: + return -EOPNOTSUPP; + } +} + static int yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress) { @@ -3499,6 +3606,20 @@ static int yt921x_chip_setup_tc(struct yt921x_priv *= priv) return res; priv->meter_slot_ns =3D ctrl * op_ns; =20 + ctrl =3D max(priv->port_shape_slot_ns / op_ns, + YT921X_PORT_SHAPE_SLOT_MIN); + res =3D yt921x_reg_write(priv, YT921X_PORT_SHAPE_SLOT, ctrl); + if (res) + return res; + priv->port_shape_slot_ns =3D ctrl * op_ns; + + ctrl =3D max(priv->queue_shape_slot_ns / op_ns, + YT921X_QUEUE_SHAPE_SLOT_MIN); + res =3D yt921x_reg_write(priv, YT921X_QUEUE_SHAPE_SLOT, ctrl); + if (res) + return res; + priv->queue_shape_slot_ns =3D ctrl * op_ns; + return 0; } =20 @@ -3655,6 +3776,7 @@ static const struct dsa_switch_ops yt921x_dsa_switch_= ops =3D { /* rate */ .port_policer_del =3D yt921x_dsa_port_policer_del, .port_policer_add =3D yt921x_dsa_port_policer_add, + .port_setup_tc =3D yt921x_dsa_port_setup_tc, /* hsr */ .port_hsr_leave =3D dsa_port_simple_hsr_leave, .port_hsr_join =3D dsa_port_simple_hsr_join, diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index e7022657c994..2ec59e03043d 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -524,6 +524,12 @@ enum yt921x_app_selector { #define YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_TAGGED BIT(1) #define YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED BIT(0) =20 +#define YT921X_PORTn_PRIO_UCAST_QUEUE(port) (0x300200 + 4 * (port)) +#define YT921X_PORT_PRIOm_UCAST_QUEUE_M(m) (7 << (3 * (m))) +#define YT921X_PORT_PRIOm_UCAST_QUEUE(m, x) ((x) << (3 * (m))) +#define YT921X_PORTn_PRIO_MCAST_QUEUE(port) (0x300280 + 4 * (port)) +#define YT921X_PORT_PRIOm_MCAST_QUEUE_M(m) (3 << (2 * (m))) +#define YT921X_PORT_PRIOm_MCAST_QUEUE(m, x) ((x) << (2 * (m))) #define YT921X_MIRROR 0x300300 #define YT921X_MIRROR_IGR_PORTS_M GENMASK(26, 16) #define YT921X_MIRROR_IGR_PORTS(x) FIELD_PREP(YT921X_MIRROR_IGR_PORTS_= M, (x)) @@ -534,6 +540,47 @@ enum yt921x_app_selector { #define YT921X_MIRROR_PORT_M GENMASK(3, 0) #define YT921X_MIRROR_PORT(x) FIELD_PREP(YT921X_MIRROR_PORT_M, (x)) =20 +#define YT921X_QUEUE_SHAPE_SLOT 0x340008 +#define YT921X_QUEUE_SHAPE_SLOT_SLOT_M GENMASK(11, 0) +#define YT921X_PORT_SHAPE_SLOT 0x34000c +#define YT921X_PORT_SHAPE_SLOT_SLOT_M GENMASK(11, 0) +#define YT921X_QUEUEn_SCH(x) (0x341000 + 4 * (x)) +#define YT921X_QUEUE_SCH_E_DWRR_M GENMASK(27, 18) +#define YT921X_QUEUE_SCH_E_DWRR(x) FIELD_PREP(YT921X_QUEUE_SCH_E_DWRR_= M, (x)) +#define YT921X_QUEUE_SCH_C_DWRR_M GENMASK(17, 8) +#define YT921X_QUEUE_SCH_C_DWRR(x) FIELD_PREP(YT921X_QUEUE_SCH_C_DWRR_= M, (x)) +#define YT921X_QUEUE_SCH_E_PRIO_M GENMASK(7, 4) +#define YT921X_QUEUE_SCH_E_PRIO(x) FIELD_PREP(YT921X_QUEUE_SCH_E_PRIO_= M, (x)) +#define YT921X_QUEUE_SCH_C_PRIO_M GENMASK(3, 0) +#define YT921X_QUEUE_SCH_C_PRIO(x) FIELD_PREP(YT921X_QUEUE_SCH_C_PRIO_= M, (x)) +#define YT921X_C_DWRRn(x) (0x342000 + 4 * (x)) +#define YT921X_E_DWRRn(x) (0x343000 + 4 * (x)) +#define YT921X_DWRR_PKT_MODE BIT(0) /* 0: byte rate mode */ +#define YT921X_QUEUEn_SHAPE_CTRL(x) (0x34c000 + 0x10 * (x)) +#define YT921X_QUEUE_SHAPE_CTRLc_TOKEN_OVERFLOW_EN BIT(6) +#define YT921X_QUEUE_SHAPE_CTRLc_E_EN BIT(5) +#define YT921X_QUEUE_SHAPE_CTRLc_C_EN BIT(4) +#define YT921X_QUEUE_SHAPE_CTRLc_PKT_MODE BIT(3) /* 0: byte rate mode */ +#define YT921X_QUEUE_SHAPE_CTRLc_UNIT_M GENMASK(2, 0) +#define YT921X_QUEUE_SHAPE_CTRLc_UNIT(x) FIELD_PREP(YT921X_QUEUE_SHAPE_= CTRLc_UNIT_M, (x)) +#define YT921X_QUEUE_SHAPE_CTRLb_EBS_M GENMASK(31, 18) +#define YT921X_QUEUE_SHAPE_CTRLb_EBS(x) FIELD_PREP(YT921X_QUEUE_SHAPE_C= TRLb_EBS_M, (x)) +#define YT921X_QUEUE_SHAPE_CTRLb_EIR_M GENMASK(17, 0) +#define YT921X_QUEUE_SHAPE_CTRLb_EIR(x) FIELD_PREP(YT921X_QUEUE_SHAPE_C= TRLb_EIR_M, (x)) +#define YT921X_QUEUE_SHAPE_CTRLa_CBS_M GENMASK(31, 18) +#define YT921X_QUEUE_SHAPE_CTRLa_CBS(x) FIELD_PREP(YT921X_QUEUE_SHAPE_C= TRLa_CBS_M, (x)) +#define YT921X_QUEUE_SHAPE_CTRLa_CIR_M GENMASK(17, 0) +#define YT921X_QUEUE_SHAPE_CTRLa_CIR(x) FIELD_PREP(YT921X_QUEUE_SHAPE_C= TRLa_CIR_M, (x)) +#define YT921X_PORTn_SHAPE_CTRL(port) (0x354000 + 8 * (port)) +#define YT921X_PORT_SHAPE_CTRLb_EN BIT(4) +#define YT921X_PORT_SHAPE_CTRLb_PKT_MODE BIT(3) /* 0: byte rate mode */ +#define YT921X_PORT_SHAPE_CTRLb_UNIT_M GENMASK(2, 0) +#define YT921X_PORT_SHAPE_CTRLb_UNIT(x) FIELD_PREP(YT921X_PORT_SHAPE_CT= RLb_UNIT_M, (x)) +#define YT921X_PORT_SHAPE_CTRLa_CBS_M GENMASK(31, 18) +#define YT921X_PORT_SHAPE_CTRLa_CBS(x) FIELD_PREP(YT921X_PORT_SHAPE_CTR= La_CBS_M, (x)) +#define YT921X_PORT_SHAPE_CTRLa_CIR_M GENMASK(17, 0) +#define YT921X_PORT_SHAPE_CTRLa_CIR(x) FIELD_PREP(YT921X_PORT_SHAPE_CTR= La_CIR_M, (x)) + #define YT921X_EDATA_EXTMODE 0xfb #define YT921X_EDATA_LEN 0x100 =20 @@ -559,6 +606,11 @@ enum yt921x_fdb_entry_status { #define YT921X_METER_UNIT_MAX ((1 << 3) - 1) #define YT921X_METER_BURST_MAX ((1 << 16) - 1) #define YT921X_METER_RATE_MAX ((1 << 18) - 1) +#define YT921X_PORT_SHAPE_SLOT_MIN 80 +#define YT921X_QUEUE_SHAPE_SLOT_MIN 132 +#define YT921X_SHAPE_UNIT_MAX ((1 << 3) - 1) +#define YT921X_SHAPE_BURST_MAX ((1 << 14) - 1) +#define YT921X_SHAPE_RATE_MAX ((1 << 18) - 1) =20 #define YT921X_LAG_NUM 2 #define YT921X_LAG_PORT_NUM 4 @@ -576,7 +628,16 @@ enum yt921x_fdb_entry_status { #define YT921X_TAG_LEN 8 =20 /* 8 internal + 2 external + 1 mcu */ -#define YT921X_PORT_NUM 11 +#define YT921X_PORT_NUM 11 +#define YT921X_UCAST_QUEUE_NUM 8 +#define YT921X_MCAST_QUEUE_NUM 4 +#define YT921X_PORT_QUEUE_NUM \ + (YT921X_UCAST_QUEUE_NUM + YT921X_MCAST_QUEUE_NUM) +#define YT921X_UCAST_QUEUE_ID(port, queue) \ + (YT921X_UCAST_QUEUE_NUM * (port) + (queue)) +#define YT921X_MCAST_QUEUE_ID(port, queue) \ + (YT921X_UCAST_QUEUE_NUM * YT921X_PORT_NUM + \ + YT921X_MCAST_QUEUE_NUM * (port) + (queue)) =20 #define yt921x_port_is_internal(port) ((port) < 8) #define yt921x_port_is_external(port) (8 <=3D (port) && (port) < 9) @@ -655,6 +716,8 @@ struct yt921x_priv { =20 const struct yt921x_info *info; unsigned int meter_slot_ns; + unsigned int port_shape_slot_ns; + unsigned int queue_shape_slot_ns; /* cache of dsa_cpu_ports(ds) */ u16 cpu_ports_mask; u8 cycle_ns; --=20 2.53.0