lkml.org 
[lkml]   [2022]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 058/121] net: bcmgenet: Dont claim WOL when its not available
    Date
    From: Jeremy Linton <jeremy.linton@arm.com>

    [ Upstream commit 00b022f8f876a3a036b0df7f971001bef6398605 ]

    Some of the bcmgenet platforms don't correctly support WOL, yet
    ethtool returns:

    "Supports Wake-on: gsf"

    which is false.

    Ideally if there isn't a wol_irq, or there is something else that
    keeps the device from being able to wakeup it should display:

    "Supports Wake-on: d"

    This patch checks whether the device can wakup, before using the
    hard-coded supported flags. This corrects the ethtool reporting, as
    well as the WOL configuration because ethtool verifies that the mode
    is supported before attempting it.

    Fixes: c51de7f3976b ("net: bcmgenet: add Wake-on-LAN support code")
    Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
    Tested-by: Peter Robinson <pbrobinson@gmail.com>
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Link: https://lore.kernel.org/r/20220310045535.224450-1-jeremy.linton@arm.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    index e31a5a397f11..f55d9d9c01a8 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
    @@ -40,6 +40,13 @@
    void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
    {
    struct bcmgenet_priv *priv = netdev_priv(dev);
    + struct device *kdev = &priv->pdev->dev;
    +
    + if (!device_can_wakeup(kdev)) {
    + wol->supported = 0;
    + wol->wolopts = 0;
    + return;
    + }

    wol->supported = WAKE_MAGIC | WAKE_MAGICSECURE | WAKE_FILTER;
    wol->wolopts = priv->wolopts;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-03-14 13:40    [W:4.109 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site