diff options
| author | Maxim Kochetkov <fido_max@inbox.ru> | 2021-03-29 18:30:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-29 13:49:04 -0700 |
| commit | fb6ec87f7229b92baa81b35cbc76f2626d5bfadb (patch) | |
| tree | e8f7e2d16d95cc0bb122f95aacffb56f8c1bb859 | |
| parent | bff5b62585123823842833ab20b1c0a7fa437f8c (diff) | |
| download | linux-stable-fb6ec87f7229b92baa81b35cbc76f2626d5bfadb.tar.gz linux-stable-fb6ec87f7229b92baa81b35cbc76f2626d5bfadb.tar.bz2 linux-stable-fb6ec87f7229b92baa81b35cbc76f2626d5bfadb.zip | |
net: dsa: Fix type was not set for devlink port
If PHY is not available on DSA port (described at devicetree but absent or
failed to detect) then kernel prints warning after 3700 secs:
[ 3707.948771] ------------[ cut here ]------------
[ 3707.948784] Type was not set for devlink port.
[ 3707.948894] WARNING: CPU: 1 PID: 17 at net/core/devlink.c:8097 0xc083f9d8
We should unregister the devlink port as a user port and
re-register it as an unused port before executing "continue" in case of
dsa_port_setup error.
Fixes: 86f8b1c01a0a ("net: dsa: Do not make user port errors fatal")
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/dsa2.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index d142eb2b288b..3c3e56a1f34d 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -795,8 +795,14 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst) list_for_each_entry(dp, &dst->ports, list) { err = dsa_port_setup(dp); - if (err) + if (err) { + dsa_port_devlink_teardown(dp); + dp->type = DSA_PORT_TYPE_UNUSED; + err = dsa_port_devlink_setup(dp); + if (err) + goto teardown; continue; + } } return 0; |