From nobody Wed Jun 17 02:57:20 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.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 AF0483CBE7E for ; Tue, 28 Apr 2026 11:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375600; cv=none; b=RrtJd2BRS+MiHB4mYlBu8RNdgkIAj8R0K0cIkI2P36RQ/15sHYcxBOOhOmmqbUTBEYxnSJQlOrPukofsYVZUAV4ECHDs7AcrLfaoVkykFq/AR5B7QRndUfwWwNxRbP4hOQlTH4BZavoAHzuoNUwuI424VTwV0aTGIGVRHYa7WJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375600; c=relaxed/simple; bh=pQsdsngi7xJbMC0DhlA4xDQB0AlSNkiEtvxDsUc3YJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V1tG3sxeTKBtbgUtf9OUIiV5YYgvcDcTF0B/rDd60Nf5V6TpK4KL2YgbgfxxWiHoGQPtqTEXsemHDCZ04EzHZsw7Qi+f7C0vaBCEFtyhbxb6ETsX2kGiZ89hUPqrIgViabAgK8A+Kpd0xInPM0KRfKPg7ejnPfNWLDgxmMRFHmQ= 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=FU3BWDfB; arc=none smtp.client-ip=209.85.210.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="FU3BWDfB" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8296dabef74so9391665b3a.1 for ; Tue, 28 Apr 2026 04:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777375599; x=1777980399; 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=DkGu6l8elNHejMOrOk+YYmlLgI6Oh4DCOBagI53T70E=; b=FU3BWDfBxKKzHCQ6BNaVWx7wS1vGpzDuw5DSktQ58aMz7bcxWvSF1t59uRQyiI1k+s ijSYQGt50Mqsll0HwixNol4FjvSGuvVWH7nOF8sVxaa0c4D2PpryAx1k4s1QStDbG+Oo 8c3KDxdlzMeh0MQUgf3Tr2JABWwWFF+iFwNtJimmG8aNNa2z6SkmgITAVrSVREi+yr2d DP3LFGTcFyf5R5HqMHF+HhQJdTiwwtHbOQ3LynqrDasC0SpvZKr7UpCsaa3CEegYSckX NMa/xsd67b/X7NnDuletw/ybLw/FbVUE1KGMBB5iK9XHCWdaX39DUtt7AjvlIBI7kjY/ LExA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777375599; x=1777980399; 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=DkGu6l8elNHejMOrOk+YYmlLgI6Oh4DCOBagI53T70E=; b=UepLYxE4RXtEGZjjekZK0TYxoroK+sYU1+cvB/qH+Jp9NGt0mn4NZ4zlRruIiK7rvr Y80JryEE6fIw3/ZjTpgxNTbA9pwqL1j35maoyZWSWKPRUOHwu9hzjGfO4P1igp/or0k7 Cqq6IMxITn+zlyjlN7XT2mKXbiepTy4PAl4pJWQT5+oGo3fMohfvKUdcQxMM2s8QMpuZ FHuhsbBBlgFeio/+tGBlSmGTI1VhEfNg9tW006kWZs3ISESpyvib8gnOAAFUzEPsO6uY BwF7RRn6FjB5wCDQXs05DcNk44veBfY/ZmfmqeRPDQB91LBwWtOBX3o84om1J8hm8wqS VjVQ== X-Forwarded-Encrypted: i=1; AFNElJ+vOUuYka4Att2boZTixpow8mQv1kzmPEoGBZ6zctVQ1OnpVprsWAduNKv6a3ZzuSlAEOvhlGWDbAsCbpY=@vger.kernel.org X-Gm-Message-State: AOJu0YxySr9CeV6w+Id337IzBDcAJj+Ls/msNOqm6eR91Hd5bL3FGzCt CFqemqCWTH4KyyiUa3zci7wPSVCVdiV9UUz+KHnMrPkbiXGx7C0W4OZ6 X-Gm-Gg: AeBDiesoQZB25nlkv0C812L3iGVTJgBgktdGMao/PcLczLFK4SWquvMtmkAq9L8qsG+ flTMU2Rt8pwDOwqZHbyA4pSXTXeKKCHrvx5v2pvlXhOQi18kzAoJtugGqTEnJ+yIXVzG13SIjyh OEURPjdgP98zEfA26WpXhIpYvLKegH8H1dJ4cpY102CKhnGbBvelIkU8TCyW6MfE6d9wY9/DQCK j9G9WPqAoCQbIucQijzqOCGwUcPGGrrjuIXSfXT/U6Jrcn3yeHVQBAvH7xeFAOyXZZtmD7AGXZU VLJDq/oe+VtZofC36cJ0HaKseJPaUFUvOGnN0NoY1wD0HfWNADiwyaAvRpopvEdxzL2xelNK/0Y ehKnoh2LiJcUe9h6NNGdV2AOLQurLBtqByMZT//QI1wdQoH7ecTdNVSMkYKaJX1Eb6lbO6TFo8r 9DS1bobzXR4z3f1aFKffhJPySsEnnoan0OyMm3IPECmcPwaPmmzz0C6yHesh/+ X-Received: by 2002:a05:6a00:12c1:b0:82f:3828:a00a with SMTP id d2e1a72fcca58-834ddc581cbmr2642074b3a.41.1777375598994; Tue, 28 Apr 2026 04:26:38 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-834dae36b4bsm2284327b3a.27.2026.04.28.04.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 04:26:38 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , UNGLinuxDriver@microchip.com, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org Subject: [PATCH net-next v5 1/3] net: dsa: pass extack to dsa_switch_ops :: port_policer_add() Date: Tue, 28 Apr 2026 19:26:01 +0800 Message-ID: <20260428112606.1917230-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428112606.1917230-1-mmyangfl@gmail.com> References: <20260428112606.1917230-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" Drivers might have error messages to propagate to user space. Propagate the netlink extack so that they can inform user space in a verbal way of their limitations. 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 8b6d34e8a6f0..4cc67469cf2e 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -1122,7 +1122,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 Wed Jun 17 02:57:20 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 8EA243FE36F for ; Tue, 28 Apr 2026 11:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375605; cv=none; b=jvqirV3UxzHhSDvhr9h08ORpcR4p3Hqs3XxXS0rn7JHeZicez7q/NmLJ7c7LLwmbOHFB68gxZ8nPyWX7R/J+WcrLUDet6CbY+X/zdusz9qURB9Mq6KN0EKRrIDox/4HWNDfdvEp92A8TmGHK67nnScrbtneDE1tnwBipkAghqkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375605; c=relaxed/simple; bh=33BKGtv99YCHlFC84RXU206UHS5feYZDByPIWJfGB4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PH2jqV0I72grFlwEEAQafHCrlIcVYdtnCg/FDzjy1PsYJiYwUjtFFlDRLtASx7O3otlnqbGihwiKRfM5ZdZ+sCaZfbyuBmNH2nBfu7yomzi9gDusF8NJ15nVbKYVMkIHz1n9BrKDUyMmgL5g+mHxkqsePU5Car66DWE/Jr63ks0= 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=g6w1i7Ea; arc=none smtp.client-ip=209.85.210.174 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="g6w1i7Ea" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82cf636dac8so4806240b3a.3 for ; Tue, 28 Apr 2026 04:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777375603; x=1777980403; 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=vVudMn5DOWAnraSt8EcXAJqKne+FmaKhjEXBR4n3BFY=; b=g6w1i7EaCq3dnuWyzyqRURIn89868Z0iqqv9BN/K9x+Lr860QN30TRMk7TnfXOxD8a d6F2KMgVm5kx7onsp9NKwquyOAju48uikh0e3JSJeul7dxobHYSDdzvab/07YDJNA+cD 9o/x/7RvMgnSfYhYoWA8i004934hgYtm13c1VywMzZsodshPgH+JctDzdlsGY5wy4x2w 561qSQ9iML8qdfkTriMsUymxaiAqxcr/fxhhT+OxVWEnQeDT+8C5hkVMPRbY+HChrvDw EfedSjKN9NNeeKG7ytXhVv3q1L5QRBQwz6ZyA1b4g/yXkeYSFkrQcwBv+d/EKGJ4MsMq hWEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777375603; x=1777980403; 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=vVudMn5DOWAnraSt8EcXAJqKne+FmaKhjEXBR4n3BFY=; b=qE6OAfwYN/OAiJPNSs0ftybDIvs1mqgkrbXFS3unAqg4k29RbcRsNi51cRkSO6QVwf 5ggtZLTG8T54IfHo4hJnL+fIMj2gNmPsGY+Trh0Gfxzx/BvMGe9z1J0e/53da4x+4Uuj tWiKF3ORma4gbaXYuuieDZbZsQFkaTpk9xC9qGgBLU7jnfC+4al0lcpmq5Bv5AOrH8G3 KL5gz4qAflioUGUgzQh6XUMEzuIAtTAC6vtAn6Jht/MRgKl8xWG1ErwS2gx6VQQcYRiU 2mvCLIKqdK3bdGuMlvsyhcHx3ehfcIm1UZ3yF4gCufOuRnl7MGYy0Zqvwn6e9CxI1ViK yBOA== X-Forwarded-Encrypted: i=1; AFNElJ8plDzvmjAD2cFdt3HmVs0iU9+3oC3CqSg5OsOz9Zock3XiBLAI9Pkkb/WVWqrkudiEw7qY7EB3w0DMwkc=@vger.kernel.org X-Gm-Message-State: AOJu0YwjS01TXyQOtSB212CEgTuzXDy2A3Uy0pJYCYkfozm23qQXsl6w +qS2RG5IoAG/lr/zLnDPduZ24pDPYDbJj4iRj2ghHY21KoDWL9d4AvM+ X-Gm-Gg: AeBDievEDufx5ptaaxzfKEci7pvbDOj6vwyLfL3nvQyJzcwTj2BIYPE2kWxkFxewOzc S/Ke4B4/sPZWkQT5aQ8+/Q8J8dVs6qHwp48RsiIUYzmedm9GgaCz/1+QmIHs1MwaC3M0D/vfhVO PlfBJ+7K3Ne56B/2+B/qMixGSKm0Hou2/wdIC5nbyEhja1+KSgnw3E8xxx89831Mg9Tm3DzxUaI 1AUgELTdulOFB1N084kgzI+LF2pomFega0IjJaBRTAlJDVCYBQObWKtdiQkkKkG+oPiMVi0Lihp akWWr1JZ7UlOdw41ei8bzUbSmoc41ueKm0lZMPcLdfoU/tYMDL8CUu59uMbVxHxSF594boqZKaa C/YoJOITIVw50I79pfbc1e6MYk7Jk0FwuHMnTnrP7gIhvNtAA17/42NQ0NzdS+/9dGpza5459Dp K9aFoa/YU++3fdErqz3BXJsgVX2x7Zka7fAkvNHPSHisU/MWD7vmEUCVJBaN00G8wT3Q6nCo4= X-Received: by 2002:a05:6a00:3902:b0:82c:1cd0:2f5e with SMTP id d2e1a72fcca58-834ddc75743mr2956194b3a.44.1777375602851; Tue, 28 Apr 2026 04:26:42 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-834dae36b4bsm2284327b3a.27.2026.04.28.04.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 04:26:42 -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 v5 2/3] net: dsa: yt921x: Refactor long register helpers Date: Tue, 28 Apr 2026 19:26:02 +0800 Message-ID: <20260428112606.1917230-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428112606.1917230-1-mmyangfl@gmail.com> References: <20260428112606.1917230-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. Refactor reg64 helpers to use u32 arrays instead of u64 values, in preparation for 96-bit registers. We do not keep the separate u64 version for reg64 to avoid duplicated wrappers, although it looks better when dealing with reg64 *only*. Helpers for reg96 should be added when they are actually used to avoid function unused warnings. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 162 +++++++++++++++++++++++++++------------ drivers/net/dsa/yt921x.h | 36 ++++----- 2 files changed, 129 insertions(+), 69 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 87139448bec3..0c07b903fd68 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -255,63 +255,122 @@ 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 multi-word registers, like VLANn_CTRL, should be treated as a sing= le + * long register. More specifically, writes to parts of its words won't be= come + * visible, until the last word is written. * - * There is no such restriction for reading, but we still provide 64-bit r= ead - * wrappers so that we always handle u64 values. + * Here we require full read and write operations over these registers to + * eliminate potential issues, although partial reads/writes are also poss= ible. */ =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 +1903,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 @@ -2318,8 +2375,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) @@ -2327,12 +2384,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; @@ -3084,7 +3143,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; @@ -3145,8 +3204,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 Wed Jun 17 02:57:20 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 724A03FE657 for ; Tue, 28 Apr 2026 11:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375609; cv=none; b=oVEJlQy7batoj0gD+lws5IxlJZaZ2h2vsmS/vKeB3p0TEu1RHeTDw0etEdMWdmw8yi3lFsj0LXF8bom239819wjryOaGzNLbPNjecIbmDvnJCVG3eyFV5ZFrqEtoSJYkpdiO6tkezrlDISRLrc6pfKq7OnU1Who2bdEgicLWgwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777375609; c=relaxed/simple; bh=dQD+q7Upq8Sn2zCkvYkWmsdL2sSDnFnXiKg2BR1/cOo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RqQos1RBWGHctJeCiUu/H55Z3S8VNz/AkaHVfYRFZTTXhlLKmX1jUOWp8rIm0LdB3WO3wZ8JitidpKMjIjj0sY3DL5b57kdfD9TPWHjIYYp2Y5oDWvcRdtDopWw805kgZtmVe5lg6GboWGcMN4ONeMhGG+mWDcwGnu/HiyTHp74= 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=KUP7IviK; arc=none smtp.client-ip=209.85.210.177 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="KUP7IviK" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82f8cebc935so4883169b3a.0 for ; Tue, 28 Apr 2026 04:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777375606; x=1777980406; 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=13ko0EGi1d5MwYTMjgeOX/JxXQYMOi59NTgO/q3LFT4=; b=KUP7IviK+12uyzLNV+ICTt//tnMhUDC6qLFX+1VYvwa8ylORU5f/qyciD5vjuROaLd OonZXfPdXrZRf7Wj1S38WaxT94zRC8UbN+1wPi70ol0RmwPFFOkO4a0ru/TWGIjPqrub tiN1efSXB3FFzau4/w7/QcLgIavmo6AnmOwVqXSU2ER3R/mL5dB8XM/wWD4/VdOyxVWP OniKYvHhMFbFxoN9u3Lc/54185ureASbm9dOdqT+Hd/ZOSUsjrP9LeKgh+/iDxZVwEBA +JUeQsAmR3OJ36BiKCQY2R1EFFSRC95+cQXl2c219bl9yVrP+BGtfKUKsRvhIWcATJNS FOPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777375606; x=1777980406; 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=13ko0EGi1d5MwYTMjgeOX/JxXQYMOi59NTgO/q3LFT4=; b=Q8i7Zr2XJAO5TU606Z2VmgXUH9b04/ae2xJF6emkU1wZBqhARqtMOZyozKSWaYIT8n jaONV3pJAukWKkIDSQWrbHO0ElGr+NkqZ/cQqc0LWIoLnzULpLfOexrRsnPMBuBlVMRz MeixA9dPnUanXKJd6tdQRQNtEhBepIn22EslzPMcwCf1U20C1CE+srvZOxsg3z7zI+Rp WJUkdSFk1nZE9vEOV4biaXupr6SHurMfHuCqnkbfLNaoaZ21uEM/9C65NCET16m2pNaM 9dRheb2tQWRrv6mOezrMBrlRwLWYXBM7q6oMbOUbMN3uf1eDKgi3y81v3NPWBPdeVRGh baCA== X-Forwarded-Encrypted: i=1; AFNElJ9joWJd5DtesPXwtSu+7apT0lKX20Tp+2qUbnS/esodzPaXiIXL6LRznZhsKJ4af6Z796oECzYdwkNQjcE=@vger.kernel.org X-Gm-Message-State: AOJu0YyrjGdQcNPK/2mKiI98S0K7BvtXVrQSGM5Hot68dT0CJbHsIci1 iUgMP1VT6mAiIM5eNQNhQRSGmiVXbNgkpaVXByH92O6zlO4329Q4VUW9M41T/fg2 X-Gm-Gg: AeBDievxqGdwN34E3HnY9hGSiHbUzsIudObSSHVz/CHtjSMrXvvnZoezuadskFjj4m/ 7u0Eh8e2TA9dMCcDeQ1PIr4J2xpKze4pdEGAJprbq7i1e8j64XWCet1Hhngq4UhjJsvOFF3pN1Q UrWuAs0BklGVmZgrsxa9PzUAnSxfFQGAubsK+NRFTBPSxy0nvl3l19xWYFvQ7jV6y6Mun1pt2IP hlPVCbAu37LeSL34mTxMCmPprfsAkytxXxFQuuWUicKqiCS6enIhY8N/rAoGGkQcHbhyMZ/X7b4 Ydc7URiD4E4jgyfYo3++rqhytK1Wt8N+hDc64pBZhXfh55S7LUORgaZfZi2MzbWk+GRKgylMzyI rKzq1b8+YC1WJfNkllv31HjbULcyNeJ6UUhAJHSOc1lg0wpGYm/JZhyIXFlKu5IzuN3M5AlQseK cl4VDwN3n5dWZiWNYce4x/wcd2ycSERrOFhh0kQY5uXDZ0P1/9t/JhXq/aDQy5 X-Received: by 2002:a05:6a00:99f:b0:82c:ded1:261f with SMTP id d2e1a72fcca58-834ddbe7be7mr2673646b3a.27.1777375606276; Tue, 28 Apr 2026 04:26:46 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-834dae36b4bsm2284327b3a.27.2026.04.28.04.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 04:26:45 -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 v5 3/3] net: dsa: yt921x: Add port police support Date: Tue, 28 Apr 2026 19:26:03 +0800 Message-ID: <20260428112606.1917230-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428112606.1917230-1-mmyangfl@gmail.com> References: <20260428112606.1917230-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 | 323 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 51 +++++++ 2 files changed, 373 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 0c07b903fd68..d93674d567d7 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -263,6 +263,14 @@ yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 r= eg, u32 mask, bool set) * eliminate potential issues, although partial reads/writes are also poss= ible. */ =20 +static void update_ctrls_unaligned(u32 *lo, u32 *hi, u64 mask, u64 val) +{ + *lo &=3D ~lower_32_bits(mask); + *hi &=3D ~upper_32_bits(mask); + *lo |=3D lower_32_bits(val); + *hi |=3D upper_32_bits(val); +} + static int yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, unsigned int num_regs) @@ -373,6 +381,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; @@ -1066,6 +1080,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) { @@ -1097,6 +1118,266 @@ 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_marker { + u32 cir; + u32 cbs; + u32 ebs; + int unit; + bool pkt_mode; +}; + +#define YT921X_MARKER_PKT_MODE BIT(0) +#define YT921X_MARKER_SINGLE_BUCKET BIT(1) + +static int +yt921x_marker_tfm(struct yt921x_marker *marker, u64 rate, u64 burst, + unsigned int flags, unsigned int slot_ns, u32 cir_max, + u32 cbs_max, int unit_max, struct yt921x_priv *priv, int port, + struct netlink_ext_ack *extack) +{ + const int C =3D flags & YT921X_MARKER_PKT_MODE ? YT921X_TOKEN_PKT_C : + YT921X_TOKEN_BYTE_C; + struct device *dev =3D to_device(priv); + struct yt921x_marker m; + u64 burst_est; + u64 burst_sug; + u64 burst_max; + u64 rate_max; + + m.unit =3D unit_max; + rate_max =3D token2rate(cir_max, slot_ns, m.unit, C); + burst_max =3D token2burst(cbs_max, m.unit, C); + + /* Check for unusual values */ + if (rate > rate_max || burst > burst_max) { + NL_SET_ERR_MSG_MOD(extack, "Unexpected tremendous rate"); + return -ERANGE; + } + + /* Check for matching burst */ + burst_est =3D div_u64(slot_ns * rate, 1000000000); + burst_sug =3D burst_est; + if (flags & YT921X_MARKER_PKT_MODE) + burst_sug++; + else + burst_sug +=3D ETH_HLEN + yt921x_mtu_fetch(priv, port) + + ETH_FCS_LEN; + if (burst_sug > burst) + NL_SET_ERR_MSG_FMT_MOD(extack, + "Consider burst at least %llu to match rate %llu\n", + burst_sug, rate); + + /* Select unit */ + for (; m.unit > 0; m.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 */ + m.cir =3D rate2token(rate, slot_ns, m.unit, C); + if (!m.cir) + m.cir =3D 1; + else if (WARN_ON(m.cir > cir_max)) + m.cir =3D cir_max; + m.cbs =3D burst2token(burst, m.unit, C); + if (!m.cbs) + m.cbs =3D 1; + else if (WARN_ON(m.cbs > cbs_max)) + m.cbs =3D cbs_max; + + /* Cut EBS */ + m.ebs =3D 0; + if (!(flags & YT921X_MARKER_SINGLE_BUCKET)) { + /* We don't have a chance to adjust rate when MTU is changed */ + if (flags & YT921X_MARKER_PKT_MODE) + burst_est++; + else + burst_est +=3D YT921X_FRAME_SIZE_MAX; + + if (burst_est < burst) { + u32 pbs =3D m.cbs; + + m.cbs =3D burst2token(burst_est, m.unit, C); + if (!m.cbs) + m.cbs =3D 1; + else if (WARN_ON(m.cbs > cbs_max)) + m.cbs =3D cbs_max; + + if (pbs > m.cbs) + m.ebs =3D pbs - m.cbs; + } + } + + dev_dbg(dev, + "slot %u ns, rate %llu, burst %llu -> unit %d, cir %u, cbs %u, ebs %u\n", + slot_ns, rate, burst, m.unit, m.cir, m.cbs, m.ebs); + + m.pkt_mode =3D flags & YT921X_MARKER_PKT_MODE; + *marker =3D m; + return 0; +} + +static int +yt921x_marker_tfm_police(struct yt921x_marker *marker, + const struct flow_action_police *police, + unsigned int flags, struct yt921x_priv *priv, int port, + struct netlink_ext_ack *extack) +{ + bool pkt_mode =3D !!police->rate_pkt_ps; + u64 burst; + u64 rate; + + rate =3D pkt_mode ? police->rate_pkt_ps : police->rate_bytes_ps; + burst =3D pkt_mode ? police->burst_pkt : police->burst; + if (pkt_mode) + flags |=3D YT921X_MARKER_PKT_MODE; + + return yt921x_marker_tfm(marker, rate, burst, flags, + priv->meter_slot_ns, YT921X_METER_CIR_MAX, + YT921X_METER_CBS_MAX, YT921X_METER_UNIT_MAX, + priv, port, extack); +} + +static int +yt921x_police_validate(const struct flow_action_police *police, + const struct flow_action *action, + const struct flow_action_entry *act, + struct netlink_ext_ack *extack) +{ + if (police->exceed.act_id !=3D FLOW_ACTION_DROP) { + NL_SET_ERR_MSG_MOD(extack, + "Offload not supported when exceed action is not drop"); + return -EOPNOTSUPP; + } + + if (police->notexceed.act_id !=3D FLOW_ACTION_PIPE && + police->notexceed.act_id !=3D FLOW_ACTION_ACCEPT) { + NL_SET_ERR_MSG_MOD(extack, + "Offload not supported when conform action is not pipe or ok"); + return -EOPNOTSUPP; + } + + if (police->notexceed.act_id =3D=3D FLOW_ACTION_ACCEPT && action && act && + !flow_action_is_last_entry(action, act)) { + NL_SET_ERR_MSG_MOD(extack, + "Offload not supported when conform action is ok, but action is not= last"); + return -EOPNOTSUPP; + } + + /* mtu defaults to unlimited but we got 2040 here, don't know why */ + if (police->peakrate_bytes_ps || police->avrate || police->overhead) { + NL_SET_ERR_MSG_MOD(extack, + "Offload not supported when peakrate/avrate/overhead is configured"= ); + return -EOPNOTSUPP; + } + + return 0; +} + +static int +yt921x_meter_config(struct yt921x_priv *priv, unsigned int id, + const struct yt921x_marker *marker) +{ + u32 ctrls[3]; + + ctrls[0] =3D 0; + ctrls[1] =3D YT921X_METER_CTRLb_CIR(marker->cir); + ctrls[2] =3D YT921X_METER_CTRLc_UNIT(marker->unit) | + YT921X_METER_CTRLc_DROP_R | + YT921X_METER_CTRLc_TOKEN_OVERFLOW_EN | + YT921X_METER_CTRLc_METER_EN; + if (marker->pkt_mode) + ctrls[2] |=3D YT921X_METER_CTRLc_PKT_MODE; + update_ctrls_unaligned(&ctrls[0], &ctrls[1], + YT921X_METER_CTRLab_EBS_M, + YT921X_METER_CTRLab_EBS(marker->ebs)); + update_ctrls_unaligned(&ctrls[1], &ctrls[2], + YT921X_METER_CTRLbc_CBS_M, + YT921X_METER_CTRLbc_CBS(marker->cbs)); + + return yt921x_reg96_write(priv, YT921X_METERn_CTRL(id), ctrls); +} + +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 *police, + struct netlink_ext_ack *extack) +{ + struct yt921x_priv *priv =3D to_yt921x_priv(ds); + struct yt921x_marker marker; + u32 ctrl; + int res; + + res =3D yt921x_police_validate(police, NULL, NULL, extack); + if (res) + return res; + + res =3D yt921x_marker_tfm_police(&marker, police, 0, priv, port, extack); + if (res) + return res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_meter_config(priv, port + YT921X_METER_NUM, &marker); + if (res) + goto end; + + ctrl =3D YT921X_PORT_METER_ID(port) | YT921X_PORT_METER_EN; + res =3D yt921x_reg_write(priv, YT921X_PORTn_METER(port), ctrl); +end: + mutex_unlock(&priv->reg_lock); + + return res; +} + static int yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress) { @@ -3052,6 +3333,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); @@ -3086,12 +3368,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 @@ -3213,6 +3510,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; @@ -3259,7 +3573,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; @@ -3268,6 +3582,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) @@ -3359,6 +3677,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..546b12a8994a 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,39 @@ 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(x) (0x221000 + 8 * (x)) + #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 +547,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 +/* Custom meters only, not including dedicated port meters (11) */ +#define YT921X_METER_NUM 64 +#define YT921X_METER_SLOT_MIN 80 +#define YT921X_METER_UNIT_MAX ((1 << 3) - 1) +#define YT921X_METER_CIR_MAX ((1 << 18) - 1) +#define YT921X_METER_CBS_MAX ((1 << 16) - 1) + #define YT921X_LAG_NUM 2 #define YT921X_LAG_PORT_NUM 4 =20 @@ -602,8 +651,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; + unsigned char cycle_ns; =20 /* protect the access to the switch registers */ struct mutex reg_lock; --=20 2.53.0