Commit 3288dffc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Port-and-flow-policers-for-DSA' 

Vladimir Oltean says:

====================
Port and flow policers for DSA (SJA1105, Felix/Ocelot)

This series adds support for 2 types of policers:
 - port policers, via tc matchall filter
 - flow policers, via tc flower filter
for 2 DSA drivers:
 - sja1105
 - felix/ocelot

First we start with ocelot/felix. Prior to this patch, the ocelot core
library currently only supported:
- Port policers
- Flow-based dropping and trapping
But the felix wrapper could not actually use the port policers due to
missing linkage and support in the DSA core. So one of the patches
addresses exactly that limitation by adding the missing support to the
DSA core. The other patch for felix flow policers (via the VCAP IS2
engine) is actually in the ocelot library itself, since the linkage with
the ocelot flower classifier has already been done in an earlier patch
set.

Then with the newly added .port_policer_add and .port_policer_del, we
can also start supporting the L2 policers on sja1105.

Then, for full functionality of these L2 policers on sja1105, we also
implement a more limited set of flow-based policing keys for this
switch, namely for broadcast and VLAN PCP.

Series version 1 was submitted here:
https://patchwork.ozlabs.org/cover/1263353/



Nothing functional changed in v2, only a rebase.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0d5d6045 a6af7763

drivers/net/dsa/ocelot/felix.c

+24 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of_net.h>

#include <linux/pci.h>

#include <linux/of.h>

#include <net/pkt_sched.h>

#include <net/dsa.h>

#include "felix.h"
@@ -650,6 +651,27 @@ static int felix_cls_flower_stats(struct dsa_switch *ds, int port, 
	return ocelot_cls_flower_stats(ocelot, port, cls, ingress);

}



static int felix_port_policer_add(struct dsa_switch *ds, int port,

				  struct dsa_mall_policer_tc_entry *policer)

{

	struct ocelot *ocelot = ds->priv;

	struct ocelot_policer pol = {

		.rate = div_u64(policer->rate_bytes_per_sec, 1000) * 8,

		.burst = div_u64(policer->rate_bytes_per_sec *

				 PSCHED_NS2TICKS(policer->burst),

				 PSCHED_TICKS_PER_SEC),

	};



	return ocelot_port_policer_add(ocelot, port, &pol);

}



static void felix_port_policer_del(struct dsa_switch *ds, int port)

{

	struct ocelot *ocelot = ds->priv;



	ocelot_port_policer_del(ocelot, port);

}



static const struct dsa_switch_ops felix_switch_ops = {

	.get_tag_protocol	= felix_get_tag_protocol,

	.setup			= felix_setup,
@@ -683,6 +705,8 @@ static const struct dsa_switch_ops felix_switch_ops = { 
	.port_txtstamp		= felix_txtstamp,

	.port_change_mtu	= felix_change_mtu,

	.port_max_mtu		= felix_get_max_mtu,

	.port_policer_add	= felix_port_policer_add,

	.port_policer_del	= felix_port_policer_del,

	.cls_flower_add		= felix_cls_flower_add,

	.cls_flower_del		= felix_cls_flower_del,

	.cls_flower_stats	= felix_cls_flower_stats,

drivers/net/dsa/sja1105/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_NET_DSA_SJA1105) += sja1105.o 
sja1105-objs := \

    sja1105_spi.o \

    sja1105_main.o \

    sja1105_flower.o \

    sja1105_ethtool.o \

    sja1105_clocking.o \

    sja1105_static_config.o \

drivers/net/dsa/sja1105/sja1105.h

+40 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * The passed parameter is in multiples of 1 ms.

 */

#define SJA1105_AGEING_TIME_MS(ms)	((ms) / 10)

#define SJA1105_NUM_L2_POLICERS		45



typedef enum {

	SPI_READ = 0,
@@ -95,6 +96,36 @@ struct sja1105_info { 
	const char *name;

};



enum sja1105_rule_type {

	SJA1105_RULE_BCAST_POLICER,

	SJA1105_RULE_TC_POLICER,

};



struct sja1105_rule {

	struct list_head list;

	unsigned long cookie;

	unsigned long port_mask;

	enum sja1105_rule_type type;



	union {

		/* SJA1105_RULE_BCAST_POLICER */

		struct {

			int sharindx;

		} bcast_pol;



		/* SJA1105_RULE_TC_POLICER */

		struct {

			int sharindx;

			int tc;

		} tc_pol;

	};

};



struct sja1105_flow_block {

	struct list_head rules;

	bool l2_policer_used[SJA1105_NUM_L2_POLICERS];

};



struct sja1105_private {

	struct sja1105_static_config static_config;

	bool rgmii_rx_delay[SJA1105_NUM_PORTS];
@@ -103,6 +134,7 @@ struct sja1105_private { 
	struct gpio_desc *reset_gpio;

	struct spi_device *spidev;

	struct dsa_switch *ds;

	struct sja1105_flow_block flow_block;

	struct sja1105_port ports[SJA1105_NUM_PORTS];

	/* Serializes transmission of management frames so that

	 * the switch doesn't confuse them with one another.
@@ -222,4 +254,12 @@ size_t sja1105pqrs_mac_config_entry_packing(void *buf, void *entry_ptr, 
size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr,

					    enum packing_op op);



/* From sja1105_flower.c */

int sja1105_cls_flower_del(struct dsa_switch *ds, int port,

			   struct flow_cls_offload *cls, bool ingress);

int sja1105_cls_flower_add(struct dsa_switch *ds, int port,

			   struct flow_cls_offload *cls, bool ingress);

void sja1105_flower_setup(struct dsa_switch *ds);

void sja1105_flower_teardown(struct dsa_switch *ds);



#endif

drivers/net/dsa/sja1105/sja1105_flower.c

0 → 100644
+340 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright 2020, NXP Semiconductors

 */

#include "sja1105.h"



static struct sja1105_rule *sja1105_rule_find(struct sja1105_private *priv,

					      unsigned long cookie)

{

	struct sja1105_rule *rule;



	list_for_each_entry(rule, &priv->flow_block.rules, list)

		if (rule->cookie == cookie)

			return rule;



	return NULL;

}



static int sja1105_find_free_l2_policer(struct sja1105_private *priv)

{

	int i;



	for (i = 0; i < SJA1105_NUM_L2_POLICERS; i++)

		if (!priv->flow_block.l2_policer_used[i])

			return i;



	return -1;

}



static int sja1105_setup_bcast_policer(struct sja1105_private *priv,

				       struct netlink_ext_ack *extack,

				       unsigned long cookie, int port,

				       u64 rate_bytes_per_sec,

				       s64 burst)

{

	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);

	struct sja1105_l2_policing_entry *policing;

	bool new_rule = false;

	unsigned long p;

	int rc;



	if (!rule) {

		rule = kzalloc(sizeof(*rule), GFP_KERNEL);

		if (!rule)

			return -ENOMEM;



		rule->cookie = cookie;

		rule->type = SJA1105_RULE_BCAST_POLICER;

		rule->bcast_pol.sharindx = sja1105_find_free_l2_policer(priv);

		new_rule = true;

	}



	if (rule->bcast_pol.sharindx == -1) {

		NL_SET_ERR_MSG_MOD(extack, "No more L2 policers free");

		rc = -ENOSPC;

		goto out;

	}



	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	if (policing[(SJA1105_NUM_PORTS * SJA1105_NUM_TC) + port].sharindx != port) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Port already has a broadcast policer");

		rc = -EEXIST;

		goto out;

	}



	rule->port_mask |= BIT(port);



	/* Make the broadcast policers of all ports attached to this block

	 * point to the newly allocated policer

	 */

	for_each_set_bit(p, &rule->port_mask, SJA1105_NUM_PORTS) {

		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + p;



		policing[bcast].sharindx = rule->bcast_pol.sharindx;

	}



	policing[rule->bcast_pol.sharindx].rate = div_u64(rate_bytes_per_sec *

							  512, 1000000);

	policing[rule->bcast_pol.sharindx].smax = div_u64(rate_bytes_per_sec *

							  PSCHED_NS2TICKS(burst),

							  PSCHED_TICKS_PER_SEC);

	/* TODO: support per-flow MTU */

	policing[rule->bcast_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +

						    ETH_FCS_LEN;



	rc = sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);



out:

	if (rc == 0 && new_rule) {

		priv->flow_block.l2_policer_used[rule->bcast_pol.sharindx] = true;

		list_add(&rule->list, &priv->flow_block.rules);

	} else if (new_rule) {

		kfree(rule);

	}



	return rc;

}



static int sja1105_setup_tc_policer(struct sja1105_private *priv,

				    struct netlink_ext_ack *extack,

				    unsigned long cookie, int port, int tc,

				    u64 rate_bytes_per_sec,

				    s64 burst)

{

	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);

	struct sja1105_l2_policing_entry *policing;

	bool new_rule = false;

	unsigned long p;

	int rc;



	if (!rule) {

		rule = kzalloc(sizeof(*rule), GFP_KERNEL);

		if (!rule)

			return -ENOMEM;



		rule->cookie = cookie;

		rule->type = SJA1105_RULE_TC_POLICER;

		rule->tc_pol.sharindx = sja1105_find_free_l2_policer(priv);

		rule->tc_pol.tc = tc;

		new_rule = true;

	}



	if (rule->tc_pol.sharindx == -1) {

		NL_SET_ERR_MSG_MOD(extack, "No more L2 policers free");

		rc = -ENOSPC;

		goto out;

	}



	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	if (policing[(port * SJA1105_NUM_TC) + tc].sharindx != port) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Port-TC pair already has an L2 policer");

		rc = -EEXIST;

		goto out;

	}



	rule->port_mask |= BIT(port);



	/* Make the policers for traffic class @tc of all ports attached to

	 * this block point to the newly allocated policer

	 */

	for_each_set_bit(p, &rule->port_mask, SJA1105_NUM_PORTS) {

		int index = (p * SJA1105_NUM_TC) + tc;



		policing[index].sharindx = rule->tc_pol.sharindx;

	}



	policing[rule->tc_pol.sharindx].rate = div_u64(rate_bytes_per_sec *

						       512, 1000000);

	policing[rule->tc_pol.sharindx].smax = div_u64(rate_bytes_per_sec *

						       PSCHED_NS2TICKS(burst),

						       PSCHED_TICKS_PER_SEC);

	/* TODO: support per-flow MTU */

	policing[rule->tc_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +

						 ETH_FCS_LEN;



	rc = sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);



out:

	if (rc == 0 && new_rule) {

		priv->flow_block.l2_policer_used[rule->tc_pol.sharindx] = true;

		list_add(&rule->list, &priv->flow_block.rules);

	} else if (new_rule) {

		kfree(rule);

	}



	return rc;

}



