From patchwork Wed Jun 17 11:12:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 217673 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCB97C433DF for ; Wed, 17 Jun 2020 11:13:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA8A7208B8 for ; Wed, 17 Jun 2020 11:13:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726728AbgFQLNI (ORCPT ); Wed, 17 Jun 2020 07:13:08 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:36634 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725964AbgFQLNH (ORCPT ); Wed, 17 Jun 2020 07:13:07 -0400 Received: from [114.249.250.117] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jlW01-0006g5-Cg; Wed, 17 Jun 2020 11:12:58 +0000 From: Aaron Ma To: jeffrey.t.kirsher@intel.com, davem@davemloft.net, kuba@kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vitaly.lifshits@intel.com, kai.heng.feng@canonical.com, sasha.neftin@intel.com Subject: [v2][PATCH] e1000e: continue to init phy even when failed to disable ULP Date: Wed, 17 Jun 2020 19:12:48 +0800 Message-Id: <20200617111249.20855-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200616100512.22512-1-aaron.ma@canonical.com> References: <20200616100512.22512-1-aaron.ma@canonical.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After commit: e086ba2fccd ("e1000e: disable s0ix entry and exit flows for ME systems"). ThinkPad P14s always failed to disable ULP by ME. commit: 0c80cdbf33 ("e1000e: Warn if disabling ULP failed") break out of init phy: error log: [ 42.364753] e1000e 0000:00:1f.6 enp0s31f6: Failed to disable ULP [ 42.524626] e1000e 0000:00:1f.6 enp0s31f6: PHY Wakeup cause - Unicast Packet [ 42.822476] e1000e 0000:00:1f.6 enp0s31f6: Hardware Error When disable s0ix, E1000_FWSM_ULP_CFG_DONE will never be 1. If continue to init phy like before, it can work as before. iperf test result good too. Fixes: 0c80cdbf33 ("e1000e: Warn if disabling ULP failed") Signed-off-by: Aaron Ma --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index f999cca37a8a..be7475c5529d 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -303,7 +303,6 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) ret_val = e1000_disable_ulp_lpt_lp(hw, true); if (ret_val) { e_warn("Failed to disable ULP\n"); - goto out; } ret_val = hw->phy.ops.acquire(hw);