From: Mario Limonciello <mario.limonciello@dell.com>
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
intel-wired-lan@lists.osuosl.org
Cc: linux-kernel@vger.kernel.org, Linux PM <linux-pm@vger.kernel.org>,
Netdev <netdev@vger.kernel.org>,
Alexander Duyck <alexander.duyck@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Sasha Netfin <sasha.neftin@intel.com>,
Aaron Brown <aaron.f.brown@intel.com>,
Stefan Assmann <sassmann@redhat.com>,
David Miller <davem@davemloft.net>,
darcari@redhat.com, Yijun.Shen@dell.com, Perry.Yuan@dell.com,
Mario Limonciello <mario.limonciello@dell.com>,
Yijun Shen <yijun.shen@dell.com>
Subject: [PATCH v2 3/5] e1000e: Add Dell's Comet Lake systems into s0ix heuristics
Date: Wed, 2 Dec 2020 10:17:46 -0600 [thread overview]
Message-ID: <20201202161748.128938-4-mario.limonciello@dell.com> (raw)
In-Reply-To: <20201202161748.128938-1-mario.limonciello@dell.com>
Dell's Comet Lake Latitude and Precision systems containing i219LM are
properly configured and should use the s0ix flows.
Tested-by: Yijun Shen <yijun.shen@dell.com>
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
---
drivers/net/ethernet/intel/e1000e/s0ix.c | 33 +++++++++++++++++++++---
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/s0ix.c b/drivers/net/ethernet/intel/e1000e/s0ix.c
index c3013edbd9e4..74043e80c32f 100644
--- a/drivers/net/ethernet/intel/e1000e/s0ix.c
+++ b/drivers/net/ethernet/intel/e1000e/s0ix.c
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 1999 - 2018 Intel Corporation. */
+/* Copyright(c) 1999 - 2018 Intel Corporation.
+ * Copyright(c) 2020 Dell Inc.
+ */
#include <linux/netdevice.h>
@@ -44,6 +46,26 @@ static bool e1000e_check_me(u16 device_id)
return false;
}
+static bool e1000e_check_subsystem_allowlist(struct pci_dev *dev)
+{
+ if (dev->subsystem_vendor == PCI_VENDOR_ID_DELL) {
+ switch (dev->subsystem_device) {
+ case 0x099f: /* Latitude 5310 */
+ case 0x09a0: /* Latitude 5410 */
+ case 0x09c9: /* Latitude 5410 */
+ case 0x09a1: /* Latitude 5510 */
+ case 0x09a2: /* Precision 3550 */
+ case 0x09c0: /* Latitude 5411 */
+ case 0x09c1: /* Latitude 5511 */
+ case 0x09c2: /* Precision 3551 */
+ case 0x09c3: /* Precision 7550 */
+ case 0x09c4: /* Precision 7750 */
+ return true;
+ }
+ }
+ return false;
+}
+
void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
@@ -273,8 +295,11 @@ void e1000e_maybe_enable_s0ix(struct e1000_adapter *adapter)
/* require cannon point or later */
if (hw->mac.type < e1000_pch_cnp)
return;
- /* turn off on ME configurations */
- if (e1000e_check_me(pdev->device))
- return;
+ /* check for allowlist of systems */
+ if (!e1000e_check_subsystem_allowlist(pdev)) {
+ /* turn off on ME configurations */
+ if (e1000e_check_me(pdev->device))
+ return;
+ }
adapter->flags2 |= FLAG2_ENABLE_S0IX_FLOWS;
}
--
2.25.1
next prev parent reply other threads:[~2020-12-02 16:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 16:17 [PATCH v2 0/5] Improve s0ix flows for systems i219LM Mario Limonciello
2020-12-02 16:17 ` [PATCH v2 1/5] e1000e: fix S0ix flow to allow S0i3.2 subset entry Mario Limonciello
2020-12-02 20:10 ` Bjorn Helgaas
2020-12-02 16:17 ` [PATCH v2 2/5] e1000e: Move all s0ix related code into it's own source file Mario Limonciello
2020-12-02 20:11 ` Bjorn Helgaas
2020-12-02 16:17 ` Mario Limonciello [this message]
2020-12-02 16:17 ` [PATCH v2 4/5] e1000e: Add more Dell CML systems into s0ix heuristics Mario Limonciello
2020-12-02 20:12 ` Bjorn Helgaas
2020-12-02 16:17 ` [PATCH v2 5/5] e1000e: Export s0ix flags to ethtool Mario Limonciello
2020-12-02 19:06 ` [PATCH v2 0/5] Improve s0ix flows for systems i219LM Jakub Kicinski
2020-12-02 19:24 ` Limonciello, Mario
2020-12-02 20:14 ` Bjorn Helgaas
2020-12-02 20:23 ` Limonciello, Mario
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201202161748.128938-4-mario.limonciello@dell.com \
--to=mario.limonciello@dell.com \
--cc=Perry.Yuan@dell.com \
--cc=Yijun.Shen@dell.com \
--cc=aaron.f.brown@intel.com \
--cc=alexander.duyck@gmail.com \
--cc=anthony.l.nguyen@intel.com \
--cc=darcari@redhat.com \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sasha.neftin@intel.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox