lkml.org 
[lkml]   [2021]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 121/188] net: dsa: Fix type was not set for devlink port
    Date
    From: Maxim Kochetkov <fido_max@inbox.ru>

    [ Upstream commit fb6ec87f7229b92baa81b35cbc76f2626d5bfadb ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/dsa/dsa2.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
    index a04fd637b4cd..3ada338d7e08 100644
    --- a/net/dsa/dsa2.c
    +++ b/net/dsa/dsa2.c
    @@ -533,8 +533,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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-04-12 11:41    [W:5.485 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site