From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 C6549C433DF for ; Tue, 16 Jun 2020 11:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE66520734 for ; Tue, 16 Jun 2020 11:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728420AbgFPLYE convert rfc822-to-8bit (ORCPT ); Tue, 16 Jun 2020 07:24:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:50783 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbgFPLYC (ORCPT ); Tue, 16 Jun 2020 07:24:02 -0400 Received: from mail-pl1-f198.google.com ([209.85.214.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jl9h9-0005PP-Sv for linux-kernel@vger.kernel.org; Tue, 16 Jun 2020 11:24:00 +0000 Received: by mail-pl1-f198.google.com with SMTP id b5so5287021pls.17 for ; Tue, 16 Jun 2020 04:23:59 -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=RKV/iihpMFOKrX8Dy/UHawwcIU/eq1oQLDV9xYsClvQ=; b=QubAzf16E4/SURbmIjFraYRZQfSK85c+5vKk0fGj23lDbGGn8bN28JWNoS5IMzrFk4 qY4auJSJ2g5463J0xPz1A8myy6obYbHH81VKA+0LVz1tX5NYXHZNu6zhySeFY4pepZFr GtYUAUfx4D5cloO/VZoaOiF4cTv0HmUdbFucqKM42X7kDn5MaL8cvkcHJTwaES28P8eY MixcXZ4PX10TC0txPhjKF2JMIvm3pKG3YLfykyEixOBB7UY8Ivzr9zeIL3XetL56EiXr VxKP7JxmYfXvdFlsEofixI2ufNHt4AN5ZzP5/D5wRT/bKO3Tg/CX4cmZhSr++rtVYLq6 TuOQ== X-Gm-Message-State: AOAM530HCOtJALLlOFaliJzr+pptSLELQvYiAVq874LI6qz048nPPwHH KdXTCRKfTbqm9FA9gkP4LmMSjtjCtJj32J19VdIiBlrJ7QNqsW0bDf58u3fXjnuP8Dsb6jTaWcv OI/6I8ZQuHJ4apapuMM6zX8j0Atq1clQfpxMQxBfchw== X-Received: by 2002:aa7:9f10:: with SMTP id g16mr1692901pfr.47.1592306638258; Tue, 16 Jun 2020 04:23:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxn76cJL80QgLRqpVQR9LS39Yxme3oExRkYxI5UyhE9Nws2RV5nZr3RTYu817dCcgb8VQkTjA== X-Received: by 2002:aa7:9f10:: with SMTP id g16mr1692885pfr.47.1592306637881; Tue, 16 Jun 2020 04:23:57 -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 gg10sm2268181pjb.38.2020.06.16.04.23.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 04:23:57 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: [PATCH] e1000e: continue to init phy even when failed to disable ULP From: Kai-Heng Feng In-Reply-To: <20200616100512.22512-1-aaron.ma@canonical.com> Date: Tue, 16 Jun 2020 19:23:53 +0800 Cc: Jeff Kirsher , "David S. Miller" , Jakub Kicinski , "moderated list:INTEL ETHERNET DRIVERS" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vitaly.lifshits@intel.com, sasha.neftin@intel.com Content-Transfer-Encoding: 8BIT Message-Id: <4CC928F1-02CC-4675-908E-42B26C151FA1@canonical.com> References: <20200616100512.22512-1-aaron.ma@canonical.com> To: Aaron Ma X-Mailer: Apple Mail (2.3608.80.23.2.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Archived-At: List-Archive: List-Post: > On Jun 16, 2020, at 18:05, Aaron Ma wrote: > > After commit "e1000e: disable s0ix entry and exit flows for ME systems", > some ThinkPads always failed to disable ulp by ME. > commit "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. > > Chnage e_warn to e_dbg, in case it confuses. > > Signed-off-by: Aaron Ma > --- > drivers/net/ethernet/intel/e1000e/ich8lan.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c > index f999cca37a8a..63405819eb83 100644 > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c > @@ -302,8 +302,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) > hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown; > ret_val = e1000_disable_ulp_lpt_lp(hw, true); If si0x entry isn't enabled, maybe skip calling e1000_disable_ulp_lpt_lp() altogether? We can use e1000e_check_me() to check that. > if (ret_val) { > - e_warn("Failed to disable ULP\n"); > - goto out; > + e_dbg("Failed to disable ULP\n"); > } The change of "e1000e: Warn if disabling ULP failed" is intentional to catch bugs like this. Kai-Heng > > ret_val = hw->phy.ops.acquire(hw); > -- > 2.26.2 >