Commit 5b1918a5 authored by Xiaoliang Yang's avatar Xiaoliang Yang Committed by David S. Miller
Browse files

net: mscc: ocelot: set vcap IS2 chain to goto PSFP chain 



Some chips in the ocelot series such as VSC9959 support Per-Stream
Filtering and Policing(PSFP), which is processing after VCAP blocks.
We set this block on chain 30000 and set vcap IS2 chain to goto PSFP
chain if hardware support.

Signed-off-by: default avatarXiaoliang Yang <xiaoliang.yang_1@nxp.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0568c3bf

drivers/net/ethernet/mscc/ocelot_flower.c

+14 −3
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
	(1 * VCAP_BLOCK + (lookup) * VCAP_LOOKUP)

#define VCAP_IS2_CHAIN(lookup, pag)	\

	(2 * VCAP_BLOCK + (lookup) * VCAP_LOOKUP + (pag))

/* PSFP chain and block ID */

#define PSFP_BLOCK_ID			OCELOT_NUM_VCAP_BLOCKS

#define OCELOT_PSFP_CHAIN		(3 * VCAP_BLOCK)



static int ocelot_chain_to_block(int chain, bool ingress)

{
@@ -46,6 +49,9 @@ static int ocelot_chain_to_block(int chain, bool ingress) 
			if (chain == VCAP_IS2_CHAIN(lookup, pag))

				return VCAP_IS2;



	if (chain == OCELOT_PSFP_CHAIN)

		return PSFP_BLOCK_ID;



	return -EOPNOTSUPP;

}
@@ -84,7 +90,8 @@ static bool ocelot_is_goto_target_valid(int goto_target, int chain, 
			goto_target == VCAP_IS1_CHAIN(1) ||

			goto_target == VCAP_IS1_CHAIN(2) ||

			goto_target == VCAP_IS2_CHAIN(0, 0) ||

			goto_target == VCAP_IS2_CHAIN(1, 0));

			goto_target == VCAP_IS2_CHAIN(1, 0) ||

			goto_target == OCELOT_PSFP_CHAIN);



	if (chain == VCAP_IS1_CHAIN(0))

		return (goto_target == VCAP_IS1_CHAIN(1));
@@ -111,7 +118,11 @@ static bool ocelot_is_goto_target_valid(int goto_target, int chain, 
		if (chain == VCAP_IS2_CHAIN(0, pag))

			return (goto_target == VCAP_IS2_CHAIN(1, pag));



	/* VCAP IS2 lookup 1 cannot jump anywhere */

	/* VCAP IS2 lookup 1 can goto to PSFP block if hardware support */

	for (pag = 0; pag < VCAP_IS2_NUM_PAG; pag++)

		if (chain == VCAP_IS2_CHAIN(1, pag))

			return (goto_target == OCELOT_PSFP_CHAIN);



	return false;

}
@@ -407,7 +418,7 @@ static int ocelot_flower_parse_action(struct ocelot *ocelot, int port, 


	if (filter->goto_target == -1) {

		if ((filter->block_id == VCAP_IS2 && filter->lookup == 1) ||

		    chain == 0) {

		    chain == 0 || filter->block_id == PSFP_BLOCK_ID) {

			allow_missing_goto_target = true;

		} else {

			NL_SET_ERR_MSG_MOD(extack, "Missing GOTO action");