static int sja1105_flower_parse_policer(struct sja1105_private *priv, int port,

					struct netlink_ext_ack *extack,

					struct flow_cls_offload *cls,

					u64 rate_bytes_per_sec,

					s64 burst)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct flow_dissector *dissector = rule->match.dissector;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Unsupported keys used");

		return -EOPNOTSUPP;

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {

		struct flow_match_basic match;



		flow_rule_match_basic(rule, &match);

		if (match.key->n_proto) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Matching on protocol not supported");

			return -EOPNOTSUPP;

		}

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {

		u8 bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

		u8 null[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

		struct flow_match_eth_addrs match;



		flow_rule_match_eth_addrs(rule, &match);



		if (!ether_addr_equal_masked(match.key->src, null,

					     match.mask->src)) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Matching on source MAC not supported");

			return -EOPNOTSUPP;

		}



		if (!ether_addr_equal_masked(match.key->dst, bcast,

					     match.mask->dst)) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Only matching on broadcast DMAC is supported");

			return -EOPNOTSUPP;

		}



		return sja1105_setup_bcast_policer(priv, extack, cls->cookie,

						   port, rate_bytes_per_sec,

						   burst);

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {

		struct flow_match_vlan match;



		flow_rule_match_vlan(rule, &match);



		if (match.key->vlan_id & match.mask->vlan_id) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Matching on VID is not supported");

			return -EOPNOTSUPP;

		}



		if (match.mask->vlan_priority != 0x7) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Masked matching on PCP is not supported");

			return -EOPNOTSUPP;

		}



		return sja1105_setup_tc_policer(priv, extack, cls->cookie, port,

						match.key->vlan_priority,

						rate_bytes_per_sec,

						burst);

	}



	NL_SET_ERR_MSG_MOD(extack, "Not matching on any known key");

	return -EOPNOTSUPP;

}



