* [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups
@ 2026-10-01 20:48 David Yang
2026-10-01 20:48 ` [PATCH net-next v2 1/5] net: dsa: motorcomm: Hoist type casting helper into chip.h David Yang
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
This series continues the traffic control work on the Motorcomm YT9215S
DSA driver: it reorganizes the offload code and then adds ACL enablement
on demand and flower priority mapping.
v2:
- move type casting helper into chip.h
- remove flow statistics and broadcast/multicast policers
v1: https://lore.kernel.org/r/20260926211813.935723-1-mmyangfl@gmail.com
David Yang (5):
net: dsa: motorcomm: Hoist type casting helper into chip.h
net: dsa: motorcomm: Split TC module
net: dsa: motorcomm: Use NSEC_PER_SEC
net: dsa: motorcomm: Enable ACL on demand
net: dsa: motorcomm: Add TC prio support
drivers/net/dsa/motorcomm/Makefile | 1 +
drivers/net/dsa/motorcomm/chip.c | 1568 +-------------------------
drivers/net/dsa/motorcomm/chip.h | 355 +-----
drivers/net/dsa/motorcomm/leds.c | 7 +-
drivers/net/dsa/motorcomm/mdio_bus.c | 10 +-
drivers/net/dsa/motorcomm/pcs-921x.c | 8 +-
drivers/net/dsa/motorcomm/tc.c | 1524 +++++++++++++++++++++++++
drivers/net/dsa/motorcomm/tc.h | 379 +++++++
8 files changed, 1982 insertions(+), 1870 deletions(-)
create mode 100644 drivers/net/dsa/motorcomm/tc.c
create mode 100644 drivers/net/dsa/motorcomm/tc.h
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 1/5] net: dsa: motorcomm: Hoist type casting helper into chip.h
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
@ 2026-10-01 20:48 ` David Yang
2026-10-01 20:48 ` [PATCH net-next v2 2/5] net: dsa: motorcomm: Split TC module David Yang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
Rename and move dsa_to_yt921x_priv() and yt921x_priv_to_device() to
chip.h so all files use one definition.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/motorcomm/chip.c | 127 +++++++++++++--------------
drivers/net/dsa/motorcomm/chip.h | 2 +
drivers/net/dsa/motorcomm/leds.c | 7 +-
drivers/net/dsa/motorcomm/mdio_bus.c | 10 +--
drivers/net/dsa/motorcomm/pcs-921x.c | 8 +-
5 files changed, 74 insertions(+), 80 deletions(-)
diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c
index 3ff2de383157..aa7d6ab34cbb 100644
--- a/drivers/net/dsa/motorcomm/chip.c
+++ b/drivers/net/dsa/motorcomm/chip.c
@@ -171,9 +171,6 @@ struct yt921x_reg_mdio {
/* TODO: SPI/I2C */
-#define to_yt921x_priv(_ds) container_of_const(_ds, struct yt921x_priv, ds)
-#define to_device(priv) ((priv)->ds.dev)
-
static u32 ethaddr_hi4_to_u32(const unsigned char *addr)
{
return (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3];
@@ -272,7 +269,7 @@ static const struct yt921x_reg_ops yt921x_reg_ops_mdio = {
static int yt921x_read_mib(struct yt921x_priv *priv, int port)
{
struct yt921x_port *pp = &priv->ports[port];
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct yt921x_mib *mib = &pp->mib;
int res = 0;
@@ -364,7 +361,7 @@ yt921x_dsa_get_strings(struct dsa_switch *ds, int port, u32 stringset,
static void
yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
size_t j;
@@ -406,7 +403,7 @@ static void
yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, int port,
struct ethtool_eth_mac_stats *mac_stats)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
@@ -442,7 +439,7 @@ static void
yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, int port,
struct ethtool_eth_ctrl_stats *ctrl_stats)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
@@ -471,7 +468,7 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int port,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
@@ -507,7 +504,7 @@ static void
yt921x_dsa_get_stats64(struct dsa_switch *ds, int port,
struct rtnl_link_stats64 *stats)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
@@ -543,7 +540,7 @@ static void
yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int port,
struct ethtool_pause_stats *pause_stats)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_port *pp = &priv->ports[port];
struct yt921x_mib *mib = &pp->mib;
@@ -598,7 +595,7 @@ yt921x_set_eee(struct yt921x_priv *priv, int port, struct ethtool_keee *e)
static int
yt921x_dsa_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -622,7 +619,7 @@ yt921x_dsa_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
* maximum after reset
*/
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct dsa_port *dp = dsa_to_port(ds, port);
int frame_size;
int res;
@@ -697,7 +694,7 @@ yt921x_marker_tfm(struct yt921x_marker *marker, u64 rate, u64 burst,
{
const int C = flags & YT921X_MARKER_PKT_MODE ? YT921X_TOKEN_PKT_C :
YT921X_TOKEN_BYTE_C;
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct yt921x_marker m;
u64 burst_est;
u64 burst_sug;
@@ -873,8 +870,8 @@ yt921x_meter_config(struct yt921x_priv *priv, unsigned int id,
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);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
int res;
mutex_lock(&priv->reg_lock);
@@ -891,7 +888,7 @@ 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 = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_marker marker;
u32 ctrl;
int res;
@@ -921,7 +918,7 @@ 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);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct netlink_ext_ack *extack = qopt->extack;
u32 ctrls[2];
int res;
@@ -1970,7 +1967,7 @@ static int
yt921x_dsa_cls_flower_del(struct dsa_switch *ds, int port,
struct flow_cls_offload *cls, bool ingress)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -1985,7 +1982,7 @@ yt921x_dsa_cls_flower_add(struct dsa_switch *ds, int port,
struct flow_cls_offload *cls, bool ingress)
{
struct netlink_ext_ack *extack = cls->common.extack;
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct yt921x_acl_rule_ext ruleext;
int res;
@@ -2056,8 +2053,8 @@ static void
yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,
struct dsa_mall_mirror_tc_entry *mirror)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
- struct device *dev = to_device(priv);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
int res;
mutex_lock(&priv->reg_lock);
@@ -2074,7 +2071,7 @@ yt921x_dsa_port_mirror_add(struct dsa_switch *ds, int port,
struct dsa_mall_mirror_tc_entry *mirror,
bool ingress, struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -2143,7 +2140,7 @@ static int yt921x_lag_set(struct yt921x_priv *priv, u8 index, u16 ports_mask)
static int
yt921x_dsa_port_lag_leave(struct dsa_switch *ds, int port, struct dsa_lag lag)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct dsa_port *dp;
u32 ctrl;
int res;
@@ -2206,7 +2203,7 @@ yt921x_dsa_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag lag,
struct netdev_lag_upper_info *info,
struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct dsa_port *dp;
bool unique_lag;
unsigned int i;
@@ -2269,7 +2266,7 @@ yt921x_dsa_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag lag,
static int yt921x_fdb_wait(struct yt921x_priv *priv, u32 *valp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u32 val = YT921X_FDB_RESULT_DONE;
int res;
@@ -2338,7 +2335,7 @@ static int
yt921x_fdb_read(struct yt921x_priv *priv, unsigned char *addr, u16 *vidp,
u16 *ports_maskp, u16 *indexp, u8 *statusp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u16 index;
u32 data0;
u32 data1;
@@ -2629,7 +2626,7 @@ static int
yt921x_dsa_port_fdb_dump(struct dsa_switch *ds, int port,
dsa_fdb_dump_cb_t *cb, void *data)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -2644,8 +2641,8 @@ yt921x_dsa_port_fdb_dump(struct dsa_switch *ds, int port,
static void yt921x_dsa_port_fast_age(struct dsa_switch *ds, int port)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
- struct device *dev = to_device(priv);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
int res;
mutex_lock(&priv->reg_lock);
@@ -2660,7 +2657,7 @@ static void yt921x_dsa_port_fast_age(struct dsa_switch *ds, int port)
static int
yt921x_dsa_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 ctrl;
int res;
@@ -2678,7 +2675,7 @@ static int
yt921x_dsa_port_fdb_del(struct dsa_switch *ds, int port,
const unsigned char *addr, u16 vid, struct dsa_db db)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -2692,7 +2689,7 @@ static int
yt921x_dsa_port_fdb_add(struct dsa_switch *ds, int port,
const unsigned char *addr, u16 vid, struct dsa_db db)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -2707,7 +2704,7 @@ yt921x_dsa_port_mdb_del(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_mdb *mdb,
struct dsa_db db)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
const unsigned char *addr = mdb->addr;
u16 vid = mdb->vid;
int res;
@@ -2724,7 +2721,7 @@ yt921x_dsa_port_mdb_add(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_mdb *mdb,
struct dsa_db db)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
const unsigned char *addr = mdb->addr;
u16 vid = mdb->vid;
int res;
@@ -2889,7 +2886,7 @@ yt921x_dsa_port_vlan_filtering(struct dsa_switch *ds, int port,
bool vlan_filtering,
struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
if (dsa_is_cpu_port(ds, port))
@@ -2906,7 +2903,7 @@ static int
yt921x_dsa_port_vlan_del(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u16 vid = vlan->vid;
u16 pvid;
int res;
@@ -2940,7 +2937,7 @@ yt921x_dsa_port_vlan_add(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan,
struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u16 vid = vlan->vid;
u16 pvid;
int res;
@@ -3185,7 +3182,7 @@ yt921x_dsa_port_bridge_flags(struct dsa_switch *ds, int port,
struct switchdev_brport_flags flags,
struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
if (dsa_is_cpu_port(ds, port))
@@ -3202,8 +3199,8 @@ static void
yt921x_dsa_port_bridge_leave(struct dsa_switch *ds, int port,
struct dsa_bridge bridge)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
- struct device *dev = to_device(priv);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
int res;
if (dsa_is_cpu_port(ds, port))
@@ -3223,7 +3220,7 @@ yt921x_dsa_port_bridge_join(struct dsa_switch *ds, int port,
struct dsa_bridge bridge, bool *tx_fwd_offload,
struct netlink_ext_ack *extack)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u16 ports_mask;
int res;
@@ -3244,7 +3241,7 @@ static int
yt921x_dsa_port_mst_state_set(struct dsa_switch *ds, int port,
const struct switchdev_mst_state *st)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 mask;
u32 ctrl;
int res;
@@ -3278,7 +3275,7 @@ static int
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);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 masks[2];
u32 ctrls[2];
int res;
@@ -3304,9 +3301,9 @@ yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struct dsa_bridge bridge,
static void
yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
struct dsa_port *dp = dsa_to_port(ds, port);
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
bool learning;
u32 mask;
u32 ctrl;
@@ -3356,7 +3353,7 @@ yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
static int __maybe_unused
yt921x_dsa_port_get_default_prio(struct dsa_switch *ds, int port)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 val;
int res;
@@ -3373,7 +3370,7 @@ yt921x_dsa_port_get_default_prio(struct dsa_switch *ds, int port)
static int __maybe_unused
yt921x_dsa_port_set_default_prio(struct dsa_switch *ds, int port, u8 prio)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 mask;
u32 ctrl;
int res;
@@ -3399,7 +3396,7 @@ static int __maybe_unused
yt921x_dsa_port_get_apptrust(struct dsa_switch *ds, int port, u8 *sel,
int *nselp)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u8 appprios[2][2] = {};
int nsel;
u32 val;
@@ -3433,8 +3430,8 @@ static int __maybe_unused
yt921x_dsa_port_set_apptrust(struct dsa_switch *ds, int port, const u8 *sel,
int nsel)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
- struct device *dev = to_device(priv);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
u32 ctrl;
int res;
@@ -3576,7 +3573,7 @@ yt921x_port_config(struct yt921x_priv *priv, int port, unsigned int mode,
{
const struct yt921x_info *info = priv->info;
struct yt921x_port *pp = &priv->ports[port];
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u32 mask;
int res;
@@ -3628,7 +3625,7 @@ yt921x_phylink_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
struct dsa_port *dp = dsa_phylink_to_port(config);
- struct yt921x_priv *priv = to_yt921x_priv(dp->ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(dp->ds);
const struct yt921x_info *info = priv->info;
int port = dp->index;
@@ -3651,7 +3648,7 @@ yt921x_phylink_mac_link_down(struct phylink_config *config, unsigned int mode,
phy_interface_t interface)
{
struct dsa_port *dp = dsa_phylink_to_port(config);
- struct yt921x_priv *priv = to_yt921x_priv(dp->ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(dp->ds);
int port = dp->index;
int res;
@@ -3674,7 +3671,7 @@ yt921x_phylink_mac_link_up(struct phylink_config *config,
bool tx_pause, bool rx_pause)
{
struct dsa_port *dp = dsa_phylink_to_port(config);
- struct yt921x_priv *priv = to_yt921x_priv(dp->ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(dp->ds);
int port = dp->index;
int res;
@@ -3695,7 +3692,7 @@ yt921x_phylink_mac_config(struct phylink_config *config, unsigned int mode,
const struct phylink_link_state *state)
{
struct dsa_port *dp = dsa_phylink_to_port(config);
- struct yt921x_priv *priv = to_yt921x_priv(dp->ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(dp->ds);
int port = dp->index;
int res;
@@ -3712,7 +3709,7 @@ static void
yt921x_dsa_phylink_get_caps(struct dsa_switch *ds, int port,
struct phylink_config *config)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
const struct yt921x_info *info = priv->info;
config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
@@ -3803,7 +3800,7 @@ yt921x_dsa_get_tag_protocol(struct dsa_switch *ds, int port,
static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
mutex_lock(&priv->reg_lock);
@@ -3817,7 +3814,7 @@ static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port)
static int __maybe_unused
yt921x_dsa_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 val;
int res;
@@ -3834,7 +3831,7 @@ yt921x_dsa_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp)
static int __maybe_unused
yt921x_dsa_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
u32 val;
int res;
@@ -3859,7 +3856,7 @@ yt921x_dsa_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio)
static int __maybe_unused
yt921x_dsa_port_add_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
int res;
if (prio >= YT921X_PRIO_NUM)
@@ -3920,7 +3917,7 @@ static int yt921x_edata_read(struct yt921x_priv *priv, u8 addr, u8 *valp)
static void yt921x_dsa_teardown(struct dsa_switch *ds)
{
#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS)
- struct yt921x_priv *priv = to_yt921x_priv(ds);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
yt921x_leds_remove(priv);
#endif
@@ -3928,7 +3925,7 @@ static void yt921x_dsa_teardown(struct dsa_switch *ds)
static int yt921x_chip_detect(struct yt921x_priv *priv)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
const struct yt921x_info *info;
u8 extmode;
u32 chipid;
@@ -3995,7 +3992,7 @@ static int yt921x_chip_detect(struct yt921x_priv *priv)
static int yt921x_chip_reset(struct yt921x_priv *priv)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u16 eth_p_tag;
u32 val;
int res;
@@ -4243,8 +4240,8 @@ static int yt921x_chip_setup(struct yt921x_priv *priv)
static int yt921x_dsa_setup(struct dsa_switch *ds)
{
- struct yt921x_priv *priv = to_yt921x_priv(ds);
- struct device *dev = to_device(priv);
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
struct device_node *np = dev->of_node;
struct device_node *child;
unsigned long mask;
diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h
index 28e4f26f9cc4..9c34fb704bf8 100644
--- a/drivers/net/dsa/motorcomm/chip.h
+++ b/drivers/net/dsa/motorcomm/chip.h
@@ -984,8 +984,10 @@ struct yt921x_priv {
struct yt921x_acl_blk *acl_blks[YT921X_ACL_BLK_NUM];
};
+#define dsa_to_yt921x_priv(_ds) container_of_const(_ds, struct yt921x_priv, ds)
#define yt921x_port_to_priv(pp) \
container_of_const((pp), struct yt921x_priv, ports[(pp)->index])
+#define yt921x_priv_to_device(priv) ((priv)->ds.dev)
static inline int ethtool_speed_to_yt921x(int speed)
{
diff --git a/drivers/net/dsa/motorcomm/leds.c b/drivers/net/dsa/motorcomm/leds.c
index 6613fe3b0471..a402d1cf28d1 100644
--- a/drivers/net/dsa/motorcomm/leds.c
+++ b/drivers/net/dsa/motorcomm/leds.c
@@ -12,7 +12,6 @@
#define to_yt921x_led(led_cdev) \
container_of_const((led_cdev), struct yt921x_led, cdev)
#define to_yt921x_port(led) ((led)->port)
-#define to_device(priv) ((priv)->ds.dev)
static u32 yt921x_led_regaddr(struct yt921x_priv *priv, int port, int group)
{
@@ -414,7 +413,7 @@ yt921x_led_setup(struct yt921x_priv *priv, int port,
struct fwnode_handle *fwnode)
{
struct yt921x_port *pp = &priv->ports[port];
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct led_init_data init_data;
struct led_classdev *led_cdev;
char name[LED_MAX_NAME_SIZE];
@@ -569,7 +568,7 @@ yt921x_led_setup(struct yt921x_priv *priv, int port,
static void yt921x_leds_remove_port(struct yt921x_priv *priv, int port)
{
struct yt921x_port *pp = &priv->ports[port];
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
for (int group = 0; group < YT921X_LED_GROUP_NUM; group++) {
struct yt921x_led *led = pp->leds[group];
@@ -587,7 +586,7 @@ static void yt921x_leds_remove_port(struct yt921x_priv *priv, int port)
static int yt921x_leds_setup_port(struct yt921x_priv *priv, int port)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct dsa_switch *ds = &priv->ds;
struct device_node *leds_np;
struct dsa_port *dp;
diff --git a/drivers/net/dsa/motorcomm/mdio_bus.c b/drivers/net/dsa/motorcomm/mdio_bus.c
index 1a3f3cc68275..dd6c52f37bbf 100644
--- a/drivers/net/dsa/motorcomm/mdio_bus.c
+++ b/drivers/net/dsa/motorcomm/mdio_bus.c
@@ -9,8 +9,6 @@
#include "mdio_bus.h"
#include "smi.h"
-#define to_device(priv) ((priv)->ds.dev)
-
static int yt921x_intif_wait(struct yt921x_priv *priv)
{
u32 val = 0;
@@ -21,7 +19,7 @@ static int yt921x_intif_wait(struct yt921x_priv *priv)
int yt921x_intif_read(struct yt921x_priv *priv, int port, int reg, u16 *valp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u32 mask;
u32 ctrl;
u32 val;
@@ -145,7 +143,7 @@ yt921x_mbus_int_write(struct mii_bus *mbus, int port, int reg, u16 data)
int yt921x_mbus_int_init(struct yt921x_priv *priv, struct device_node *mnp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct mii_bus *mbus;
int res;
@@ -181,7 +179,7 @@ static int yt921x_extif_wait(struct yt921x_priv *priv)
static int
yt921x_extif_read(struct yt921x_priv *priv, int port, int reg, u16 *valp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
u32 mask;
u32 ctrl;
u32 val;
@@ -275,7 +273,7 @@ yt921x_mbus_ext_write(struct mii_bus *mbus, int port, int reg, u16 data)
int yt921x_mbus_ext_init(struct yt921x_priv *priv, struct device_node *mnp)
{
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
struct mii_bus *mbus;
int res;
diff --git a/drivers/net/dsa/motorcomm/pcs-921x.c b/drivers/net/dsa/motorcomm/pcs-921x.c
index 47467d803e13..e942b61d8eb2 100644
--- a/drivers/net/dsa/motorcomm/pcs-921x.c
+++ b/drivers/net/dsa/motorcomm/pcs-921x.c
@@ -8,8 +8,6 @@
#include "pcs.h"
#include "smi.h"
-#define to_device(priv) ((priv)->ds.dev)
-
static int
yt921x_serdes_config(struct yt921x_priv *priv, int port, unsigned int neg_mode,
phy_interface_t interface,
@@ -116,7 +114,7 @@ yt921x_phylink_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,
{
struct yt921x_port *pp = pcs_to_yt921x_port(pcs);
struct yt921x_priv *priv = yt921x_port_to_priv(pp);
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
int port = pp->index;
u16 bmsr;
u16 lpa;
@@ -155,7 +153,7 @@ static void yt921x_phylink_pcs_an_restart(struct phylink_pcs *pcs)
{
struct yt921x_port *pp = pcs_to_yt921x_port(pcs);
struct yt921x_priv *priv = yt921x_port_to_priv(pp);
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
int port = pp->index;
u16 val;
int res;
@@ -181,7 +179,7 @@ static void yt921x_phylink_pcs_disable(struct phylink_pcs *pcs)
{
struct yt921x_port *pp = pcs_to_yt921x_port(pcs);
struct yt921x_priv *priv = yt921x_port_to_priv(pp);
- struct device *dev = to_device(priv);
+ struct device *dev = yt921x_priv_to_device(priv);
int port = pp->index;
int res;
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 2/5] net: dsa: motorcomm: Split TC module
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
2026-10-01 20:48 ` [PATCH net-next v2 1/5] net: dsa: motorcomm: Hoist type casting helper into chip.h David Yang
@ 2026-10-01 20:48 ` David Yang
2026-10-01 20:48 ` [PATCH net-next v2 3/5] net: dsa: motorcomm: Use NSEC_PER_SEC David Yang
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
Move the traffic control code from chip.c into a separate tc.c, to
reduce the length of chip.c.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/motorcomm/Makefile | 1 +
drivers/net/dsa/motorcomm/chip.c | 1458 +---------------------------
drivers/net/dsa/motorcomm/chip.h | 351 +------
drivers/net/dsa/motorcomm/tc.c | 1454 +++++++++++++++++++++++++++
drivers/net/dsa/motorcomm/tc.h | 378 ++++++++
5 files changed, 1844 insertions(+), 1798 deletions(-)
create mode 100644 drivers/net/dsa/motorcomm/tc.c
create mode 100644 drivers/net/dsa/motorcomm/tc.h
diff --git a/drivers/net/dsa/motorcomm/Makefile b/drivers/net/dsa/motorcomm/Makefile
index 1d2c1b3064c4..b4a577012b0f 100644
--- a/drivers/net/dsa/motorcomm/Makefile
+++ b/drivers/net/dsa/motorcomm/Makefile
@@ -5,3 +5,4 @@ yt921x-$(CONFIG_NET_DSA_YT921X_LEDS) += leds.o
yt921x-objs += mdio_bus.o
yt921x-objs += pcs-921x.o
yt921x-objs += smi.o
+yt921x-objs += tc.o
diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c
index aa7d6ab34cbb..5be198d9e5cd 100644
--- a/drivers/net/dsa/motorcomm/chip.c
+++ b/drivers/net/dsa/motorcomm/chip.c
@@ -23,13 +23,13 @@
#include <net/dsa.h>
#include <net/dscp.h>
#include <net/ieee8021q.h>
-#include <net/pkt_cls.h>
#include "chip.h"
#include "leds.h"
#include "mdio_bus.h"
#include "pcs.h"
#include "smi.h"
+#include "tc.h"
struct yt921x_mib_desc {
unsigned int size;
@@ -171,16 +171,6 @@ struct yt921x_reg_mdio {
/* TODO: SPI/I2C */
-static u32 ethaddr_hi4_to_u32(const unsigned char *addr)
-{
- return (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3];
-}
-
-static u32 ethaddr_lo2_to_u32(const unsigned char *addr)
-{
- return (addr[4] << 8) | addr[5];
-}
-
static int yt921x_reg_mdio_read(void *context, u32 reg, u32 *valp)
{
struct yt921x_reg_mdio *mdio = context;
@@ -605,13 +595,6 @@ 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)
{
@@ -643,1445 +626,6 @@ 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_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 = flags & YT921X_MARKER_PKT_MODE ? YT921X_TOKEN_PKT_C :
- YT921X_TOKEN_BYTE_C;
- struct device *dev = yt921x_priv_to_device(priv);
- struct yt921x_marker m;
- u64 burst_est;
- u64 burst_sug;
- u64 burst_max;
- u64 rate_max;
-
- m.unit = unit_max;
- rate_max = token2rate(cir_max, slot_ns, m.unit, C);
- burst_max = 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 = div_u64(slot_ns * rate, 1000000000);
- burst_sug = burst_est;
- if (flags & YT921X_MARKER_PKT_MODE)
- burst_sug++;
- else
- burst_sug += ETH_HLEN + yt921x_mtu_fetch(priv, port) +
- ETH_FCS_LEN;
- if (burst_sug > burst)
- NL_SET_ERR_MSG_FMT_MOD(extack,
- "Consider match rate %llu with burst at least %llu",
- rate, burst_sug);
-
- /* Select unit */
- for (; m.unit > 0; m.unit--) {
- if (rate > (rate_max >> 2) || burst > (burst_max >> 2))
- break;
- rate_max >>= 2;
- burst_max >>= 2;
- }
-
- /* Calculate information rate and bucket size */
- m.cir = rate2token(rate, slot_ns, m.unit, C);
- if (!m.cir)
- m.cir = 1;
- else if (WARN_ON(m.cir > cir_max))
- m.cir = cir_max;
- m.cbs = burst2token(burst, m.unit, C);
- if (!m.cbs)
- m.cbs = 1;
- else if (WARN_ON(m.cbs > cbs_max))
- m.cbs = cbs_max;
-
- /* Cut EBS */
- m.ebs = 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 += YT921X_FRAME_SIZE_MAX;
-
- if (burst_est < burst) {
- u32 pbs = m.cbs;
-
- m.cbs = burst2token(burst_est, m.unit, C);
- if (!m.cbs)
- m.cbs = 1;
- else if (WARN_ON(m.cbs > cbs_max))
- m.cbs = cbs_max;
-
- if (pbs > m.cbs)
- m.ebs = 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 = flags & YT921X_MARKER_PKT_MODE;
- *marker = 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 = !!police->rate_pkt_ps;
- u64 burst;
- u64 rate;
-
- rate = pkt_mode ? police->rate_pkt_ps : police->rate_bytes_ps;
- burst = pkt_mode ? police->burst_pkt : police->burst;
- if (pkt_mode)
- flags |= 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_marker_tfm_shape(struct yt921x_marker *marker, u64 rate, u64 burst,
- unsigned int flags, struct yt921x_priv *priv, int port,
- struct netlink_ext_ack *extack)
-{
- return yt921x_marker_tfm(marker, rate, burst, flags,
- 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,
- const struct flow_action_entry *act,
- struct netlink_ext_ack *extack)
-{
- if (police->exceed.act_id != 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 != FLOW_ACTION_PIPE &&
- police->notexceed.act_id != 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 == 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] = 0;
- ctrls[1] = YT921X_METER_CTRLb_CIR(marker->cir);
- ctrls[2] = 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] |= 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 = dsa_to_yt921x_priv(ds);
- struct device *dev = yt921x_priv_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 *police,
- struct netlink_ext_ack *extack)
-{
- struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
- struct yt921x_marker marker;
- u32 ctrl;
- int res;
-
- res = yt921x_police_validate(police, NULL, NULL, extack);
- if (res)
- return res;
-
- res = yt921x_marker_tfm_police(&marker, police, 0, priv, port, extack);
- if (res)
- return res;
-
- mutex_lock(&priv->reg_lock);
- res = yt921x_meter_config(priv, port + YT921X_METER_NUM, &marker);
- if (res)
- goto end;
-
- ctrl = YT921X_PORT_METER_ID(port) | YT921X_PORT_METER_EN;
- res = yt921x_reg_write(priv, YT921X_PORTn_METER(port), ctrl);
-end:
- mutex_unlock(&priv->reg_lock);
-
- return res;
-}
-
-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 = dsa_to_yt921x_priv(ds);
- struct netlink_ext_ack *extack = qopt->extack;
- u32 ctrls[2];
- int res;
-
- if (qopt->parent != TC_H_ROOT)
- return -EOPNOTSUPP;
-
- switch (qopt->command) {
- case TC_TBF_STATS:
- /* Unfortunately the convention for TC_*_STATS is a mess,
- * neither 0 nor -EOPNOTSUPP is perfect here.
- */
- return -EOPNOTSUPP;
- 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_marker marker;
-
- p = &qopt->replace_params;
-
- res = yt921x_marker_tfm_shape(&marker, p->rate.rate_bytes_ps,
- p->max_size,
- YT921X_MARKER_SINGLE_BUCKET,
- priv, port, extack);
- if (res)
- return res;
-
- ctrls[0] = YT921X_PORT_SHAPE_CTRLa_CIR(marker.cir) |
- YT921X_PORT_SHAPE_CTRLa_CBS(marker.cbs);
- ctrls[1] = YT921X_PORT_SHAPE_CTRLb_UNIT(marker.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)
-{
- switch (type) {
- case TC_SETUP_QDISC_TBF: {
- const struct tc_tbf_qopt_offload *qopt = type_data;
-
- return yt921x_dsa_port_setup_tc_tbf_port(ds, port, qopt);
- }
- default:
- return -EOPNOTSUPP;
- }
-}
-
-/* ACL: 48 blocks * 8 entries
- *
- * One rule can span multiple entries, but within a block.
- */
-
-static void
-yt921x_acl_entry_set(struct yt921x_acl_entry *entry, unsigned int offset,
- u32 flags, bool set)
-{
- if (set)
- entry->key[offset] |= flags;
- entry->mask[offset] |= flags;
-}
-
-static unsigned int
-yt921x_acl_entries_set_is_fragment(struct yt921x_acl_entry *entries,
- unsigned int size, bool set)
-{
- for (unsigned int i = 0; i < size; i++)
- switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
- case YT921X_ACL_TYPE_IPV4_DA:
- case YT921X_ACL_TYPE_IPV4_SA:
- yt921x_acl_entry_set(&entries[i], 1,
- YT921X_ACL_BINb_IPV4_FRAG, set);
- return size;
- case YT921X_ACL_TYPE_IPV6_DA3:
- case YT921X_ACL_TYPE_IPV6_SA3:
- yt921x_acl_entry_set(&entries[i], 1,
- YT921X_ACL_BINb_IPV6_xA3_FRAG,
- set);
- return size;
- case YT921X_ACL_TYPE_MISC:
- yt921x_acl_entry_set(&entries[i], 1,
- YT921X_ACL_BINb_MISC_FRAG, set);
- return size;
- case YT921X_ACL_TYPE_L4:
- yt921x_acl_entry_set(&entries[i], 1,
- YT921X_ACL_BINb_L4_FRAG, set);
- return size;
- }
-
- if (size >= YT921X_ACL_ENT_PER_BLK)
- return 0;
-
- entries[size] = (typeof(*entries)){};
- entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
- yt921x_acl_entry_set(&entries[size], 1, YT921X_ACL_BINb_MISC_FRAG, set);
-
- return size + 1;
-}
-
-static unsigned int
-yt921x_acl_entries_set_first_frag(struct yt921x_acl_entry *entries,
- unsigned int size, bool set)
-{
- for (unsigned int i = 0; i < size; i++)
- switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
- case YT921X_ACL_TYPE_IPV6_DA2:
- case YT921X_ACL_TYPE_IPV6_SA2:
- yt921x_acl_entry_set(&entries[i], 1,
- YT921X_ACL_BINb_IPV6_xA2_FIRST_FRAG,
- set);
- return size;
- case YT921X_ACL_TYPE_MISC:
- yt921x_acl_entry_set(&entries[i], 0,
- YT921X_ACL_BINa_MISC_FIRST_FRAG,
- set);
- return size;
- }
-
- if (size >= YT921X_ACL_ENT_PER_BLK)
- return 0;
-
- entries[size] = (typeof(*entries)){};
- entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
- yt921x_acl_entry_set(&entries[size], 0,
- YT921X_ACL_BINa_MISC_FIRST_FRAG, set);
-
- return size + 1;
-}
-
-static unsigned int
-yt921x_acl_entries_set_l3_type(struct yt921x_acl_entry *entries,
- unsigned int size, enum yt921x_l3_type type)
-{
- for (unsigned int i = 0; i < size; i++)
- switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
- case YT921X_ACL_TYPE_MAC_DA0:
- case YT921X_ACL_TYPE_MAC_SA0:
- entries[i].key[1] |= YT921X_ACL_BINb_MAC_xA0_L3_TYPE(type);
- entries[i].mask[1] |= YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M;
- return size;
- case YT921X_ACL_TYPE_MISC:
- entries[i].key[0] |= YT921X_ACL_BINa_MISC_L3_TYPE(type);
- entries[i].mask[0] |= YT921X_ACL_BINa_MISC_L3_TYPE_M;
- return size;
- }
-
- if (size >= YT921X_ACL_ENT_PER_BLK)
- return 0;
-
- entries[size] = (typeof(*entries)){};
- entries[size].key[0] = YT921X_ACL_BINa_MISC_L3_TYPE(type);
- entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
- entries[size].mask[0] = YT921X_ACL_BINa_MISC_L3_TYPE_M;
-
- return size + 1;
-}
-
-static unsigned int
-yt921x_acl_entries_set_l4_type(struct yt921x_acl_entry *entries,
- unsigned int size, enum yt921x_l4_type type)
-{
- for (unsigned int i = 0; i < size; i++)
- switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
- case YT921X_ACL_TYPE_IPV4_DA:
- case YT921X_ACL_TYPE_IPV4_SA:
- entries[i].key[1] |= YT921X_ACL_BINb_IPV4_L4_TYPE(type);
- entries[i].mask[1] |= YT921X_ACL_BINb_IPV4_L4_TYPE_M;
- return size;
- case YT921X_ACL_TYPE_IPV6_DA0:
- case YT921X_ACL_TYPE_IPV6_DA1:
- case YT921X_ACL_TYPE_IPV6_DA2:
- case YT921X_ACL_TYPE_IPV6_DA3:
- case YT921X_ACL_TYPE_IPV6_SA0:
- case YT921X_ACL_TYPE_IPV6_SA1:
- case YT921X_ACL_TYPE_IPV6_SA2:
- case YT921X_ACL_TYPE_IPV6_SA3:
- entries[i].key[1] |= YT921X_ACL_BINb_IPV6_L4_TYPE(type);
- entries[i].mask[1] |= YT921X_ACL_BINb_IPV6_L4_TYPE_M;
- return size;
- case YT921X_ACL_TYPE_L4:
- entries[i].key[1] |= YT921X_ACL_BINb_L4_TYPE(type);
- entries[i].mask[1] |= YT921X_ACL_BINb_L4_TYPE_M;
- return size;
- case YT921X_ACL_TYPE_MISC:
- entries[i].key[1] |= YT921X_ACL_BINb_MISC_L4_TYPE(type);
- entries[i].mask[1] |= YT921X_ACL_BINb_MISC_L4_TYPE_M;
- return size;
- }
-
- if (size >= YT921X_ACL_ENT_PER_BLK)
- return 0;
-
- entries[size] = (typeof(*entries)){};
- entries[size].key[1] = YT921X_ACL_BINb_MISC_L4_TYPE(type) |
- YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
- entries[size].mask[1] = YT921X_ACL_BINb_MISC_L4_TYPE_M;
-
- return size + 1;
-}
-
-static struct yt921x_acl_entry *
-yt921x_acl_entries_new(struct yt921x_acl_entry *entries, unsigned int *sizep,
- u32 type)
-{
- unsigned int size = *sizep;
-
- if (size >= YT921X_ACL_ENT_PER_BLK)
- return NULL;
-
- entries[size] = (typeof(*entries)){};
- entries[size].key[1] = YT921X_ACL_KEYb_TYPE(type);
-
- (*sizep)++;
- return &entries[size];
-}
-
-static struct yt921x_acl_entry *
-yt921x_acl_entries_find(struct yt921x_acl_entry *entries, unsigned int *sizep,
- u32 type)
-{
- for (unsigned int i = 0; i < *sizep; i++)
- if (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1]) ==
- type)
- return &entries[i];
- return yt921x_acl_entries_new(entries, sizep, type);
-}
-
-static void
-yt921x_acl_rule_set_ports(struct yt921x_acl_rule *aclrule, u16 ord,
- u16 ports_mask)
-{
- struct yt921x_acl_entry *entries = aclrule->entries;
-
- for (unsigned int i = 0; i < hweight8(aclrule->mask); i++) {
- entries[i].key[1] |= YT921X_ACL_KEYb_SPORTS(ports_mask) |
- YT921X_ACL_KEYb_ORD(ord);
- }
-}
-
-struct yt921x_acl_rule_ext {
- struct yt921x_acl_rule r;
-
- struct yt921x_marker marker;
-};
-
-static int
-yt921x_acl_rule_ext_parse_flow_entries(struct yt921x_acl_rule_ext *ruleext,
- const struct flow_cls_offload *cls)
-{
- const struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
- struct yt921x_acl_entry *entries = ruleext->r.entries;
- struct netlink_ext_ack *extack = cls->common.extack;
- const struct flow_dissector *dissector;
- struct yt921x_acl_entry *entry;
- unsigned int size = 0;
- bool use_dport;
- bool use_sport;
-
- /* Incomplete and probably won't, since it supports custom u32 filters.
- * New adapters are welcome.
- */
- dissector = rule->match.dissector;
- if (dissector->used_keys &
- ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |
- BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |
- BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |
- BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
- BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |
- BIT_ULL(FLOW_DISSECTOR_KEY_PORTS_RANGE) |
- BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
- BIT_ULL(FLOW_DISSECTOR_KEY_IP) |
- BIT_ULL(FLOW_DISSECTOR_KEY_TCP))) {
- NL_SET_ERR_MSG_MOD(extack, "Unsupported keys used");
- return -EOPNOTSUPP;
- }
-
- /* Entries */
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) {
- struct flow_match_ipv4_addrs match;
-
- flow_rule_match_ipv4_addrs(rule, &match);
-
- if (match.mask->dst) {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_IPV4_DA);
- if (!entry)
- goto err;
-
- entry->key[0] |= ntohl(match.key->dst);
- entry->mask[0] |= ntohl(match.mask->dst);
- }
-
- if (match.mask->src) {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_IPV4_SA);
- if (!entry)
- goto err;
-
- entry->key[0] |= ntohl(match.key->src);
- entry->mask[0] |= ntohl(match.mask->src);
- }
- }
-
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV6_ADDRS)) {
- struct flow_match_ipv6_addrs match;
-
- flow_rule_match_ipv6_addrs(rule, &match);
-
- for (unsigned int i = 0; i < 4; i++) {
- if (!match.mask->dst.s6_addr32[i])
- continue;
-
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_IPV6_DA0 + i);
- if (!entry)
- goto err;
-
- entry->key[0] |= ntohl(match.key->dst.s6_addr32[i]);
- entry->mask[0] |= ntohl(match.mask->dst.s6_addr32[i]);
- }
-
- for (unsigned int i = 0; i < 4; i++) {
- if (!match.mask->src.s6_addr32[i])
- continue;
-
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_IPV6_SA0 + i);
- if (!entry)
- goto err;
-
- entry->key[0] |= ntohl(match.key->src.s6_addr32[i]);
- entry->mask[0] |= ntohl(match.mask->src.s6_addr32[i]);
- }
- }
-
- use_dport = false;
- use_sport = false;
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {
- struct flow_match_ports match;
-
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_L4);
- if (!entry)
- goto err;
-
- flow_rule_match_ports(rule, &match);
-
- use_dport = !!match.mask->dst;
- use_sport = !!match.mask->src;
-
- entry->key[0] |= (ntohs(match.key->dst) << 16) |
- ntohs(match.key->src);
- entry->mask[0] |= (ntohs(match.mask->dst) << 16) |
- ntohs(match.mask->src);
- }
-
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS_RANGE)) {
- struct flow_match_ports_range match;
-
- entry = yt921x_acl_entries_find(entries, &size,
- YT921X_ACL_TYPE_L4);
- if (!entry)
- goto err;
-
- flow_rule_match_ports_range(rule, &match);
-
- if ((use_dport && match.mask->tp.dst) ||
- (use_sport && match.mask->tp.src)) {
- NL_SET_ERR_MSG_MOD(extack,
- "Port mask and range are mutually exclusive");
- return -EINVAL;
- }
-
- if (match.mask->tp.dst) {
- entry->key[0] |= ntohs(match.key->tp_min.dst) << 16;
- entry->key[1] |= YT921X_ACL_KEYb_L4_DPORT_RANGE_EN;
- entry->mask[0] |= ntohs(match.key->tp_max.dst) << 16;
- }
-
- if (match.mask->tp.src) {
- entry->key[0] |= ntohs(match.key->tp_min.src);
- entry->key[1] |= YT921X_ACL_KEYb_L4_SPORT_RANGE_EN;
- entry->mask[0] |= ntohs(match.key->tp_max.src);
- }
- }
-
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
- struct flow_match_eth_addrs match;
- u32 mask;
-
- flow_rule_match_eth_addrs(rule, &match);
-
- mask = ethaddr_hi4_to_u32(match.mask->dst);
- if (mask) {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_MAC_DA0);
- if (!entry)
- goto err;
-
- entry->key[0] |= ethaddr_hi4_to_u32(match.key->dst);
- entry->mask[0] |= mask;
- }
-
- mask = ethaddr_hi4_to_u32(match.mask->src);
- if (mask) {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_MAC_SA0);
- if (!entry)
- goto err;
-
- entry->key[0] |= ethaddr_hi4_to_u32(match.key->src);
- entry->mask[0] |= mask;
- }
-
- mask = (ethaddr_lo2_to_u32(match.mask->dst) << 16) |
- ethaddr_lo2_to_u32(match.mask->src);
- if (mask) {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_MAC_DA1_SA1);
- if (!entry)
- goto err;
-
- entry->key[0] |= (ethaddr_lo2_to_u32(match.key->dst) << 16) |
- ethaddr_lo2_to_u32(match.key->src);
- entry->mask[0] |= mask;
- }
- }
-
- /* Entries + Misc */
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {
- struct flow_match_basic match;
-
- flow_rule_match_basic(rule, &match);
-
- if (match.mask->n_proto) {
- enum yt921x_l3_type l3type = YT921X_L3_TYPE_OTHER;
-
- if (match.mask->n_proto == htons(~0))
- switch (match.key->n_proto) {
- case htons(ETH_P_IP):
- l3type = YT921X_L3_TYPE_IPV4;
- break;
- case htons(ETH_P_IPV6):
- l3type = YT921X_L3_TYPE_IPV6;
- break;
- case htons(ETH_P_ARP):
- l3type = YT921X_L3_TYPE_ARP;
- break;
- case htons(ETH_P_LLDP):
- l3type = YT921X_L3_TYPE_LLDP;
- break;
- case htons(ETH_P_PAE):
- l3type = YT921X_L3_TYPE_PAE;
- break;
- case htons(ETH_P_CFM):
- l3type = YT921X_L3_TYPE_ERP;
- break;
- }
-
- if (l3type != YT921X_L3_TYPE_OTHER) {
- size = yt921x_acl_entries_set_l3_type(entries,
- size,
- l3type);
- if (!size)
- goto err;
- } else {
- entry = yt921x_acl_entries_new(entries, &size,
- YT921X_ACL_TYPE_ETHERTYPE);
- if (!entry)
- goto err;
-
- entry->key[0] |= ntohs(match.key->n_proto);
- entry->mask[0] |= ntohs(match.mask->n_proto);
- }
- }
-
- if (match.mask->ip_proto) {
- enum yt921x_l4_type l4type = YT921X_L4_TYPE_OTHER;
-
- if (match.mask->ip_proto == (u8)~0)
- switch (match.key->ip_proto) {
- case IPPROTO_TCP:
- l4type = YT921X_L4_TYPE_TCP;
- break;
- case IPPROTO_UDP:
- l4type = YT921X_L4_TYPE_UDP;
- break;
- case IPPROTO_UDPLITE:
- l4type = YT921X_L4_TYPE_UDPLITE;
- break;
- case IPPROTO_ICMP:
- l4type = YT921X_L4_TYPE_ICMP;
- break;
- case IPPROTO_IGMP:
- l4type = YT921X_L4_TYPE_IGMP;
- break;
- }
-
- if (l4type != YT921X_L4_TYPE_OTHER) {
- size = yt921x_acl_entries_set_l4_type(entries,
- size,
- l4type);
- if (!size)
- goto err;
- } else {
- entry = yt921x_acl_entries_find(entries, &size,
- YT921X_ACL_TYPE_MISC);
- if (!entry)
- goto err;
-
- entry->key[0] |= YT921X_ACL_BINa_MISC_IP_PROTO(match.key->ip_proto);
- entry->mask[0] |= YT921X_ACL_BINa_MISC_IP_PROTO(match.mask->ip_proto);
- }
- }
- }
-
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {
- u32 supp_flags = FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG;
- struct flow_match_control match;
-
- flow_rule_match_control(rule, &match);
- if (!flow_rule_is_supp_control_flags(supp_flags,
- match.mask->flags, extack))
- return -EOPNOTSUPP;
-
- if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
- bool set = match.key->flags & FLOW_DIS_IS_FRAGMENT;
-
- size = yt921x_acl_entries_set_is_fragment(entries, size,
- set);
- if (!size)
- goto err;
- }
- if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
- bool set = match.key->flags & FLOW_DIS_FIRST_FRAG;
-
- size = yt921x_acl_entries_set_first_frag(entries, size,
- set);
- if (!size)
- goto err;
- }
- }
-
- /* Misc only */
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IP)) {
- struct flow_match_ip match;
-
- flow_rule_match_ip(rule, &match);
- if (match.mask->ttl) {
- NL_SET_ERR_MSG_MOD(extack,
- "Matching on TTL not supported");
- return -EOPNOTSUPP;
- }
-
- if (match.mask->tos) {
- entry = yt921x_acl_entries_find(entries, &size,
- YT921X_ACL_TYPE_MISC);
- if (!entry)
- goto err;
-
- entry->key[0] |= YT921X_ACL_BINa_MISC_TOS(match.key->tos);
- entry->mask[0] |= YT921X_ACL_BINa_MISC_TOS(match.mask->tos);
- }
- }
-
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_TCP)) {
- struct flow_match_tcp match;
-
- flow_rule_match_tcp(rule, &match);
- if (match.mask->flags & htons(~0xff)) {
- NL_SET_ERR_MSG_MOD(extack, "Unsupported TCP flags");
- return -EOPNOTSUPP;
- }
-
- if (match.mask->flags) {
- entry = yt921x_acl_entries_find(entries, &size,
- YT921X_ACL_TYPE_MISC);
- if (!entry)
- goto err;
-
- entry->key[0] |= YT921X_ACL_BINa_MISC_TCP_FLAGS(ntohs(match.key->flags));
- entry->mask[0] |= YT921X_ACL_BINa_MISC_TCP_FLAGS(ntohs(match.mask->flags));
- }
- }
-
- if (!size) {
- NL_SET_ERR_MSG_MOD(extack, "Empty rule generated, this should not happen");
- return -EOPNOTSUPP;
- }
-
- ruleext->r.mask = (1 << size) - 1;
- return 0;
-
-err:
- NL_SET_ERR_MSG_MOD(extack, "Rule too complex");
- return -EOPNOTSUPP;
-}
-
-static int
-yt921x_acl_rule_ext_parse_flow_action(struct yt921x_acl_rule_ext *ruleext,
- const struct flow_cls_offload *cls,
- struct yt921x_priv *priv, int port)
-{
- const struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
- const struct flow_action *flow_action = &rule->action;
- struct netlink_ext_ack *extack = cls->common.extack;
- enum flow_action_id redir_act = NUM_FLOW_ACTIONS;
- const struct flow_action_entry *act;
- u32 *action = ruleext->r.action;
- bool seen_priority = false;
- const char *reason = NULL;
- bool seen_police = false;
- unsigned int i;
- int res;
-
- memset(action, 0, 3 * sizeof(*action));
- flow_action_for_each(i, act, flow_action)
- switch (act->id) {
- case FLOW_ACTION_ACCEPT:
- case FLOW_ACTION_DROP:
- case FLOW_ACTION_REDIRECT:
- if (redir_act != NUM_FLOW_ACTIONS &&
- redir_act != act->id) {
- reason = "Different redirect actions";
- goto fallback;
- }
- redir_act = act->id;
-
- switch (act->id) {
- case FLOW_ACTION_ACCEPT:
- action[2] |= YT921X_ACL_ACTc_FWD_EN |
- YT921X_ACL_ACTc_FWD_FWD;
- break;
- case FLOW_ACTION_DROP:
- action[2] |= YT921X_ACL_ACTc_FWD_EN |
- YT921X_ACL_ACTc_FWD_REDIR;
- break;
- case FLOW_ACTION_REDIRECT: {
- struct dsa_port *to_dp;
-
- to_dp = dsa_port_from_netdev(act->dev);
- if (IS_ERR(to_dp) || to_dp->ds != &priv->ds) {
- reason = "Redirect to non-local port";
- goto fallback;
- }
-
- action[2] |= YT921X_ACL_ACTc_FWD_EN |
- YT921X_ACL_ACTc_FWD_REDIR |
- YT921X_ACL_ACTc_FWD_REDIR_DPORTn(to_dp->index);
- break;
- }
- default:
- break;
- }
- break;
- case FLOW_ACTION_PRIORITY:
- if (seen_priority) {
- action[0] &= ~YT921X_ACL_ACTa_PRIO_EN;
- action[1] &= ~YT921X_ACL_ACTb_PRIO_M;
-
- reason = "Multiple priority actions";
- goto fallback;
- }
- seen_priority = true;
-
- if (act->priority >= YT921X_PRIO_NUM) {
- NL_SET_ERR_MSG_MOD(extack,
- "Priority value is too high");
- return -EOPNOTSUPP;
- }
- action[0] |= YT921X_ACL_ACTa_PRIO_EN;
- action[1] |= YT921X_ACL_ACTb_PRIO(act->priority);
- break;
- case FLOW_ACTION_POLICE: {
- const struct flow_action_police *police = &act->police;
-
- if (seen_police) {
- action[0] &= ~YT921X_ACL_ACTa_METER_EN;
-
- reason = "Multiple police actions";
- goto fallback;
- }
- seen_police = true;
-
- res = yt921x_police_validate(police, flow_action, act,
- extack);
- if (res)
- return res;
-
- res = yt921x_marker_tfm_police(&ruleext->marker, police,
- 0, priv, port, extack);
- if (res)
- return res;
-
- action[0] |= YT921X_ACL_ACTa_METER_EN;
- break;
- }
- default:
-fallback:
- if (cls->common.skip_sw) {
- NL_SET_ERR_MSG_FMT_MOD(extack,
- "Action not supported when skip_sw: %s",
- reason);
- return -EOPNOTSUPP;
- }
- fallthrough;
- case FLOW_ACTION_TRAP:
- redir_act = FLOW_ACTION_TRAP;
-
- action[2] &= ~YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M &
- ~YT921X_ACL_ACTc_FWD_M;
- action[2] |= YT921X_ACL_ACTc_FWD_EN |
- YT921X_ACL_ACTc_FWD_TRAP;
- break;
- }
-
- ruleext->r.sw_assisted = !cls->common.skip_sw;
- return 0;
-}
-
-static int
-yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
- const struct flow_cls_offload *cls, bool ingress,
- struct yt921x_priv *priv)
-{
- struct netlink_ext_ack *extack = cls->common.extack;
- int res;
-
- if (!ingress) {
- NL_SET_ERR_MSG_MOD(extack, "Only ingress is supported");
- return -EOPNOTSUPP;
- }
-
- if (cls->common.chain_index) {
- NL_SET_ERR_MSG(extack, "Only chain 0 is supported");
- return -EOPNOTSUPP;
- }
-
- res = yt921x_acl_rule_ext_parse_flow_action(ruleext, cls, priv, port);
- if (res)
- return res;
- res = yt921x_acl_rule_ext_parse_flow_entries(ruleext, cls);
- if (res)
- return res;
-
- yt921x_acl_rule_set_ports(&ruleext->r, 0, BIT(port));
- ruleext->r.tag = cls->cookie;
- ruleext->r.type = TC_SETUP_CLSFLOWER;
- return 0;
-}
-
-static unsigned int
-yt921x_acl_find(const struct yt921x_priv *priv, enum tc_setup_type type,
- unsigned long tag)
-{
- for (unsigned int blkid = 0; blkid < YT921X_ACL_BLK_NUM; blkid++) {
- const struct yt921x_acl_blk *aclblk = priv->acl_blks[blkid];
-
- if (!aclblk)
- continue;
-
- for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++)
- if (aclblk->rules[i] && aclblk->rules[i]->tag == tag &&
- aclblk->rules[i]->type == type)
- return YT921X_ACL_ENT_PER_BLK * blkid + i;
- }
-
- return UINT_MAX;
-}
-
-static unsigned int
-yt921x_acl_reserve(struct yt921x_priv *priv, unsigned int entscnt,
- struct netlink_ext_ack *extack)
-{
- int candidates[YT921X_ACL_ENT_PER_BLK + 1];
- unsigned int acl_used_cnt = 0;
-
- if (WARN_ON(entscnt > YT921X_ACL_ENT_PER_BLK))
- return UINT_MAX;
-
- for (unsigned int i = 0; i < ARRAY_SIZE(candidates); i++)
- candidates[i] = -1;
- for (unsigned int i = YT921X_ACL_BLK_NUM; i-- > 0;) {
- unsigned int blk_used_cnt = hweight8(priv->acl_masks[i]);
-
- candidates[blk_used_cnt] = i;
- acl_used_cnt += blk_used_cnt;
- }
-
- if (acl_used_cnt >= YT921X_ACL_NUM) {
- NL_SET_ERR_MSG_MOD(extack, "ACL entry limit reached");
- return UINT_MAX;
- }
- if (acl_used_cnt + entscnt <= YT921X_ACL_NUM)
- for (unsigned int i = YT921X_ACL_ENT_PER_BLK - entscnt + 1;
- i-- > 0;)
- if (candidates[i] >= 0)
- return YT921X_ACL_ENT_PER_BLK * candidates[i] +
- ffz(priv->acl_masks[candidates[i]]);
-
- NL_SET_ERR_MSG_MOD(extack,
- "ACL entry allocation failed, simplify your rules or remove existing rules");
- return UINT_MAX;
-}
-
-static int
-yt921x_acl_commit(struct yt921x_priv *priv, unsigned int entid, u8 entsmask)
-{
- const struct yt921x_acl_rule *aclrule;
- const struct yt921x_acl_blk *aclblk;
- unsigned int blkid;
- unsigned int binid;
- unsigned long mask;
- u32 zeros[3] = {};
- unsigned int i;
- unsigned int o;
- u32 ctrl;
- int res;
-
- blkid = entid / YT921X_ACL_ENT_PER_BLK;
- binid = entid % YT921X_ACL_ENT_PER_BLK;
- aclblk = priv->acl_blks[blkid];
- aclrule = aclblk->rules[binid];
-
- /* Write actions */
- res = yt921x_reg96_write(priv, YT921X_ACLn_ACT(entid),
- aclrule ? aclrule->action : zeros);
- if (res)
- return res;
-
- /* Select the block */
- ctrl = YT921X_ACL_BLK_CMD_MODIFY | YT921X_ACL_BLK_CMD_BLKID(blkid);
- res = yt921x_reg_write(priv, YT921X_ACL_BLK_CMD, ctrl);
- if (res)
- return res;
-
- /* Write keys and masks */
- ctrl = 0;
- for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++)
- ctrl |= YT921X_ACL_BLK_KEEP_KEEPn(i);
-
- mask = entsmask;
- i = 0;
- for_each_set_bit(o, &mask, YT921X_ACL_ENT_PER_BLK) {
- res = yt921x_reg64_write(priv, YT921X_ACLn_KEYm(blkid, o),
- aclrule ? aclrule->entries[i].key :
- zeros);
- if (res)
- return res;
-
- res = yt921x_reg64_write(priv, YT921X_ACLn_MASKm(blkid, o),
- aclrule ? aclrule->entries[i].mask :
- zeros);
- if (res)
- return res;
-
- ctrl &= ~YT921X_ACL_BLK_KEEP_KEEPn(o);
- i++;
- }
-
- res = yt921x_reg_write(priv, YT921X_ACL_BLK_KEEP, ctrl);
- if (res)
- return res;
-
- ctrl = 0;
- for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++) {
- const struct yt921x_acl_rule *other = aclblk->rules[i];
-
- if (!other)
- continue;
-
- mask = other->mask;
- for_each_set_bit(o, &mask, YT921X_ACL_ENT_PER_BLK)
- ctrl |= YT921X_ACL_ENTRY_ENm(o) |
- YT921X_ACL_ENTRY_GRPIDm(o, i);
- }
- res = yt921x_reg_write(priv, YT921X_ACLn_ENTRY(blkid), ctrl);
- if (res)
- return res;
-
- /* Commit the block */
- ctrl = YT921X_ACL_BLK_CMD_BLKID(blkid);
- res = yt921x_reg_write(priv, YT921X_ACL_BLK_CMD, ctrl);
- if (res)
- return res;
-
- return 0;
-}
-
-static int
-yt921x_acl_del(struct yt921x_priv *priv, enum tc_setup_type type,
- unsigned long tag)
-{
- struct yt921x_acl_rule *aclrule;
- struct yt921x_acl_blk *aclblk;
- unsigned int binid;
- unsigned int blkid;
- unsigned int entid;
- int res;
-
- entid = yt921x_acl_find(priv, type, tag);
- if (entid == UINT_MAX)
- return -ENOENT;
-
- blkid = entid / YT921X_ACL_ENT_PER_BLK;
- binid = entid % YT921X_ACL_ENT_PER_BLK;
- aclblk = priv->acl_blks[blkid];
- aclrule = aclblk->rules[binid];
-
- aclblk->rules[binid] = NULL;
- res = yt921x_acl_commit(priv, entid, aclrule->mask);
- /* the kernel never rolls back on failure */
-
- if (aclrule->action[0] & YT921X_ACL_ACTa_METER_EN)
- clear_bit(FIELD_GET(YT921X_ACL_ACTa_METER_ID_M,
- aclrule->action[0]),
- priv->meters_map);
- priv->acl_masks[blkid] &= ~aclrule->mask;
- kvfree(aclrule);
- if (!priv->acl_masks[blkid]) {
- kvfree(aclblk);
- priv->acl_blks[blkid] = NULL;
- }
- return res;
-}
-
-static int
-yt921x_acl_add(struct yt921x_priv *priv,
- const struct yt921x_acl_rule_ext *ruleext,
- struct netlink_ext_ack *extack)
-{
- unsigned int entscnt = hweight8(ruleext->r.mask);
- struct yt921x_acl_rule *aclrule;
- struct yt921x_acl_blk *aclblk;
- bool use_trap = false;
- unsigned int meterid;
- unsigned long mask;
- unsigned int binid;
- unsigned int blkid;
- unsigned int entid;
- unsigned int o;
- int res;
-
- /* Allocate resources */
- entid = yt921x_acl_reserve(priv, entscnt, extack);
- if (entid == UINT_MAX)
- return -EOPNOTSUPP;
-
- if (!(ruleext->r.action[0] & YT921X_ACL_ACTa_METER_EN)) {
- meterid = YT921X_METER_NUM;
- } else {
- meterid = find_first_zero_bit(priv->meters_map,
- YT921X_METER_NUM);
- if (meterid < YT921X_METER_NUM) {
- res = yt921x_meter_config(priv, meterid,
- &ruleext->marker);
- if (res)
- return res;
- } else if (ruleext->r.sw_assisted) {
- use_trap = true;
- } else {
- NL_SET_ERR_MSG_MOD(extack,
- "No more meters available");
- return -EOPNOTSUPP;
- }
- }
-
- /* Prepare acl block ctrlblk */
- blkid = entid / YT921X_ACL_ENT_PER_BLK;
- binid = entid % YT921X_ACL_ENT_PER_BLK;
- aclblk = priv->acl_blks[blkid];
- if (!aclblk) {
- aclblk = kvzalloc_obj(*aclblk);
- if (!aclblk)
- return -ENOMEM;
- priv->acl_blks[blkid] = aclblk;
- }
-
- /* Prepare acl rule ctrlblk */
- aclrule = kvmemdup(&ruleext->r,
- offsetof(struct yt921x_acl_rule, entries[entscnt]),
- GFP_KERNEL);
- if (!aclrule) {
- res = -ENOMEM;
- goto err;
- }
-
- /* Replace the placeholder resource IDs */
- aclrule->mask = 0;
- mask = priv->acl_masks[blkid];
- for_each_clear_bit(o, &mask, YT921X_ACL_ENT_PER_BLK) {
- aclrule->mask |= BIT(o);
- entscnt--;
- if (!entscnt)
- break;
- }
-
- if (use_trap) {
- aclrule->action[2] &= ~YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M &
- ~YT921X_ACL_ACTc_FWD_M;
- aclrule->action[2] |= YT921X_ACL_ACTc_FWD_EN |
- YT921X_ACL_ACTc_FWD_TRAP;
- }
- if (meterid < YT921X_METER_NUM)
- aclrule->action[0] |= YT921X_ACL_ACTa_METER_ID(meterid);
- else
- aclrule->action[0] &= ~YT921X_ACL_ACTa_METER_EN;
-
- /* Write rules */
- aclblk->rules[binid] = aclrule;
- res = yt921x_acl_commit(priv, entid, aclrule->mask);
- if (res) {
- aclblk->rules[binid] = NULL;
- kvfree(aclrule);
- goto err;
- }
-
- if (meterid < YT921X_METER_NUM)
- set_bit(meterid, priv->meters_map);
- priv->acl_masks[blkid] |= aclrule->mask;
- return 0;
-
-err:
- if (!priv->acl_masks[blkid]) {
- kvfree(aclblk);
- priv->acl_blks[blkid] = NULL;
- }
- return res;
-}
-
-static int
-yt921x_dsa_cls_flower_del(struct dsa_switch *ds, int port,
- struct flow_cls_offload *cls, bool ingress)
-{
- struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
- int res;
-
- mutex_lock(&priv->reg_lock);
- res = yt921x_acl_del(priv, TC_SETUP_CLSFLOWER, cls->cookie);
- mutex_unlock(&priv->reg_lock);
-
- return res;
-}
-
-static int
-yt921x_dsa_cls_flower_add(struct dsa_switch *ds, int port,
- struct flow_cls_offload *cls, bool ingress)
-{
- struct netlink_ext_ack *extack = cls->common.extack;
- struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
- struct yt921x_acl_rule_ext ruleext;
- int res;
-
- res = yt921x_acl_rule_ext_parse_flow(&ruleext, port, cls, ingress,
- priv);
- if (res)
- return res;
-
- mutex_lock(&priv->reg_lock);
- res = yt921x_acl_add(priv, &ruleext, extack);
- mutex_unlock(&priv->reg_lock);
-
- return res;
-}
-
-static int
-yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress)
-{
- u32 mask;
-
- if (ingress)
- mask = YT921X_MIRROR_IGR_PORTn(port);
- else
- mask = YT921X_MIRROR_EGR_PORTn(port);
- return yt921x_reg_clear_bits(priv, YT921X_MIRROR, mask);
-}
-
-static int
-yt921x_mirror_add(struct yt921x_priv *priv, int port, bool ingress,
- int to_local_port, struct netlink_ext_ack *extack)
-{
- u32 srcs;
- u32 ctrl;
- u32 val;
- u32 dst;
- int res;
-
- if (ingress)
- srcs = YT921X_MIRROR_IGR_PORTn(port);
- else
- srcs = YT921X_MIRROR_EGR_PORTn(port);
- dst = YT921X_MIRROR_PORT(to_local_port);
-
- res = yt921x_reg_read(priv, YT921X_MIRROR, &val);
- if (res)
- return res;
-
- /* other mirror tasks & different dst port -> conflict */
- if ((val & ~srcs & (YT921X_MIRROR_EGR_PORTS_M |
- YT921X_MIRROR_IGR_PORTS_M)) &&
- (val & YT921X_MIRROR_PORT_M) != dst) {
- NL_SET_ERR_MSG_MOD(extack,
- "Sniffer port is already configured, delete existing rules & retry");
- return -EBUSY;
- }
-
- ctrl = val & ~YT921X_MIRROR_PORT_M;
- ctrl |= srcs;
- ctrl |= dst;
-
- if (ctrl == val)
- return 0;
-
- return yt921x_reg_write(priv, YT921X_MIRROR, ctrl);
-}
-
-static void
-yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,
- struct dsa_mall_mirror_tc_entry *mirror)
-{
- struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
- struct device *dev = yt921x_priv_to_device(priv);
- int res;
-
- mutex_lock(&priv->reg_lock);
- res = yt921x_mirror_del(priv, port, mirror->ingress);
- mutex_unlock(&priv->reg_lock);
-
- if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "unmirror",
- port, res);
-}
-
-static int
-yt921x_dsa_port_mirror_add(struct dsa_switch *ds, int port,
- struct dsa_mall_mirror_tc_entry *mirror,
- bool ingress, struct netlink_ext_ack *extack)
-{
- struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
- int res;
-
- mutex_lock(&priv->reg_lock);
- res = yt921x_mirror_add(priv, port, ingress,
- mirror->to_local_port, extack);
- mutex_unlock(&priv->reg_lock);
-
- return res;
-}
-
static int yt921x_lag_hash(struct yt921x_priv *priv, u32 ctrl, bool unique_lag,
struct netlink_ext_ack *extack)
{
diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h
index 9c34fb704bf8..40ab5187f774 100644
--- a/drivers/net/dsa/motorcomm/chip.h
+++ b/drivers/net/dsa/motorcomm/chip.h
@@ -434,249 +434,6 @@ enum yt921x_app_selector {
#define YT921X_VLAN_CTRLa_METER_EN BIT(5)
#define YT921X_VLAN_CTRLa_METER_ID_M GENMASK(4, 0)
-#define YT921X_ACLn_ACT(n) (0x1c0000 + 0x10 * (n))
-#define YT921X_ACL_ACTc_STAG_M GENMASK(26, 25)
-#define YT921X_ACL_ACTc_STAG(x) FIELD_PREP(YT921X_ACL_ACTc_STAG_M, (x))
-#define YT921X_ACL_ACTc_STAG_DONTCARE YT921X_ACL_ACTc_STAG(0)
-#define YT921X_ACL_ACTc_STAG_UNTAG YT921X_ACL_ACTc_STAG(1)
-#define YT921X_ACL_ACTc_STAG_TAG YT921X_ACL_ACTc_STAG(2)
-#define YT921X_ACL_ACTc_STAG_KEEP YT921X_ACL_ACTc_STAG(3)
-#define YT921X_ACL_ACTc_CTAG_M GENMASK(24, 23)
-#define YT921X_ACL_ACTc_CTAG(x) FIELD_PREP(YT921X_ACL_ACTc_CTAG_M, (x))
-#define YT921X_ACL_ACTc_CTAG_DONTCARE YT921X_ACL_ACTc_CTAG(0)
-#define YT921X_ACL_ACTc_CTAG_UNTAG YT921X_ACL_ACTc_CTAG(1)
-#define YT921X_ACL_ACTc_CTAG_TAG YT921X_ACL_ACTc_CTAG(2)
-#define YT921X_ACL_ACTc_CTAG_KEEP YT921X_ACL_ACTc_CTAG(3)
-#define YT921X_ACL_ACTc_FWD_M GENMASK(22, 21)
-#define YT921X_ACL_ACTc_FWD(x) FIELD_PREP(YT921X_ACL_ACTc_FWD_M, (x))
-#define YT921X_ACL_ACTc_FWD_FWD YT921X_ACL_ACTc_FWD(0)
-#define YT921X_ACL_ACTc_FWD_COPY YT921X_ACL_ACTc_FWD(1)
-#define YT921X_ACL_ACTc_FWD_REDIR YT921X_ACL_ACTc_FWD(2)
-#define YT921X_ACL_ACTc_FWD_TRAP YT921X_ACL_ACTc_FWD(3)
-#define YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M GENMASK(20, 10)
-#define YT921X_ACL_ACTc_FWD_REDIR_DPORTS(x) FIELD_PREP(YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M, (x))
-#define YT921X_ACL_ACTc_FWD_REDIR_DPORTn(port) BIT((port) + 10)
-#define YT921X_ACL_ACTc_FWD_EN BIT(9)
-#define YT921X_ACL_ACTc_SDEI BIT(8)
-#define YT921X_ACL_ACTc_SDEI_REPLACE BIT(7)
-#define YT921X_ACL_ACTc_SPRI_M GENMASK(6, 4)
-#define YT921X_ACL_ACTc_SPRI(x) FIELD_PREP(YT921X_ACL_ACTc_SPRI_M, (x))
-#define YT921X_ACL_ACTc_SPRI_REPLACE BIT(3)
-#define YT921X_ACL_ACTbc_SVID_M GENMASK_ULL(34, 23)
-#define YT921X_ACL_ACTbc_SVID(x) FIELD_PREP(YT921X_ACL_ACTbc_SVID_M, (x))
-#define YT921X_ACL_ACTb_SVID_REPLACE BIT(22)
-#define YT921X_ACL_ACTb_CDEI BIT(21)
-#define YT921X_ACL_ACTb_CDEI_REPLACE BIT(20)
-#define YT921X_ACL_ACTb_CPRI_M GENMASK(19, 17)
-#define YT921X_ACL_ACTb_CPRI(x) FIELD_PREP(YT921X_ACL_ACTb_CPRI_M, (x))
-#define YT921X_ACL_ACTb_CPRI_REPLACE BIT(16)
-#define YT921X_ACL_ACTb_CVID_M GENMASK(15, 4)
-#define YT921X_ACL_ACTb_CVID(x) FIELD_PREP(YT921X_ACL_ACTb_CVID_M, (x))
-#define YT921X_ACL_ACTb_CVID_REPLACE BIT(3)
-#define YT921X_ACL_ACTb_PRIO_M GENMASK(2, 0)
-#define YT921X_ACL_ACTb_PRIO(x) FIELD_PREP(YT921X_ACL_ACTb_PRIO_M, (x))
-#define YT921X_ACL_ACTa_PRIO_EN BIT(31)
-#define YT921X_ACL_ACTa_COLOR_M GENMASK(30, 29)
-#define YT921X_ACL_ACTa_COLOR(x) FIELD_PREP(YT921X_ACL_ACTa_COLOR_M, (x))
-#define YT921X_ACL_ACTa_COLOR_GREEN YT921X_ACL_ACTa_COLOR(0)
-#define YT921X_ACL_ACTa_COLOR_YELLOW YT921X_ACL_ACTa_COLOR(1)
-#define YT921X_ACL_ACTa_COLOR_RED YT921X_ACL_ACTa_COLOR(2)
-#define YT921X_ACL_ACTa_COLOR_EN BIT(28)
-#define YT921X_ACL_ACTa_DSCP_M GENMASK(27, 22)
-#define YT921X_ACL_ACTa_DSCP(x) FIELD_PREP(YT921X_ACL_ACTa_DSCP_M, (x))
-#define YT921X_ACL_ACTa_DSCP_REPLACE BIT(21)
-#define YT921X_ACL_ACTa_METER_ID_M GENMASK(20, 15)
-#define YT921X_ACL_ACTa_METER_ID(x) FIELD_PREP(YT921X_ACL_ACTa_METER_ID_M, (x))
-#define YT921X_ACL_ACTa_METER_EN BIT(14)
-#define YT921X_ACL_ACTa_MIRROR_EN BIT(13)
-#define YT921X_ACL_ACTa_FLOWSTAT_EN BIT(12)
-#define YT921X_ACL_ACTa_FLOWSTAT_ID_M GENMASK(11, 6)
-#define YT921X_ACL_ACTa_FLOWSTAT_ID(x) FIELD_PREP(YT921X_ACL_ACTa_FLOWSTAT_ID_M, (x))
-#define YT921X_ACL_ACTa_GPIO_EN BIT(5)
-#define YT921X_ACL_ACTa_GPIO_PIN_M GENMASK(4, 1)
-#define YT921X_ACL_ACTa_GPIO_PIN(x) FIELD_PREP(YT921X_ACL_ACTa_GPIO_PIN_M, (x))
-#define YT921X_ACL_ACTa_INTR_EN BIT(0)
-#define YT921X_ACL_BLK_KEEP 0x201000
-#define YT921X_ACL_BLK_KEEP_GRPIDn_M(bin) (7 << (4 * (bin) + 1))
-#define YT921X_ACL_BLK_KEEP_GRPIDn(bin, x) ((x) << (4 * (bin) + 1))
-#define YT921X_ACL_BLK_KEEP_KEEPn(bin) BIT(4 * (bin))
-#define YT921X_ACL_PORT 0x202000
-#define YT921X_ACL_PORT_PORTS_M GENMASK(10, 0)
-#define YT921X_ACL_PORT_PORTS(x) FIELD_PREP(YT921X_ACL_PORT_PORTS_M, (x))
-#define YT921X_ACL_PORT_PORTn(port) BIT(port)
-#define YT921X_ACL_BLK_CMD 0x202004
-#define YT921X_ACL_BLK_CMD_BLKID_M GENMASK(6, 1)
-#define YT921X_ACL_BLK_CMD_BLKID(x) FIELD_PREP(YT921X_ACL_BLK_CMD_BLKID_M, (x))
-#define YT921X_ACL_BLK_CMD_MODIFY BIT(0)
-#define YT921X_ACLn_ENTRY(blk) (0x203000 + 4 * (blk))
-#define YT921X_ACL_ENTRY_GRPIDm_M(bin) (7 << (4 * (bin) + 1))
-#define YT921X_ACL_ENTRY_GRPIDm(bin, x) ((x) << (4 * (bin) + 1))
-#define YT921X_ACL_ENTRY_ENm(bin) BIT(4 * (bin))
-#define YT921X_ACLn_KEYm(blk, bin) (0x204000 + 0x200 * (bin) + 8 * (blk))
-#define YT921X_ACL_KEYb_ORD_M GENMASK(29, 21)
-#define YT921X_ACL_KEYb_ORD(x) FIELD_PREP(YT921X_ACL_KEYb_ORD_M, (x))
-#define YT921X_ACL_KEYb_SPORTS_M GENMASK(20, 10)
-#define YT921X_ACL_KEYb_SPORTS(x) FIELD_PREP(YT921X_ACL_KEYb_SPORTS_M, (x))
-#define YT921X_ACL_KEYb_SPORTn(port) BIT((port) + 10)
-#define YT921X_ACL_KEYb_REVERSE BIT(9) /* reverse match */
-#define YT921X_ACL_KEYb_TYPE_M GENMASK(8, 4)
-#define YT921X_ACL_KEYb_TYPE(x) FIELD_PREP(YT921X_ACL_KEYb_TYPE_M, (x))
-/* KEY_* fields need no masks */
-#define YT921X_ACLn_MASKm(blk, bin) (0x205000 + 0x200 * (bin) + 8 * (blk))
-
-enum yt921x_acl_type {
- YT921X_ACL_TYPE_NA,
- YT921X_ACL_TYPE_MAC_DA0,
- YT921X_ACL_TYPE_MAC_SA0,
- YT921X_ACL_TYPE_MAC_DA1_SA1,
- YT921X_ACL_TYPE_VLAN,
- YT921X_ACL_TYPE_VTAG,
- YT921X_ACL_TYPE_IPV4_DA,
- YT921X_ACL_TYPE_IPV4_SA,
- YT921X_ACL_TYPE_IPV6_DA0,
- YT921X_ACL_TYPE_IPV6_DA1,
- YT921X_ACL_TYPE_IPV6_DA2,
- YT921X_ACL_TYPE_IPV6_DA3,
- YT921X_ACL_TYPE_IPV6_SA0,
- YT921X_ACL_TYPE_IPV6_SA1,
- YT921X_ACL_TYPE_IPV6_SA2,
- YT921X_ACL_TYPE_IPV6_SA3,
- YT921X_ACL_TYPE_MISC,
- YT921X_ACL_TYPE_L4,
- YT921X_ACL_TYPE_UDF0,
- YT921X_ACL_TYPE_UDF1,
- YT921X_ACL_TYPE_UDF2,
- YT921X_ACL_TYPE_UDF3,
- YT921X_ACL_TYPE_UDF4,
- YT921X_ACL_TYPE_UDF5,
- YT921X_ACL_TYPE_UDF6,
- YT921X_ACL_TYPE_UDF7,
- YT921X_ACL_TYPE_ETHERTYPE,
- YT921X_ACL_TYPE_NUM
-};
-
-/* Range: turn KEY:MASK into MIN:MAX */
-
-#define YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M GENMASK(3, 0)
-#define YT921X_ACL_BINb_MAC_xA0_L3_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M, (x))
-#define YT921X_ACL_BINa_MAC_xA0_MAC_xA0_M GENMASK(31, 0)
-
-#define YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE_M, (x))
-#define YT921X_ACL_BINa_MAC_DA1_SA1_MAC_DA1_M GENMASK(31, 16)
-#define YT921X_ACL_BINa_MAC_DA1_SA1_MAC_SA1_M GENMASK(15, 0)
-
-#define YT921X_ACL_KEYb_VLAN_SVID_RANGE_EN BIT(31)
-#define YT921X_ACL_KEYb_VLAN_CVID_RANGE_EN BIT(30)
-#define YT921X_ACL_BINb_VLAN_CDEI BIT(3)
-#define YT921X_ACL_BINb_VLAN_CPRI_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_VLAN_CPRI(x) FIELD_PREP(YT921X_ACL_BINb_VLAN_CPRI_M, (x))
-#define YT921X_ACL_BINa_VLAN_CTAG_FMT_M GENMASK(31, 30)
-#define YT921X_ACL_BINa_VLAN_CTAG_FMT(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_CTAG_FMT_M, (x))
-#define YT921X_ACL_BINa_VLAN_SDEI BIT(29)
-#define YT921X_ACL_BINa_VLAN_SPRI_M GENMASK(28, 26)
-#define YT921X_ACL_BINa_VLAN_SPRI(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_SPRI_M, (x))
-#define YT921X_ACL_BINa_VLAN_STAG_FMT_M GENMASK(25, 24)
-#define YT921X_ACL_BINa_VLAN_STAG_FMT(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_STAG_FMT_M, (x))
-#define YT921X_ACL_BINa_VLAN_SVID_M GENMASK(23, 12)
-#define YT921X_ACL_BINa_VLAN_SVID(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_SVID_M, (x))
-#define YT921X_ACL_BINa_VLAN_CVID_M GENMASK(11, 0)
-#define YT921X_ACL_BINa_VLAN_CVID(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_CVID_M, (x))
-
-#define YT921X_ACL_KEYb_VTAG_SVID_RANGE_EN BIT(31)
-#define YT921X_ACL_KEYb_VTAG_CVID_RANGE_EN BIT(30)
-#define YT921X_ACL_BINa_VTAG_CDEI BIT(31)
-#define YT921X_ACL_BINa_VTAG_CPRI_M GENMASK(30, 28)
-#define YT921X_ACL_BINa_VTAG_CPRI(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_CPRI_M, (x))
-#define YT921X_ACL_BINa_VTAG_SDEI BIT(27)
-#define YT921X_ACL_BINa_VTAG_SPRI_M GENMASK(26, 24)
-#define YT921X_ACL_BINa_VTAG_SPRI(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_SPRI_M, (x))
-#define YT921X_ACL_BINa_VTAG_SVID_M GENMASK(23, 12)
-#define YT921X_ACL_BINa_VTAG_SVID(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_SVID_M, (x))
-#define YT921X_ACL_BINa_VTAG_CVID_M GENMASK(11, 0)
-#define YT921X_ACL_BINa_VTAG_CVID(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_CVID_M, (x))
-
-#define YT921X_ACL_KEYb_IPV4_ADDR_RANGE_EN BIT(30)
-#define YT921X_ACL_BINb_IPV4_FRAG BIT(3)
-#define YT921X_ACL_BINb_IPV4_L4_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_IPV4_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_IPV4_L4_TYPE_M, (x))
-#define YT921X_ACL_BINa_IPV4_ADDR_M GENMASK(31, 0)
-
-#define YT921X_ACL_BINb_IPV6_L4_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_IPV6_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_IPV6_L4_TYPE_M, (x))
-#define YT921X_ACL_BINa_IPV6_ADDRx_M GENMASK(31, 0)
-
-#define YT921X_ACL_BINb_IPV6_xA1_IP_OPTION BIT(3)
-
-#define YT921X_ACL_BINb_IPV6_xA2_FIRST_FRAG BIT(3)
-
-#define YT921X_ACL_KEYb_IPV6_xA3_ADDR_RANGE_EN BIT(30)
-#define YT921X_ACL_BINb_IPV6_xA3_FRAG BIT(3)
-
-#define YT921X_ACL_BINb_MISC_FRAG BIT(3)
-#define YT921X_ACL_BINb_MISC_L4_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_MISC_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MISC_L4_TYPE_M, (x))
-#define YT921X_ACL_BINa_MISC_PPPOE_FLAG BIT(30)
-#define YT921X_ACL_BINa_MISC_FIRST_FRAG BIT(29)
-#define YT921X_ACL_BINa_MISC_IP_OPTION BIT(28)
-#define YT921X_ACL_BINa_MISC_TCP_FLAGS_M GENMASK(27, 20)
-#define YT921X_ACL_BINa_MISC_TCP_FLAGS(x) FIELD_PREP(YT921X_ACL_BINa_MISC_TCP_FLAGS_M, (x))
-#define YT921X_ACL_BINa_MISC_IP_PROTO_M GENMASK(19, 12)
-#define YT921X_ACL_BINa_MISC_IP_PROTO(x) FIELD_PREP(YT921X_ACL_BINa_MISC_IP_PROTO_M, (x))
-#define YT921X_ACL_BINa_MISC_TOS_M GENMASK(11, 4)
-#define YT921X_ACL_BINa_MISC_TOS(x) FIELD_PREP(YT921X_ACL_BINa_MISC_TOS_M, (x))
-#define YT921X_ACL_BINa_MISC_L3_TYPE_M GENMASK(3, 0)
-#define YT921X_ACL_BINa_MISC_L3_TYPE(x) FIELD_PREP(YT921X_ACL_BINa_MISC_L3_TYPE_M, (x))
-
-#define YT921X_ACL_KEYb_L4_DPORT_RANGE_EN BIT(31)
-#define YT921X_ACL_KEYb_L4_SPORT_RANGE_EN BIT(30)
-#define YT921X_ACL_BINb_L4_FRAG BIT(3)
-#define YT921X_ACL_BINb_L4_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_L4_TYPE_M, (x))
-#define YT921X_ACL_BINa_L4_DPORT_M GENMASK(31, 16)
-#define YT921X_ACL_BINa_L4_SPORT_M GENMASK(15, 0)
-
-#define YT921X_ACL_BINb_UDF_IS_IGMP BIT(0)
-#define YT921X_ACL_BINa_UDF_UDF0_M GENMASK(31, 16)
-#define YT921X_ACL_BINa_UDF_UDF0(x) FIELD_PREP(YT921X_ACL_BINa_UDF_UDF0_M, (x))
-#define YT921X_ACL_BINa_UDF_UDF1_M GENMASK(15, 0)
-#define YT921X_ACL_BINa_UDF_UDF1(x) FIELD_PREP(YT921X_ACL_BINa_UDF_UDF1_M, (x))
-
-#define YT921X_ACL_KEYb_ETHERTYPE_ETHERTYPE_RANGE_EN BIT(30)
-#define YT921X_ACL_BINb_ETHERTYPE_L4_TYPE_M GENMASK(2, 0)
-#define YT921X_ACL_BINb_ETHERTYPE_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_ETHERTYPE_L4_TYPE_M, (x))
-#define YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE_M GENMASK(15, 0)
-#define YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE(x) FIELD_PREP(YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE_M, (x))
-
-enum yt921x_l2_type {
- YT921X_L2_TYPE_ETH,
- YT921X_L2_TYPE_ETHV2,
- YT921X_L2_TYPE_ETHSAP,
- YT921X_L2_TYPE_ETHSNAP,
-};
-
-enum yt921x_l3_type {
- YT921X_L3_TYPE_OTHER,
- YT921X_L3_TYPE_IPV4,
- YT921X_L3_TYPE_IPV6,
- YT921X_L3_TYPE_ARP,
- YT921X_L3_TYPE_LLDP,
- YT921X_L3_TYPE_PAE,
- YT921X_L3_TYPE_ERP,
- YT921X_L3_TYPE_SLOW_PROTOCOL,
-};
-
-enum yt921x_l4_type {
- YT921X_L4_TYPE_OTHER,
- YT921X_L4_TYPE_TCP,
- YT921X_L4_TYPE_UDP,
- YT921X_L4_TYPE_UDPLITE,
- YT921X_L4_TYPE_ICMP,
- YT921X_L4_TYPE_IGMP,
- YT921X_L4_TYPE_MLD,
- YT921X_L4_TYPE_ND,
-};
-
#define YT921X_TPID_IGRn(x) (0x210000 + 4 * (x)) /* [0, 3] */
#define YT921X_TPID_IGR_TPID_M GENMASK(15, 0)
#define YT921X_PORTn_IGR_TPID(port) (0x210010 + 4 * (port))
@@ -693,47 +450,6 @@ enum yt921x_l4_type {
#define YT921X_LAG_HASH_MAC_SA BIT(2)
#define YT921X_LAG_HASH_MAC_DA BIT(1)
#define YT921X_LAG_HASH_SRC_PORT BIT(0)
-#define YT921X_UDFn_CTRL(x) (0x210094 + 4 * (x))
-#define YT921X_UDF_CTRL_UDF_TYPE_M GENMASK(8, 7)
-#define YT921X_UDF_CTRL_UDF_TYPE(x) FIELD_PREP(YT921X_UDF_CTRL_UDF_TYPE_M, (x))
-#define YT921X_UDF_CTRL_UDF_TYPE_ETH YT921X_UDF_CTRL_UDF_TYPE(0)
-#define YT921X_UDF_CTRL_UDF_TYPE_L3 YT921X_UDF_CTRL_UDF_TYPE(1)
-#define YT921X_UDF_CTRL_UDF_TYPE_L4 YT921X_UDF_CTRL_UDF_TYPE(2)
-#define YT921X_UDF_CTRL_UDF_OFFSET_M GENMASK(6, 0)
-#define YT921X_UDF_CTRL_UDF_OFFSET(x) FIELD_PREP(YT921X_UDF_CTRL_UDF_OFFSET_M, (x))
-
-#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 use 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 bytes 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)
@@ -752,29 +468,6 @@ enum yt921x_l4_type {
#define YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_TAGGED BIT(1)
#define YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED BIT(0)
-#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))
-#define YT921X_MIRROR_IGR_PORTn(port) BIT((port) + 16)
-#define YT921X_MIRROR_EGR_PORTS_M GENMASK(14, 4)
-#define YT921X_MIRROR_EGR_PORTS(x) FIELD_PREP(YT921X_MIRROR_EGR_PORTS_M, (x))
-#define YT921X_MIRROR_EGR_PORTn(port) BIT((port) + 4)
-#define YT921X_MIRROR_PORT_M GENMASK(3, 0)
-#define YT921X_MIRROR_PORT(x) FIELD_PREP(YT921X_MIRROR_PORT_M, (x))
-
-#define YT921X_PORT_SHAPE_SLOT 0x34000c
-#define YT921X_PORT_SHAPE_SLOT_SLOT_M GENMASK(11, 0)
-#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_CTRLb_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_CTRLa_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_CTRLa_CIR_M, (x))
-#define YT921X_PORTn_SHAPE_STAT(port) (0x356000 + 4 * (port))
-
#define YT921X_EDATA_EXTMODE 0xfb
#define YT921X_EDATA_LEN 0x100
@@ -791,19 +484,8 @@ enum yt921x_fdb_entry_status {
#define YT921X_MSTI_NUM 16
-#define YT921X_TOKEN_BYTE_C 1 /* 1 token = 2^1 byte */
-#define YT921X_TOKEN_PKT_C -6 /* 1 token = 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_PORT_SHAPE_SLOT_MIN 80
-#define YT921X_SHAPE_UNIT_MAX ((1 << 3) - 1)
-#define YT921X_SHAPE_CIR_MAX ((1 << 18) - 1)
-#define YT921X_SHAPE_CBS_MAX ((1 << 14) - 1)
#define YT921X_LAG_NUM 2
#define YT921X_LAG_PORT_NUM 4
@@ -821,9 +503,6 @@ enum yt921x_fdb_entry_status {
#define YT921X_TAG_LEN 8
#define YT921X_ACL_BLK_NUM 48
-#define YT921X_ACL_ENT_PER_BLK 8
-#define YT921X_ACL_NUM (YT921X_ACL_BLK_NUM * YT921X_ACL_ENT_PER_BLK)
-#define YT921X_UDF_NUM 8
#define YT921X_LED_GROUP_NUM 3
#define YT921X_LED_PORT_NUM 10
@@ -885,26 +564,6 @@ struct yt921x_mib {
u64 tx_oam;
};
-struct yt921x_acl_entry {
- u32 key[2];
- u32 mask[2];
-};
-
-struct yt921x_acl_rule {
- unsigned long tag;
- enum tc_setup_type type;
-
- u32 action[3];
- bool sw_assisted;
-
- u8 mask;
- struct yt921x_acl_entry entries[YT921X_ACL_ENT_PER_BLK];
-};
-
-struct yt921x_acl_blk {
- struct yt921x_acl_rule *rules[YT921X_ACL_ENT_PER_BLK];
-};
-
struct yt921x_port {
unsigned char index;
@@ -1007,4 +666,14 @@ static inline int ethtool_speed_to_yt921x(int speed)
}
}
+static inline u32 ethaddr_hi4_to_u32(const unsigned char *addr)
+{
+ return (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3];
+}
+
+static inline u32 ethaddr_lo2_to_u32(const unsigned char *addr)
+{
+ return (addr[4] << 8) | addr[5];
+}
+
#endif
diff --git a/drivers/net/dsa/motorcomm/tc.c b/drivers/net/dsa/motorcomm/tc.c
new file mode 100644
index 000000000000..84abc2ef8b61
--- /dev/null
+++ b/drivers/net/dsa/motorcomm/tc.c
@@ -0,0 +1,1454 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2026 David Yang
+ */
+
+#include "chip.h"
+#include "smi.h"
+#include "tc.h"
+
+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;
+}
+
+/* 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_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 = flags & YT921X_MARKER_PKT_MODE ? YT921X_TOKEN_PKT_C :
+ YT921X_TOKEN_BYTE_C;
+ struct device *dev = yt921x_priv_to_device(priv);
+ struct yt921x_marker m;
+ u64 burst_est;
+ u64 burst_sug;
+ u64 burst_max;
+ u64 rate_max;
+
+ m.unit = unit_max;
+ rate_max = token2rate(cir_max, slot_ns, m.unit, C);
+ burst_max = 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 = div_u64(slot_ns * rate, 1000000000);
+ burst_sug = burst_est;
+ if (flags & YT921X_MARKER_PKT_MODE)
+ burst_sug++;
+ else
+ burst_sug += ETH_HLEN + yt921x_mtu_fetch(priv, port) +
+ ETH_FCS_LEN;
+ if (burst_sug > burst)
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Consider match rate %llu with burst at least %llu",
+ rate, burst_sug);
+
+ /* Select unit */
+ for (; m.unit > 0; m.unit--) {
+ if (rate > (rate_max >> 2) || burst > (burst_max >> 2))
+ break;
+ rate_max >>= 2;
+ burst_max >>= 2;
+ }
+
+ /* Calculate information rate and bucket size */
+ m.cir = rate2token(rate, slot_ns, m.unit, C);
+ if (!m.cir)
+ m.cir = 1;
+ else if (WARN_ON(m.cir > cir_max))
+ m.cir = cir_max;
+ m.cbs = burst2token(burst, m.unit, C);
+ if (!m.cbs)
+ m.cbs = 1;
+ else if (WARN_ON(m.cbs > cbs_max))
+ m.cbs = cbs_max;
+
+ /* Cut EBS */
+ m.ebs = 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 += YT921X_FRAME_SIZE_MAX;
+
+ if (burst_est < burst) {
+ u32 pbs = m.cbs;
+
+ m.cbs = burst2token(burst_est, m.unit, C);
+ if (!m.cbs)
+ m.cbs = 1;
+ else if (WARN_ON(m.cbs > cbs_max))
+ m.cbs = cbs_max;
+
+ if (pbs > m.cbs)
+ m.ebs = 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 = flags & YT921X_MARKER_PKT_MODE;
+ *marker = 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 = !!police->rate_pkt_ps;
+ u64 burst;
+ u64 rate;
+
+ rate = pkt_mode ? police->rate_pkt_ps : police->rate_bytes_ps;
+ burst = pkt_mode ? police->burst_pkt : police->burst;
+ if (pkt_mode)
+ flags |= 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_marker_tfm_shape(struct yt921x_marker *marker, u64 rate, u64 burst,
+ unsigned int flags, struct yt921x_priv *priv, int port,
+ struct netlink_ext_ack *extack)
+{
+ return yt921x_marker_tfm(marker, rate, burst, flags,
+ 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,
+ const struct flow_action_entry *act,
+ struct netlink_ext_ack *extack)
+{
+ if (police->exceed.act_id != 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 != FLOW_ACTION_PIPE &&
+ police->notexceed.act_id != 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 == 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] = 0;
+ ctrls[1] = YT921X_METER_CTRLb_CIR(marker->cir);
+ ctrls[2] = 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] |= 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);
+}
+
+void yt921x_dsa_port_policer_del(struct dsa_switch *ds, int port)
+{
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_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);
+}
+
+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 = dsa_to_yt921x_priv(ds);
+ struct yt921x_marker marker;
+ u32 ctrl;
+ int res;
+
+ res = yt921x_police_validate(police, NULL, NULL, extack);
+ if (res)
+ return res;
+
+ res = yt921x_marker_tfm_police(&marker, police, 0, priv, port, extack);
+ if (res)
+ return res;
+
+ mutex_lock(&priv->reg_lock);
+ res = yt921x_meter_config(priv, port + YT921X_METER_NUM, &marker);
+ if (res)
+ goto end;
+
+ ctrl = YT921X_PORT_METER_ID(port) | YT921X_PORT_METER_EN;
+ res = yt921x_reg_write(priv, YT921X_PORTn_METER(port), ctrl);
+end:
+ mutex_unlock(&priv->reg_lock);
+
+ return res;
+}
+
+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 = dsa_to_yt921x_priv(ds);
+ struct netlink_ext_ack *extack = qopt->extack;
+ u32 ctrls[2];
+ int res;
+
+ if (qopt->parent != TC_H_ROOT)
+ return -EOPNOTSUPP;
+
+ switch (qopt->command) {
+ case TC_TBF_STATS:
+ /* Unfortunately the convention for TC_*_STATS is a mess,
+ * neither 0 nor -EOPNOTSUPP is perfect here.
+ */
+ return -EOPNOTSUPP;
+ 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_marker marker;
+
+ p = &qopt->replace_params;
+
+ res = yt921x_marker_tfm_shape(&marker, p->rate.rate_bytes_ps,
+ p->max_size,
+ YT921X_MARKER_SINGLE_BUCKET,
+ priv, port, extack);
+ if (res)
+ return res;
+
+ ctrls[0] = YT921X_PORT_SHAPE_CTRLa_CIR(marker.cir) |
+ YT921X_PORT_SHAPE_CTRLa_CBS(marker.cbs);
+ ctrls[1] = YT921X_PORT_SHAPE_CTRLb_UNIT(marker.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;
+}
+
+int
+yt921x_dsa_port_setup_tc(struct dsa_switch *ds, int port,
+ enum tc_setup_type type, void *type_data)
+{
+ switch (type) {
+ case TC_SETUP_QDISC_TBF: {
+ const struct tc_tbf_qopt_offload *qopt = type_data;
+
+ return yt921x_dsa_port_setup_tc_tbf_port(ds, port, qopt);
+ }
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+/* ACL: 48 blocks * 8 entries
+ *
+ * One rule can span multiple entries, but within a block.
+ */
+
+static void
+yt921x_acl_entry_set(struct yt921x_acl_entry *entry, unsigned int offset,
+ u32 flags, bool set)
+{
+ if (set)
+ entry->key[offset] |= flags;
+ entry->mask[offset] |= flags;
+}
+
+static unsigned int
+yt921x_acl_entries_set_is_fragment(struct yt921x_acl_entry *entries,
+ unsigned int size, bool set)
+{
+ for (unsigned int i = 0; i < size; i++)
+ switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
+ case YT921X_ACL_TYPE_IPV4_DA:
+ case YT921X_ACL_TYPE_IPV4_SA:
+ yt921x_acl_entry_set(&entries[i], 1,
+ YT921X_ACL_BINb_IPV4_FRAG, set);
+ return size;
+ case YT921X_ACL_TYPE_IPV6_DA3:
+ case YT921X_ACL_TYPE_IPV6_SA3:
+ yt921x_acl_entry_set(&entries[i], 1,
+ YT921X_ACL_BINb_IPV6_xA3_FRAG,
+ set);
+ return size;
+ case YT921X_ACL_TYPE_MISC:
+ yt921x_acl_entry_set(&entries[i], 1,
+ YT921X_ACL_BINb_MISC_FRAG, set);
+ return size;
+ case YT921X_ACL_TYPE_L4:
+ yt921x_acl_entry_set(&entries[i], 1,
+ YT921X_ACL_BINb_L4_FRAG, set);
+ return size;
+ }
+
+ if (size >= YT921X_ACL_ENT_PER_BLK)
+ return 0;
+
+ entries[size] = (typeof(*entries)){};
+ entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
+ yt921x_acl_entry_set(&entries[size], 1, YT921X_ACL_BINb_MISC_FRAG, set);
+
+ return size + 1;
+}
+
+static unsigned int
+yt921x_acl_entries_set_first_frag(struct yt921x_acl_entry *entries,
+ unsigned int size, bool set)
+{
+ for (unsigned int i = 0; i < size; i++)
+ switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
+ case YT921X_ACL_TYPE_IPV6_DA2:
+ case YT921X_ACL_TYPE_IPV6_SA2:
+ yt921x_acl_entry_set(&entries[i], 1,
+ YT921X_ACL_BINb_IPV6_xA2_FIRST_FRAG,
+ set);
+ return size;
+ case YT921X_ACL_TYPE_MISC:
+ yt921x_acl_entry_set(&entries[i], 0,
+ YT921X_ACL_BINa_MISC_FIRST_FRAG,
+ set);
+ return size;
+ }
+
+ if (size >= YT921X_ACL_ENT_PER_BLK)
+ return 0;
+
+ entries[size] = (typeof(*entries)){};
+ entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
+ yt921x_acl_entry_set(&entries[size], 0,
+ YT921X_ACL_BINa_MISC_FIRST_FRAG, set);
+
+ return size + 1;
+}
+
+static unsigned int
+yt921x_acl_entries_set_l3_type(struct yt921x_acl_entry *entries,
+ unsigned int size, enum yt921x_l3_type type)
+{
+ for (unsigned int i = 0; i < size; i++)
+ switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
+ case YT921X_ACL_TYPE_MAC_DA0:
+ case YT921X_ACL_TYPE_MAC_SA0:
+ entries[i].key[1] |= YT921X_ACL_BINb_MAC_xA0_L3_TYPE(type);
+ entries[i].mask[1] |= YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M;
+ return size;
+ case YT921X_ACL_TYPE_MISC:
+ entries[i].key[0] |= YT921X_ACL_BINa_MISC_L3_TYPE(type);
+ entries[i].mask[0] |= YT921X_ACL_BINa_MISC_L3_TYPE_M;
+ return size;
+ }
+
+ if (size >= YT921X_ACL_ENT_PER_BLK)
+ return 0;
+
+ entries[size] = (typeof(*entries)){};
+ entries[size].key[0] = YT921X_ACL_BINa_MISC_L3_TYPE(type);
+ entries[size].key[1] = YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
+ entries[size].mask[0] = YT921X_ACL_BINa_MISC_L3_TYPE_M;
+
+ return size + 1;
+}
+
+static unsigned int
+yt921x_acl_entries_set_l4_type(struct yt921x_acl_entry *entries,
+ unsigned int size, enum yt921x_l4_type type)
+{
+ for (unsigned int i = 0; i < size; i++)
+ switch (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1])) {
+ case YT921X_ACL_TYPE_IPV4_DA:
+ case YT921X_ACL_TYPE_IPV4_SA:
+ entries[i].key[1] |= YT921X_ACL_BINb_IPV4_L4_TYPE(type);
+ entries[i].mask[1] |= YT921X_ACL_BINb_IPV4_L4_TYPE_M;
+ return size;
+ case YT921X_ACL_TYPE_IPV6_DA0:
+ case YT921X_ACL_TYPE_IPV6_DA1:
+ case YT921X_ACL_TYPE_IPV6_DA2:
+ case YT921X_ACL_TYPE_IPV6_DA3:
+ case YT921X_ACL_TYPE_IPV6_SA0:
+ case YT921X_ACL_TYPE_IPV6_SA1:
+ case YT921X_ACL_TYPE_IPV6_SA2:
+ case YT921X_ACL_TYPE_IPV6_SA3:
+ entries[i].key[1] |= YT921X_ACL_BINb_IPV6_L4_TYPE(type);
+ entries[i].mask[1] |= YT921X_ACL_BINb_IPV6_L4_TYPE_M;
+ return size;
+ case YT921X_ACL_TYPE_L4:
+ entries[i].key[1] |= YT921X_ACL_BINb_L4_TYPE(type);
+ entries[i].mask[1] |= YT921X_ACL_BINb_L4_TYPE_M;
+ return size;
+ case YT921X_ACL_TYPE_MISC:
+ entries[i].key[1] |= YT921X_ACL_BINb_MISC_L4_TYPE(type);
+ entries[i].mask[1] |= YT921X_ACL_BINb_MISC_L4_TYPE_M;
+ return size;
+ }
+
+ if (size >= YT921X_ACL_ENT_PER_BLK)
+ return 0;
+
+ entries[size] = (typeof(*entries)){};
+ entries[size].key[1] = YT921X_ACL_BINb_MISC_L4_TYPE(type) |
+ YT921X_ACL_KEYb_TYPE(YT921X_ACL_TYPE_MISC);
+ entries[size].mask[1] = YT921X_ACL_BINb_MISC_L4_TYPE_M;
+
+ return size + 1;
+}
+
+static struct yt921x_acl_entry *
+yt921x_acl_entries_new(struct yt921x_acl_entry *entries, unsigned int *sizep,
+ u32 type)
+{
+ unsigned int size = *sizep;
+
+ if (size >= YT921X_ACL_ENT_PER_BLK)
+ return NULL;
+
+ entries[size] = (typeof(*entries)){};
+ entries[size].key[1] = YT921X_ACL_KEYb_TYPE(type);
+
+ (*sizep)++;
+ return &entries[size];
+}
+
+static struct yt921x_acl_entry *
+yt921x_acl_entries_find(struct yt921x_acl_entry *entries, unsigned int *sizep,
+ u32 type)
+{
+ for (unsigned int i = 0; i < *sizep; i++)
+ if (FIELD_GET(YT921X_ACL_KEYb_TYPE_M, entries[i].key[1]) ==
+ type)
+ return &entries[i];
+ return yt921x_acl_entries_new(entries, sizep, type);
+}
+
+static void
+yt921x_acl_rule_set_ports(struct yt921x_acl_rule *aclrule, u16 ord,
+ u16 ports_mask)
+{
+ struct yt921x_acl_entry *entries = aclrule->entries;
+
+ for (unsigned int i = 0; i < hweight8(aclrule->mask); i++) {
+ entries[i].key[1] |= YT921X_ACL_KEYb_SPORTS(ports_mask) |
+ YT921X_ACL_KEYb_ORD(ord);
+ }
+}
+
+struct yt921x_acl_rule_ext {
+ struct yt921x_acl_rule r;
+
+ struct yt921x_marker marker;
+};
+
+static int
+yt921x_acl_rule_ext_parse_flow_entries(struct yt921x_acl_rule_ext *ruleext,
+ const struct flow_cls_offload *cls)
+{
+ const struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
+ struct yt921x_acl_entry *entries = ruleext->r.entries;
+ struct netlink_ext_ack *extack = cls->common.extack;
+ const struct flow_dissector *dissector;
+ struct yt921x_acl_entry *entry;
+ unsigned int size = 0;
+ bool use_dport;
+ bool use_sport;
+
+ /* Incomplete and probably won't, since it supports custom u32 filters.
+ * New adapters are welcome.
+ */
+ dissector = rule->match.dissector;
+ if (dissector->used_keys &
+ ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_PORTS_RANGE) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_IP) |
+ BIT_ULL(FLOW_DISSECTOR_KEY_TCP))) {
+ NL_SET_ERR_MSG_MOD(extack, "Unsupported keys used");
+ return -EOPNOTSUPP;
+ }
+
+ /* Entries */
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) {
+ struct flow_match_ipv4_addrs match;
+
+ flow_rule_match_ipv4_addrs(rule, &match);
+
+ if (match.mask->dst) {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_IPV4_DA);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ntohl(match.key->dst);
+ entry->mask[0] |= ntohl(match.mask->dst);
+ }
+
+ if (match.mask->src) {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_IPV4_SA);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ntohl(match.key->src);
+ entry->mask[0] |= ntohl(match.mask->src);
+ }
+ }
+
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV6_ADDRS)) {
+ struct flow_match_ipv6_addrs match;
+
+ flow_rule_match_ipv6_addrs(rule, &match);
+
+ for (unsigned int i = 0; i < 4; i++) {
+ if (!match.mask->dst.s6_addr32[i])
+ continue;
+
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_IPV6_DA0 + i);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ntohl(match.key->dst.s6_addr32[i]);
+ entry->mask[0] |= ntohl(match.mask->dst.s6_addr32[i]);
+ }
+
+ for (unsigned int i = 0; i < 4; i++) {
+ if (!match.mask->src.s6_addr32[i])
+ continue;
+
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_IPV6_SA0 + i);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ntohl(match.key->src.s6_addr32[i]);
+ entry->mask[0] |= ntohl(match.mask->src.s6_addr32[i]);
+ }
+ }
+
+ use_dport = false;
+ use_sport = false;
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {
+ struct flow_match_ports match;
+
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_L4);
+ if (!entry)
+ goto err;
+
+ flow_rule_match_ports(rule, &match);
+
+ use_dport = !!match.mask->dst;
+ use_sport = !!match.mask->src;
+
+ entry->key[0] |= (ntohs(match.key->dst) << 16) |
+ ntohs(match.key->src);
+ entry->mask[0] |= (ntohs(match.mask->dst) << 16) |
+ ntohs(match.mask->src);
+ }
+
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS_RANGE)) {
+ struct flow_match_ports_range match;
+
+ entry = yt921x_acl_entries_find(entries, &size,
+ YT921X_ACL_TYPE_L4);
+ if (!entry)
+ goto err;
+
+ flow_rule_match_ports_range(rule, &match);
+
+ if ((use_dport && match.mask->tp.dst) ||
+ (use_sport && match.mask->tp.src)) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Port mask and range are mutually exclusive");
+ return -EINVAL;
+ }
+
+ if (match.mask->tp.dst) {
+ entry->key[0] |= ntohs(match.key->tp_min.dst) << 16;
+ entry->key[1] |= YT921X_ACL_KEYb_L4_DPORT_RANGE_EN;
+ entry->mask[0] |= ntohs(match.key->tp_max.dst) << 16;
+ }
+
+ if (match.mask->tp.src) {
+ entry->key[0] |= ntohs(match.key->tp_min.src);
+ entry->key[1] |= YT921X_ACL_KEYb_L4_SPORT_RANGE_EN;
+ entry->mask[0] |= ntohs(match.key->tp_max.src);
+ }
+ }
+
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
+ struct flow_match_eth_addrs match;
+ u32 mask;
+
+ flow_rule_match_eth_addrs(rule, &match);
+
+ mask = ethaddr_hi4_to_u32(match.mask->dst);
+ if (mask) {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_MAC_DA0);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ethaddr_hi4_to_u32(match.key->dst);
+ entry->mask[0] |= mask;
+ }
+
+ mask = ethaddr_hi4_to_u32(match.mask->src);
+ if (mask) {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_MAC_SA0);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ethaddr_hi4_to_u32(match.key->src);
+ entry->mask[0] |= mask;
+ }
+
+ mask = (ethaddr_lo2_to_u32(match.mask->dst) << 16) |
+ ethaddr_lo2_to_u32(match.mask->src);
+ if (mask) {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_MAC_DA1_SA1);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= (ethaddr_lo2_to_u32(match.key->dst) << 16) |
+ ethaddr_lo2_to_u32(match.key->src);
+ entry->mask[0] |= mask;
+ }
+ }
+
+ /* Entries + Misc */
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {
+ struct flow_match_basic match;
+
+ flow_rule_match_basic(rule, &match);
+
+ if (match.mask->n_proto) {
+ enum yt921x_l3_type l3type = YT921X_L3_TYPE_OTHER;
+
+ if (match.mask->n_proto == htons(~0))
+ switch (match.key->n_proto) {
+ case htons(ETH_P_IP):
+ l3type = YT921X_L3_TYPE_IPV4;
+ break;
+ case htons(ETH_P_IPV6):
+ l3type = YT921X_L3_TYPE_IPV6;
+ break;
+ case htons(ETH_P_ARP):
+ l3type = YT921X_L3_TYPE_ARP;
+ break;
+ case htons(ETH_P_LLDP):
+ l3type = YT921X_L3_TYPE_LLDP;
+ break;
+ case htons(ETH_P_PAE):
+ l3type = YT921X_L3_TYPE_PAE;
+ break;
+ case htons(ETH_P_CFM):
+ l3type = YT921X_L3_TYPE_ERP;
+ break;
+ }
+
+ if (l3type != YT921X_L3_TYPE_OTHER) {
+ size = yt921x_acl_entries_set_l3_type(entries,
+ size,
+ l3type);
+ if (!size)
+ goto err;
+ } else {
+ entry = yt921x_acl_entries_new(entries, &size,
+ YT921X_ACL_TYPE_ETHERTYPE);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= ntohs(match.key->n_proto);
+ entry->mask[0] |= ntohs(match.mask->n_proto);
+ }
+ }
+
+ if (match.mask->ip_proto) {
+ enum yt921x_l4_type l4type = YT921X_L4_TYPE_OTHER;
+
+ if (match.mask->ip_proto == (u8)~0)
+ switch (match.key->ip_proto) {
+ case IPPROTO_TCP:
+ l4type = YT921X_L4_TYPE_TCP;
+ break;
+ case IPPROTO_UDP:
+ l4type = YT921X_L4_TYPE_UDP;
+ break;
+ case IPPROTO_UDPLITE:
+ l4type = YT921X_L4_TYPE_UDPLITE;
+ break;
+ case IPPROTO_ICMP:
+ l4type = YT921X_L4_TYPE_ICMP;
+ break;
+ case IPPROTO_IGMP:
+ l4type = YT921X_L4_TYPE_IGMP;
+ break;
+ }
+
+ if (l4type != YT921X_L4_TYPE_OTHER) {
+ size = yt921x_acl_entries_set_l4_type(entries,
+ size,
+ l4type);
+ if (!size)
+ goto err;
+ } else {
+ entry = yt921x_acl_entries_find(entries, &size,
+ YT921X_ACL_TYPE_MISC);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= YT921X_ACL_BINa_MISC_IP_PROTO(match.key->ip_proto);
+ entry->mask[0] |= YT921X_ACL_BINa_MISC_IP_PROTO(match.mask->ip_proto);
+ }
+ }
+ }
+
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {
+ u32 supp_flags = FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG;
+ struct flow_match_control match;
+
+ flow_rule_match_control(rule, &match);
+ if (!flow_rule_is_supp_control_flags(supp_flags,
+ match.mask->flags, extack))
+ return -EOPNOTSUPP;
+
+ if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
+ bool set = match.key->flags & FLOW_DIS_IS_FRAGMENT;
+
+ size = yt921x_acl_entries_set_is_fragment(entries, size,
+ set);
+ if (!size)
+ goto err;
+ }
+ if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
+ bool set = match.key->flags & FLOW_DIS_FIRST_FRAG;
+
+ size = yt921x_acl_entries_set_first_frag(entries, size,
+ set);
+ if (!size)
+ goto err;
+ }
+ }
+
+ /* Misc only */
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IP)) {
+ struct flow_match_ip match;
+
+ flow_rule_match_ip(rule, &match);
+ if (match.mask->ttl) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Matching on TTL not supported");
+ return -EOPNOTSUPP;
+ }
+
+ if (match.mask->tos) {
+ entry = yt921x_acl_entries_find(entries, &size,
+ YT921X_ACL_TYPE_MISC);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= YT921X_ACL_BINa_MISC_TOS(match.key->tos);
+ entry->mask[0] |= YT921X_ACL_BINa_MISC_TOS(match.mask->tos);
+ }
+ }
+
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_TCP)) {
+ struct flow_match_tcp match;
+
+ flow_rule_match_tcp(rule, &match);
+ if (match.mask->flags & htons(~0xff)) {
+ NL_SET_ERR_MSG_MOD(extack, "Unsupported TCP flags");
+ return -EOPNOTSUPP;
+ }
+
+ if (match.mask->flags) {
+ entry = yt921x_acl_entries_find(entries, &size,
+ YT921X_ACL_TYPE_MISC);
+ if (!entry)
+ goto err;
+
+ entry->key[0] |= YT921X_ACL_BINa_MISC_TCP_FLAGS(ntohs(match.key->flags));
+ entry->mask[0] |= YT921X_ACL_BINa_MISC_TCP_FLAGS(ntohs(match.mask->flags));
+ }
+ }
+
+ if (!size) {
+ NL_SET_ERR_MSG_MOD(extack, "Empty rule generated, this should not happen");
+ return -EOPNOTSUPP;
+ }
+
+ ruleext->r.mask = (1 << size) - 1;
+ return 0;
+
+err:
+ NL_SET_ERR_MSG_MOD(extack, "Rule too complex");
+ return -EOPNOTSUPP;
+}
+
+static int
+yt921x_acl_rule_ext_parse_flow_action(struct yt921x_acl_rule_ext *ruleext,
+ const struct flow_cls_offload *cls,
+ struct yt921x_priv *priv, int port)
+{
+ const struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
+ const struct flow_action *flow_action = &rule->action;
+ struct netlink_ext_ack *extack = cls->common.extack;
+ enum flow_action_id redir_act = NUM_FLOW_ACTIONS;
+ const struct flow_action_entry *act;
+ u32 *action = ruleext->r.action;
+ bool seen_priority = false;
+ const char *reason = NULL;
+ bool seen_police = false;
+ unsigned int i;
+ int res;
+
+ memset(action, 0, 3 * sizeof(*action));
+ flow_action_for_each(i, act, flow_action)
+ switch (act->id) {
+ case FLOW_ACTION_ACCEPT:
+ case FLOW_ACTION_DROP:
+ case FLOW_ACTION_REDIRECT:
+ if (redir_act != NUM_FLOW_ACTIONS &&
+ redir_act != act->id) {
+ reason = "Different redirect actions";
+ goto fallback;
+ }
+ redir_act = act->id;
+
+ switch (act->id) {
+ case FLOW_ACTION_ACCEPT:
+ action[2] |= YT921X_ACL_ACTc_FWD_EN |
+ YT921X_ACL_ACTc_FWD_FWD;
+ break;
+ case FLOW_ACTION_DROP:
+ action[2] |= YT921X_ACL_ACTc_FWD_EN |
+ YT921X_ACL_ACTc_FWD_REDIR;
+ break;
+ case FLOW_ACTION_REDIRECT: {
+ struct dsa_port *to_dp;
+
+ to_dp = dsa_port_from_netdev(act->dev);
+ if (IS_ERR(to_dp) || to_dp->ds != &priv->ds) {
+ reason = "Redirect to non-local port";
+ goto fallback;
+ }
+
+ action[2] |= YT921X_ACL_ACTc_FWD_EN |
+ YT921X_ACL_ACTc_FWD_REDIR |
+ YT921X_ACL_ACTc_FWD_REDIR_DPORTn(to_dp->index);
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ case FLOW_ACTION_PRIORITY:
+ if (seen_priority) {
+ action[0] &= ~YT921X_ACL_ACTa_PRIO_EN;
+ action[1] &= ~YT921X_ACL_ACTb_PRIO_M;
+
+ reason = "Multiple priority actions";
+ goto fallback;
+ }
+ seen_priority = true;
+
+ if (act->priority >= YT921X_PRIO_NUM) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Priority value is too high");
+ return -EOPNOTSUPP;
+ }
+ action[0] |= YT921X_ACL_ACTa_PRIO_EN;
+ action[1] |= YT921X_ACL_ACTb_PRIO(act->priority);
+ break;
+ case FLOW_ACTION_POLICE: {
+ const struct flow_action_police *police = &act->police;
+
+ if (seen_police) {
+ action[0] &= ~YT921X_ACL_ACTa_METER_EN;
+
+ reason = "Multiple police actions";
+ goto fallback;
+ }
+ seen_police = true;
+
+ res = yt921x_police_validate(police, flow_action, act,
+ extack);
+ if (res)
+ return res;
+
+ res = yt921x_marker_tfm_police(&ruleext->marker, police,
+ 0, priv, port, extack);
+ if (res)
+ return res;
+
+ action[0] |= YT921X_ACL_ACTa_METER_EN;
+ break;
+ }
+ default:
+fallback:
+ if (cls->common.skip_sw) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Action not supported when skip_sw: %s",
+ reason);
+ return -EOPNOTSUPP;
+ }
+ fallthrough;
+ case FLOW_ACTION_TRAP:
+ redir_act = FLOW_ACTION_TRAP;
+
+ action[2] &= ~YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M &
+ ~YT921X_ACL_ACTc_FWD_M;
+ action[2] |= YT921X_ACL_ACTc_FWD_EN |
+ YT921X_ACL_ACTc_FWD_TRAP;
+ break;
+ }
+
+ ruleext->r.sw_assisted = !cls->common.skip_sw;
+ return 0;
+}
+
+static int
+yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
+ const struct flow_cls_offload *cls, bool ingress,
+ struct yt921x_priv *priv)
+{
+ struct netlink_ext_ack *extack = cls->common.extack;
+ int res;
+
+ if (!ingress) {
+ NL_SET_ERR_MSG_MOD(extack, "Only ingress is supported");
+ return -EOPNOTSUPP;
+ }
+
+ if (cls->common.chain_index) {
+ NL_SET_ERR_MSG(extack, "Only chain 0 is supported");
+ return -EOPNOTSUPP;
+ }
+
+ res = yt921x_acl_rule_ext_parse_flow_action(ruleext, cls, priv, port);
+ if (res)
+ return res;
+ res = yt921x_acl_rule_ext_parse_flow_entries(ruleext, cls);
+ if (res)
+ return res;
+
+ yt921x_acl_rule_set_ports(&ruleext->r, 0, BIT(port));
+ ruleext->r.tag = cls->cookie;
+ ruleext->r.type = TC_SETUP_CLSFLOWER;
+ return 0;
+}
+
+static unsigned int
+yt921x_acl_find(const struct yt921x_priv *priv, enum tc_setup_type type,
+ unsigned long tag)
+{
+ for (unsigned int blkid = 0; blkid < YT921X_ACL_BLK_NUM; blkid++) {
+ const struct yt921x_acl_blk *aclblk = priv->acl_blks[blkid];
+
+ if (!aclblk)
+ continue;
+
+ for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++)
+ if (aclblk->rules[i] && aclblk->rules[i]->tag == tag &&
+ aclblk->rules[i]->type == type)
+ return YT921X_ACL_ENT_PER_BLK * blkid + i;
+ }
+
+ return UINT_MAX;
+}
+
+static unsigned int
+yt921x_acl_reserve(struct yt921x_priv *priv, unsigned int entscnt,
+ struct netlink_ext_ack *extack)
+{
+ int candidates[YT921X_ACL_ENT_PER_BLK + 1];
+ unsigned int acl_used_cnt = 0;
+
+ if (WARN_ON(entscnt > YT921X_ACL_ENT_PER_BLK))
+ return UINT_MAX;
+
+ for (unsigned int i = 0; i < ARRAY_SIZE(candidates); i++)
+ candidates[i] = -1;
+ for (unsigned int i = YT921X_ACL_BLK_NUM; i-- > 0;) {
+ unsigned int blk_used_cnt = hweight8(priv->acl_masks[i]);
+
+ candidates[blk_used_cnt] = i;
+ acl_used_cnt += blk_used_cnt;
+ }
+
+ if (acl_used_cnt >= YT921X_ACL_NUM) {
+ NL_SET_ERR_MSG_MOD(extack, "ACL entry limit reached");
+ return UINT_MAX;
+ }
+ if (acl_used_cnt + entscnt <= YT921X_ACL_NUM)
+ for (unsigned int i = YT921X_ACL_ENT_PER_BLK - entscnt + 1;
+ i-- > 0;)
+ if (candidates[i] >= 0)
+ return YT921X_ACL_ENT_PER_BLK * candidates[i] +
+ ffz(priv->acl_masks[candidates[i]]);
+
+ NL_SET_ERR_MSG_MOD(extack,
+ "ACL entry allocation failed, simplify your rules or remove existing rules");
+ return UINT_MAX;
+}
+
+static int
+yt921x_acl_commit(struct yt921x_priv *priv, unsigned int entid, u8 entsmask)
+{
+ const struct yt921x_acl_rule *aclrule;
+ const struct yt921x_acl_blk *aclblk;
+ unsigned int blkid;
+ unsigned int binid;
+ unsigned long mask;
+ u32 zeros[3] = {};
+ unsigned int i;
+ unsigned int o;
+ u32 ctrl;
+ int res;
+
+ blkid = entid / YT921X_ACL_ENT_PER_BLK;
+ binid = entid % YT921X_ACL_ENT_PER_BLK;
+ aclblk = priv->acl_blks[blkid];
+ aclrule = aclblk->rules[binid];
+
+ /* Write actions */
+ res = yt921x_reg96_write(priv, YT921X_ACLn_ACT(entid),
+ aclrule ? aclrule->action : zeros);
+ if (res)
+ return res;
+
+ /* Select the block */
+ ctrl = YT921X_ACL_BLK_CMD_MODIFY | YT921X_ACL_BLK_CMD_BLKID(blkid);
+ res = yt921x_reg_write(priv, YT921X_ACL_BLK_CMD, ctrl);
+ if (res)
+ return res;
+
+ /* Write keys and masks */
+ ctrl = 0;
+ for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++)
+ ctrl |= YT921X_ACL_BLK_KEEP_KEEPn(i);
+
+ mask = entsmask;
+ i = 0;
+ for_each_set_bit(o, &mask, YT921X_ACL_ENT_PER_BLK) {
+ res = yt921x_reg64_write(priv, YT921X_ACLn_KEYm(blkid, o),
+ aclrule ? aclrule->entries[i].key :
+ zeros);
+ if (res)
+ return res;
+
+ res = yt921x_reg64_write(priv, YT921X_ACLn_MASKm(blkid, o),
+ aclrule ? aclrule->entries[i].mask :
+ zeros);
+ if (res)
+ return res;
+
+ ctrl &= ~YT921X_ACL_BLK_KEEP_KEEPn(o);
+ i++;
+ }
+
+ res = yt921x_reg_write(priv, YT921X_ACL_BLK_KEEP, ctrl);
+ if (res)
+ return res;
+
+ ctrl = 0;
+ for (unsigned int i = 0; i < YT921X_ACL_ENT_PER_BLK; i++) {
+ const struct yt921x_acl_rule *other = aclblk->rules[i];
+
+ if (!other)
+ continue;
+
+ mask = other->mask;
+ for_each_set_bit(o, &mask, YT921X_ACL_ENT_PER_BLK)
+ ctrl |= YT921X_ACL_ENTRY_ENm(o) |
+ YT921X_ACL_ENTRY_GRPIDm(o, i);
+ }
+ res = yt921x_reg_write(priv, YT921X_ACLn_ENTRY(blkid), ctrl);
+ if (res)
+ return res;
+
+ /* Commit the block */
+ ctrl = YT921X_ACL_BLK_CMD_BLKID(blkid);
+ res = yt921x_reg_write(priv, YT921X_ACL_BLK_CMD, ctrl);
+ if (res)
+ return res;
+
+ return 0;
+}
+
+static int
+yt921x_acl_del(struct yt921x_priv *priv, enum tc_setup_type type,
+ unsigned long tag)
+{
+ struct yt921x_acl_rule *aclrule;
+ struct yt921x_acl_blk *aclblk;
+ unsigned int binid;
+ unsigned int blkid;
+ unsigned int entid;
+ int res;
+
+ entid = yt921x_acl_find(priv, type, tag);
+ if (entid == UINT_MAX)
+ return -ENOENT;
+
+ blkid = entid / YT921X_ACL_ENT_PER_BLK;
+ binid = entid % YT921X_ACL_ENT_PER_BLK;
+ aclblk = priv->acl_blks[blkid];
+ aclrule = aclblk->rules[binid];
+
+ aclblk->rules[binid] = NULL;
+ res = yt921x_acl_commit(priv, entid, aclrule->mask);
+ /* the kernel never rolls back on failure */
+
+ if (aclrule->action[0] & YT921X_ACL_ACTa_METER_EN)
+ clear_bit(FIELD_GET(YT921X_ACL_ACTa_METER_ID_M,
+ aclrule->action[0]),
+ priv->meters_map);
+ priv->acl_masks[blkid] &= ~aclrule->mask;
+ kvfree(aclrule);
+ if (!priv->acl_masks[blkid]) {
+ kvfree(aclblk);
+ priv->acl_blks[blkid] = NULL;
+ }
+ return res;
+}
+
+static int
+yt921x_acl_add(struct yt921x_priv *priv,
+ const struct yt921x_acl_rule_ext *ruleext,
+ struct netlink_ext_ack *extack)
+{
+ unsigned int entscnt = hweight8(ruleext->r.mask);
+ struct yt921x_acl_rule *aclrule;
+ struct yt921x_acl_blk *aclblk;
+ bool use_trap = false;
+ unsigned int meterid;
+ unsigned long mask;
+ unsigned int binid;
+ unsigned int blkid;
+ unsigned int entid;
+ unsigned int o;
+ int res;
+
+ /* Allocate resources */
+ entid = yt921x_acl_reserve(priv, entscnt, extack);
+ if (entid == UINT_MAX)
+ return -EOPNOTSUPP;
+
+ if (!(ruleext->r.action[0] & YT921X_ACL_ACTa_METER_EN)) {
+ meterid = YT921X_METER_NUM;
+ } else {
+ meterid = find_first_zero_bit(priv->meters_map,
+ YT921X_METER_NUM);
+ if (meterid < YT921X_METER_NUM) {
+ res = yt921x_meter_config(priv, meterid,
+ &ruleext->marker);
+ if (res)
+ return res;
+ } else if (ruleext->r.sw_assisted) {
+ use_trap = true;
+ } else {
+ NL_SET_ERR_MSG_MOD(extack,
+ "No more meters available");
+ return -EOPNOTSUPP;
+ }
+ }
+
+ /* Prepare acl block ctrlblk */
+ blkid = entid / YT921X_ACL_ENT_PER_BLK;
+ binid = entid % YT921X_ACL_ENT_PER_BLK;
+ aclblk = priv->acl_blks[blkid];
+ if (!aclblk) {
+ aclblk = kvzalloc_obj(*aclblk);
+ if (!aclblk)
+ return -ENOMEM;
+ priv->acl_blks[blkid] = aclblk;
+ }
+
+ /* Prepare acl rule ctrlblk */
+ aclrule = kvmemdup(&ruleext->r,
+ offsetof(struct yt921x_acl_rule, entries[entscnt]),
+ GFP_KERNEL);
+ if (!aclrule) {
+ res = -ENOMEM;
+ goto err;
+ }
+
+ /* Replace the placeholder resource IDs */
+ aclrule->mask = 0;
+ mask = priv->acl_masks[blkid];
+ for_each_clear_bit(o, &mask, YT921X_ACL_ENT_PER_BLK) {
+ aclrule->mask |= BIT(o);
+ entscnt--;
+ if (!entscnt)
+ break;
+ }
+
+ if (use_trap) {
+ aclrule->action[2] &= ~YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M &
+ ~YT921X_ACL_ACTc_FWD_M;
+ aclrule->action[2] |= YT921X_ACL_ACTc_FWD_EN |
+ YT921X_ACL_ACTc_FWD_TRAP;
+ }
+ if (meterid < YT921X_METER_NUM)
+ aclrule->action[0] |= YT921X_ACL_ACTa_METER_ID(meterid);
+ else
+ aclrule->action[0] &= ~YT921X_ACL_ACTa_METER_EN;
+
+ /* Write rules */
+ aclblk->rules[binid] = aclrule;
+ res = yt921x_acl_commit(priv, entid, aclrule->mask);
+ if (res) {
+ aclblk->rules[binid] = NULL;
+ kvfree(aclrule);
+ goto err;
+ }
+
+ if (meterid < YT921X_METER_NUM)
+ set_bit(meterid, priv->meters_map);
+ priv->acl_masks[blkid] |= aclrule->mask;
+ return 0;
+
+err:
+ if (!priv->acl_masks[blkid]) {
+ kvfree(aclblk);
+ priv->acl_blks[blkid] = NULL;
+ }
+ return res;
+}
+
+int
+yt921x_dsa_cls_flower_del(struct dsa_switch *ds, int port,
+ struct flow_cls_offload *cls, bool ingress)
+{
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ int res;
+
+ mutex_lock(&priv->reg_lock);
+ res = yt921x_acl_del(priv, TC_SETUP_CLSFLOWER, cls->cookie);
+ mutex_unlock(&priv->reg_lock);
+
+ return res;
+}
+
+int
+yt921x_dsa_cls_flower_add(struct dsa_switch *ds, int port,
+ struct flow_cls_offload *cls, bool ingress)
+{
+ struct netlink_ext_ack *extack = cls->common.extack;
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct yt921x_acl_rule_ext ruleext;
+ int res;
+
+ res = yt921x_acl_rule_ext_parse_flow(&ruleext, port, cls, ingress,
+ priv);
+ if (res)
+ return res;
+
+ mutex_lock(&priv->reg_lock);
+ res = yt921x_acl_add(priv, &ruleext, extack);
+ mutex_unlock(&priv->reg_lock);
+
+ return res;
+}
+
+static int
+yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress)
+{
+ u32 mask;
+
+ if (ingress)
+ mask = YT921X_MIRROR_IGR_PORTn(port);
+ else
+ mask = YT921X_MIRROR_EGR_PORTn(port);
+ return yt921x_reg_clear_bits(priv, YT921X_MIRROR, mask);
+}
+
+static int
+yt921x_mirror_add(struct yt921x_priv *priv, int port, bool ingress,
+ int to_local_port, struct netlink_ext_ack *extack)
+{
+ u32 srcs;
+ u32 ctrl;
+ u32 val;
+ u32 dst;
+ int res;
+
+ if (ingress)
+ srcs = YT921X_MIRROR_IGR_PORTn(port);
+ else
+ srcs = YT921X_MIRROR_EGR_PORTn(port);
+ dst = YT921X_MIRROR_PORT(to_local_port);
+
+ res = yt921x_reg_read(priv, YT921X_MIRROR, &val);
+ if (res)
+ return res;
+
+ /* other mirror tasks & different dst port -> conflict */
+ if ((val & ~srcs & (YT921X_MIRROR_EGR_PORTS_M |
+ YT921X_MIRROR_IGR_PORTS_M)) &&
+ (val & YT921X_MIRROR_PORT_M) != dst) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Sniffer port is already configured, delete existing rules & retry");
+ return -EBUSY;
+ }
+
+ ctrl = val & ~YT921X_MIRROR_PORT_M;
+ ctrl |= srcs;
+ ctrl |= dst;
+
+ if (ctrl == val)
+ return 0;
+
+ return yt921x_reg_write(priv, YT921X_MIRROR, ctrl);
+}
+
+void
+yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror)
+{
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ struct device *dev = yt921x_priv_to_device(priv);
+ int res;
+
+ mutex_lock(&priv->reg_lock);
+ res = yt921x_mirror_del(priv, port, mirror->ingress);
+ mutex_unlock(&priv->reg_lock);
+
+ if (res)
+ dev_err(dev, "Failed to %s port %d: %i\n", "unmirror",
+ port, res);
+}
+
+int
+yt921x_dsa_port_mirror_add(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror,
+ bool ingress, struct netlink_ext_ack *extack)
+{
+ struct yt921x_priv *priv = dsa_to_yt921x_priv(ds);
+ int res;
+
+ mutex_lock(&priv->reg_lock);
+ res = yt921x_mirror_add(priv, port, ingress,
+ mirror->to_local_port, extack);
+ mutex_unlock(&priv->reg_lock);
+
+ return res;
+}
diff --git a/drivers/net/dsa/motorcomm/tc.h b/drivers/net/dsa/motorcomm/tc.h
new file mode 100644
index 000000000000..2a811127ec8c
--- /dev/null
+++ b/drivers/net/dsa/motorcomm/tc.h
@@ -0,0 +1,378 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2026 David Yang
+ */
+
+#ifndef _YT_TC_H
+#define _YT_TC_H
+
+#include <net/dsa.h>
+#include <net/pkt_cls.h>
+
+#define YT921X_ACLn_ACT(n) (0x1c0000 + 0x10 * (n))
+#define YT921X_ACL_ACTc_STAG_M GENMASK(26, 25)
+#define YT921X_ACL_ACTc_STAG(x) FIELD_PREP(YT921X_ACL_ACTc_STAG_M, (x))
+#define YT921X_ACL_ACTc_STAG_DONTCARE YT921X_ACL_ACTc_STAG(0)
+#define YT921X_ACL_ACTc_STAG_UNTAG YT921X_ACL_ACTc_STAG(1)
+#define YT921X_ACL_ACTc_STAG_TAG YT921X_ACL_ACTc_STAG(2)
+#define YT921X_ACL_ACTc_STAG_KEEP YT921X_ACL_ACTc_STAG(3)
+#define YT921X_ACL_ACTc_CTAG_M GENMASK(24, 23)
+#define YT921X_ACL_ACTc_CTAG(x) FIELD_PREP(YT921X_ACL_ACTc_CTAG_M, (x))
+#define YT921X_ACL_ACTc_CTAG_DONTCARE YT921X_ACL_ACTc_CTAG(0)
+#define YT921X_ACL_ACTc_CTAG_UNTAG YT921X_ACL_ACTc_CTAG(1)
+#define YT921X_ACL_ACTc_CTAG_TAG YT921X_ACL_ACTc_CTAG(2)
+#define YT921X_ACL_ACTc_CTAG_KEEP YT921X_ACL_ACTc_CTAG(3)
+#define YT921X_ACL_ACTc_FWD_M GENMASK(22, 21)
+#define YT921X_ACL_ACTc_FWD(x) FIELD_PREP(YT921X_ACL_ACTc_FWD_M, (x))
+#define YT921X_ACL_ACTc_FWD_FWD YT921X_ACL_ACTc_FWD(0)
+#define YT921X_ACL_ACTc_FWD_COPY YT921X_ACL_ACTc_FWD(1)
+#define YT921X_ACL_ACTc_FWD_REDIR YT921X_ACL_ACTc_FWD(2)
+#define YT921X_ACL_ACTc_FWD_TRAP YT921X_ACL_ACTc_FWD(3)
+#define YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M GENMASK(20, 10)
+#define YT921X_ACL_ACTc_FWD_REDIR_DPORTS(x) FIELD_PREP(YT921X_ACL_ACTc_FWD_REDIR_DPORTS_M, (x))
+#define YT921X_ACL_ACTc_FWD_REDIR_DPORTn(port) BIT((port) + 10)
+#define YT921X_ACL_ACTc_FWD_EN BIT(9)
+#define YT921X_ACL_ACTc_SDEI BIT(8)
+#define YT921X_ACL_ACTc_SDEI_REPLACE BIT(7)
+#define YT921X_ACL_ACTc_SPRI_M GENMASK(6, 4)
+#define YT921X_ACL_ACTc_SPRI(x) FIELD_PREP(YT921X_ACL_ACTc_SPRI_M, (x))
+#define YT921X_ACL_ACTc_SPRI_REPLACE BIT(3)
+#define YT921X_ACL_ACTbc_SVID_M GENMASK_ULL(34, 23)
+#define YT921X_ACL_ACTbc_SVID(x) FIELD_PREP(YT921X_ACL_ACTbc_SVID_M, (x))
+#define YT921X_ACL_ACTb_SVID_REPLACE BIT(22)
+#define YT921X_ACL_ACTb_CDEI BIT(21)
+#define YT921X_ACL_ACTb_CDEI_REPLACE BIT(20)
+#define YT921X_ACL_ACTb_CPRI_M GENMASK(19, 17)
+#define YT921X_ACL_ACTb_CPRI(x) FIELD_PREP(YT921X_ACL_ACTb_CPRI_M, (x))
+#define YT921X_ACL_ACTb_CPRI_REPLACE BIT(16)
+#define YT921X_ACL_ACTb_CVID_M GENMASK(15, 4)
+#define YT921X_ACL_ACTb_CVID(x) FIELD_PREP(YT921X_ACL_ACTb_CVID_M, (x))
+#define YT921X_ACL_ACTb_CVID_REPLACE BIT(3)
+#define YT921X_ACL_ACTb_PRIO_M GENMASK(2, 0)
+#define YT921X_ACL_ACTb_PRIO(x) FIELD_PREP(YT921X_ACL_ACTb_PRIO_M, (x))
+#define YT921X_ACL_ACTa_PRIO_EN BIT(31)
+#define YT921X_ACL_ACTa_COLOR_M GENMASK(30, 29)
+#define YT921X_ACL_ACTa_COLOR(x) FIELD_PREP(YT921X_ACL_ACTa_COLOR_M, (x))
+#define YT921X_ACL_ACTa_COLOR_GREEN YT921X_ACL_ACTa_COLOR(0)
+#define YT921X_ACL_ACTa_COLOR_YELLOW YT921X_ACL_ACTa_COLOR(1)
+#define YT921X_ACL_ACTa_COLOR_RED YT921X_ACL_ACTa_COLOR(2)
+#define YT921X_ACL_ACTa_COLOR_EN BIT(28)
+#define YT921X_ACL_ACTa_DSCP_M GENMASK(27, 22)
+#define YT921X_ACL_ACTa_DSCP(x) FIELD_PREP(YT921X_ACL_ACTa_DSCP_M, (x))
+#define YT921X_ACL_ACTa_DSCP_REPLACE BIT(21)
+#define YT921X_ACL_ACTa_METER_ID_M GENMASK(20, 15)
+#define YT921X_ACL_ACTa_METER_ID(x) FIELD_PREP(YT921X_ACL_ACTa_METER_ID_M, (x))
+#define YT921X_ACL_ACTa_METER_EN BIT(14)
+#define YT921X_ACL_ACTa_MIRROR_EN BIT(13)
+#define YT921X_ACL_ACTa_FLOWSTAT_EN BIT(12)
+#define YT921X_ACL_ACTa_FLOWSTAT_ID_M GENMASK(11, 6)
+#define YT921X_ACL_ACTa_FLOWSTAT_ID(x) FIELD_PREP(YT921X_ACL_ACTa_FLOWSTAT_ID_M, (x))
+#define YT921X_ACL_ACTa_GPIO_EN BIT(5)
+#define YT921X_ACL_ACTa_GPIO_PIN_M GENMASK(4, 1)
+#define YT921X_ACL_ACTa_GPIO_PIN(x) FIELD_PREP(YT921X_ACL_ACTa_GPIO_PIN_M, (x))
+#define YT921X_ACL_ACTa_INTR_EN BIT(0)
+#define YT921X_ACL_BLK_KEEP 0x201000
+#define YT921X_ACL_BLK_KEEP_GRPIDn_M(bin) (7 << (4 * (bin) + 1))
+#define YT921X_ACL_BLK_KEEP_GRPIDn(bin, x) ((x) << (4 * (bin) + 1))
+#define YT921X_ACL_BLK_KEEP_KEEPn(bin) BIT(4 * (bin))
+#define YT921X_ACL_PORT 0x202000
+#define YT921X_ACL_PORT_PORTS_M GENMASK(10, 0)
+#define YT921X_ACL_PORT_PORTS(x) FIELD_PREP(YT921X_ACL_PORT_PORTS_M, (x))
+#define YT921X_ACL_PORT_PORTn(port) BIT(port)
+#define YT921X_ACL_BLK_CMD 0x202004
+#define YT921X_ACL_BLK_CMD_BLKID_M GENMASK(6, 1)
+#define YT921X_ACL_BLK_CMD_BLKID(x) FIELD_PREP(YT921X_ACL_BLK_CMD_BLKID_M, (x))
+#define YT921X_ACL_BLK_CMD_MODIFY BIT(0)
+#define YT921X_ACLn_ENTRY(blk) (0x203000 + 4 * (blk))
+#define YT921X_ACL_ENTRY_GRPIDm_M(bin) (7 << (4 * (bin) + 1))
+#define YT921X_ACL_ENTRY_GRPIDm(bin, x) ((x) << (4 * (bin) + 1))
+#define YT921X_ACL_ENTRY_ENm(bin) BIT(4 * (bin))
+#define YT921X_ACLn_KEYm(blk, bin) (0x204000 + 0x200 * (bin) + 8 * (blk))
+#define YT921X_ACL_KEYb_ORD_M GENMASK(29, 21)
+#define YT921X_ACL_KEYb_ORD(x) FIELD_PREP(YT921X_ACL_KEYb_ORD_M, (x))
+#define YT921X_ACL_KEYb_SPORTS_M GENMASK(20, 10)
+#define YT921X_ACL_KEYb_SPORTS(x) FIELD_PREP(YT921X_ACL_KEYb_SPORTS_M, (x))
+#define YT921X_ACL_KEYb_SPORTn(port) BIT((port) + 10)
+#define YT921X_ACL_KEYb_REVERSE BIT(9) /* reverse match */
+#define YT921X_ACL_KEYb_TYPE_M GENMASK(8, 4)
+#define YT921X_ACL_KEYb_TYPE(x) FIELD_PREP(YT921X_ACL_KEYb_TYPE_M, (x))
+/* KEY_* fields need no masks */
+#define YT921X_ACLn_MASKm(blk, bin) (0x205000 + 0x200 * (bin) + 8 * (blk))
+
+enum yt921x_acl_type {
+ YT921X_ACL_TYPE_NA,
+ YT921X_ACL_TYPE_MAC_DA0,
+ YT921X_ACL_TYPE_MAC_SA0,
+ YT921X_ACL_TYPE_MAC_DA1_SA1,
+ YT921X_ACL_TYPE_VLAN,
+ YT921X_ACL_TYPE_VTAG,
+ YT921X_ACL_TYPE_IPV4_DA,
+ YT921X_ACL_TYPE_IPV4_SA,
+ YT921X_ACL_TYPE_IPV6_DA0,
+ YT921X_ACL_TYPE_IPV6_DA1,
+ YT921X_ACL_TYPE_IPV6_DA2,
+ YT921X_ACL_TYPE_IPV6_DA3,
+ YT921X_ACL_TYPE_IPV6_SA0,
+ YT921X_ACL_TYPE_IPV6_SA1,
+ YT921X_ACL_TYPE_IPV6_SA2,
+ YT921X_ACL_TYPE_IPV6_SA3,
+ YT921X_ACL_TYPE_MISC,
+ YT921X_ACL_TYPE_L4,
+ YT921X_ACL_TYPE_UDF0,
+ YT921X_ACL_TYPE_UDF1,
+ YT921X_ACL_TYPE_UDF2,
+ YT921X_ACL_TYPE_UDF3,
+ YT921X_ACL_TYPE_UDF4,
+ YT921X_ACL_TYPE_UDF5,
+ YT921X_ACL_TYPE_UDF6,
+ YT921X_ACL_TYPE_UDF7,
+ YT921X_ACL_TYPE_ETHERTYPE,
+ YT921X_ACL_TYPE_NUM
+};
+
+/* Range: turn KEY:MASK into MIN:MAX */
+
+#define YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M GENMASK(3, 0)
+#define YT921X_ACL_BINb_MAC_xA0_L3_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MAC_xA0_L3_TYPE_M, (x))
+#define YT921X_ACL_BINa_MAC_xA0_MAC_xA0_M GENMASK(31, 0)
+
+#define YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MAC_DA1_SA1_L2_TYPE_M, (x))
+#define YT921X_ACL_BINa_MAC_DA1_SA1_MAC_DA1_M GENMASK(31, 16)
+#define YT921X_ACL_BINa_MAC_DA1_SA1_MAC_SA1_M GENMASK(15, 0)
+
+#define YT921X_ACL_KEYb_VLAN_SVID_RANGE_EN BIT(31)
+#define YT921X_ACL_KEYb_VLAN_CVID_RANGE_EN BIT(30)
+#define YT921X_ACL_BINb_VLAN_CDEI BIT(3)
+#define YT921X_ACL_BINb_VLAN_CPRI_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_VLAN_CPRI(x) FIELD_PREP(YT921X_ACL_BINb_VLAN_CPRI_M, (x))
+#define YT921X_ACL_BINa_VLAN_CTAG_FMT_M GENMASK(31, 30)
+#define YT921X_ACL_BINa_VLAN_CTAG_FMT(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_CTAG_FMT_M, (x))
+#define YT921X_ACL_BINa_VLAN_SDEI BIT(29)
+#define YT921X_ACL_BINa_VLAN_SPRI_M GENMASK(28, 26)
+#define YT921X_ACL_BINa_VLAN_SPRI(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_SPRI_M, (x))
+#define YT921X_ACL_BINa_VLAN_STAG_FMT_M GENMASK(25, 24)
+#define YT921X_ACL_BINa_VLAN_STAG_FMT(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_STAG_FMT_M, (x))
+#define YT921X_ACL_BINa_VLAN_SVID_M GENMASK(23, 12)
+#define YT921X_ACL_BINa_VLAN_SVID(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_SVID_M, (x))
+#define YT921X_ACL_BINa_VLAN_CVID_M GENMASK(11, 0)
+#define YT921X_ACL_BINa_VLAN_CVID(x) FIELD_PREP(YT921X_ACL_BINa_VLAN_CVID_M, (x))
+
+#define YT921X_ACL_KEYb_VTAG_SVID_RANGE_EN BIT(31)
+#define YT921X_ACL_KEYb_VTAG_CVID_RANGE_EN BIT(30)
+#define YT921X_ACL_BINa_VTAG_CDEI BIT(31)
+#define YT921X_ACL_BINa_VTAG_CPRI_M GENMASK(30, 28)
+#define YT921X_ACL_BINa_VTAG_CPRI(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_CPRI_M, (x))
+#define YT921X_ACL_BINa_VTAG_SDEI BIT(27)
+#define YT921X_ACL_BINa_VTAG_SPRI_M GENMASK(26, 24)
+#define YT921X_ACL_BINa_VTAG_SPRI(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_SPRI_M, (x))
+#define YT921X_ACL_BINa_VTAG_SVID_M GENMASK(23, 12)
+#define YT921X_ACL_BINa_VTAG_SVID(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_SVID_M, (x))
+#define YT921X_ACL_BINa_VTAG_CVID_M GENMASK(11, 0)
+#define YT921X_ACL_BINa_VTAG_CVID(x) FIELD_PREP(YT921X_ACL_BINa_VTAG_CVID_M, (x))
+
+#define YT921X_ACL_KEYb_IPV4_ADDR_RANGE_EN BIT(30)
+#define YT921X_ACL_BINb_IPV4_FRAG BIT(3)
+#define YT921X_ACL_BINb_IPV4_L4_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_IPV4_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_IPV4_L4_TYPE_M, (x))
+#define YT921X_ACL_BINa_IPV4_ADDR_M GENMASK(31, 0)
+
+#define YT921X_ACL_BINb_IPV6_L4_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_IPV6_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_IPV6_L4_TYPE_M, (x))
+#define YT921X_ACL_BINa_IPV6_ADDRx_M GENMASK(31, 0)
+
+#define YT921X_ACL_BINb_IPV6_xA1_IP_OPTION BIT(3)
+
+#define YT921X_ACL_BINb_IPV6_xA2_FIRST_FRAG BIT(3)
+
+#define YT921X_ACL_KEYb_IPV6_xA3_ADDR_RANGE_EN BIT(30)
+#define YT921X_ACL_BINb_IPV6_xA3_FRAG BIT(3)
+
+#define YT921X_ACL_BINb_MISC_FRAG BIT(3)
+#define YT921X_ACL_BINb_MISC_L4_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_MISC_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_MISC_L4_TYPE_M, (x))
+#define YT921X_ACL_BINa_MISC_PPPOE_FLAG BIT(30)
+#define YT921X_ACL_BINa_MISC_FIRST_FRAG BIT(29)
+#define YT921X_ACL_BINa_MISC_IP_OPTION BIT(28)
+#define YT921X_ACL_BINa_MISC_TCP_FLAGS_M GENMASK(27, 20)
+#define YT921X_ACL_BINa_MISC_TCP_FLAGS(x) FIELD_PREP(YT921X_ACL_BINa_MISC_TCP_FLAGS_M, (x))
+#define YT921X_ACL_BINa_MISC_IP_PROTO_M GENMASK(19, 12)
+#define YT921X_ACL_BINa_MISC_IP_PROTO(x) FIELD_PREP(YT921X_ACL_BINa_MISC_IP_PROTO_M, (x))
+#define YT921X_ACL_BINa_MISC_TOS_M GENMASK(11, 4)
+#define YT921X_ACL_BINa_MISC_TOS(x) FIELD_PREP(YT921X_ACL_BINa_MISC_TOS_M, (x))
+#define YT921X_ACL_BINa_MISC_L3_TYPE_M GENMASK(3, 0)
+#define YT921X_ACL_BINa_MISC_L3_TYPE(x) FIELD_PREP(YT921X_ACL_BINa_MISC_L3_TYPE_M, (x))
+
+#define YT921X_ACL_KEYb_L4_DPORT_RANGE_EN BIT(31)
+#define YT921X_ACL_KEYb_L4_SPORT_RANGE_EN BIT(30)
+#define YT921X_ACL_BINb_L4_FRAG BIT(3)
+#define YT921X_ACL_BINb_L4_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_L4_TYPE_M, (x))
+#define YT921X_ACL_BINa_L4_DPORT_M GENMASK(31, 16)
+#define YT921X_ACL_BINa_L4_SPORT_M GENMASK(15, 0)
+
+#define YT921X_ACL_BINb_UDF_IS_IGMP BIT(0)
+#define YT921X_ACL_BINa_UDF_UDF0_M GENMASK(31, 16)
+#define YT921X_ACL_BINa_UDF_UDF0(x) FIELD_PREP(YT921X_ACL_BINa_UDF_UDF0_M, (x))
+#define YT921X_ACL_BINa_UDF_UDF1_M GENMASK(15, 0)
+#define YT921X_ACL_BINa_UDF_UDF1(x) FIELD_PREP(YT921X_ACL_BINa_UDF_UDF1_M, (x))
+
+#define YT921X_ACL_KEYb_ETHERTYPE_ETHERTYPE_RANGE_EN BIT(30)
+#define YT921X_ACL_BINb_ETHERTYPE_L4_TYPE_M GENMASK(2, 0)
+#define YT921X_ACL_BINb_ETHERTYPE_L4_TYPE(x) FIELD_PREP(YT921X_ACL_BINb_ETHERTYPE_L4_TYPE_M, (x))
+#define YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE_M GENMASK(15, 0)
+#define YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE(x) FIELD_PREP(YT921X_ACL_BINa_ETHERTYPE_ETHERTYPE_M, (x))
+
+enum yt921x_l2_type {
+ YT921X_L2_TYPE_ETH,
+ YT921X_L2_TYPE_ETHV2,
+ YT921X_L2_TYPE_ETHSAP,
+ YT921X_L2_TYPE_ETHSNAP,
+};
+
+enum yt921x_l3_type {
+ YT921X_L3_TYPE_OTHER,
+ YT921X_L3_TYPE_IPV4,
+ YT921X_L3_TYPE_IPV6,
+ YT921X_L3_TYPE_ARP,
+ YT921X_L3_TYPE_LLDP,
+ YT921X_L3_TYPE_PAE,
+ YT921X_L3_TYPE_ERP,
+ YT921X_L3_TYPE_SLOW_PROTOCOL,
+};
+
+enum yt921x_l4_type {
+ YT921X_L4_TYPE_OTHER,
+ YT921X_L4_TYPE_TCP,
+ YT921X_L4_TYPE_UDP,
+ YT921X_L4_TYPE_UDPLITE,
+ YT921X_L4_TYPE_ICMP,
+ YT921X_L4_TYPE_IGMP,
+ YT921X_L4_TYPE_MLD,
+ YT921X_L4_TYPE_ND,
+};
+
+#define YT921X_UDFn_CTRL(x) (0x210094 + 4 * (x))
+#define YT921X_UDF_CTRL_UDF_TYPE_M GENMASK(8, 7)
+#define YT921X_UDF_CTRL_UDF_TYPE(x) FIELD_PREP(YT921X_UDF_CTRL_UDF_TYPE_M, (x))
+#define YT921X_UDF_CTRL_UDF_TYPE_ETH YT921X_UDF_CTRL_UDF_TYPE(0)
+#define YT921X_UDF_CTRL_UDF_TYPE_L3 YT921X_UDF_CTRL_UDF_TYPE(1)
+#define YT921X_UDF_CTRL_UDF_TYPE_L4 YT921X_UDF_CTRL_UDF_TYPE(2)
+#define YT921X_UDF_CTRL_UDF_OFFSET_M GENMASK(6, 0)
+#define YT921X_UDF_CTRL_UDF_OFFSET(x) FIELD_PREP(YT921X_UDF_CTRL_UDF_OFFSET_M, (x))
+
+#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 use 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 bytes 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_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))
+#define YT921X_MIRROR_IGR_PORTn(port) BIT((port) + 16)
+#define YT921X_MIRROR_EGR_PORTS_M GENMASK(14, 4)
+#define YT921X_MIRROR_EGR_PORTS(x) FIELD_PREP(YT921X_MIRROR_EGR_PORTS_M, (x))
+#define YT921X_MIRROR_EGR_PORTn(port) BIT((port) + 4)
+#define YT921X_MIRROR_PORT_M GENMASK(3, 0)
+#define YT921X_MIRROR_PORT(x) FIELD_PREP(YT921X_MIRROR_PORT_M, (x))
+
+#define YT921X_PORT_SHAPE_SLOT 0x34000c
+#define YT921X_PORT_SHAPE_SLOT_SLOT_M GENMASK(11, 0)
+#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_CTRLb_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_CTRLa_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_CTRLa_CIR_M, (x))
+#define YT921X_PORTn_SHAPE_STAT(port) (0x356000 + 4 * (port))
+
+#define YT921X_TOKEN_BYTE_C 1 /* 1 token = 2^1 byte */
+#define YT921X_TOKEN_PKT_C -6 /* 1 token = 2^-6 packets */
+#define YT921X_TOKEN_RATE_C -15
+#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_PORT_SHAPE_SLOT_MIN 80
+#define YT921X_SHAPE_UNIT_MAX ((1 << 3) - 1)
+#define YT921X_SHAPE_CIR_MAX ((1 << 18) - 1)
+#define YT921X_SHAPE_CBS_MAX ((1 << 14) - 1)
+
+#define YT921X_ACL_ENT_PER_BLK 8
+#define YT921X_ACL_NUM 384
+#define YT921X_UDF_NUM 8
+
+struct yt921x_acl_entry {
+ u32 key[2];
+ u32 mask[2];
+};
+
+struct yt921x_acl_rule {
+ unsigned long tag;
+ enum tc_setup_type type;
+
+ u32 action[3];
+ bool sw_assisted;
+
+ u8 mask;
+ struct yt921x_acl_entry entries[YT921X_ACL_ENT_PER_BLK];
+};
+
+struct yt921x_acl_blk {
+ struct yt921x_acl_rule *rules[YT921X_ACL_ENT_PER_BLK];
+};
+
+void yt921x_dsa_port_policer_del(struct dsa_switch *ds, int port);
+int
+yt921x_dsa_port_policer_add(struct dsa_switch *ds, int port,
+ const struct flow_action_police *police,
+ struct netlink_ext_ack *extack);
+int
+yt921x_dsa_port_setup_tc(struct dsa_switch *ds, int port,
+ enum tc_setup_type type, void *type_data);
+int
+yt921x_dsa_cls_flower_del(struct dsa_switch *ds, int port,
+ struct flow_cls_offload *cls, bool ingress);
+int
+yt921x_dsa_cls_flower_add(struct dsa_switch *ds, int port,
+ struct flow_cls_offload *cls, bool ingress);
+void
+yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror);
+int
+yt921x_dsa_port_mirror_add(struct dsa_switch *ds, int port,
+ struct dsa_mall_mirror_tc_entry *mirror,
+ bool ingress, struct netlink_ext_ack *extack);
+
+#endif
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 3/5] net: dsa: motorcomm: Use NSEC_PER_SEC
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
2026-10-01 20:48 ` [PATCH net-next v2 1/5] net: dsa: motorcomm: Hoist type casting helper into chip.h David Yang
2026-10-01 20:48 ` [PATCH net-next v2 2/5] net: dsa: motorcomm: Split TC module David Yang
@ 2026-10-01 20:48 ` David Yang
2026-10-01 20:48 ` [PATCH net-next v2 4/5] net: dsa: motorcomm: Enable ACL on demand David Yang
2026-10-01 20:48 ` [PATCH net-next v2 5/5] net: dsa: motorcomm: Add TC prio support David Yang
4 siblings, 0 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
Get rid of magic numbers.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/motorcomm/tc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/motorcomm/tc.c b/drivers/net/dsa/motorcomm/tc.c
index 84abc2ef8b61..0e5f19a39d0c 100644
--- a/drivers/net/dsa/motorcomm/tc.c
+++ b/drivers/net/dsa/motorcomm/tc.c
@@ -25,14 +25,14 @@ 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);
+ return div_u64(ldexpu64(slot_ns * rate, -e), NSEC_PER_SEC);
}
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);
+ return div_u64(ldexpu64(mul_u32_u32(NSEC_PER_SEC, token), e), slot_ns);
}
/* burst = 2^C * token * 4^unit */
@@ -83,7 +83,7 @@ yt921x_marker_tfm(struct yt921x_marker *marker, u64 rate, u64 burst,
}
/* Check for matching burst */
- burst_est = div_u64(slot_ns * rate, 1000000000);
+ burst_est = div_u64(slot_ns * rate, NSEC_PER_SEC);
burst_sug = burst_est;
if (flags & YT921X_MARKER_PKT_MODE)
burst_sug++;
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 4/5] net: dsa: motorcomm: Enable ACL on demand
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
` (2 preceding siblings ...)
2026-10-01 20:48 ` [PATCH net-next v2 3/5] net: dsa: motorcomm: Use NSEC_PER_SEC David Yang
@ 2026-10-01 20:48 ` David Yang
2026-10-01 20:48 ` [PATCH net-next v2 5/5] net: dsa: motorcomm: Add TC prio support David Yang
4 siblings, 0 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
Track the usage of ACL rules and enable it per port only when it is
actually used.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/motorcomm/chip.c | 3 +-
drivers/net/dsa/motorcomm/chip.h | 2 +
drivers/net/dsa/motorcomm/tc.c | 63 +++++++++++++++++++++++++++++---
3 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c
index 5be198d9e5cd..4b8cb2ba28b7 100644
--- a/drivers/net/dsa/motorcomm/chip.c
+++ b/drivers/net/dsa/motorcomm/chip.c
@@ -2686,8 +2686,7 @@ static int yt921x_chip_setup_acl(struct yt921x_priv *priv)
if (res)
return res;
- ctrl = YT921X_ACL_PORT_PORTS_M;
- res = yt921x_reg_write(priv, YT921X_ACL_PORT, ctrl);
+ res = yt921x_reg_write(priv, YT921X_ACL_PORT, 0);
if (res)
return res;
diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h
index 40ab5187f774..68cbbc9b9b78 100644
--- a/drivers/net/dsa/motorcomm/chip.h
+++ b/drivers/net/dsa/motorcomm/chip.h
@@ -581,6 +581,8 @@ struct yt921x_port {
u64 rx_frames;
u64 tx_frames;
+ unsigned short acl_cnt;
+
#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS)
unsigned char led_duty;
unsigned short led_cycle;
diff --git a/drivers/net/dsa/motorcomm/tc.c b/drivers/net/dsa/motorcomm/tc.c
index 0e5f19a39d0c..95ed0f245b1f 100644
--- a/drivers/net/dsa/motorcomm/tc.c
+++ b/drivers/net/dsa/motorcomm/tc.c
@@ -1055,6 +1055,17 @@ yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
return 0;
}
+static u16 yt921x_acl_activated_ports(const struct yt921x_priv *priv)
+{
+ u16 mask = 0;
+
+ for (int port = 0; port < YT921X_PORT_NUM; port++)
+ if (priv->ports[port].acl_cnt)
+ mask |= BIT(port);
+
+ return mask;
+}
+
static unsigned int
yt921x_acl_find(const struct yt921x_priv *priv, enum tc_setup_type type,
unsigned long tag)
@@ -1199,10 +1210,15 @@ yt921x_acl_del(struct yt921x_priv *priv, enum tc_setup_type type,
{
struct yt921x_acl_rule *aclrule;
struct yt921x_acl_blk *aclblk;
+ bool refresh_en = false;
unsigned int binid;
unsigned int blkid;
unsigned int entid;
+ unsigned long m;
+ unsigned int o;
+ u32 ctrl;
int res;
+ int ret;
entid = yt921x_acl_find(priv, type, tag);
if (entid == UINT_MAX)
@@ -1214,9 +1230,27 @@ yt921x_acl_del(struct yt921x_priv *priv, enum tc_setup_type type,
aclrule = aclblk->rules[binid];
aclblk->rules[binid] = NULL;
- res = yt921x_acl_commit(priv, entid, aclrule->mask);
+ ret = yt921x_acl_commit(priv, entid, aclrule->mask);
/* the kernel never rolls back on failure */
+ m = FIELD_GET(YT921X_ACL_KEYb_SPORTS_M, aclrule->entries[0].key[1]);
+ for_each_set_bit(o, &m, YT921X_PORT_NUM) {
+ struct yt921x_port *pp = &priv->ports[o];
+
+ if (!WARN_ON(!pp->acl_cnt)) {
+ pp->acl_cnt--;
+ if (pp->acl_cnt)
+ continue;
+ }
+ refresh_en = true;
+ }
+ if (refresh_en) {
+ ctrl = yt921x_acl_activated_ports(priv);
+ res = yt921x_reg_write(priv, YT921X_ACL_PORT, ctrl);
+ if (res)
+ ret = res;
+ }
+
if (aclrule->action[0] & YT921X_ACL_ACTa_METER_EN)
clear_bit(FIELD_GET(YT921X_ACL_ACTa_METER_ID_M,
aclrule->action[0]),
@@ -1227,7 +1261,7 @@ yt921x_acl_del(struct yt921x_priv *priv, enum tc_setup_type type,
kvfree(aclblk);
priv->acl_blks[blkid] = NULL;
}
- return res;
+ return ret;
}
static int
@@ -1240,11 +1274,12 @@ yt921x_acl_add(struct yt921x_priv *priv,
struct yt921x_acl_blk *aclblk;
bool use_trap = false;
unsigned int meterid;
- unsigned long mask;
unsigned int binid;
unsigned int blkid;
unsigned int entid;
+ unsigned long m;
unsigned int o;
+ u32 ctrl;
int res;
/* Allocate resources */
@@ -1293,8 +1328,8 @@ yt921x_acl_add(struct yt921x_priv *priv,
/* Replace the placeholder resource IDs */
aclrule->mask = 0;
- mask = priv->acl_masks[blkid];
- for_each_clear_bit(o, &mask, YT921X_ACL_ENT_PER_BLK) {
+ m = priv->acl_masks[blkid];
+ for_each_clear_bit(o, &m, YT921X_ACL_ENT_PER_BLK) {
aclrule->mask |= BIT(o);
entscnt--;
if (!entscnt)
@@ -1312,6 +1347,19 @@ yt921x_acl_add(struct yt921x_priv *priv,
else
aclrule->action[0] &= ~YT921X_ACL_ACTa_METER_EN;
+ /* Activate ACL if needed */
+ ctrl = 0;
+ m = FIELD_GET(YT921X_ACL_KEYb_SPORTS_M, ruleext->r.entries[0].key[1]);
+ for_each_set_bit(o, &m, YT921X_PORT_NUM)
+ if (!priv->ports[o].acl_cnt)
+ ctrl |= YT921X_ACL_PORT_PORTn(o);
+ if (ctrl) {
+ ctrl |= yt921x_acl_activated_ports(priv);
+ res = yt921x_reg_write(priv, YT921X_ACL_PORT, ctrl);
+ if (res)
+ return res;
+ }
+
/* Write rules */
aclblk->rules[binid] = aclrule;
res = yt921x_acl_commit(priv, entid, aclrule->mask);
@@ -1321,6 +1369,11 @@ yt921x_acl_add(struct yt921x_priv *priv,
goto err;
}
+ /* Bookkeeping */
+ m = FIELD_GET(YT921X_ACL_KEYb_SPORTS_M, ruleext->r.entries[0].key[1]);
+ for_each_set_bit(o, &m, YT921X_PORT_NUM)
+ priv->ports[o].acl_cnt++;
+
if (meterid < YT921X_METER_NUM)
set_bit(meterid, priv->meters_map);
priv->acl_masks[blkid] |= aclrule->mask;
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v2 5/5] net: dsa: motorcomm: Add TC prio support
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
` (3 preceding siblings ...)
2026-10-01 20:48 ` [PATCH net-next v2 4/5] net: dsa: motorcomm: Enable ACL on demand David Yang
@ 2026-10-01 20:48 ` David Yang
4 siblings, 0 replies; 6+ messages in thread
From: David Yang @ 2026-10-01 20:48 UTC (permalink / raw)
To: netdev
Cc: David Yang, Andrew Lunn, Vladimir Oltean, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Russell King,
linux-kernel
The HW supports fewer ACL priorities than TC does. Notice the default
priority for flower is 49152 and catchall filter has priority 65535, so
scale the priority accordingly and reject the ones that do not map onto
a hardware priority.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/motorcomm/tc.c | 19 ++++++++++++++++++-
drivers/net/dsa/motorcomm/tc.h | 1 +
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/motorcomm/tc.c b/drivers/net/dsa/motorcomm/tc.c
index 95ed0f245b1f..c5581e85208f 100644
--- a/drivers/net/dsa/motorcomm/tc.c
+++ b/drivers/net/dsa/motorcomm/tc.c
@@ -1029,7 +1029,10 @@ yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
const struct flow_cls_offload *cls, bool ingress,
struct yt921x_priv *priv)
{
+ const unsigned int scale = (U16_MAX + 1) / YT921X_ACL_ORD_NUM;
struct netlink_ext_ack *extack = cls->common.extack;
+ u32 prio = cls->common.prio;
+ u32 ord;
int res;
if (!ingress) {
@@ -1042,6 +1045,20 @@ yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
return -EOPNOTSUPP;
}
+ /* TC prio can't be 0 & TC lowest first -> HW highest first
+ * map 1...U16_MAX to (ACL_ORD_NUM - 1)...0
+ */
+ if (prio == U16_MAX) {
+ ord = 0;
+ } else if (!(prio % scale)) {
+ ord = YT921X_ACL_ORD_NUM - prio / scale;
+ } else {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Invalid priority %u, must be a multiple of %u or 65535",
+ prio, scale);
+ return -EOPNOTSUPP;
+ }
+
res = yt921x_acl_rule_ext_parse_flow_action(ruleext, cls, priv, port);
if (res)
return res;
@@ -1049,7 +1066,7 @@ yt921x_acl_rule_ext_parse_flow(struct yt921x_acl_rule_ext *ruleext, int port,
if (res)
return res;
- yt921x_acl_rule_set_ports(&ruleext->r, 0, BIT(port));
+ yt921x_acl_rule_set_ports(&ruleext->r, ord, BIT(port));
ruleext->r.tag = cls->cookie;
ruleext->r.type = TC_SETUP_CLSFLOWER;
return 0;
diff --git a/drivers/net/dsa/motorcomm/tc.h b/drivers/net/dsa/motorcomm/tc.h
index 2a811127ec8c..99d4abf5dacd 100644
--- a/drivers/net/dsa/motorcomm/tc.h
+++ b/drivers/net/dsa/motorcomm/tc.h
@@ -331,6 +331,7 @@ enum yt921x_l4_type {
#define YT921X_ACL_ENT_PER_BLK 8
#define YT921X_ACL_NUM 384
+#define YT921X_ACL_ORD_NUM 512
#define YT921X_UDF_NUM 8
struct yt921x_acl_entry {
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-10-01 20:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-01 20:48 [PATCH net-next v2 0/5] net: dsa: motorcomm: TC offload follow-ups David Yang
2026-10-01 20:48 ` [PATCH net-next v2 1/5] net: dsa: motorcomm: Hoist type casting helper into chip.h David Yang
2026-10-01 20:48 ` [PATCH net-next v2 2/5] net: dsa: motorcomm: Split TC module David Yang
2026-10-01 20:48 ` [PATCH net-next v2 3/5] net: dsa: motorcomm: Use NSEC_PER_SEC David Yang
2026-10-01 20:48 ` [PATCH net-next v2 4/5] net: dsa: motorcomm: Enable ACL on demand David Yang
2026-10-01 20:48 ` [PATCH net-next v2 5/5] net: dsa: motorcomm: Add TC prio support David Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®