@@ -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
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */
-#include <linux/dmi.h>
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -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;
}
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 <aaron.ma@canonical.com> --- drivers/net/ethernet/intel/Kconfig | 1 - drivers/net/ethernet/intel/e1000e/param.c | 80 +---------------------- 2 files changed, 1 insertion(+), 80 deletions(-)