Commit 166a1a5a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sparx5-ES2-VCAP-support' 



Steen Hegelund says:

====================
Adding Sparx5 ES2 VCAP support

This provides the Egress Stage 2 (ES2) VCAP (Versatile Content-Aware
Processor) support for the Sparx5 platform.

The ES2 VCAP is an Egress Access Control VCAP that uses frame keyfields and
previously classified keyfields to apply e.g. policing, trapping or
mirroring to frames.

The ES2 VCAP has 2 lookups and they are accessible with a TC chain id:

- chain 20000000: ES2 Lookup 0
- chain 20100000: ES2 Lookup 1

As the other Sparx5 VCAPs the ES2 VCAP has its own lookup/port keyset
configuration that decides which keys will be used for matching on which
traffic type.

The ES2 VCAP has these traffic classifications:

- IPv4 frames
- IPv6 frames
- Other frames

The ES2 VCAP can match on an ISDX key (Ingress Service Index) as one of the
frame metadata keyfields.  The IS0 VCAP can update this key using its
actions, and this allows a IS0 VCAP rule to be linked to an ES2 rule.

This is similar to how the IS0 VCAP and the IS2 VCAP use the PAG
(Policy Association Group) keyfield to link rules.

From user space this is exposed via "chain offsets", so an IS0 rule with a
"goto chain 20000015" action will use an ISDX key value of 15 to link to a
rule in the ES2 VCAP attached to the same chain id.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5dd3beba 1f741f00

drivers/net/ethernet/microchip/lan966x/lan966x_main.h

+2 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ int lan966x_vcap_init(struct lan966x *lan966x); 
void lan966x_vcap_deinit(struct lan966x *lan966x);



int lan966x_tc_flower(struct lan966x_port *port,

		      struct flow_cls_offload *f);

		      struct flow_cls_offload *f,

		      bool ingress);



int lan966x_goto_port_add(struct lan966x_port *port,

			  int from_cid, int to_cid,

drivers/net/ethernet/microchip/lan966x/lan966x_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int lan966x_tc_block_cb(enum tc_setup_type type, void *type_data, 
	case TC_SETUP_CLSMATCHALL:

		return lan966x_tc_matchall(port, type_data, ingress);

	case TC_SETUP_CLSFLOWER:

		return lan966x_tc_flower(port, type_data);

		return lan966x_tc_flower(port, type_data, ingress);

	default:

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c

+10 −6
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static int lan966x_tc_flower_use_dissectors(struct flow_cls_offload *f, 


static int lan966x_tc_flower_action_check(struct vcap_control *vctrl,

					  struct net_device *dev,

					  struct flow_cls_offload *fco)

					  struct flow_cls_offload *fco,

					  bool ingress)

{

	struct flow_rule *rule = flow_cls_offload_flow_rule(fco);

	struct flow_action_entry *actent, *last_actent = NULL;
@@ -120,7 +121,8 @@ static int lan966x_tc_flower_action_check(struct vcap_control *vctrl, 
					   "Invalid goto chain");

			return -EINVAL;

		}

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index)) {

	} else if (!vcap_is_last_chain(vctrl, fco->common.chain_index,

				       ingress)) {

		NL_SET_ERR_MSG_MOD(fco->common.extack,

				   "Last action must be 'goto'");

		return -EINVAL;
@@ -139,7 +141,8 @@ static int lan966x_tc_flower_action_check(struct vcap_control *vctrl, 


static int lan966x_tc_flower_add(struct lan966x_port *port,

				 struct flow_cls_offload *f,

				 struct vcap_admin *admin)

				 struct vcap_admin *admin,

				 bool ingress)

{

	struct flow_action_entry *act;

	u16 l3_proto = ETH_P_ALL;
@@ -148,7 +151,7 @@ static int lan966x_tc_flower_add(struct lan966x_port *port, 
	int err, idx;



	err = lan966x_tc_flower_action_check(port->lan966x->vcap_ctrl,

					     port->dev, f);

					     port->dev, f, ingress);

	if (err)

		return err;
@@ -232,7 +235,8 @@ static int lan966x_tc_flower_del(struct lan966x_port *port, 
}



int lan966x_tc_flower(struct lan966x_port *port,

		      struct flow_cls_offload *f)

		      struct flow_cls_offload *f,

		      bool ingress)

{

	struct vcap_admin *admin;
@@ -245,7 +249,7 @@ int lan966x_tc_flower(struct lan966x_port *port, 


	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return lan966x_tc_flower_add(port, f, admin);

		return lan966x_tc_flower_add(port, f, admin, ingress);

	case FLOW_CLS_DESTROY:

		return lan966x_tc_flower_del(port, f, admin);

	default:

drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ static struct lan966x_vcap_inst { 
	int first_cid; /* first chain id in this vcap */

	int last_cid; /* last chain id in this vcap */

	int count; /* number of available addresses */

	bool ingress; /* is vcap in the ingress path */

} lan966x_vcap_inst_cfg[] = {

	{

		.vtype = VCAP_TYPE_IS2, /* IS2-0 */
@@ -31,6 +32,7 @@ static struct lan966x_vcap_inst { 
		.first_cid = LAN966X_VCAP_CID_IS2_L0,

		.last_cid = LAN966X_VCAP_CID_IS2_MAX,

		.count = 256,

		.ingress = true,

	},

};
@@ -431,6 +433,7 @@ lan966x_vcap_admin_alloc(struct lan966x *lan966x, struct vcap_control *ctrl, 


	admin->vtype = cfg->vtype;

	admin->vinst = 0;

	admin->ingress = cfg->ingress;

	admin->w32be = true;

	admin->tgt_inst = cfg->tgt_inst;

drivers/net/ethernet/microchip/sparx5/sparx5_main.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static const struct sparx5_main_io_resource sparx5_main_iomap[] = { 
	{ TARGET_QSYS,               0x110a0000, 2 }, /* 0x6110a0000 */

	{ TARGET_QFWD,               0x110b0000, 2 }, /* 0x6110b0000 */

	{ TARGET_XQS,                0x110c0000, 2 }, /* 0x6110c0000 */

	{ TARGET_VCAP_ES2,           0x110d0000, 2 }, /* 0x6110d0000 */

	{ TARGET_CLKGEN,             0x11100000, 2 }, /* 0x611100000 */

	{ TARGET_ANA_AC_POL,         0x11200000, 2 }, /* 0x611200000 */

	{ TARGET_QRES,               0x11280000, 2 }, /* 0x611280000 */