* [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th
@ 2020-03-19 5:26 Kai-Heng Feng
2020-03-22 0:10 ` [Intel-wired-lan] " Tsai, Rex
2020-04-20 20:27 ` Brown, Aaron F
0 siblings, 2 replies; 4+ messages in thread
From: Kai-Heng Feng @ 2020-03-19 5:26 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Kai-Heng Feng, David S. Miller,
moderated list:INTEL ETHERNET DRIVERS,
open list:NETWORKING DRIVERS, open list
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/019222.html
BugLink: https://bugs.launchpad.net/bugs/1865570
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
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 <linux/pm_runtime.h>
#include <linux/aer.h>
#include <linux/prefetch.h>
+#include <linux/dmi.h>
#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
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th
2020-03-19 5:26 [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th Kai-Heng Feng
@ 2020-03-22 0:10 ` Tsai, Rex
2020-04-20 20:27 ` Brown, Aaron F
1 sibling, 0 replies; 4+ messages in thread
From: Tsai, Rex @ 2020-03-22 0:10 UTC (permalink / raw)
To: Kai-Heng Feng
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 <intel-wired-lan-bounces@osuosl.org> On Behalf Of Kai-Heng Feng
Sent: Wednesday, March 18, 2020 10:26 PM
To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
Cc: open list:NETWORKING DRIVERS <netdev@vger.kernel.org>; Kai-Heng Feng <kai.heng.feng@canonical.com>; moderated list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; David S. Miller <davem@davemloft.net>; open list <linux-kernel@vger.kernel.org>
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 <kai.heng.feng@canonical.com>
---
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 <linux/pm_runtime.h>
#include <linux/aer.h>
#include <linux/prefetch.h>
+#include <linux/dmi.h>
#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
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th
2020-03-19 5:26 [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th Kai-Heng Feng
2020-03-22 0:10 ` [Intel-wired-lan] " Tsai, Rex
@ 2020-04-20 20:27 ` Brown, Aaron F
2020-04-21 4:50 ` Kai-Heng Feng
1 sibling, 1 reply; 4+ messages in thread
From: Brown, Aaron F @ 2020-04-20 20:27 UTC (permalink / raw)
To: Kai-Heng Feng, Kirsher, Jeffrey T
Cc: open list:NETWORKING DRIVERS,
moderated list:INTEL ETHERNET DRIVERS, David S. Miller,
open list
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Kai-
> Heng Feng
> Sent: Wednesday, March 18, 2020 10:26 PM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Cc: open list:NETWORKING DRIVERS <netdev@vger.kernel.org>; Kai-Heng Feng
> <kai.heng.feng@canonical.com>; moderated list:INTEL ETHERNET DRIVERS
> <intel-wired-lan@lists.osuosl.org>; David S. Miller <davem@davemloft.net>;
> open list <linux-kernel@vger.kernel.org>
> 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/019222.html
> BugLink: https://bugs.launchpad.net/bugs/1865570
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
I do not have access to the "X1 Carbon 7th" this patch targets, but from a regression perspective against a number of other e1000e based parts:
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th
2020-04-20 20:27 ` Brown, Aaron F
@ 2020-04-21 4:50 ` Kai-Heng Feng
0 siblings, 0 replies; 4+ messages in thread
From: Kai-Heng Feng @ 2020-04-21 4:50 UTC (permalink / raw)
To: Brown, Aaron F
Cc: Kirsher, Jeffrey T, open list:NETWORKING DRIVERS,
moderated list:INTEL ETHERNET DRIVERS, David S. Miller,
open list
Hi,
> On Apr 21, 2020, at 04:27, Brown, Aaron F <aaron.f.brown@intel.com> wrote:
>
>> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Kai-
>> Heng Feng
>> Sent: Wednesday, March 18, 2020 10:26 PM
>> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
>> Cc: open list:NETWORKING DRIVERS <netdev@vger.kernel.org>; Kai-Heng Feng
>> <kai.heng.feng@canonical.com>; moderated list:INTEL ETHERNET DRIVERS
>> <intel-wired-lan@lists.osuosl.org>; David S. Miller <davem@davemloft.net>;
>> open list <linux-kernel@vger.kernel.org>
>> 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/019222.html
>> BugLink: https://bugs.launchpad.net/bugs/1865570
>> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
>> ---
>> drivers/net/ethernet/intel/e1000e/netdev.c | 16 ++++++++++++++--
>> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> I do not have access to the "X1 Carbon 7th" this patch targets, but from a regression perspective against a number of other e1000e based parts:
This patch can be superseded by "e1000e: bump up timeout to wait when ME un-configure ULP mode".
So it's better to drop this patch in favor of a more generic solution.
Kai-Heng
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-21 4:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-19 5:26 [PATCH 1/1] e1000e: Disable s0ix flow for X1 Carbon 7th Kai-Heng Feng
2020-03-22 0:10 ` [Intel-wired-lan] " Tsai, Rex
2020-04-20 20:27 ` Brown, Aaron F
2020-04-21 4:50 ` Kai-Heng Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).