From patchwork Fri Mar 27 02:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1262511 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48pR7j5vY6z9sSM for ; Fri, 27 Mar 2020 13:46:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727733AbgC0CqW (ORCPT ); Thu, 26 Mar 2020 22:46:22 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34355 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726363AbgC0CqW (ORCPT ); Thu, 26 Mar 2020 22:46:22 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jHf0Z-0002zW-PR; Fri, 27 Mar 2020 02:46:08 +0000 From: Kai-Heng Feng To: davem@davemloft.net, kuba@kernel.org Cc: alexander.duyck@gmail.com, Kai-Heng Feng , Jeff Kirsher , Aaron Brown , Michal Kubecek , Florian Fainelli , Andrew Lunn , Maxime Chevallier , netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ethtool: Report speed and duplex as unknown when device is runtime suspended Date: Fri, 27 Mar 2020 10:45:51 +0800 Message-Id: <20200327024552.22170-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Device like igb gets runtime suspended when there's no link partner. We can't get correct speed under that state: $ cat /sys/class/net/enp3s0/speed 1000 In addition to that, an error can also be spotted in dmesg: [ 385.991957] igb 0000:03:00.0 enp3s0: PCIe link lost Since device can only be runtime suspended when there's no link partner, we can directly report the speed and duplex as unknown. Cc: Jeff Kirsher Cc: Aaron Brown Suggested-by: Alexander Duyck Signed-off-by: Kai-Heng Feng --- net/ethtool/ioctl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 10d929abdf6a..2ba04aa9d775 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "common.h" @@ -429,6 +430,13 @@ int __ethtool_get_link_ksettings(struct net_device *dev, return -EOPNOTSUPP; memset(link_ksettings, 0, sizeof(*link_ksettings)); + + if (pm_runtime_suspended(dev->dev.parent)) { + link_ksettings->base.duplex = DUPLEX_UNKNOWN; + link_ksettings->base.speed = SPEED_UNKNOWN; + return 0; + } + return dev->ethtool_ops->get_link_ksettings(dev, link_ksettings); } EXPORT_SYMBOL(__ethtool_get_link_ksettings);