From patchwork Mon Jan 11 08:01:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 1424449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDmPz15G2z9sW8; Mon, 11 Jan 2021 19:01:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kys9D-0005Ta-TB; Mon, 11 Jan 2021 08:01:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kys9C-0005Sc-2v for kernel-team@lists.ubuntu.com; Mon, 11 Jan 2021 08:01:54 +0000 Received: from [222.129.36.158] (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 1kys9A-0007e8-Ui for kernel-team@lists.ubuntu.com; Mon, 11 Jan 2021 08:01:53 +0000 From: Aaron Ma To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/9][U/OEM-5.10] Revert "UBUNTU: SAUCE: e1000e: Add Dell's Comet Lake systems into s0ix heuristics" Date: Mon, 11 Jan 2021 16:01:27 +0800 Message-Id: <20210111080132.622317-5-aaron.ma@canonical.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210111080132.622317-1-aaron.ma@canonical.com> References: <20210111080132.622317-1-aaron.ma@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1910541 This reverts commit 5fa550a99a4e2c9c894a64da4dbc8510ee7c9c5c. Formally enable s0ix for all platform, then we can remove quirks that enable s0ix on the specific platform. Signed-off-by: Aaron Ma --- drivers/net/ethernet/intel/Kconfig | 1 - drivers/net/ethernet/intel/e1000e/param.c | 80 +---------------------- 2 files changed, 1 insertion(+), 80 deletions(-) diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 280af47d74d2..5aa86318ed3e 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -58,7 +58,6 @@ 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 58e6718c4f75..e66b222c824b 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 1999 - 2018 Intel Corporation. */ -#include #include #include #include @@ -202,80 +201,6 @@ 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; @@ -674,11 +599,8 @@ 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 */ - else if (e1000e_check_me(hw->adapter->pdev->device)) + if (e1000e_check_me(hw->adapter->pdev->device)) enabled = S0IX_FORCE_OFF; }