lkml.org 
[lkml]   [2020]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 102/166] net: macb: fix macb_get/set_wol() when moving to phylink
    Date
    From: Nicolas Ferre <nicolas.ferre@microchip.com>

    [ Upstream commit 253fe09435045ab9346a8e364299d971185ae031 ]

    Keep previous function goals and integrate phylink actions to them.

    phylink_ethtool_get_wol() is not enough to figure out if Ethernet driver
    supports Wake-on-Lan.
    Initialization of "supported" and "wolopts" members is done in phylink
    function, no need to keep them in calling function.

    phylink_ethtool_set_wol() return value is considered and determines
    if the MAC has to handle WoL or not. The case where the PHY doesn't
    implement WoL leads to the MAC configuring it to provide this feature.

    Fixes: 7897b071ac3b ("net: macb: convert to phylink")
    Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
    Cc: Harini Katakam <harini.katakam@xilinx.com>
    Cc: Antoine Tenart <antoine.tenart@bootlin.com>
    Cc: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/cadence/macb_main.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
    index 4cafe343c0a27..79c2fe0543038 100644
    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -2821,11 +2821,13 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
    {
    struct macb *bp = netdev_priv(netdev);

    - wol->supported = 0;
    - wol->wolopts = 0;
    -
    - if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET)
    + if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) {
    phylink_ethtool_get_wol(bp->phylink, wol);
    + wol->supported |= WAKE_MAGIC;
    +
    + if (bp->wol & MACB_WOL_ENABLED)
    + wol->wolopts |= WAKE_MAGIC;
    + }
    }

    static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
    @@ -2833,9 +2835,13 @@ static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
    struct macb *bp = netdev_priv(netdev);
    int ret;

    + /* Pass the order to phylink layer */
    ret = phylink_ethtool_set_wol(bp->phylink, wol);
    - if (!ret)
    - return 0;
    + /* Don't manage WoL on MAC if handled by the PHY
    + * or if there's a failure in talking to the PHY
    + */
    + if (!ret || ret != -EOPNOTSUPP)
    + return ret;

    if (!(bp->wol & MACB_WOL_HAS_MAGIC_PACKET) ||
    (wol->wolopts & ~WAKE_MAGIC))
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-14 21:04    [W:4.557 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site