From nobody Thu Apr 16 22:32:45 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 94B8B3E275E for ; Thu, 9 Apr 2026 17:12:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754746; cv=none; b=dtpbhCuqxgeX8v7RE1RJRfUbw4dYqiX3xhFPa5HTuWqeOjY+ImWop5a0unxLvghFEZOUbV/1Nla0ISxvozKe4NlJcZDATZWYXYCcwwLoDeCIbr0w6QpTITOemTY3oVeF4nU4AL8+pLRMz3J10dt005dxfyNsyZMInmHabXiLS8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754746; c=relaxed/simple; bh=v+E1MO93EOHLyDkpX6IzNEHlsvKdg/1FgUS+hyR8of4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZDh99X6dfOi5DICVYBOi2R2Zg4NVSlBVtW9lOYpA2CG5bGAW0E0L5F1qbq+Dyaz9Tb0TSbfWupDvh/g+Mr02lj3KYPjzMNfsr6car/khpDDU1EBMZK0jyN8jlUOC95fp424XxLsnva9tILman99IH0l85SxID8lrlHCUBgkzsOA= 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=aHSVoSHD; arc=none smtp.client-ip=209.85.214.181 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="aHSVoSHD" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a9296b3926so6826515ad.1 for ; Thu, 09 Apr 2026 10:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775754744; x=1776359544; 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=Vm1sew/8xxotCRJE85MOTIviBnsMsznbuVyL8JjP6fo=; b=aHSVoSHDH4CIuZL5YI2Zv7fxmn3Tq+Vt52wH8IY2WZDLIhRWCOCS8i4Zq4qy/pmcdY M24UI+t2qnRtIXFvPRgGwjSvb4HmKSVKMrEqrwPPo+KqdPBWkiPi+X0D4cCpGND2+UcA 3yZUXYeBm/u+U7p85iifLIHhHeHiEBkJyjYfjJNsr6fjRQALLKbDU0lOP5qGkJI2pBUX vIxr+/vZNO4CwLg2uPbh77meRsmWGRMZNq5e6JS8nflGeUM3PrPvJDje4NYdjX4tdk69 mHb/TZLwqbKkaTsWkoerRmPlStDVNFeX3KyGG4zJIaafWq57QbtPyWnHwHVsQWOnDOPw C1Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775754744; x=1776359544; 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=Vm1sew/8xxotCRJE85MOTIviBnsMsznbuVyL8JjP6fo=; b=ZV3Da0Ak3d92jP2hx4WQ3oieMAHcY8JqpWsCUmSkmXF1F4jFwEhfc0qllfz2gkKuK3 60ARl7I9NJ4jYLbvH1E1B0bh/cmnTmnsxBtHtMQGXlJZWp/ZmJujeLUUkIfoGQMG6akh 0ql1VQD22whNpkl2HMOfrtPHeQ39wuVDvsRM7v+0gOZi5fznO2TGATmuqMu7fp9d3CvC OW24I0MaDrR6nHFzo+qHS7Dvi5o0jQoNbdxyDICM3uizMuoYRKHijhOtWH82jwfG3TRZ P8pRVQQN52upWDwLRWHV9ws3U2AkTH42DQwb0kgHx7DqLJtTUOABEZP4Y07O6MU5TM5/ PMqg== X-Forwarded-Encrypted: i=1; AJvYcCWC2FzliAMkgF/O42W1s3Hleab9+XE4B6SX7os/MD62Ri8i9JHYCkM6HQzkpQCzxEkdyduWISssZyEVTVM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4RVOrB4YTRi3Uce+6RrmYcf/Cy4EHJuUE+wO4HBLmJY2j1rjK DTH9m/IuxGDLQnZvk1qKttj6zXajnDim/eWF6GY3y2tMUQqUx3hd3AVA X-Gm-Gg: AeBDiet6w6b9Uh24zm0Aei06M+gqtXZtbmmGf9M4g4pO5GomrI/FGEtIhto/6PT1rlj tPee8jXAGgbvvVHObpue0h/SZD8Xh0W4AkM1qWC3W3WxQ4FwEmV5tcX9OL/I/lOJb9x5dCQrcq6 6zCyFDzClUX/gzoTVbyWJk0OJNBsGp6Euta/LLR/tyOngEezdZPguOYHhq/IfDLgvDtUvnAHCBL iKecWC+kJ8Wv5feo6rAgqHvFF/uK3cvJKGso7Ds/1TannLQGg8Trh3sdUzpHJH/00Wsl32283gf L0V31OUoMnwRPZ0r07GXyzFVh3fwAogC/6lbUGXND0YpZ610LpG0xuok9XLYLFJa82CW7wr2FHz 2ApDgjacwwS06UkdM0fyPTVmmwtpnyyIvFykzaRo+Y86agQTjqG5nCf1YKDYRtC5NTftnlutDBZ EvLf1g70YjxWPuywNwuGVmTDY1/RlT2A2k/7lyBv7W8ykr2cAZZwTLUhnY0YU= X-Received: by 2002:a17:903:1ac3:b0:2b0:673a:7c85 with SMTP id d9443c01a7336-2b2818ee1f6mr267644805ad.37.1775754743809; Thu, 09 Apr 2026 10:12:23 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac1:7680:d30::4cf:90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2d4f08d1bsm752395ad.54.2026.04.09.10.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 10:12:23 -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 v4 1/4] net: dsa: pass extack to user tc policers Date: Fri, 10 Apr 2026 01:12:01 +0800 Message-ID: <20260409171209.2575583-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409171209.2575583-1-mmyangfl@gmail.com> References: <20260409171209.2575583-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 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 Thu Apr 16 22:32:45 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 22A7A3E1CFE for ; Thu, 9 Apr 2026 17:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754751; cv=none; b=YQii5pvYp/fmj4WeG6vWN8zeBwQrfW97HKLXC9FiIISCP4jLZNqExIl1ufn7x3wiZwwvKIcjtS3uv2STS4mlmT9ynstxVBCPhAAARsrZjcC4iXzTTGyK6BYbU/368YI1MA4332EE+L9jQh/ER5La0O2+40fAQApiYFMzKv3+tjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754751; c=relaxed/simple; bh=33BKGtv99YCHlFC84RXU206UHS5feYZDByPIWJfGB4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KHN9EIebR1hZfoPorCo0aJ7Zz4pgv0Hax2qjEJZYHh+IhhImcMvCEcwmVB3vPyNX2cH++IUTdA1/e3u6413XKEkkcqS/fSkeJEgPudeJsX0AhhNgBSzfTKqh+dVQFueclJOQ6pbSVlPHGGxLI5d5wx/quSSqqQr/PKsH+apCIbc= 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=GKHQOleb; arc=none smtp.client-ip=209.85.216.54 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="GKHQOleb" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-35d94f4ee36so825480a91.3 for ; Thu, 09 Apr 2026 10:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775754747; x=1776359547; 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=GKHQOlebfTo+VdOJklityRTH9GeKdWjFK9ezvecWNtZIZY7byl8wPePWkntk9ocLpt o0vW4Hx4n3yFLvyKDTRHF08i9FpHn3iiJoXKTxsZXsWk08AsbAmBTkTyUgA0K+DVHwBh 2chkQhGhy6zeIzYvmN1hOvRGrEnPd4im9tyy4HchOtIScb1jRdOxb48KdBzmitn5J0eu zMqzH/69853Ybmjs9KJ/X1glojVB1k1yBziU/0FVnDPwjdY9zwt25XGJM1qKJWretUXS 4PmbFX0jEtgDSoVeyYU3yFOmoKedtPGYoo8iuFYoKaRKML2ESABTi6+HEtJtlVmthIe0 PiEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775754747; x=1776359547; 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=j8/4uY/G0/g0LZAc1IOXVrDfXX+hgSj6SrUvntzKqrkSno1k1Wz3CXRqtrOsCYoYSs oRp1B0aUsj+m3cTQnHtELLvbjQqG7g/Q/VRyoCGknD8Scf0zHgWdr+eQkwXf7wOPCrX8 /i7Fiz4Xc9sj6y3JRPqZVwaziwYamPYn7PpSwTCE1DW5X1IJSn02oKDBdeOCNhgeROh0 YW8Z1nfSZVVAQzz1QPhtKY52X2TQphDAacZ57ij7RAKfw7mfI57pR6McZOUv1GYCJu+n V2Z3TI61ccgaMxLcRcY0uycpolkqNpoE25mwTcaXhBDdYRhgQAwIju2Qohnzg7oFCfgB lE3A== X-Forwarded-Encrypted: i=1; AJvYcCWwX1XLrz5lQMQQsx6FnKIx95dBAX9MQ3zFAm3JYqfz3bWeLR4ElusEGmG1bAh5h/SqOfhcTPwa4WKpd5A=@vger.kernel.org X-Gm-Message-State: AOJu0YxPwHtheuPK+Cq3Ich3usXjJQoTFIp9xdfMid1i3Qp51YsdrcUq W3nose/fvEmhQMPz0CcILAnXpyG5xEcWp0VSsRa/+yVC9olhCYc0n5Vp X-Gm-Gg: AeBDievk+5s5kxRaKP8m5VZ2a98Y/fwEXmVa4ni1jIGPnFSQjPzcMYVTs8+H/5x3nM9 HqUVKM2itx0iD7/vpxdVLikOMpNf1OIWv4wn8PHjxEjNDEftuFkmS/JN30ELxVxwjSzVyf3vxZA 3TPpiRWggm35RRTHFymh0vKtO17rmOe6Zz5cHtDIABm0XNe9kWiwXeyjcXtNv5fWgI2ZK3dgaZA eq8CfFnQxDDjHWT/pN4OPaR8RYG0PBLh7QPWhSOQXBB4jcegykykcy6jEC6XHNLey9L7Z2MMrtg bWupDZi6SdWRxh8bW4yrsiOXzUOBsopHhebl55/K30yabxgIj7dOHhmkWuoz43SIcPZJN2yfAOS VA+otVkizWG+jOdlXLJHx2Nuh2KJQVL34cQBtKStNFn3h/i87p+9Nqq4f/Qaca6CJ+Yj8yRiIE5 lVVPcyXC8oZYHZ3EnA+fdO1dHBBNPTX1kbbQvQZaD+qI+pFqkH X-Received: by 2002:a17:90b:4a49:b0:35c:d37:6024 with SMTP id 98e67ed59e1d1-35e35791f8fmr4551963a91.11.1775754747184; Thu, 09 Apr 2026 10:12:27 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac1:7680:d30::4cf:90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2d4f08d1bsm752395ad.54.2026.04.09.10.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 10:12:26 -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 v4 2/4] net: dsa: yt921x: Refactor long register helpers Date: Fri, 10 Apr 2026 01:12:02 +0800 Message-ID: <20260409171209.2575583-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409171209.2575583-1-mmyangfl@gmail.com> References: <20260409171209.2575583-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 Thu Apr 16 22:32:45 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 2E09733AD99 for ; Thu, 9 Apr 2026 17:12:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754753; cv=none; b=Jc2C/AetXHyHyD8td5pj/IKhuXgsPfXoXaZWoc9bj5eeY9IDQTVzPevleMOqRxwpzmZ/iWPEKYRKniDBGNTLBFm21liqwbCT1LKN9RKogmHc0ZeRIxd1w+MZlbRvunIjD+mnhzdn0Zo9JiHgqokst6dcuAnLrgsBKoQF+iJeGN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754753; c=relaxed/simple; bh=dXW3jIJkAafjnaie9T4TwffI/RxoM5p7H3bF7n50mDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IkMi1jVcnwdZvI9vGBgnDwokrEn26zEYmWj5Yb0gi9++MAqdyxWDnV5kSBppvMWOZT90Qky9ES5GyZ90MZx2MUQsjHWF33uQKJEZFrIrHad/Q0nw/uiwQVBc0W74wpgDLzUyMQRvioqK8yNZRdTVFyY1XSVw+bKmKC/bWxZKzW4= 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=ZXRWYkJn; arc=none smtp.client-ip=209.85.214.178 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="ZXRWYkJn" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2b0c8362d93so8630235ad.3 for ; Thu, 09 Apr 2026 10:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775754750; x=1776359550; 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=C0PerIpgKG32JFRNFK9DSuHMidXArqX6Q005ECyvyPQ=; b=ZXRWYkJnyKrWnBfP0R0528A58hP3Qyv5N6bVRuO2tSDtfdCea62jI3vVnWS1eiQUxw 19kZKmElTPFToKPkryhDBmqla+arHhsA3JtnTKjOKJTKTnhrRwL9G0l0qkhwwGbURjlF EsmTwgAAmeWG2kSRvIQR0SigCa1BQrkc63o69fi19tgch/nGWDDUwvQ0GXjb6kUTuU9g Bq/eJ9NiD/DPJu8UX9T80QrLR5cY+qIM0sDiaAwNtYslWtqFWosTBdxOt0kqAYzbp4dh Sm+ZolZfYu71p80Ac0ymr+2c34t1cu25xoDWUrvWRywPKqORDXtO4EEYv++OexB5L+Rz 6MoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775754750; x=1776359550; 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=C0PerIpgKG32JFRNFK9DSuHMidXArqX6Q005ECyvyPQ=; b=Sd6DqW+HJLV/YOBYckMKnfd1U7F8T1zT9pPgRQhPonS5YKB5WeKj0R9sqIILaCYA4a /yHnbNA3fhkTMVuoXU2MVUJUcb9HB8v8Yb4OIlvXxwbC9TQD8Fe4buqJ0BeG0LUQmF8n fuVhZuUWlRESdv64zVCR+pGeZRaw3wpnYdWBGMy3fFrNCPzaqT7nM5MPbvHcf02fHok3 LZ6ryJ7hOkBbEhVgdsRavCa9G+NijqKM56IpBMSNLDuyyFeMPjjcMJrsn1buNyT4/qPM 2sxI+VoWrpPS4KFsj5Wl1+J5Q7EkRLlHoXP7iFAIz/H20Ai8OB8JGJti+I1hm2VIfBJg WXZA== X-Forwarded-Encrypted: i=1; AJvYcCViKBpcT9Co9vfgGc6EezDvaBs+AlxQvjJX5s+zTju8Nz/sMpHVAAlhqy2tZU9/8eqoOEULmNmo8zPiRHE=@vger.kernel.org X-Gm-Message-State: AOJu0YxGhOHe5xsOb2RI4qsCVlJHlRfmQxVkvyGwazCiAttJ8ks/KQcp 56++OM2V7AWIZbrKfexnICwMH1DKTAPzdaco7IiZVHrW5FVBQkQQrl+4 X-Gm-Gg: AeBDiesgm6B8IaV9GzUzNP/9NryyTWR5m+x3TA6vanjOtfS4bZqrt3N9iAnRSBuZTEn NhqshAQ/JKPB8XTYcQ1yUxxlyU4xI1laM/IiFnh627TW2+UGpzblm3qoWeXe48GQbto3+bSZwfZ yjI1ludhY2cBMNkCBA8wW94DfOI9/HbWcgLxI3hJ3+8d1zPDllZmlRBOvi6s9gL9j0JvLv368TZ y3tpVPlwRKGVIVrcwBt4B76asUGe0cbZulc8O/reXAeewYl9y00Z/lzOdc0MkHGsPOkWv63Kn9B sLZSlhj1SLO8roKorHgdqP8cR0fUu+SgMxJEkICQKB0NGuqbDGg9/vtk3jijPcyn+tp4iEXc1E6 zPhR8i+z6jPMITVaoIZ4QZ2NDm/kIhiFv8LueP+gbD1E8MnxLPujdt2HRY6Jt6a5UbzZmCA/sgQ +HWdEvbJGVUV7C0/+okqcrAcnuZlmWihTP61/eTJt1bsFK8sW9 X-Received: by 2002:a17:903:a8f:b0:2b2:5637:1480 with SMTP id d9443c01a7336-2b2818850fdmr262690915ad.40.1775754750227; Thu, 09 Apr 2026 10:12:30 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac1:7680:d30::4cf:90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2d4f08d1bsm752395ad.54.2026.04.09.10.12.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 10:12:29 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 3/4] net: dsa: yt921x: Add port police support Date: Fri, 10 Apr 2026 01:12:03 +0800 Message-ID: <20260409171209.2575583-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409171209.2575583-1-mmyangfl@gmail.com> References: <20260409171209.2575583-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 | 325 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 54 +++++++ 2 files changed, 378 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 0c07b903fd68..f0ebbcd2151c 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,268 @@ 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) + dev_warn(dev, + "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 (m.cbs > cbs_max) { + WARN_ON(1); + 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 +3335,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 +3370,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 +3512,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 +3575,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 +3584,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 +3679,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..01cc2298be94 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 +/* 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 +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; + unsigned char cycle_ns; =20 /* protect the access to the switch registers */ struct mutex reg_lock; --=20 2.53.0 From nobody Thu Apr 16 22:32:45 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23D4B3E2753 for ; Thu, 9 Apr 2026 17:12:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754755; cv=none; b=VLyCVBbQFY5+p0mZjmfgPgIdQ0I3yYipXnQ1BrPoflZs6WrvI26ZtDlSeA5ybx2OT/KaleGKlrnlNwCMcJdqWDST7kzkCMrCr7RinxwC5ZgcovCFniYl1Bt6spXNJoY0Z4I/ROnAfZqpnZwpVmKMgnL1gsIM6bI8RmhWNzGL82M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775754755; c=relaxed/simple; bh=+4WVx8f/2+vU0fO+r5uPr9sVtf23lHa78BcGbCxB4IY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IjrB0xw7wDCvdlELdBl7wikPCs2VnZPo/fz0X+yYdXA9rqQmJLCpupM4eWqprTlAKXXW5fhGkaLOwuRiFg4o5QBmn35RnozhSrE9vABMFgSWIPNfVe1VFJuy/2RIOy3NTn2biK92MO03DPRJE/DiPo3YYzOtUFUe5+9RvruyuYw= 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=VvxnsMVK; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VvxnsMVK" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-35d9749c26dso1101507a91.2 for ; Thu, 09 Apr 2026 10:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775754753; x=1776359553; 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=w+NDWXu5Ducy6eJnnQ/3edoBP8cPmmntQKeSOV1FYCk=; b=VvxnsMVKscW815VJ6MQIwNmqA3UhKlu5sFDgZ34ltbil441jGKseO+SmykhQ6bpKTA OSdKkB+Tt0DVjHHTiA2kUjd3pdbnhLZ+kgM8ZUmTWiulg9+q/PMijiSN3+ujGCuT+5Hy IplN8bo7MV7/LNYz20/2urpZc+5ItsUtMBJ9gVyb+Vnw/v1zEAygztqU/GjgJ3he46/i 9IoEF3VJ4gBXf2pxek5eU+1kThceKkT9jYbsS0rAYLU36qdcjRnvL23qNCeHBffECOzk gboF7AXAgFtNiCQdtRpQeVkB1D6KCMcG18T8PiIJJrG+gLbuXIAoMFJmrSz8QvMTgmES IYug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775754753; x=1776359553; 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=w+NDWXu5Ducy6eJnnQ/3edoBP8cPmmntQKeSOV1FYCk=; b=j/Xvit49oGm59yhBRsjn07TQizuESc/APSiLZ3Me/OhqeW6JGVSq0t8GYnM+jtjYgb gJg/WHyijQx2mEvL6iHISb8/JDPdRfM4Z83CwsvjAZTBNChnqcenh9UzrSjSQivdV4Q9 e4ExuU0G0h7lAiFgS5LtO0vCFiaudNcazZPj+DJqZ215cMaziyCBF/uM991fcuuHs/tH dG+knwtU/0LJ7WhfCeDzcelW1y6SR98j4Hc7p2C8T1ANz8icKerDyM/Vr5x2KjMjiqB7 a+4oq4sus4/jYTP8x9X1NNj58wAchR8DFMRVKqu0XgZCpZwIRkzeO6gtP6A/FfWnqKGV WXXg== X-Forwarded-Encrypted: i=1; AJvYcCX8Z1GE04LjVs6kxp2n5lYa5pFte6d+QkNfaQCirorsVG7YUaFmXnbOmBxOvvZ18m0g8AG4foy9BaopQ2M=@vger.kernel.org X-Gm-Message-State: AOJu0Yzmc0MTlBB0Rvukg6awL3H33qTBAIU51Cwk2H5iaWh1xg06oP0l p9Pxg4icZCXFaZopxyq/GHZ+J/WWOFgY7QDmzh+EZoS+VzfdI99yI/OD X-Gm-Gg: AeBDiev/mMpzM1zdPEVUp1V6zFiDHAAxzxWKdobNsWjScDyCRFBGIJG9ZzzwW748jHz +BwjLPHVMSwxN+ZjEglNAJ1PkXDlo+xx713mP1GJ4UA+CAetg++uj+lxofz6PSsGdo01/QQSgaQ UcEhei31gmn/IU4oaY9gijzI2gOB8avMXGrTC3gkcLqpXUh72G0u8XLRW3aNnSWAuwLxUucVFz0 dDgchCqUpmTXDrZ2k+k8iUEQltJoIofCvswqSRJ50rYPBvQ/D6CdcBNk+ug7GOhqZ0zrKJ3k/mj Zv5/aD4S94sXe8GGmNdstFwqgJRYWbUdNDBPwBUC8QMUwjq8HsKsLwB+6hv5iayEoyOiyTvi5fe scrIA+hq4Sb/i5pa1iZrz0T+cXDhe9SBwlfWx5N/lccwiJTcuyzNrSQDvjt3p08tDx9F64J41/D pNu+516PCmUFj5vtaiU50DmrZ5m+C9JszdqwUw5UEJseBnFQ6p X-Received: by 2002:a17:903:3b84:b0:2b2:71b4:a3cf with SMTP id d9443c01a7336-2b2816e4279mr275032485ad.19.1775754753280; Thu, 09 Apr 2026 10:12:33 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac1:7680:d30::4cf:90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2d4f08d1bsm752395ad.54.2026.04.09.10.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 10:12:32 -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 v4 4/4] net: dsa: yt921x: Add port qdisc tbf support Date: Fri, 10 Apr 2026 01:12:04 +0800 Message-ID: <20260409171209.2575583-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409171209.2575583-1-mmyangfl@gmail.com> References: <20260409171209.2575583-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 | 134 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 65 ++++++++++++++++++- 2 files changed, 198 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index f0ebbcd2151c..b50d76b2d164 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 @@ -1274,6 +1275,19 @@ yt921x_marker_tfm_police(struct yt921x_marker *marke= r, priv, port, extack); } =20 +static int +yt921x_marker_tfm_shape(struct yt921x_marker *marker, u64 rate, u64 burst, + unsigned int flags, bool queue, + struct yt921x_priv *priv, int port, + struct netlink_ext_ack *extack) +{ + return yt921x_marker_tfm(marker, rate, burst, flags, + queue ? priv->queue_shape_slot_ns : + priv->port_shape_slot_ns, YT921X_SHAPE_CIR_MAX, + YT921X_SHAPE_CBS_MAX, YT921X_SHAPE_UNIT_MAX, + priv, port, extack); +} + static int yt921x_police_validate(const struct flow_action_police *police, const struct flow_action *action, @@ -1380,6 +1394,111 @@ 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; + + /* TODO: queue support */ + 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_marker marker; + 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_marker_tfm_shape(&marker, p->rate.rate_bytes_ps, + burst, + YT921X_MARKER_SINGLE_BUCKET, + false, priv, port, NULL); + if (res) + return res; + + ctrls[0] =3D YT921X_PORT_SHAPE_CTRLa_CIR(marker.cir) | + YT921X_PORT_SHAPE_CTRLa_CBS(marker.cbs); + ctrls[1] =3D YT921X_PORT_SHAPE_CTRLb_UNIT(marker.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) { @@ -3526,6 +3645,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 @@ -3682,6 +3815,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 01cc2298be94..1c4f4b56d1c8 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_CIR_MAX ((1 << 18) - 1) #define YT921X_METER_CBS_MAX ((1 << 16) - 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_CIR_MAX ((1 << 18) - 1) +#define YT921X_SHAPE_CBS_MAX ((1 << 14) - 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; unsigned char cycle_ns; --=20 2.53.0