diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-05-24 16:14:16 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-24 13:59:03 -0700 |
| commit | df2a81a35ebb507d8d614d993d3b55425d73ffee (patch) | |
| tree | 35a2949ae11ec76a25f0f939acab9d14440a92c7 | |
| parent | net: dsa: sja1105: dimension the data structures for a larger port count (diff) | |
| download | wireguard-linux-df2a81a35ebb507d8d614d993d3b55425d73ffee.tar.xz wireguard-linux-df2a81a35ebb507d8d614d993d3b55425d73ffee.zip | |
net: dsa: sja1105: don't assign the host port using dsa_upstream_port()
If @port is unused, then dsa_upstream_port(ds, port) returns @port,
which means we cannot assume the CPU port can be retrieved this way.
The sja1105 switches support a single CPU port, so just iterate over the
switch ports and stop at the first CPU port we see.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index 76fc730b341d..409e059b87e3 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -556,7 +556,7 @@ static int sja1105_init_general_params(struct sja1105_private *priv) * receieved on host_port itself would be dropped, except * by installing a temporary 'management route' */ - .host_port = dsa_upstream_port(priv->ds, 0), + .host_port = priv->ds->num_ports, /* Default to an invalid value */ .mirr_port = priv->ds->num_ports, /* Link-local traffic received on casc_port will be forwarded @@ -579,7 +579,16 @@ static int sja1105_init_general_params(struct sja1105_private *priv) .tpid = ETH_P_SJA1105, .tpid2 = ETH_P_SJA1105, }; + struct dsa_switch *ds = priv->ds; struct sja1105_table *table; + int port; + + for (port = 0; port < ds->num_ports; port++) { + if (dsa_is_cpu_port(ds, port)) { + default_general_params.host_port = port; + break; + } + } table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS]; |