Commit db78ed27 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: Allow looping back CFP rules 



When the source and destination port of a CFP rule match, we must set
the loopback bit enable to allow that, otherwise the frame is discarded.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4ae9c08

drivers/net/dsa/bcm_sf2_cfp.c

+8 −3
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ static inline unsigned int bcm_sf2_cfp_rule_size(struct bcm_sf2_priv *priv) 


static int bcm_sf2_cfp_act_pol_set(struct bcm_sf2_priv *priv,

				   unsigned int rule_index,

				   int src_port,

				   unsigned int port_num,

				   unsigned int queue_num,

				   bool fwd_map_change)
@@ -230,6 +231,10 @@ static int bcm_sf2_cfp_act_pol_set(struct bcm_sf2_priv *priv, 
	else

		reg = 0;



	/* Enable looping back to the original port */

	if (src_port == port_num)

		reg |= LOOP_BK_EN;



	core_writel(priv, reg, CORE_ACT_POL_DATA0);



	/* Set classification ID that needs to be put in Broadcom tag */
@@ -443,7 +448,7 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port, 
	}



	/* Insert into Action and policer RAMs now */

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index, port_num,

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index, port, port_num,

				      queue_num, true);

	if (ret)

		goto out_err_flow_rule;
@@ -733,7 +738,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port, 
	}



	/* Insert into Action and policer RAMs now */

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index[0], port_num,

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index[0], port, port_num,

				      queue_num, false);

	if (ret)

		goto out_err_flow_rule;
@@ -795,7 +800,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port, 
	/* Insert into Action and policer RAMs now, set chain ID to

	 * the one we are chained to

	 */

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index[1], port_num,

	ret = bcm_sf2_cfp_act_pol_set(priv, rule_index[1], port, port_num,

				      queue_num, true);

	if (ret)

		goto out_err_flow_rule;