Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e72e6f8 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: Allow multi hop routes to be expressed 



With more than two switches in a hierarchy, it becomes necessary to
describe multi-hop routes between switches. The current binding does
not allow this, although the older platform_data did. Extend the link
property to be a list rather than a single phandle to a remote switch.
It is then possible to express that a port should be used to reach
more than one switch and the switch maybe more than one hop away.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61ed713b

Documentation/devicetree/bindings/net/dsa/dsa.txt

+27 −6
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ Note that a port labelled "dsa" will imply checking for the uplink phandle 
described below.



Optionnal property:

- link			: Should be a phandle to another switch's DSA port.

- link			: Should be a list of phandles to another switch's DSA port.

			  This property is only used when switches are being

			  chained/cascaded together.

			  chained/cascaded together. This port is used as outgoing port

			  towards the phandle port, which can be more than one hop away.



- phy-handle		: Phandle to a PHY on an external MDIO bus, not the

			  switch internal one. See
@@ -100,10 +101,11 @@ Example: 
				label = "cpu";

			};



			switch0uplink: port@6 {

			switch0port6: port@6 {

				reg = <6>;

				label = "dsa";

				link = <&switch1uplink>;

				link = <&switch1port0

				        &switch2port0>;

			};

		};
@@ -113,10 +115,29 @@ Example: 
			reg = <17 1>;	/* MDIO address 17, switch 1 in tree */

			mii-bus = <&mii_bus1>;



			switch1uplink: port@0 {

			switch1port0: port@0 {

				reg = <0>;

				label = "dsa";

				link = <&switch0uplink>;

				link = <&switch0port6>;

			};

			switch1port1: port@1 {

				reg = <1>;

				label = "dsa";

				link = <&switch2port1>;

			};

		};



		switch@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <18 2>;	/* MDIO address 18, switch 2 in tree */

			mii-bus = <&mii_bus1>;



			switch2port0: port@0 {

				reg = <0>;

				label = "dsa";

				link = <&switch1port1

				        &switch0port6>;

			};

		};

	};

net/dsa/dsa.c

+30 −10
Original line number Diff line number Diff line
@@ -554,6 +554,31 @@ static int dsa_of_setup_routing_table(struct dsa_platform_data *pd, 
	return 0;

}



static int dsa_of_probe_links(struct dsa_platform_data *pd,

			      struct dsa_chip_data *cd,

			      int chip_index, int port_index,

			      struct device_node *port,

			      const char *port_name)

{

	struct device_node *link;

	int link_index;

	int ret;



	for (link_index = 0;; link_index++) {

		link = of_parse_phandle(port, "link", link_index);

		if (!link)

			break;



		if (!strcmp(port_name, "dsa") && pd->nr_chips > 1) {

			ret = dsa_of_setup_routing_table(pd, cd, chip_index,

							 port_index, link);

			if (ret)

				return ret;

		}

	}

	return 0;

}



static void dsa_of_free_platform_data(struct dsa_platform_data *pd)

{

	int i;
@@ -573,7 +598,7 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd) 
static int dsa_of_probe(struct device *dev)

{

	struct device_node *np = dev->of_node;

	struct device_node *child, *mdio, *ethernet, *port, *link;

	struct device_node *child, *mdio, *ethernet, *port;

	struct mii_bus *mdio_bus, *mdio_bus_switch;

	struct net_device *ethernet_dev;

	struct dsa_platform_data *pd;
@@ -668,15 +693,10 @@ static int dsa_of_probe(struct device *dev) 
				goto out_free_chip;

			}



			link = of_parse_phandle(port, "link", 0);



			if (!strcmp(port_name, "dsa") && link &&

					pd->nr_chips > 1) {

				ret = dsa_of_setup_routing_table(pd, cd,

						chip_index, port_index, link);

			ret = dsa_of_probe_links(pd, cd, chip_index,

						 port_index, port, port_name);

			if (ret)

				goto out_free_chip;

			}



		}

	}