int sja1105_cls_flower_add(struct dsa_switch *ds, int port,

			   struct flow_cls_offload *cls, bool ingress)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct netlink_ext_ack *extack = cls->common.extack;

	struct sja1105_private *priv = ds->priv;

	const struct flow_action_entry *act;

	int rc = -EOPNOTSUPP, i;



	flow_action_for_each(i, act, &rule->action) {

		switch (act->id) {

		case FLOW_ACTION_POLICE:

			rc = sja1105_flower_parse_policer(priv, port, extack, cls,

							  act->police.rate_bytes_ps,

							  act->police.burst);

			break;

		default:

			NL_SET_ERR_MSG_MOD(extack,

					   "Action not supported");

			break;

		}

	}



	return rc;

}



int sja1105_cls_flower_del(struct dsa_switch *ds, int port,

			   struct flow_cls_offload *cls, bool ingress)

{

	struct sja1105_private *priv = ds->priv;

	struct sja1105_rule *rule = sja1105_rule_find(priv, cls->cookie);

	struct sja1105_l2_policing_entry *policing;

	int old_sharindx;



	if (!rule)

		return 0;



	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	if (rule->type == SJA1105_RULE_BCAST_POLICER) {

		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + port;



		old_sharindx = policing[bcast].sharindx;

		policing[bcast].sharindx = port;

	} else if (rule->type == SJA1105_RULE_TC_POLICER) {

		int index = (port * SJA1105_NUM_TC) + rule->tc_pol.tc;



		old_sharindx = policing[index].sharindx;

		policing[index].sharindx = port;

	} else {

		return -EINVAL;

	}



	rule->port_mask &= ~BIT(port);

	if (!rule->port_mask) {

		priv->flow_block.l2_policer_used[old_sharindx] = false;

		list_del(&rule->list);

		kfree(rule);

	}



	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);

}



void sja1105_flower_setup(struct dsa_switch *ds)

{

	struct sja1105_private *priv = ds->priv;

	int port;



	INIT_LIST_HEAD(&priv->flow_block.rules);



	for (port = 0; port < SJA1105_NUM_PORTS; port++)

		priv->flow_block.l2_policer_used[port] = true;

}



void sja1105_flower_teardown(struct dsa_switch *ds)

{

	struct sja1105_private *priv = ds->priv;

	struct sja1105_rule *rule;

	struct list_head *pos, *n;



	list_for_each_safe(pos, n, &priv->flow_block.rules) {

		rule = list_entry(pos, struct sja1105_rule, list);

		list_del(&rule->list);

		kfree(rule);

	}

}

drivers/net/dsa/sja1105/sja1105_main.c

+104 −32
Original line number Diff line number Diff line
@@ -516,23 +516,56 @@ static int sja1105_init_avb_params(struct sja1105_private *priv) 
	return 0;

}



/* The L2 policing table is 2-stage. The table is looked up for each frame

 * according to the ingress port, whether it was broadcast or not, and the

 * classified traffic class (given by VLAN PCP). This portion of the lookup is

 * fixed, and gives access to the SHARINDX, an indirection register pointing

 * within the policing table itself, which is used to resolve the policer that

 * will be used for this frame.

 *

 *  Stage 1                              Stage 2

 * +------------+--------+              +---------------------------------+

 * |Port 0 TC 0 |SHARINDX|              | Policer 0: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 * |Port 0 TC 1 |SHARINDX|              | Policer 1: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 *    ...                               | Policer 2: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 * |Port 0 TC 7 |SHARINDX|              | Policer 3: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 * |Port 1 TC 0 |SHARINDX|              | Policer 4: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 *    ...                               | Policer 5: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 * |Port 1 TC 7 |SHARINDX|              | Policer 6: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 *    ...                               | Policer 7: Rate, Burst, MTU     |

 * +------------+--------+              +---------------------------------+

 * |Port 4 TC 7 |SHARINDX|                 ...

 * +------------+--------+

 * |Port 0 BCAST|SHARINDX|                 ...

 * +------------+--------+

 * |Port 1 BCAST|SHARINDX|                 ...

 * +------------+--------+

 *    ...                                  ...

 * +------------+--------+              +---------------------------------+

 * |Port 4 BCAST|SHARINDX|              | Policer 44: Rate, Burst, MTU    |

 * +------------+--------+              +---------------------------------+

 *

 * In this driver, we shall use policers 0-4 as statically alocated port

 * (matchall) policers. So we need to make the SHARINDX for all lookups

 * corresponding to this ingress port (8 VLAN PCP lookups and 1 broadcast

 * lookup) equal.

 * The remaining policers (40) shall be dynamically allocated for flower

 * policers, where the key is either vlan_prio or dst_mac ff:ff:ff:ff:ff:ff.

 */

#define SJA1105_RATE_MBPS(speed) (((speed) * 64000) / 1000)



static void sja1105_setup_policer(struct sja1105_l2_policing_entry *policing,

				  int index, int mtu)

{

	policing[index].sharindx = index;

	policing[index].smax = 65535; /* Burst size in bytes */

	policing[index].rate = SJA1105_RATE_MBPS(1000);

	policing[index].maxlen = mtu;

	policing[index].partition = 0;

}



static int sja1105_init_l2_policing(struct sja1105_private *priv)

{

	struct sja1105_l2_policing_entry *policing;

	struct sja1105_table *table;

	int i, j, k;

	int port, tc;



	table = &priv->static_config.tables[BLK_IDX_L2_POLICING];
@@ -551,22 +584,29 @@ static int sja1105_init_l2_policing(struct sja1105_private *priv) 


	policing = table->entries;



	/* k sweeps through all unicast policers (0-39).

	 * bcast sweeps through policers 40-44.

	 */

	for (i = 0, k = 0; i < SJA1105_NUM_PORTS; i++) {

		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + i;

	/* Setup shared indices for the matchall policers */

	for (port = 0; port < SJA1105_NUM_PORTS; port++) {

		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + port;



		for (tc = 0; tc < SJA1105_NUM_TC; tc++)

			policing[port * SJA1105_NUM_TC + tc].sharindx = port;



		policing[bcast].sharindx = port;

	}



	/* Setup the matchall policer parameters */

	for (port = 0; port < SJA1105_NUM_PORTS; port++) {

		int mtu = VLAN_ETH_FRAME_LEN + ETH_FCS_LEN;



		if (dsa_is_cpu_port(priv->ds, i))

		if (dsa_is_cpu_port(priv->ds, port))

			mtu += VLAN_HLEN;



		for (j = 0; j < SJA1105_NUM_TC; j++, k++)

			sja1105_setup_policer(policing, k, mtu);



		/* Set up this port's policer for broadcast traffic */

		sja1105_setup_policer(policing, bcast, mtu);

		policing[port].smax = 65535; /* Burst size in bytes */

		policing[port].rate = SJA1105_RATE_MBPS(1000);

		policing[port].maxlen = mtu;

		policing[port].partition = 0;

	}



	return 0;

}
@@ -1981,6 +2021,7 @@ static void sja1105_teardown(struct dsa_switch *ds) 
			kthread_destroy_worker(sp->xmit_worker);

	}



	sja1105_flower_teardown(ds);

	sja1105_tas_teardown(ds);

	sja1105_ptp_clock_unregister(ds);

	sja1105_static_config_free(&priv->static_config);
@@ -2129,10 +2170,8 @@ static int sja1105_set_ageing_time(struct dsa_switch *ds, 


static int sja1105_change_mtu(struct dsa_switch *ds, int port, int new_mtu)

{

	int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + port;

	struct sja1105_l2_policing_entry *policing;

	struct sja1105_private *priv = ds->priv;

	int tc;



	new_mtu += VLAN_ETH_HLEN + ETH_FCS_LEN;
@@ -2141,16 +2180,10 @@ static int sja1105_change_mtu(struct dsa_switch *ds, int port, int new_mtu) 


	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	/* We set all 9 port policers to the same value, so just checking the

	 * broadcast one is fine.

	 */

	if (policing[bcast].maxlen == new_mtu)

	if (policing[port].maxlen == new_mtu)

		return 0;



	for (tc = 0; tc < SJA1105_NUM_TC; tc++)

		policing[port * SJA1105_NUM_TC + tc].maxlen = new_mtu;



	policing[bcast].maxlen = new_mtu;

	policing[port].maxlen = new_mtu;



	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);

}
@@ -2250,6 +2283,40 @@ static void sja1105_mirror_del(struct dsa_switch *ds, int port, 
			     mirror->ingress, false);

}



static int sja1105_port_policer_add(struct dsa_switch *ds, int port,

				    struct dsa_mall_policer_tc_entry *policer)

{

	struct sja1105_l2_policing_entry *policing;

	struct sja1105_private *priv = ds->priv;



	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	/* In hardware, every 8 microseconds the credit level is incremented by

	 * the value of RATE bytes divided by 64, up to a maximum of SMAX

	 * bytes.

	 */

	policing[port].rate = div_u64(512 * policer->rate_bytes_per_sec,

				      1000000);

	policing[port].smax = div_u64(policer->rate_bytes_per_sec *

				      PSCHED_NS2TICKS(policer->burst),

				      PSCHED_TICKS_PER_SEC);



	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);

}



static void sja1105_port_policer_del(struct dsa_switch *ds, int port)

{

	struct sja1105_l2_policing_entry *policing;

	struct sja1105_private *priv = ds->priv;



	policing = priv->static_config.tables[BLK_IDX_L2_POLICING].entries;



	policing[port].rate = SJA1105_RATE_MBPS(1000);

	policing[port].smax = 65535;



	sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);

}



static const struct dsa_switch_ops sja1105_switch_ops = {

	.get_tag_protocol	= sja1105_get_tag_protocol,

	.setup			= sja1105_setup,
@@ -2288,6 +2355,10 @@ static const struct dsa_switch_ops sja1105_switch_ops = { 
	.port_setup_tc		= sja1105_port_setup_tc,

	.port_mirror_add	= sja1105_mirror_add,

	.port_mirror_del	= sja1105_mirror_del,

	.port_policer_add	= sja1105_port_policer_add,

	.port_policer_del	= sja1105_port_policer_del,

	.cls_flower_add		= sja1105_cls_flower_add,

	.cls_flower_del		= sja1105_cls_flower_del,

};



static int sja1105_check_device_id(struct sja1105_private *priv)
@@ -2391,6 +2462,7 @@ static int sja1105_probe(struct spi_device *spi) 
	mutex_init(&priv->mgmt_lock);



	sja1105_tas_setup(ds);

	sja1105_flower_setup(ds);



	rc = dsa_register_switch(priv->ds);

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE