net: dsa: yt921x: Add port police/tbf support
Subsystems (5)
v2 cover net: dsa: yt921x: Add port police/tbf support
v1: https://lore.kernel.org/r/[email protected]
- pass extack to user tc policers
- keep reg64 helpers along with reg96
- avoid macros in favor of functions
- adjust log messages
David Yang (4):
net: dsa: pass extack to user tc policers
net: dsa: yt921x: Refactor long register helpers
net: dsa: yt921x: Add port police support
net: dsa: yt921x: Add port qdisc tbf support
drivers/net/dsa/ocelot/felix.c | 3 +- drivers/net/dsa/sja1105/sja1105_main.c | 3 +- drivers/net/dsa/yt921x.c | 569 ++++++++++++++++++++++--- drivers/net/dsa/yt921x.h | 155 ++++++- include/net/dsa.h | 3 +- net/dsa/user.c | 2 +- 6 files changed, 660 insertions(+), 75 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/4 net: dsa: pass extack to user tc policers
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).
--- 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(-)
drivers/net/dsa/ocelot/felix.c +2 -1
@@ -2001,7 +2001,8 @@ static int felix_cls_flower_stats(struct dsa_switch *ds, int port, }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 = ds->priv;struct ocelot_policer pol = {
drivers/net/dsa/sja1105/sja1105_main.c +2 -1
@@ -2847,7 +2847,8 @@ static void sja1105_mirror_del(struct dsa_switch *ds, int port, }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 = ds->priv;
include/net/dsa.h +2 -1
@@ -1106,7 +1106,8 @@ struct dsa_switch_ops {void (*port_mirror_del)(struct dsa_switch *ds,int port,struct dsa_mall_mirror_tc_entry *mirror);int (*port_policer_add)(struct dsa_switch *ds,int port, -const struct flow_action_police *policer); +const struct flow_action_police *policer, +struct netlink_ext_ack *extack);void (*port_policer_del)(struct dsa_switch *ds,int port);int (*port_setup_tc)(struct dsa_switch *ds,int port,enum tc_setup_type type,void *type_data);
net/dsa/user.c +1 -1
@@ -1499,7 +1499,7 @@ dsa_user_add_cls_matchall_police(struct net_device *dev, policer = &mall_tc_entry->policer; *policer = act->police; - err = ds->ops->port_policer_add (ds, dp->index, policer); + err = ds->ops->port_policer_add (ds, dp->index, policer, extack);if (err) {kfree (mall_tc_entry);return err;
Signature · 1 line
2.53.0
Re: [PATCH net-next v2 1/4] net: dsa: pass extack to user tc policers
Quoted 7 lines · David Yang
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 <[email protected]>
Andrew
PATCH v2 2/4 net: dsa: yt921x: Refactor long register helpers
In reply to David YangDealing long registers with u64 is good, until you realize there are longer 96-bit registers.
Introduce yt921x_regs_*() helpers and refactor yt921x_reg64_*() as their wrappers. yt921x_reg96_*() should be added when used to avoid unused function warnings.
--- drivers/net/dsa/yt921x.c | 161 ++++++++++++++++++++++++++------------- drivers/net/dsa/yt921x.h | 36 ++++----- 2 files changed, 128 insertions(+), 69 deletions(-)
drivers/net/dsa/yt921x.c +110 -51
@@ -255,63 +255,121 @@ yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set)return yt921x_reg_update_bits (priv, reg, mask, !set ?0 : mask); } -/* Some registers, like VLANn_CTRL, should always be written in 64-bit, even if -* you are to write only the lower / upper 32 bits. +/* Some registers, like VLANn_CTRL, should always be written whole, even if you +* only want to write parts of 32 bits. * -* There is no such restriction for reading, but we still provide 64-bit read -* wrappers so that we always handle u64 values. +* There is no such restriction for reading, but we still provide the read +* wrapper so that we can handle them consistently. */ -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; - res =yt921x_reg_read (priv, reg, &lo); -if (res) -return res; - res =yt921x_reg_read (priv, reg +4 , &hi); -if (res) -return res; +for (unsigned int i =0 ; i < num_regs; i++) { + res =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 =0 ; i < num_regs; i++) { + res =yt921x_reg_write (priv, reg +4 * i, vals[i]); +if (res) +return res; + } - *valp = ((u64 )hi <<32 ) | lo;return 0 ; } -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 *masks, +const u32 *vals,unsigned int num_regs) { +bool changed = false; +u32 vs[4 ];int res; - res =yt921x_reg_write (priv, reg, (u32 )val); +BUILD_BUG_ON (num_regs >ARRAY_SIZE (vs)); + + res =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 =0 ; i < num_regs; i++) { +u32 u = vs[i]; + + u &= ~masks[i]; + u |= vals[i]; +if (u != vs[i]) + changed = true; + + vs[i] = u; + } + +if (!changed) +return 0 ; + +return yt921x_regs_write (priv, reg, vs, num_regs); }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 = false; +u32 vs[4 ];int res; -u64 v; -u64 u; - res =yt921x_reg64_read (priv, reg, &v); +BUILD_BUG_ON (num_regs >ARRAY_SIZE (vs)); + + res =yt921x_regs_read (priv, reg, vs, num_regs);if (res)return res; - u = v; - u &= ~mask; - u |= val; -if (u == v) +for (unsigned int i =0 ; i < num_regs; i++) { +u32 u = vs[i]; + + u &= ~masks[i]; +if (u != vs[i]) + changed = true; + + vs[i] = u; + } + +if (!changed)return 0 ; -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 ); } -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 *masks, +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 *masks) +{ +return yt921x_regs_clear_bits (priv, reg, masks,2 ); }static int yt921x_reg_mdio_read (void *context,u32 reg,u32 *valp)
@@ -1844,33 +1902,31 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering)return 0 ; } -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 ]; - mask64 =YT921X_VLAN_CTRL_PORTS (port) | -YT921X_VLAN_CTRL_UNTAG_PORTn (port); + masks[0 ] =YT921X_VLAN_CTRLa_PORTn (port); + masks[1 ] =YT921X_VLAN_CTRLb_UNTAG_PORTn (port); -return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), mask64); +return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), masks); }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 ]; - mask64 =YT921X_VLAN_CTRL_PORTn (port) | -YT921X_VLAN_CTRL_PORTS (priv->cpu_ports_mask); - ctrl64 = mask64; + masks[0 ] =YT921X_VLAN_CTRLa_PORTn (port) | +YT921X_VLAN_CTRLa_PORTS (priv->cpu_ports_mask); + ctrls[0 ] = masks[0 ]; - mask64 |=YT921X_VLAN_CTRL_UNTAG_PORTn (port); -if (untagged) - ctrl64 |=YT921X_VLAN_CTRL_UNTAG_PORTn (port); + masks[1 ] =YT921X_VLAN_CTRLb_UNTAG_PORTn (port); + ctrls[1 ] = untagged ? masks[1 ] :0 ;return yt921x_reg64_update_bits (priv,YT921X_VLANn_CTRL (vid), - mask64, ctrl64); + masks, ctrls); } static int
@@ -2331,8 +2387,8 @@ yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struct dsa_bridge bridge, const struct switchdev_vlan_msti *msti) {struct yt921x_priv *priv =to_yt921x_priv (ds); -u64 mask64; -u64 ctrl64; +u32 masks[2 ]; +u32 ctrls[2 ];int res;if (!msti->vid)
@@ -2340,12 +2396,14 @@ yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struct dsa_bridge bridge,if (!msti->msti || msti->msti >=YT921X_MSTI_NUM )return -EINVAL ; - mask64 =YT921X_VLAN_CTRL_STP_ID_M ; - ctrl64 =YT921X_VLAN_CTRL_STP_ID (msti->msti); + masks[0 ] =0 ; + ctrls[0 ] =0 ; + masks[1 ] = YT921X_VLAN_CTRLb_STP_ID_M; + ctrls[1 ] =YT921X_VLAN_CTRLb_STP_ID (msti->msti);mutex_lock (&priv->reg_lock); res =yt921x_reg64_update_bits (priv,YT921X_VLANn_CTRL (msti->vid), - mask64, ctrl64); + masks, ctrls);mutex_unlock (&priv->reg_lock);return res;
@@ -3097,7 +3155,7 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *priv) {struct dsa_switch *ds = &priv->ds;unsigned long cpu_ports_mask; -u64 ctrl64; +u32 ctrls[2 ];u32 ctrl;int port;int res;
@@ -3158,8 +3216,9 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *priv)/* Tagged VID 0 should be treated as untagged, which confuses the * hardware a lot */ - ctrl64 =YT921X_VLAN_CTRL_LEARN_DIS |YT921X_VLAN_CTRL_PORTS_M ; - res =yt921x_reg64_write (priv,YT921X_VLANn_CTRL (0 ), ctrl64); + ctrls[0 ] = YT921X_VLAN_CTRLa_LEARN_DIS | YT921X_VLAN_CTRLa_PORTS_M; + ctrls[1 ] =0 ; + res =yt921x_reg64_write (priv,YT921X_VLANn_CTRL (0 ), ctrls);if (res)return res;
drivers/net/dsa/yt921x.h +18 -18
@@ -429,24 +429,24 @@ enum yt921x_app_selector {#define YT921X_FDB_HW_FLUSH_ON_LINKDOWN BIT(0)#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_UNTAG_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_UNTAG_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_ID_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)#define YT921X_TPID_IGRn (x) (0x210000 + 4 * (x))/* [0, 3] */ #define YT921X_TPID_IGR_TPID_M GENMASK(15, 0)
Signature · 1 line
2.53.0
Andrew Lunn
maintainerRe: [PATCH net-next v2 2/4] net: dsa: yt921x: Refactor long register helpers
drivers/net/dsa/yt921x.c yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set) · line 358
Quoted 4 lines
drivers/net/dsa/yt921x.c +2
-1-static int yt921x_reg64_write (struct yt921x_priv *priv,u32 reg,u64 val) +yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{
The old reg64_write actually took a u64 value, so the name fit. The new one takes 2x a u32. So i'm not sure calling is reg64 actually fits. Maybe yt921x_reg32x2_write()?
drivers/net/dsa/yt921x.c yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering) · line 1912
Quoted 12 lines
drivers/net/dsa/yt921x.c +5
-4+static int yt921x_vlan_del (struct yt921x_priv *priv,int port,u16 vid) { -u64 mask64; +u32 masks[2 ]; - mask64 =YT921X_VLAN_CTRL_PORTS (port) | -YT921X_VLAN_CTRL_UNTAG_PORTn (port); + masks[0 ] =YT921X_VLAN_CTRLa_PORTn (port); + masks[1 ] =YT921X_VLAN_CTRLb_UNTAG_PORTn (port); -return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), mask64); +return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), masks);
Or you could make yt921x_reg64_write() continue to take a u64, and avoid all these changes?
How does the datasheet describe these registers? Are they 64bit registers, or 2x 32bit registers?
Andrew
Re: [PATCH net-next v2 2/4] net: dsa: yt921x: Refactor long register helpers
Quoted 20 lines · Andrew Lunn
drivers/net/dsa/yt921x.c yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set) · line 358
Quoted 5 lines
drivers/net/dsa/yt921x.c +2
-1-static int yt921x_reg64_write (struct yt921x_priv *priv,u32 reg,u64 val) +yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{The old
reg64_writeactually took a u64 value, so the name fit. The new one takes 2x a u32. So i'm not sure calling is reg64 actually fits. Maybeyt921x_reg32x2_write()?Quoted 10 lines
drivers/net/dsa/yt921x.c +4
-3+static int yt921x_vlan_del (struct yt921x_priv *priv,int port,u16 vid) { -u64 mask64; +u32 masks[2 ]; - mask64 =YT921X_VLAN_CTRL_PORTS (port) | -YT921X_VLAN_CTRL_UNTAG_PORTn (port); + masks[0 ] =YT921X_VLAN_CTRLa_PORTn (port); + masks[1 ] =YT921X_VLAN_CTRLb_UNTAG_PORTn (port);
Quoted 6 lines
drivers/net/dsa/yt921x.c yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering) · line 1912
Quoted 2 lines
drivers/net/dsa/yt921x.c +1
-1-return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), mask64); +return yt921x_reg64_clear_bits (priv,YT921X_VLANn_CTRL (vid), masks);Or you could make
yt921x_reg64_write()continue to take a u64, and avoid all these changes?
I'd like so, but I hate much to use u64 for 2x and u32[] for 3x.
Quoted 3 lines
How does the datasheet describe these registers? Are they 64bit registers, or 2x 32bit registers?
They act more like 64b/96b registers since there are unaligned fields across the 32bit boundary.
Quoted 1 line
Andrew
PATCH v2 3/4 net: dsa: yt921x: Add port police support
In reply to David YangEnable rate meter ability and support limiting the rate of incoming traffic.
--- drivers/net/dsa/yt921x.c | 286 ++++++++++++++++++++++++++++++++++++++- drivers/net/dsa/yt921x.h | 54 ++++++++ 2 files changed, 339 insertions(+), 1 deletion(-)
drivers/net/dsa/yt921x.c +285 -1
@@ -262,6 +262,14 @@ yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set)* wrapper so that we can handle them consistently. */ +static void update_ctrls_unaligned (u32 *ctrls,u64 mask,u64 val) +{ + ctrls[0 ] &= ~((u32 )mask); + ctrls[1 ] &= ~((u32)(mask >>32 )); + ctrls[0 ] |= (u32 )val; + ctrls[1 ] |= (u32)(val >>32 ); +} +static int yt921x_regs_read (struct yt921x_priv *priv,u32 reg,u32 *vals,unsigned int num_regs)
@@ -372,6 +380,12 @@ yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *masks)return yt921x_regs_clear_bits (priv, reg, masks,2 ); } +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 = context;
@@ -1065,6 +1079,13 @@ yt921x_dsa_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)return res; } +static int yt921x_mtu_fetch (struct yt921x_priv *priv,int port) +{ +struct dsa_port *dp =dsa_to_port (&priv->ds, port); + +return dp->user ?READ_ONCE (dp->user->mtu) :ETH_DATA_LEN ; +} +static int yt921x_dsa_port_change_mtu (struct dsa_switch *ds,int port,int new_mtu) {
@@ -1096,6 +1117,229 @@ static int yt921x_dsa_port_max_mtu(struct dsa_switch *ds, int port)return YT921X_FRAME_SIZE_MAX -ETH_HLEN -ETH_FCS_LEN -YT921X_TAG_LEN ; } +/* v * 2^e */ +static u64 ldexpu64 (u64 v,int e) +{ +return e >=0 ? v << e : v >> -e; +} + +/* slot (ns) * rate (/s) / 10^9 (ns/s) = 2^C * token * 4^unit */ +static u32 rate2token (u64 rate,unsigned int slot_ns,int unit,int C ) +{ +int e =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 =2 * unit +C +YT921X_TOKEN_RATE_C ; + +return div_u64 (ldexpu64 (mul_u32_u32 (1000000000 , token), e), slot_ns); +} + +/* burst = 2^C * token * 4^unit */ +static u32 burst2token (u64 burst,int unit,int C ) +{ +return ldexpu64 (burst, -(2 * unit +C )); +} + +static u64 token2burst (u32 token,int unit,int C ) +{ +return ldexpu64 (token,2 * unit +C ); +} + +struct yt921x_meter { +u32 cir; +u32 cbs; +u32 ebs; +int unit; +}; + +#define YT921X_METER_PKT_MODE BIT(0) +#define YT921X_METER_SINGLE_BUCKET BIT(1) + +static int +yt921x_meter_tfm (struct yt921x_priv *priv,int port,unsigned int slot_ns, +u64 rate,u64 burst,unsigned int flags, +u32 cir_max,u32 cbs_max,int unit_max, +struct yt921x_meter *meterp) +{ +const int C = flags &YT921X_METER_PKT_MODE ?YT921X_TOKEN_PKT_C : +YT921X_TOKEN_BYTE_C ; +struct device *dev =to_device (priv); +struct yt921x_meter meter; +bool distorted; +u64 burst_est; +u64 burst_sug; +u64 burst_max; +u64 rate_max; + + meter.unit = unit_max; + rate_max =token2rate (cir_max, slot_ns, meter.unit,C ); + burst_max =token2burst (cbs_max, meter.unit,C ); + +/* Check for unusual values */ +if (rate > rate_max || burst > burst_max) +return -ERANGE ; + +/* Check for matching burst */ + burst_est =div_u64 (slot_ns * rate,1000000000 ); + burst_sug = burst_est; +if (flags &YT921X_METER_PKT_MODE ) + burst_sug++; +else + burst_sug +=ETH_HLEN +yt921x_mtu_fetch (priv, port) + +ETH_FCS_LEN ; +if (burst_sug > burst) +dev_warn (dev, +"Consider burst at least %llu to match rate %llu\n" , + burst_sug, rate); + +/* Select unit */ +for (; meter.unit >0 ; meter.unit--) { +if (rate > (rate_max >>2 ) || burst > (burst_max >>2 )) +break ; + rate_max >>=2 ; + burst_max >>=2 ; + } + +/* Calculate information rate and bucket size */ + distorted = false; + meter.cir =rate2token (rate, slot_ns, meter.unit,C ); +if (!meter.cir) { + distorted = true; + meter.cir =1 ; + }else if (WARN_ON (meter.cir > cir_max)) { + meter.cir = cir_max; + } + meter.cbs =burst2token (burst, meter.unit,C ); +if (!meter.cbs) { + distorted = true; + meter.cbs =1 ; + }else if (WARN_ON (meter.cbs > cbs_max)) { + meter.cbs = cbs_max; + } +if (distorted) +dev_dbg (dev, +"Have to increase rate %llu, burst %llu to %llu, %llu\n" , + rate, burst, +token2rate (meter.cir, slot_ns, meter.unit,C ), +token2burst (meter.cbs, meter.unit,C )); + +/* Cut EBS */ + meter.ebs =0 ; +if (!(flags &YT921X_METER_SINGLE_BUCKET )) { +/* We don't have a chance to adjust rate when MTU is changed */ +if (flags &YT921X_METER_PKT_MODE ) + burst_est++; +else + burst_est +=YT921X_FRAME_SIZE_MAX ; + +if (burst_est < burst) { +u32 pbs = meter.cbs; + + meter.cbs =burst2token (burst_est, meter.unit,C ); +if (!meter.cbs) { + meter.cbs =1 ; + }else if (meter.cbs > cbs_max) { +WARN_ON (1 ); + meter.cbs = cbs_max; + } + +if (pbs > meter.cbs) + meter.ebs = pbs - meter.cbs; + } + } + +dev_dbg (dev, +"slot %u ns, rate %llu, burst %llu -> unit %d, cir %u, cbs %u, ebs %u\n" , + slot_ns, rate, burst, + meter.unit, meter.cir, meter.cbs, meter.ebs); + + *meterp = meter; +return 0 ; +} + +static void yt921x_dsa_port_policer_del (struct dsa_switch *ds,int port) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +struct device *dev =to_device (priv); +int res; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_write (priv,YT921X_PORTn_METER (port),0 ); +mutex_unlock (&priv->reg_lock); + +if (res) +dev_err (dev,"Failed to %s port %d: %i\n" ,"delete policer on" , + port, res); +} + +static int +yt921x_dsa_port_policer_add (struct dsa_switch *ds,int port, +const struct flow_action_police *policer, +struct netlink_ext_ack *extack) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +struct yt921x_meter meter; +bool pkt_mode; +u32 ctrls[3 ]; +u64 burst; +u64 rate; +u32 ctrl; +int res; + +/* mtu defaults to unlimited but we got 2040 here, don't know why */ +if (policer->peakrate_bytes_ps || policer->avrate || policer->overhead) { +NL_SET_ERR_MSG_MOD (extack, +"peakrate / avrate / overhead not supported" ); +return -EOPNOTSUPP ; + } +if (policer->exceed.act_id !=FLOW_ACTION_DROP || + policer->notexceed.act_id !=FLOW_ACTION_ACCEPT ) { +NL_SET_ERR_MSG_MOD (extack, +"conform-exceed other than drop/ok not supported" ); +return -EOPNOTSUPP ; + } + + pkt_mode = !!policer->rate_pkt_ps; + rate = pkt_mode ? policer->rate_pkt_ps : policer->rate_bytes_ps; + burst = pkt_mode ? policer->burst_pkt : policer->burst; + res =yt921x_meter_tfm (priv, port, priv->meter_slot_ns, rate, burst, + pkt_mode ?YT921X_METER_PKT_MODE :0 , +YT921X_METER_RATE_MAX ,YT921X_METER_BURST_MAX , +YT921X_METER_UNIT_MAX , &meter); +if (res) { +NL_SET_ERR_MSG_MOD (extack,"Unexpected tremendous rate" ); +return res; + } + +mutex_lock (&priv->reg_lock); + ctrl =YT921X_PORT_METER_ID (port) |YT921X_PORT_METER_EN ; + res =yt921x_reg_write (priv,YT921X_PORTn_METER (port), ctrl); +if (res) + goto end; + + ctrls[0 ] =0 ; + ctrls[1 ] =YT921X_METER_CTRLb_CIR (meter.cir); + ctrls[2 ] =YT921X_METER_CTRLc_UNIT (meter.unit) | + YT921X_METER_CTRLc_DROP_R | + YT921X_METER_CTRLc_TOKEN_OVERFLOW_EN | + YT921X_METER_CTRLc_METER_EN; +update_ctrls_unaligned (&ctrls[0 ], YT921X_METER_CTRLab_EBS_M, +YT921X_METER_CTRLab_EBS (meter.ebs)); +update_ctrls_unaligned (&ctrls[1 ], YT921X_METER_CTRLbc_CBS_M, +YT921X_METER_CTRLbc_CBS (meter.cbs)); + res =yt921x_reg96_write (priv, +YT921X_METERn_CTRL (port +YT921X_METER_NUM ), + ctrls); +end: +mutex_unlock (&priv->reg_lock); + +return res; +} +static int yt921x_mirror_del (struct yt921x_priv *priv,int port,bool ingress) {
@@ -3064,6 +3308,7 @@ static int yt921x_chip_detect(struct yt921x_priv *priv)u32 chipid;u32 major;u32 mode; +u32 val;int res; res =yt921x_reg_read (priv,YT921X_CHIP_ID , &chipid);
@@ -3098,12 +3343,27 @@ static int yt921x_chip_detect(struct yt921x_priv *priv)return -ENODEV ; } + res =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 = info->major ==YT9215_MAJOR ?8 :6 ; +break ; +case YT921X_SYS_CLK_143M : + priv->cycle_ns =7 ; +break ; +default : + priv->cycle_ns =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); priv->info = info; +return 0 ; }
@@ -3225,6 +3485,23 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *priv)return 0 ; } +static int yt921x_chip_setup_tc (struct yt921x_priv *priv) +{ +unsigned int op_ns; +u32 ctrl; +int res; + + op_ns =8 * priv->cycle_ns; + + ctrl =max (priv->meter_slot_ns / op_ns,YT921X_METER_SLOT_MIN ); + res =yt921x_reg_write (priv,YT921X_METER_SLOT , ctrl); +if (res) +return res; + priv->meter_slot_ns = ctrl * op_ns; + +return 0 ; +} +static int __maybe_unused yt921x_chip_setup_qos (struct yt921x_priv *priv) {u32 ctrl;
@@ -3271,7 +3548,7 @@ static int yt921x_chip_setup(struct yt921x_priv *priv)u32 ctrl;int res; - ctrl =YT921X_FUNC_MIB ; + ctrl =YT921X_FUNC_MIB |YT921X_FUNC_METER ; res =yt921x_reg_set_bits (priv,YT921X_FUNC , ctrl);if (res)return res;
@@ -3280,6 +3557,10 @@ static int yt921x_chip_setup(struct yt921x_priv *priv)if (res)return res; + res =yt921x_chip_setup_tc (priv); +if (res) +return res; +#if IS_ENABLED (CONFIG_DCB ) res =yt921x_chip_setup_qos (priv);if (res)
@@ -3371,6 +3652,9 @@ static const struct dsa_switch_ops yt921x_dsa_switch_ops = {/* mtu */ .port_change_mtu = yt921x_dsa_port_change_mtu, .port_max_mtu = yt921x_dsa_port_max_mtu, +/* rate */ + .port_policer_del = yt921x_dsa_port_policer_del, + .port_policer_add = yt921x_dsa_port_policer_add,/* hsr */ .port_hsr_leave = dsa_port_simple_hsr_leave, .port_hsr_join = dsa_port_simple_hsr_join,
drivers/net/dsa/yt921x.h +54 -0
86 lines not on this page · raw message
Signature · 1 line
2.53.0
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] net: dsa: yt921x: Add port police support
drivers/net/dsa/yt921x.c yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set) · line 270
Quoted 6 lines
drivers/net/dsa/yt921x.c +6
-0+static void update_ctrls_unaligned (u32 *ctrls,u64 mask,u64 val) +{ + ctrls[0 ] &= ~((u32 )mask); + ctrls[1 ] &= ~((u32)(mask >>32 )); + ctrls[0 ] |= (u32 )val; + ctrls[1 ] |= (u32)(val >>32 );
Please use the macros upper_32_bits() and lower_32_bits().
drivers/net/dsa/yt921x.c static int yt921x_dsa_port_max_mtu(struct dsa_switch *ds, int port) · line 1333
Quoted 4 lines
drivers/net/dsa/yt921x.c +4
-0+update_ctrls_unaligned (&ctrls[0 ], YT921X_METER_CTRLab_EBS_M, +YT921X_METER_CTRLab_EBS (meter.ebs)); +update_ctrls_unaligned (&ctrls[1 ], YT921X_METER_CTRLbc_CBS_M, +YT921X_METER_CTRLbc_CBS (meter.cbs));
That looks odd. The first call to update_ctrls_unaligned() writes to ctrls[0] and ctrl[1]. The second call ORs into ctrls[1] and writes to ctrls[2]?
When you look at the masks:
drivers/net/dsa/yt921x.h enum yt921x_app_selector { · line 501
Quoted 2 lines
drivers/net/dsa/yt921x.h +2
-0+#define YT921X_METER_CTRLbc_CBS_M GENMASK_ULL(35, 20) +#define YT921X_METER_CTRLab_EBS_M GENMASK_ULL(33, 18)
They cross the 32 bit boundary. I think it would be cleaner to deal with these using GENMASK_U128 and construct the value in a u128. Pass the u128 to a reg96_write() and let it discard the upper 32 bits?
Andrew
Re: [PATCH net-next v2 3/4] net: dsa: yt921x: Add port police support
Quoted 21 lines · Andrew Lunn
drivers/net/dsa/yt921x.c yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set) · line 270
Quoted 7 lines
drivers/net/dsa/yt921x.c +6
-0+static void update_ctrls_unaligned (u32 *ctrls,u64 mask,u64 val) +{ + ctrls[0 ] &= ~((u32 )mask); + ctrls[1 ] &= ~((u32)(mask >>32 )); + ctrls[0 ] |= (u32 )val; + ctrls[1 ] |= (u32)(val >>32 );Please use the macros
upper_32_bits()andlower_32_bits().drivers/net/dsa/yt921x.c static int yt921x_dsa_port_max_mtu(struct dsa_switch *ds, int port) · line 1333
Quoted 4 lines
drivers/net/dsa/yt921x.c +4
-0+update_ctrls_unaligned (&ctrls[0 ], YT921X_METER_CTRLab_EBS_M, +YT921X_METER_CTRLab_EBS (meter.ebs)); +update_ctrls_unaligned (&ctrls[1 ], YT921X_METER_CTRLbc_CBS_M, +YT921X_METER_CTRLbc_CBS (meter.cbs));That looks odd. The first call to
update_ctrls_unaligned()writes to ctrls[0] and ctrl[1]. The second call ORs into ctrls[1] and writes to ctrls[2]?When you look at the masks:
Quoted 8 lines
drivers/net/dsa/yt921x.h enum yt921x_app_selector { · line 501
Quoted 2 lines
drivers/net/dsa/yt921x.h +2
-0+#define YT921X_METER_CTRLbc_CBS_M GENMASK_ULL(35, 20) +#define YT921X_METER_CTRLab_EBS_M GENMASK_ULL(33, 18)They cross the 32 bit boundary. I think it would be cleaner to deal with these using
GENMASK_U128and construct the value in a u128. Pass the u128 to areg96_write()and let it discard the upper 32 bits?Andrew
Does it unnecessarily depend on __int128? Otherwise it's good.
Andrew Lunn
maintainerRe: [PATCH net-next v2 3/4] net: dsa: yt921x: Add port police support
Quoted 1 line
Does it unnecessarily depend on
__int128? Otherwise it's good.
Ah, it seems to be a 64 bit architecture only thing.
Shame, because it would make this code easier to understand.
For these u96 values, the masks i looked at would fit into a u64. Are there any fields which cross from bits < 64 to > 64? Could you represent it as a u64+u32?
Andrew
Re: [PATCH net-next v2 3/4] net: dsa: yt921x: Add port police support
Quoted 5 lines · Andrew Lunn
Quoted 2 lines
Does it unnecessarily depend on
__int128? Otherwise it's good.Ah, it seems to be a 64 bit architecture only thing.
Quoted 7 lines
Shame, because it would make this code easier to understand.
For these u96 values, the masks i looked at would fit into a u64. Are there any fields which cross from bits < 64 to > 64? Could you represent it as a u64+u32?
Andrew
EBS crosses word #0 and #1 and CBS crosses word #1 and #2, and I didn't find any boundary patterns among other u96 registers.
But maybe I could drop those multi-word register helpers and use manual updates, since I have to use unaligned modifications anyway.
PATCH v2 4/4 net: dsa: yt921x: Add port qdisc tbf support
In reply to David YangEnable port shaping and support limiting the rate of outgoing traffic.
--- drivers/net/dsa/yt921x.c | 122 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 65 ++++++++++++++++++++- 2 files changed, 186 insertions(+), 1 deletion(-)
drivers/net/dsa/yt921x.c +122 -0
@@ -24,6 +24,7 @@#include <net/dsa.h> #include <net/dscp.h> #include <net/ieee8021q.h> +#include <net/pkt_cls.h> #include "yt921x.h"
@@ -1340,6 +1341,112 @@ yt921x_dsa_port_policer_add(struct dsa_switch *ds, int port,return res; } +static int +yt921x_tbf_validate (struct yt921x_priv *priv, +const struct tc_tbf_qopt_offload *qopt,int *queuep) +{ +struct device *dev =to_device (priv); +int queue =-1 ; + +if (qopt->parent !=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 = &qopt->replace_params; + +if (!p->rate.mpu) { +dev_info (dev,"Assuming you want mpu = 64\n" ); + }else if (p->rate.mpu !=64 ) { +dev_err (dev,"mpu other than 64 not supported\n" ); +return -EINVAL ; + } +break ; + } +default : +break ; + } + + *queuep = 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 =to_yt921x_priv (ds); +u32 ctrls[2 ]; +int res; + +switch (qopt->command) { +case TC_TBF_DESTROY : + ctrls[0 ] =0 ; + ctrls[1 ] =0 ; +break ; +case TC_TBF_REPLACE : { +const struct tc_tbf_qopt_offload_replace_params *p; +struct yt921x_meter meter; +u64 burst; + + p = &qopt->replace_params; + +/* where is burst??? */ + burst =div_u64 (priv->port_shape_slot_ns * p->rate.rate_bytes_ps, +1000000000 ) +10000 ; + res =yt921x_meter_tfm (priv, port, priv->port_shape_slot_ns, + p->rate.rate_bytes_ps, burst, +YT921X_METER_SINGLE_BUCKET , +YT921X_SHAPE_RATE_MAX , +YT921X_SHAPE_BURST_MAX , +YT921X_SHAPE_UNIT_MAX , &meter); +if (res) +return res; + + ctrls[0 ] =YT921X_PORT_SHAPE_CTRLa_CIR (meter.cir) | +YT921X_PORT_SHAPE_CTRLa_CBS (meter.cbs); + ctrls[1 ] =YT921X_PORT_SHAPE_CTRLb_UNIT (meter.unit) | + YT921X_PORT_SHAPE_CTRLb_EN; +break ; + } +default : +return -EOPNOTSUPP ; + } + +mutex_lock (&priv->reg_lock); + res =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 =to_yt921x_priv (ds); +int res; + +switch (type) { +case TC_SETUP_QDISC_TBF : { +const struct tc_tbf_qopt_offload *qopt = type_data; +int queue; + + res =yt921x_tbf_validate (priv, qopt, &queue); +if (res) +return res; + +return yt921x_dsa_port_setup_tc_tbf_port (ds, port, qopt); + } +default : +return -EOPNOTSUPP ; + } +} +static int yt921x_mirror_del (struct yt921x_priv *priv,int port,bool ingress) {
@@ -3499,6 +3606,20 @@ static int yt921x_chip_setup_tc(struct yt921x_priv *priv)return res; priv->meter_slot_ns = ctrl * op_ns; + ctrl =max (priv->port_shape_slot_ns / op_ns, +YT921X_PORT_SHAPE_SLOT_MIN ); + res =yt921x_reg_write (priv,YT921X_PORT_SHAPE_SLOT , ctrl); +if (res) +return res; + priv->port_shape_slot_ns = ctrl * op_ns; + + ctrl =max (priv->queue_shape_slot_ns / op_ns, +YT921X_QUEUE_SHAPE_SLOT_MIN ); + res =yt921x_reg_write (priv,YT921X_QUEUE_SHAPE_SLOT , ctrl); +if (res) +return res; + priv->queue_shape_slot_ns = ctrl * op_ns; +return 0 ; }
@@ -3655,6 +3776,7 @@ static const struct dsa_switch_ops yt921x_dsa_switch_ops = {/* rate */ .port_policer_del = yt921x_dsa_port_policer_del, .port_policer_add = yt921x_dsa_port_policer_add, + .port_setup_tc = yt921x_dsa_port_setup_tc,/* hsr */ .port_hsr_leave = dsa_port_simple_hsr_leave, .port_hsr_join = dsa_port_simple_hsr_join,
drivers/net/dsa/yt921x.h +64 -1
95 lines not on this page · raw message
Signature · 1 line
2.53.0