From patchwork Mon Nov 30 21:29:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 335029 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 7D7CAC64E7B for ; Mon, 30 Nov 2020 21:31:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24415221FD for ; Mon, 30 Nov 2020 21:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388655AbgK3Val (ORCPT ); Mon, 30 Nov 2020 16:30:41 -0500 Received: from mga03.intel.com ([134.134.136.65]:5403 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388554AbgK3Vak (ORCPT ); Mon, 30 Nov 2020 16:30:40 -0500 IronPort-SDR: uynYVF+kgGBrBYPsaWsTMeBUqYLagOHs6eEKTLxAnyxcvr3E1KjddFnihglE7qVYJy0hyW4QSY KHHqnmRWReDA== X-IronPort-AV: E=McAfee;i="6000,8403,9821"; a="172815007" X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="172815007" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 13:29:19 -0800 IronPort-SDR: RVv6mnXfS5b82/WyUoqownpaYPLs9UEIzWcvaoYiAhNydXQzHuGI4a8kcqsq9jgccHdmsdnwED 5QwZgDd02qEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="329719688" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by orsmga003.jf.intel.com with ESMTP; 30 Nov 2020 13:29:19 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Mario Limonciello , netdev@vger.kernel.org, sassmann@redhat.com, anthony.l.nguyen@intel.com, sasha.neftin@intel.com, Aaron Brown Subject: [net-next 1/4] e1000e: allow turning s0ix flows on for systems with ME Date: Mon, 30 Nov 2020 13:29:04 -0800 Message-Id: <20201130212907.320677-2-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130212907.320677-1-anthony.l.nguyen@intel.com> References: <20201130212907.320677-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mario Limonciello S0ix for GBE flows are needed for allowing the system to get into deepest power state, but these require coordination of components outside of control of Linux kernel. For systems that have confirmed to coordinate this properly, allow turning on the s0ix flows at load time or runtime. Fixes: e086ba2fccda ("e1000e: disable s0ix entry and exit flows for ME systems") Signed-off-by: Mario Limonciello Tested-by: Aaron Brown Signed-off-by: Tony Nguyen --- .../device_drivers/ethernet/intel/e1000e.rst | 23 ++++ drivers/net/ethernet/intel/e1000e/e1000.h | 7 ++ drivers/net/ethernet/intel/e1000e/netdev.c | 64 +++++----- drivers/net/ethernet/intel/e1000e/param.c | 110 ++++++++++++++++++ 4 files changed, 166 insertions(+), 38 deletions(-) diff --git a/Documentation/networking/device_drivers/ethernet/intel/e1000e.rst b/Documentation/networking/device_drivers/ethernet/intel/e1000e.rst index f49cd370e7bf..da029b703573 100644 --- a/Documentation/networking/device_drivers/ethernet/intel/e1000e.rst +++ b/Documentation/networking/device_drivers/ethernet/intel/e1000e.rst @@ -249,6 +249,29 @@ Debug This parameter adjusts the level of debug messages displayed in the system logs. +EnableS0ix +---------- +:Valid Range: 0, 1, 2 +:Default Value: 1 (Use Heuristics) + + +-------+----------------+ + | Value | EnableS0ix | + +=======+================+ + | 0 | Disabled | + +-------+----------------+ + | 1 | Use Heuristics | + +-------+----------------+ + | 2 | Enabled | + +-------+----------------+ + +Controls whether the e1000e driver will attempt s0ix flows. S0ix flows require +correct platform configuration. By default the e1000e driver will use some heuristics +to decide whether to enable s0ix. This parameter can be used to override heuristics. + +Additionally a sysfs file "enable_s0ix" will be present that can change the value at +runtime. + +Note: This option is only effective on Cannon Point or later hardware. Additional Features and Configurations ====================================== diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index ba7a0f8f6937..32262fa7e085 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -436,6 +436,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca); #define FLAG2_DFLT_CRC_STRIPPING BIT(12) #define FLAG2_CHECK_RX_HWTSTAMP BIT(13) #define FLAG2_CHECK_SYSTIM_OVERFLOW BIT(14) +#define FLAG2_ENABLE_S0IX_FLOWS BIT(15) #define E1000_RX_DESC_PS(R, i) \ (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) @@ -462,6 +463,12 @@ enum latency_range { extern char e1000e_driver_name[]; void e1000e_check_options(struct e1000_adapter *adapter); +ssize_t enable_s0ix_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count); +ssize_t enable_s0ix_show(struct device *dev, + struct device_attribute *attr, + char *buf); void e1000e_set_ethtool_ops(struct net_device *netdev); int e1000e_open(struct net_device *netdev); diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index b30f00891c03..f413b33127f6 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -103,44 +103,16 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = { {0, NULL} }; -struct e1000e_me_supported { - u16 device_id; /* supported device ID */ -}; +static DEVICE_ATTR_RW(enable_s0ix); -static const struct e1000e_me_supported me_supported[] = { - {E1000_DEV_ID_PCH_LPT_I217_LM}, - {E1000_DEV_ID_PCH_LPTLP_I218_LM}, - {E1000_DEV_ID_PCH_I218_LM2}, - {E1000_DEV_ID_PCH_I218_LM3}, - {E1000_DEV_ID_PCH_SPT_I219_LM}, - {E1000_DEV_ID_PCH_SPT_I219_LM2}, - {E1000_DEV_ID_PCH_LBG_I219_LM3}, - {E1000_DEV_ID_PCH_SPT_I219_LM4}, - {E1000_DEV_ID_PCH_SPT_I219_LM5}, - {E1000_DEV_ID_PCH_CNP_I219_LM6}, - {E1000_DEV_ID_PCH_CNP_I219_LM7}, - {E1000_DEV_ID_PCH_ICP_I219_LM8}, - {E1000_DEV_ID_PCH_ICP_I219_LM9}, - {E1000_DEV_ID_PCH_CMP_I219_LM10}, - {E1000_DEV_ID_PCH_CMP_I219_LM11}, - {E1000_DEV_ID_PCH_CMP_I219_LM12}, - {E1000_DEV_ID_PCH_TGP_I219_LM13}, - {E1000_DEV_ID_PCH_TGP_I219_LM14}, - {E1000_DEV_ID_PCH_TGP_I219_LM15}, - {0} +static struct attribute *e1000e_attrs[] = { + &dev_attr_enable_s0ix.attr, + NULL, }; -static bool e1000e_check_me(u16 device_id) -{ - struct e1000e_me_supported *id; - - for (id = (struct e1000e_me_supported *)me_supported; - id->device_id; id++) - if (device_id == id->device_id) - return true; - - return false; -} +static struct attribute_group e1000e_group = { + .attrs = e1000e_attrs, +}; /** * __ew32_prepare - prepare to write to MAC CSR register on certain parts @@ -4243,7 +4215,7 @@ void e1000e_reset(struct e1000_adapter *adapter) /** * e1000e_trigger_lsc - trigger an LSC interrupt - * @adapter: + * @adapter: board private structure * * Fire a link status change interrupt to start the watchdog. **/ @@ -6975,7 +6947,7 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev) /* Introduce S0ix implementation */ if (hw->mac.type >= e1000_pch_cnp && - !e1000e_check_me(hw->adapter->pdev->device)) + adapter->flags2 & FLAG2_ENABLE_S0IX_FLOWS) e1000e_s0ix_entry_flow(adapter); return rc; @@ -6991,7 +6963,7 @@ static __maybe_unused int e1000e_pm_resume(struct device *dev) /* Introduce S0ix implementation */ if (hw->mac.type >= e1000_pch_cnp && - !e1000e_check_me(hw->adapter->pdev->device)) + adapter->flags2 & FLAG2_ENABLE_S0IX_FLOWS) e1000e_s0ix_exit_flow(adapter); rc = __e1000_resume(pdev); @@ -7655,6 +7627,13 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (!(adapter->flags & FLAG_HAS_AMT)) e1000e_get_hw_control(adapter); + /* offer to turn on/off s0ix flows */ + if (hw->mac.type >= e1000_pch_cnp) { + ret_val = sysfs_create_group(&pdev->dev.kobj, &e1000e_group); + if (ret_val) + goto err_sysfs; + } + strlcpy(netdev->name, "eth%d", sizeof(netdev->name)); err = register_netdev(netdev); if (err) @@ -7673,6 +7652,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_register: + if (hw->mac.type >= e1000_pch_cnp) + sysfs_remove_group(&pdev->dev.kobj, &e1000e_group); + +err_sysfs: if (!(adapter->flags & FLAG_HAS_AMT)) e1000e_release_hw_control(adapter); err_eeprom: @@ -7710,6 +7693,7 @@ static void e1000_remove(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev_priv(netdev); + struct e1000_hw *hw = &adapter->hw; e1000e_ptp_remove(adapter); @@ -7734,6 +7718,10 @@ static void e1000_remove(struct pci_dev *pdev) } } + /* only allow turning on/off s0ix for cannon point and later */ + if (hw->mac.type >= e1000_pch_cnp) + sysfs_remove_group(&pdev->dev.kobj, &e1000e_group); + unregister_netdev(netdev); if (pci_dev_run_wake(pdev)) diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c index ebe121db4307..56316b797521 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -138,6 +138,20 @@ E1000_PARAM(WriteProtectNVM, E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs the CRC"); +/* Enable s0ix flows + * + * Valid Range: varies depending on hardware support + * + * disabled=0, heuristics=1, enabled=2 + * + * Default Value: 1 (heuristics) + */ +E1000_PARAM(EnableS0ix, + "Enable S0ix flows for the system"); +#define S0IX_FORCE_ON 2 +#define S0IX_HEURISTICS 1 +#define S0IX_FORCE_OFF 0 + struct e1000_option { enum { enable_option, range_option, list_option } type; const char *name; @@ -160,6 +174,45 @@ struct e1000_option { } arg; }; +struct e1000e_me_supported { + u16 device_id; /* supported device ID */ +}; + +static const struct e1000e_me_supported me_supported[] = { + {E1000_DEV_ID_PCH_LPT_I217_LM}, + {E1000_DEV_ID_PCH_LPTLP_I218_LM}, + {E1000_DEV_ID_PCH_I218_LM2}, + {E1000_DEV_ID_PCH_I218_LM3}, + {E1000_DEV_ID_PCH_SPT_I219_LM}, + {E1000_DEV_ID_PCH_SPT_I219_LM2}, + {E1000_DEV_ID_PCH_LBG_I219_LM3}, + {E1000_DEV_ID_PCH_SPT_I219_LM4}, + {E1000_DEV_ID_PCH_SPT_I219_LM5}, + {E1000_DEV_ID_PCH_CNP_I219_LM6}, + {E1000_DEV_ID_PCH_CNP_I219_LM7}, + {E1000_DEV_ID_PCH_ICP_I219_LM8}, + {E1000_DEV_ID_PCH_ICP_I219_LM9}, + {E1000_DEV_ID_PCH_CMP_I219_LM10}, + {E1000_DEV_ID_PCH_CMP_I219_LM11}, + {E1000_DEV_ID_PCH_CMP_I219_LM12}, + {E1000_DEV_ID_PCH_TGP_I219_LM13}, + {E1000_DEV_ID_PCH_TGP_I219_LM14}, + {E1000_DEV_ID_PCH_TGP_I219_LM15}, + {0} +}; + +static bool e1000e_check_me(u16 device_id) +{ + struct e1000e_me_supported *id; + + for (id = (struct e1000e_me_supported *)me_supported; + id->device_id; id++) + if (device_id == id->device_id) + return true; + + return false; +} + static int e1000_validate_option(unsigned int *value, const struct e1000_option *opt, struct e1000_adapter *adapter) @@ -526,4 +579,61 @@ void e1000e_check_options(struct e1000_adapter *adapter) } } } + /* Enable S0ix flows */ + { + static const struct e1000_option opt = { + .type = range_option, + .name = "S0ix flows (Cannon point or later)", + .err = "defaulting to heuristics", + .def = S0IX_HEURISTICS, + .arg = { .r = { .min = S0IX_FORCE_OFF, + .max = S0IX_FORCE_ON } } + }; + unsigned int enabled = opt.def; + + if (num_EnableS0ix > bd) { + unsigned int s0ix = EnableS0ix[bd]; + + e1000_validate_option(&s0ix, &opt, adapter); + enabled = s0ix; + } + + if (enabled == S0IX_HEURISTICS) { + /* default to off for ME configurations */ + if (e1000e_check_me(hw->adapter->pdev->device)) + enabled = S0IX_FORCE_OFF; + } + + if (enabled > S0IX_FORCE_OFF) + adapter->flags2 |= FLAG2_ENABLE_S0IX_FLOWS; + } +} + +ssize_t enable_s0ix_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); + struct e1000_adapter *adapter = netdev_priv(netdev); + bool enable_s0ix; + ssize_t ret; + + ret = kstrtobool(buf, &enable_s0ix); + e_info("s0ix flow set to %d\n", enable_s0ix); + if (enable_s0ix) + adapter->flags2 |= FLAG2_ENABLE_S0IX_FLOWS; + else + adapter->flags2 &= ~FLAG2_ENABLE_S0IX_FLOWS; + + return ret ? ret : count; +} + +ssize_t enable_s0ix_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); + struct e1000_adapter *adapter = netdev_priv(netdev); + + return sprintf(buf, "%d\n", (adapter->flags2 & FLAG2_ENABLE_S0IX_FLOWS) > 0); } From patchwork Mon Nov 30 21:29:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 335031 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 504CFC63777 for ; Mon, 30 Nov 2020 21:30:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0C51D221FD for ; Mon, 30 Nov 2020 21:30:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388579AbgK3VaA (ORCPT ); Mon, 30 Nov 2020 16:30:00 -0500 Received: from mga03.intel.com ([134.134.136.65]:5349 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388554AbgK3VaA (ORCPT ); Mon, 30 Nov 2020 16:30:00 -0500 IronPort-SDR: YirZ0gadagO6OrC5+LwnvbvdlJj2J7qksPE5gr84EKiX7mA5JeDCXzBVmCDzE9qJA0a+ehiv0w MrdsgAsDL6BA== X-IronPort-AV: E=McAfee;i="6000,8403,9821"; a="172815008" X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="172815008" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 13:29:19 -0800 IronPort-SDR: lfxbpPulktg4jAyAH32NlLE7xaIKZe2cr2bSbr72YRMfPRnNNPtXbTa/Q+SYyf5RstAlsxp6si B+E5adlLGdoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="329719691" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by orsmga003.jf.intel.com with ESMTP; 30 Nov 2020 13:29:19 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Mario Limonciello , netdev@vger.kernel.org, sassmann@redhat.com, anthony.l.nguyen@intel.com, sasha.neftin@intel.com, Yijun Shen Subject: [net-next 2/4] e1000e: Add Dell's Comet Lake systems into s0ix heuristics Date: Mon, 30 Nov 2020 13:29:05 -0800 Message-Id: <20201130212907.320677-3-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130212907.320677-1-anthony.l.nguyen@intel.com> References: <20201130212907.320677-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mario Limonciello Dell's Comet Lake Latitude and Precision systems containing i219LM are properly configured and should use the s0ix flows. Signed-off-by: Mario Limonciello Tested-by: Yijun Shen Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/Kconfig | 1 + drivers/net/ethernet/intel/e1000e/param.c | 80 ++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 5aa86318ed3e..280af47d74d2 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -58,6 +58,7 @@ config E1000 config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" depends on PCI && (!SPARC32 || BROKEN) + depends on DMI select CRC32 imply PTP_1588_CLOCK help diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c index 56316b797521..d05f55201541 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 1999 - 2018 Intel Corporation. */ +#include #include #include #include @@ -201,6 +202,80 @@ static const struct e1000e_me_supported me_supported[] = { {0} }; +static const struct dmi_system_id s0ix_supported_systems[] = { + { + /* Dell Latitude 5310 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "099F"), + }, + }, + { + /* Dell Latitude 5410 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09A0"), + }, + }, + { + /* Dell Latitude 5410 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C9"), + }, + }, + { + /* Dell Latitude 5510 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09A1"), + }, + }, + { + /* Dell Precision 3550 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09A2"), + }, + }, + { + /* Dell Latitude 5411 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C0"), + }, + }, + { + /* Dell Latitude 5511 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C1"), + }, + }, + { + /* Dell Precision 3551 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C2"), + }, + }, + { + /* Dell Precision 7550 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C3"), + }, + }, + { + /* Dell Precision 7750 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "09C4"), + }, + }, + { } +}; + static bool e1000e_check_me(u16 device_id) { struct e1000e_me_supported *id; @@ -599,8 +674,11 @@ void e1000e_check_options(struct e1000_adapter *adapter) } if (enabled == S0IX_HEURISTICS) { + /* check for allowlist of systems */ + if (dmi_check_system(s0ix_supported_systems)) + enabled = S0IX_FORCE_ON; /* default to off for ME configurations */ - if (e1000e_check_me(hw->adapter->pdev->device)) + else if (e1000e_check_me(hw->adapter->pdev->device)) enabled = S0IX_FORCE_OFF; } From patchwork Mon Nov 30 21:29:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 335676 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 0DBF8C64E7B for ; Mon, 30 Nov 2020 21:30:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95AFC2220B for ; Mon, 30 Nov 2020 21:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388597AbgK3VaP (ORCPT ); Mon, 30 Nov 2020 16:30:15 -0500 Received: from mga03.intel.com ([134.134.136.65]:5349 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388580AbgK3VaP (ORCPT ); Mon, 30 Nov 2020 16:30:15 -0500 IronPort-SDR: VolDcKJMxFZFmNh2cpb4RLMQLigZ+O9YE+vt1/DjVKVWgd/gNqlxmeCgtjBRdviTBtRk0g86wS v7En0Zyn8/KA== X-IronPort-AV: E=McAfee;i="6000,8403,9821"; a="172815009" X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="172815009" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 13:29:19 -0800 IronPort-SDR: anXuyV7rD347FIjLGrOGT5wCuVuhTuX1gDvdUu2tF7gFORV8NW6de3tUpU4rJ85F/fDbrx/n2G YVrUyh0tlyFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="329719695" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by orsmga003.jf.intel.com with ESMTP; 30 Nov 2020 13:29:19 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Mario Limonciello , netdev@vger.kernel.org, sassmann@redhat.com, anthony.l.nguyen@intel.com, sasha.neftin@intel.com, Yijun Shen Subject: [net-next 3/4] e1000e: Add more Dell CML systems into s0ix heuristics Date: Mon, 30 Nov 2020 13:29:06 -0800 Message-Id: <20201130212907.320677-4-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130212907.320677-1-anthony.l.nguyen@intel.com> References: <20201130212907.320677-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mario Limonciello These comet lake systems are not yet released, but have been validated on pre-release hardware. This is being submitted separately from released hardware in case of a regression between pre-release and release hardware so this commit can be reverted alone. Signed-off-by: Mario Limonciello Tested-by: Yijun Shen Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/e1000e/param.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c index d05f55201541..e7b7afc6c74a 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -273,6 +273,27 @@ static const struct dmi_system_id s0ix_supported_systems[] = { DMI_MATCH(DMI_PRODUCT_SKU, "09C4"), }, }, + { + /* Dell Notebook 0x0A40 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "0A40"), + }, + }, + { + /* Dell Notebook 0x0A41 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "0A41"), + }, + }, + { + /* Dell Notebook 0x0A42 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_SKU, "0A42"), + }, + }, { } }; From patchwork Mon Nov 30 21:29:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 335675 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 A90B5C63777 for ; Mon, 30 Nov 2020 21:31:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 603CF20857 for ; Mon, 30 Nov 2020 21:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388661AbgK3Var (ORCPT ); Mon, 30 Nov 2020 16:30:47 -0500 Received: from mga03.intel.com ([134.134.136.65]:5349 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388656AbgK3Vaq (ORCPT ); Mon, 30 Nov 2020 16:30:46 -0500 IronPort-SDR: Kld96QDzPyuivrp8kz4tUc6h+hhh2UHIgOYRZzoXciFfCFE18B8uBDGqcONRP+uMJcOt/gx2di XSBAPTh24Tnw== X-IronPort-AV: E=McAfee;i="6000,8403,9821"; a="172815010" X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="172815010" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 13:29:19 -0800 IronPort-SDR: grxwwvAdLFBuA2v/10jrgtvneM/uhbs76vlGt32jIaCHqxH5qLAJMRWUYAOopsHtVkDbRqgSTD hF0qopGNBhYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="329719697" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by orsmga003.jf.intel.com with ESMTP; 30 Nov 2020 13:29:19 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Vitaly Lifshits , netdev@vger.kernel.org, sassmann@redhat.com, anthony.l.nguyen@intel.com, Aaron Brown Subject: [net-next 4/4] e1000e: fix S0ix flow to allow S0i3.2 subset entry Date: Mon, 30 Nov 2020 13:29:07 -0800 Message-Id: <20201130212907.320677-5-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130212907.320677-1-anthony.l.nguyen@intel.com> References: <20201130212907.320677-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vitaly Lifshits Change configuration in the flows to align with architecture requirements to achieve S0i3.2 substate. Also fix a typo in the previous commit 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case"). Signed-off-by: Vitaly Lifshits Tested-by: Aaron Brown Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/e1000e/netdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index f413b33127f6..4333fec268b0 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6447,13 +6447,13 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) /* Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data |= BIT(28); + mac_data &= ~BIT(28); ew32(FEXTNVM9, mac_data); /* Enable K1 off to enable mPHY Power Gating */ mac_data = er32(FEXTNVM6); mac_data |= BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Enable mPHY power gating for any link and speed */ mac_data = er32(FEXTNVM8); @@ -6497,11 +6497,11 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter) /* Disable K1 off */ mac_data = er32(FEXTNVM6); mac_data &= ~BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Disable Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data &= ~BIT(28); + mac_data |= BIT(28); ew32(FEXTNVM9, mac_data); /* Cancel not waking from dynamic