Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp287040pxk; Thu, 24 Sep 2020 05:53:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQno8HR6DbAm98VIkTU8cvJi7Glz5UaF+a0Osect7npP4vg9rjlVNO4UVllqW3LiIOEfg2 X-Received: by 2002:a17:906:e0c5:: with SMTP id gl5mr928605ejb.108.1600952008799; Thu, 24 Sep 2020 05:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600952008; cv=none; d=google.com; s=arc-20160816; b=GupUNyTisuhqu54J0HU0AD/ZwbxqMAIDL7qWjcFc732uPqEPBrvNRMa/UPJB/PKX2r 4Kas3B1Fuf8FCLDnRtEWzk+6uqRM+fl+Q6qVYylP41CfX7t5k/ys9dymwpsjptvmidFA RIcR4SNesFOzyLAP/uytS2v1EV5FVi/z5SJEJgbr6somyYEov5L+HgsaeWiQej3yCqdd Mm1dlmQae+TDfnUNnYmPaQmrjzReUP1KF8aHtK3Ro/aJeyyQUGFPXrCH0fRVXS1lZST/ sD2ILlO26XWZ/kjNke/Kwq0WetgGeaFBEx5E0uLwKUGGUElEQJVN/VlrOiRnhfhwSdqt TdQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:references:message-id :content-transfer-encoding:cc:date:in-reply-to:from:subject :mime-version; bh=3pcDmIsmGA3Rxak6p6vtg2+Fkyc56gHRUMc5QVxBcmQ=; b=Z45hhPOdorRmUlS8DyM9bd4vU3N8lDokgXso8c5Dq/XKVrD9D2BL23dTwNcs/tKjMb zvf/Wv2ICBol2uVom+ok9QqLzNQ/DIipRfa57D7YurdqlCLaWkXAG3W8lKF9Y2C9iX9m ejp3lSSSTOntqkyBUrsFHF3g6t2TdsHWXQ8Z5P41gFmGQPBkiz3BHKro8wZTZEpOvlDN vRKXXaNNhguPGLkbJmxw7hY76dSXxNIQ0SQ8Qg37uIMO4Pd7uXKGG4vbomTrhoVWdRsV Y4XOUDNvwBYxJ9FcEO/6h8WI2GamPaLLo0R4C7bU6/FWZ3SowIYbbgVNcKaVicM+Kes+ 0uNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y4si2303542edp.279.2020.09.24.05.53.06; Thu, 24 Sep 2020 05:53:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728015AbgIXMvM convert rfc822-to-8bit (ORCPT + 99 others); Thu, 24 Sep 2020 08:51:12 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56120 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727874AbgIXMvM (ORCPT ); Thu, 24 Sep 2020 08:51:12 -0400 Received: from mail-pf1-f199.google.com ([209.85.210.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kLQiL-0003vU-Eo for linux-kernel@vger.kernel.org; Thu, 24 Sep 2020 12:51:09 +0000 Received: by mail-pf1-f199.google.com with SMTP id s204so1762347pfs.18 for ; Thu, 24 Sep 2020 05:51:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=DjILAW2W1Nia4thAbmZLofAgJjNgLzZMs6DEDIxBnIo=; b=lb1Vl7c/pd62I2GEXhxKEnzjMr/UOb67mcLUgbNX2FC6u9EBXQwYzqDg9iNti9lBb0 hOPND9AreQcQO/RfLEwsELaXn7KT+S0kDPkg+zLQSuz2UDhwrGfK3X+3UczK193SNUUR ZLDc7Xy+hqMnH2yQMvb34IZIvarOrkkubrRANqyJioxafI72RcC4EFaouZ2xliNSYAkK 72hpO5JsCbA6HGyfTM5w+CIu4RrkGYbwwVi0etwOD7JJfdQFTwtR505C4PHgPxCTCtl8 LZ/viVh6onhQVuf80ArZoKKyDpC1LG1wWz7RB+57leFIW+1IC/VXp7hpOznUnMWpfjVU irSQ== X-Gm-Message-State: AOAM532q9YyywkwmyoPuY0vrFzIEbbGwu0njhGFSjhAcDBGmtKiFjvJA LKjki4I29TMnjI1WN7ldhmWzjS1ZiubitPnO9EzJ0Jt5GCsYnhdludDPwWxJ5cLNYypfDRfq/u7 gC58X4ROVYdwZpEylY2Ei3JY4faDJ2H++5Uu1eAqaUQ== X-Received: by 2002:a17:902:b109:b029:d1:e5e7:be53 with SMTP id q9-20020a170902b109b02900d1e5e7be53mr4459777plr.45.1600951867655; Thu, 24 Sep 2020 05:51:07 -0700 (PDT) X-Received: by 2002:a17:902:b109:b029:d1:e5e7:be53 with SMTP id q9-20020a170902b109b02900d1e5e7be53mr4459743plr.45.1600951867169; Thu, 24 Sep 2020 05:51:07 -0700 (PDT) Received: from [192.168.1.208] (220-133-187-190.HINET-IP.hinet.net. [220.133.187.190]) by smtp.gmail.com with ESMTPSA id y4sm2879537pgl.67.2020.09.24.05.51.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 05:51:06 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: [PATCH] e1000e: Power cycle phy on PM resume From: Kai-Heng Feng In-Reply-To: <20200923153703.GC3764123@lunn.ch> Date: Thu, 24 Sep 2020 20:50:59 +0800 Cc: Jeff Kirsher , "David S. Miller" , Jakub Kicinski , "moderated list:INTEL ETHERNET DRIVERS" , "open list:NETWORKING DRIVERS" , open list Content-Transfer-Encoding: 8BIT Message-Id: References: <20200923074751.10527-1-kai.heng.feng@canonical.com> <20200923121748.GE3770354@lunn.ch> <20200923153703.GC3764123@lunn.ch> To: Andrew Lunn X-Mailer: Apple Mail (2.3608.120.23.2.1) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, > On Sep 23, 2020, at 23:37, Andrew Lunn wrote: > > On Wed, Sep 23, 2020 at 10:44:10PM +0800, Kai-Heng Feng wrote: >> Hi Andrew, >> >>> On Sep 23, 2020, at 20:17, Andrew Lunn wrote: >>> >>> On Wed, Sep 23, 2020 at 03:47:51PM +0800, Kai-Heng Feng wrote: >>>> We are seeing the following error after S3 resume: >>>> [ 704.746874] e1000e 0000:00:1f.6 eno1: Setting page 0x6020 >>>> [ 704.844232] e1000e 0000:00:1f.6 eno1: MDI Write did not complete >>>> [ 704.902817] e1000e 0000:00:1f.6 eno1: Setting page 0x6020 >>>> [ 704.903075] e1000e 0000:00:1f.6 eno1: reading PHY page 769 (or 0x6020 shifted) reg 0x17 >>>> [ 704.903281] e1000e 0000:00:1f.6 eno1: Setting page 0x6020 >>>> [ 704.903486] e1000e 0000:00:1f.6 eno1: writing PHY page 769 (or 0x6020 shifted) reg 0x17 >>>> [ 704.943155] e1000e 0000:00:1f.6 eno1: MDI Error >>>> ... >>>> [ 705.108161] e1000e 0000:00:1f.6 eno1: Hardware Error >>>> >>>> Since we don't know what platform firmware may do to the phy, so let's >>>> power cycle the phy upon system resume to resolve the issue. >>>> >>>> Signed-off-by: Kai-Heng Feng >>>> --- >>>> drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ >>>> 1 file changed, 2 insertions(+) >>>> >>>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c >>>> index 664e8ccc88d2..c2a87a408102 100644 >>>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c >>>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c >>>> @@ -6968,6 +6968,8 @@ static __maybe_unused int e1000e_pm_resume(struct device *dev) >>>> !e1000e_check_me(hw->adapter->pdev->device)) >>>> e1000e_s0ix_exit_flow(adapter); >>>> >>>> + e1000_power_down_phy(adapter); >>>> + >>> >>> static void e1000_power_down_phy(struct e1000_adapter *adapter) >>> { >>> struct e1000_hw *hw = &adapter->hw; >>> >>> /* Power down the PHY so no link is implied when interface is down * >>> * The PHY cannot be powered down if any of the following is true * >>> * (a) WoL is enabled >>> * (b) AMT is active >>> * (c) SoL/IDER session is active >>> */ >>> if (!adapter->wol && hw->mac_type >= e1000_82540 && >>> hw->media_type == e1000_media_type_copper) { >> >> Looks like the the function comes from e1000, drivers/net/ethernet/intel/e1000/e1000_main.c. >> However, this patch is for e1000e, so the function with same name is different. > > Ah! Sorry. Missed that. Also it is not nice there are two functions in > the kernel with the same name. > >>> Could it be coming out of S3 because it just received a WoL? >> >> No, the issue can be reproduced by pressing keyboard or rtcwake. > > Not relevant now, since i was looking at the wrong function. But i was > meaning the call is a NOP in the case WoL caused the wake up. So if > the issues can also happen after WoL, your fix is not going to fix it. > >>> It seems unlikely that it is the MII_CR_POWER_DOWN which is helping, >>> since that is an MDIO write itself. Do you actually know how this call >>> to e1000_power_down_phy() fixes the issues? >> > >> I don't know from hardware's perspective, but I think the comment on >> e1000_power_down_phy_copper() can give us some insight: > > And there is only one function called e1000_power_down_phy_copper() > :-) > >> >> /** >> * e1000_power_down_phy_copper - Restore copper link in case of PHY power down >> * @hw: pointer to the HW structure >> * >> * In the case of a PHY power down to save power, or to turn off link during a >> * driver unload, or wake on lan is not enabled, restore the link to previous >> * settings. >> **/ >> void e1000_power_down_phy_copper(struct e1000_hw *hw) >> { >> u16 mii_reg = 0; >> >> /* The PHY will retain its settings across a power down/up cycle */ >> e1e_rphy(hw, MII_BMCR, &mii_reg); >> mii_reg |= BMCR_PDOWN; >> e1e_wphy(hw, MII_BMCR, mii_reg); >> usleep_range(1000, 2000); >> } > > I don't really see how this explains this: > >>>> [ 704.746874] e1000e 0000:00:1f.6 eno1: Setting page 0x6020 >>>> [ 704.844232] e1000e 0000:00:1f.6 eno1: MDI Write did not complete > > https://elixir.bootlin.com/linux/latest/source/drivers/net/ethernet/intel/e1000e/phy.c#L181 > > So first off, the comments are all cut/paste from > e1000e_read_phy_reg_mdic(). It would be nice to s/read/write/g in that > function. Ah yes... > > So it sets up the transaction and starts it. MDIO is a serial bus with > no acknowledgements. You clock out around 64 bits, and hope the PHY > receives it. The time it takes to send those 64 bits is fixed by the > bus speed, typically 2.5MHz. Thanks for the info. > > So the driver polls waiting for the hardware to say the bits have been > sent. And this is timing out. How long that takes has nothing to do > with the PHY, or what state it is in. Powering down the PHY has no > effect on the MDIO bus master, and how long it takes to shift those > bits out. Which is why i don't think this patch is correct. This is > probably an MDIO bus issue, not a PHY issue. Thanks for pointing out the possible root cause. Indeed this looks like an MDIO issue so this patch is completely wrong. I'll send a V2, thanks. Kai-Heng > > Try dumping the value of MDIC in the good/bad case before the > transaction starts. > > Andrew