mirror of
https://github.com/torvalds/linux
synced 2024-10-07 20:05:15 +00:00
net: dsa: bcm_sf2: Disallow port 5 to be a DSA CPU port
While the switch driver is written such that port 5 or 8 could be CPU ports, the use case on Broadcom STB chips is to use port 8 exclusively. The platform firmware does make port 5 comply to a proper DSA CPU port binding by specifiying an "ethernet" phandle. This is undesirable for now until we have an user-space configuration mechanism (such as devlink) which could support dynamically changing the port flavor at run time. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9d33ffaaf3
commit
8c28044097
|
@ -457,6 +457,7 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
|
||||||
{
|
{
|
||||||
struct device_node *port;
|
struct device_node *port;
|
||||||
unsigned int port_num;
|
unsigned int port_num;
|
||||||
|
struct property *prop;
|
||||||
phy_interface_t mode;
|
phy_interface_t mode;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -483,6 +484,16 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
|
||||||
|
|
||||||
if (of_property_read_bool(port, "brcm,use-bcm-hdr"))
|
if (of_property_read_bool(port, "brcm,use-bcm-hdr"))
|
||||||
priv->brcm_tag_mask |= 1 << port_num;
|
priv->brcm_tag_mask |= 1 << port_num;
|
||||||
|
|
||||||
|
/* Ensure that port 5 is not picked up as a DSA CPU port
|
||||||
|
* flavour but a regular port instead. We should be using
|
||||||
|
* devlink to be able to set the port flavour.
|
||||||
|
*/
|
||||||
|
if (port_num == 5 && priv->type == BCM7278_DEVICE_ID) {
|
||||||
|
prop = of_find_property(port, "ethernet", NULL);
|
||||||
|
if (prop)
|
||||||
|
of_remove_property(port, prop);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue