lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 315/879] net: dsa: qca8k: correctly handle mdio read error
    Date
    From: Ansuel Smith <ansuelsmth@gmail.com>

    [ Upstream commit 6cfc03b602200c5cbbd8d906fd905547814e83df ]

    Restore original way to handle mdio read error by returning 0xffff.
    This was wrongly changed when the internal_mdio_read was introduced,
    now that both legacy and internal use the same function, make sure that
    they behave the same way.

    Fixes: ce062a0adbfe ("net: dsa: qca8k: fix kernel panic with legacy mdio mapping")
    Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/qca8k.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
    index d3ed0a7f8077..22b328bd7cd5 100644
    --- a/drivers/net/dsa/qca8k.c
    +++ b/drivers/net/dsa/qca8k.c
    @@ -1287,7 +1287,12 @@ qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum)
    if (ret >= 0)
    return ret;

    - return qca8k_mdio_read(priv, phy, regnum);
    + ret = qca8k_mdio_read(priv, phy, regnum);
    +
    + if (ret < 0)
    + return 0xffff;
    +
    + return ret;
    }

    static int
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:35    [W:2.108 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site