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, URIBL_BLOCKED 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 D0FE4C4332D for ; Sun, 22 Mar 2020 00:10:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE0DE20767 for ; Sun, 22 Mar 2020 00:10:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728132AbgCVAKV convert rfc822-to-8bit (ORCPT ); Sat, 21 Mar 2020 20:10:21 -0400 Received: from mga02.intel.com ([134.134.136.20]:60486 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727296AbgCVAKV (ORCPT ); Sat, 21 Mar 2020 20:10:21 -0400 IronPort-SDR: XTO9Vy5E8Z8LqTgJjBwnUodRU3dtxByjimZbBLzojmQTuwoEId5XT4Dtj+iaUeRarb2wRBZV2t kplmb8KAovSg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2020 17:10:20 -0700 IronPort-SDR: mii5KpTSfIGBj11O2+43GbeJRFg2WXU27ap44jA/W0ADYtZKKyrhVhS9ZdfY8htiBNZLtRAHRH o/FKu1TMR8JQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,290,1580803200"; d="scan'208";a="249242511" Received: from pgsmsx112.gar.corp.intel.com ([10.108.55.201]) by orsmga006.jf.intel.com with ESMTP; 21 Mar 2020 17:10:19 -0700 Received: from pgsmsx110.gar.corp.intel.com (10.221.44.111) by PGSMSX112.gar.corp.intel.com (10.108.55.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 22 Mar 2020 08:10:16 +0800 Received: from pgsmsx101.gar.corp.intel.com ([169.254.1.189]) by PGSMSX110.gar.corp.intel.com ([169.254.13.28]) with mapi id 14.03.0439.000; Sun, 22 Mar 2020 08:10:16 +0800 From: "Tsai, Rex" To: Kai-Heng Feng Subject: RE: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th Thread-Topic: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th Thread-Index: AQG3cCI3NG3RtKSKRa6ZGiuDYJEouqiQ3AGQ Date: Sun, 22 Mar 2020 00:10:15 +0000 Message-ID: References: <20200319052629.7282-1-kai.heng.feng@canonical.com> In-Reply-To: <20200319052629.7282-1-kai.heng.feng@canonical.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [172.30.20.206] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello Kai-Heng, I will take over here. When do you have a chance to talk this issue next week? Rex Tsai | Intel Client LAN Engineer | +1 (503) 264-0517 -----Original Message----- From: Intel-wired-lan On Behalf Of Kai-Heng Feng Sent: Wednesday, March 18, 2020 10:26 PM To: Kirsher, Jeffrey T Cc: open list:NETWORKING DRIVERS ; Kai-Heng Feng ; moderated list:INTEL ETHERNET DRIVERS ; David S. Miller ; open list Subject: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th The s0ix flow makes X1 Carbon 7th can only run S2Idle for only once. Temporarily disable it until Intel found a solution. Link: https://lists.osuosl.org/pipermail/intel-wired-lan/Week-of-Mon-20200316/0192 22.html BugLink: https://bugs.launchpad.net/bugs/1865570 Signed-off-by: Kai-Heng Feng --- drivers/net/ethernet/intel/e1000e/netdev.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index db4ea58bac82..3e090aa993ee 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "e1000.h" @@ -6843,6 +6844,17 @@ static int __e1000_resume(struct pci_dev *pdev) } #ifdef CONFIG_PM_SLEEP +static const struct dmi_system_id s0ix_blacklist[] = { + { + .ident = "LENOVO ThinkPad X1 Carbon 7th", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X1 Carbon 7th"), + }, + }, + {} +}; + static int e1000e_pm_suspend(struct device *dev) { struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); @@ -6860,7 +6872,7 @@ static int e1000e_pm_suspend(struct device *dev) e1000e_pm_thaw(dev); /* Introduce S0ix implementation */ - if (hw->mac.type >= e1000_pch_cnp) + if (hw->mac.type >= e1000_pch_cnp && !dmi_check_system(s0ix_blacklist)) e1000e_s0ix_entry_flow(adapter); return rc; @@ -6875,7 +6887,7 @@ static int e1000e_pm_resume(struct device *dev) int rc; /* Introduce S0ix implementation */ - if (hw->mac.type >= e1000_pch_cnp) + if (hw->mac.type >= e1000_pch_cnp && !dmi_check_system(s0ix_blacklist)) e1000e_s0ix_exit_flow(adapter); rc = __e1000_resume(pdev); -- 2.17.1 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan