Commit a4fc5665 authored by George McCollister's avatar George McCollister Committed by David S. Miller
Browse files

net: dsa: xrs700x: forward HSR supervision frames 



Forward supervision frames between redunant HSR ports. This was broken
in the last commit.

Fixes: 1a42624a ("net: dsa: xrs700x: allow HSR/PRP supervision dupes for node_table")
Signed-off-by: default avatarGeorge McCollister <george.mccollister@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d917c35a

drivers/net/dsa/xrs700x/xrs700x.c

+19 −8
Original line number Diff line number Diff line
@@ -337,7 +337,8 @@ static int xrs700x_port_add_bpdu_ipf(struct dsa_switch *ds, int port) 
 * This is required to correctly populate the HSR/PRP node_table.

 * Leave the policy disabled, it will be enabled as needed.

 */

static int xrs700x_port_add_hsrsup_ipf(struct dsa_switch *ds, int port)

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

				       int fwdport)

{

	struct xrs700x *priv = ds->priv;

	unsigned int val = 0;
@@ -368,6 +369,9 @@ static int xrs700x_port_add_hsrsup_ipf(struct dsa_switch *ds, int port) 
	if (ret)

		return ret;



	if (fwdport >= 0)

		val |= BIT(fwdport);



	/* Allow must be set prevent duplicate discard */

	ret = regmap_write(priv->regmap, XRS_ETH_ADDR_FWD_ALLOW(port, 1), val);

	if (ret)
@@ -405,10 +409,6 @@ static int xrs700x_port_setup(struct dsa_switch *ds, int port) 
		ret = xrs700x_port_add_bpdu_ipf(ds, port);

		if (ret)

			return ret;



		ret = xrs700x_port_add_hsrsup_ipf(ds, port);

		if (ret)

			return ret;

	}



	return 0;
@@ -562,6 +562,7 @@ static int xrs700x_hsr_join(struct dsa_switch *ds, int port, 
	struct net_device *slave;

	int ret, i, hsr_pair[2];

	enum hsr_version ver;

	bool fwd = false;



	ret = hsr_get_version(hsr, &ver);

	if (ret)
@@ -607,6 +608,7 @@ static int xrs700x_hsr_join(struct dsa_switch *ds, int port, 
	if (ver == HSR_V1) {

		val &= ~BIT(partner->index);

		val &= ~BIT(port);

		fwd = true;

	}

	val &= ~BIT(dsa_upstream_port(ds, port));

	regmap_write(priv->regmap, XRS_PORT_FWD_MASK(partner->index), val);
@@ -616,10 +618,19 @@ static int xrs700x_hsr_join(struct dsa_switch *ds, int port, 
			    XRS_PORT_FORWARDING);

	regmap_fields_write(priv->ps_forward, port, XRS_PORT_FORWARDING);



	/* Enable inbound policy added by xrs700x_port_add_hsrsup_ipf()

	 * which allows HSR/PRP supervision forwarding to the CPU port without

	 * discarding duplicates.

	/* Enable inbound policy which allows HSR/PRP supervision forwarding

	 * to the CPU port without discarding duplicates. Continue to

	 * forward to redundant ports when in HSR mode while discarding

	 * duplicates.

	 */

	ret = xrs700x_port_add_hsrsup_ipf(ds, partner->index, fwd ? port : -1);

	if (ret)

		return ret;



	ret = xrs700x_port_add_hsrsup_ipf(ds, port, fwd ? partner->index : -1);

	if (ret)

		return ret;



	regmap_update_bits(priv->regmap,

			   XRS_ETH_ADDR_CFG(partner->index, 1), 1, 1);

	regmap_update_bits(priv->regmap, XRS_ETH_ADDR_CFG(port, 1), 1, 1);