Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1283898pxp; Thu, 10 Mar 2022 02:25:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyetugGnZx0068b+LqXIhA86lCs/9L+Ii7JIcEb9dqzu7/UeWUfIlablT7NKfCBjyyWmouy X-Received: by 2002:a17:906:478b:b0:6db:8b6e:d5de with SMTP id cw11-20020a170906478b00b006db8b6ed5demr972323ejc.161.1646907924306; Thu, 10 Mar 2022 02:25:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646907924; cv=none; d=google.com; s=arc-20160816; b=OneSMtkDI+mwd2hxdc4nBciUgDwrpHvBTLWiNGB/oWIU4pqfU7kNGL4je/yQ7k09S3 o5Cin0BnbEr+cELGGyr83Np12O5It6b3gmryWp+Y3S1MT2FkVqtbUpK0NoMhskbJUr/Z OtYVHpo85V86Ryy0o8Hov1Hi8BBHHYUGetPhKAgmbJoxr3BY1+4zjp67SFO462+udwgL o7kXCwpSlBWSxfhssDmALoi1RhRoxKBNG55/Bxxmiq5WKAjUGVETSuKub6lj7AGoMhBd NDflKz5ots+x9xHTxtk0V6OSrwCkpG6IxCtD58iAu0Yrj9Tw1KK0Q2lrw8W5lhkQui3U XQqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=reYYAwd9AkyKeKYSo0uglt/xbxwuPqH4vFmU31pRfog=; b=k0cqh3HWi/Y64Glh4JV875/9AKnt3Vp3hwoAZvuL9xASdHJ8Hi1XYonQqdN9TqtHhG YelGbZhXLCh5ca4Ow+6sr0VgWJAd3iQcIvL4JxTb8fbgKCyG7NPMFeszr7oUrQ2Sh000 3NTHoI795Xsio3sPBnTMdldPvSEBhHnsuDG8oovE/wI/qiDKQDESxi7u4Xg6yXKx85ZL JNU8BDJcyCps6UdfO/chwzXUQxC3Wi314BGTY3dFvU8dG6wHdTJMGmXfL/o+afpyiLxl OXepE5+A1h58cYDvwkXE/JW/JQux+V7QHm+hu4KOgGoyf9R42E/1P7hHD4sPwLzFqtxT Fhdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p3-20020a1709060e8300b006cf6504d1a3si2574450ejf.705.2022.03.10.02.25.00; Thu, 10 Mar 2022 02:25:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239544AbiCJE4m (ORCPT + 99 others); Wed, 9 Mar 2022 23:56:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231351AbiCJE4l (ORCPT ); Wed, 9 Mar 2022 23:56:41 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5BDF4129BA3; Wed, 9 Mar 2022 20:55:40 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 283C21691; Wed, 9 Mar 2022 20:55:40 -0800 (PST) Received: from u200865.usa.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D14323FA27; Wed, 9 Mar 2022 20:55:39 -0800 (PST) From: Jeremy Linton To: netdev@vger.kernel.org Cc: opendmb@gmail.com, f.fainelli@gmail.com, davem@davemloft.net, kuba@kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, pbrobinson@gmail.com, Jeremy Linton Subject: [PATCH] net: bcmgenet: Don't claim WOL when its not available Date: Wed, 9 Mar 2022 22:55:35 -0600 Message-Id: <20220310045535.224450-1-jeremy.linton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Jeremy Linton --- 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.35.1