| Message ID | 20210111080132.622317-1-aaron.ma@canonical.com |
|---|---|
| Headers | show |
| Series | re-enable s0ix of e1000e | expand |
On Mon, Jan 11, 2021 at 04:01:23PM +0800, Aaron Ma wrote:
> BugLink: https://bugs.launchpad.net/bugs/1910541
On 11.01.21 09:01, Aaron Ma wrote: > BugLink: https://bugs.launchpad.net/bugs/1910541 > > [Impact] > Due to s2idle failure on e1000e driver in ME enabled system, it disabled > s0ix. > Finally latest kernel accepted the bump up timeout value to fixed the > issue. > s0ix can be supported again. > > [Fix] > Rebase the sauce patch to upstream patch, then support s0ix of e1000e. > > [Test Case] > s2idle can work normally on ME enabled platform. > > [Where problems could occur] > s2idle may fail to suspend on 2nd times. > > These patches are trying to revert the disabled s0ix patch in 5.8+, > no need for 5.7- kernels. > > Aaron Ma (5): > Revert "UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME > un-configure ULP mode" > Revert "UBUNTU: SAUCE: e1000e: Add more Dell AIO systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: Add more Dell CML systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: Add Dell's Comet Lake systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: allow turning s0ix flows on for systems > with ME" > > Mario Limonciello (4): > e1000e: Only run S0ix flows if shutdown succeeded > e1000e: bump up timeout to wait when ME un-configures ULP mode > Revert "e1000e: disable s0ix entry and exit flows for ME systems" > e1000e: Export S0ix flags to ethtool > > .../device_drivers/ethernet/intel/e1000e.rst | 23 -- > drivers/net/ethernet/intel/Kconfig | 1 - > drivers/net/ethernet/intel/e1000e/e1000.h | 6 - > drivers/net/ethernet/intel/e1000e/ethtool.c | 46 ++++ > drivers/net/ethernet/intel/e1000e/ich8lan.c | 15 +- > drivers/net/ethernet/intel/e1000e/netdev.c | 47 +--- > drivers/net/ethernet/intel/e1000e/param.c | 237 ------------------ > 7 files changed, 69 insertions(+), 306 deletions(-) > Concentrating on the Groovy changes from my side. So this looks to replace a special solution by upstream changes which is always good. Question on testing: Did we double check that this did not re-introduce the power consumption issues on at least one of the previously affected platforms? Other question: Is the groovy version of user-space ethtool able to handle the additional flag? If both is looking good: Acked-by: Stefan Bader <stefan.bader@canonical.com> -Stefan
On 1/19/21 6:46 PM, Stefan Bader wrote: > On 11.01.21 09:01, Aaron Ma wrote: >> BugLink: https://bugs.launchpad.net/bugs/1910541 >> >> [Impact] >> Due to s2idle failure on e1000e driver in ME enabled system, it disabled >> s0ix. >> Finally latest kernel accepted the bump up timeout value to fixed the >> issue. >> s0ix can be supported again. >> >> [Fix] >> Rebase the sauce patch to upstream patch, then support s0ix of e1000e. >> >> [Test Case] >> s2idle can work normally on ME enabled platform. >> >> [Where problems could occur] >> s2idle may fail to suspend on 2nd times. >> >> These patches are trying to revert the disabled s0ix patch in 5.8+, >> no need for 5.7- kernels. >> >> Aaron Ma (5): >> Revert "UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME >> un-configure ULP mode" >> Revert "UBUNTU: SAUCE: e1000e: Add more Dell AIO systems into s0ix >> heuristics" >> Revert "UBUNTU: SAUCE: e1000e: Add more Dell CML systems into s0ix >> heuristics" >> Revert "UBUNTU: SAUCE: e1000e: Add Dell's Comet Lake systems into s0ix >> heuristics" >> Revert "UBUNTU: SAUCE: e1000e: allow turning s0ix flows on for systems >> with ME" >> >> Mario Limonciello (4): >> e1000e: Only run S0ix flows if shutdown succeeded >> e1000e: bump up timeout to wait when ME un-configures ULP mode >> Revert "e1000e: disable s0ix entry and exit flows for ME systems" >> e1000e: Export S0ix flags to ethtool >> >> .../device_drivers/ethernet/intel/e1000e.rst | 23 -- >> drivers/net/ethernet/intel/Kconfig | 1 - >> drivers/net/ethernet/intel/e1000e/e1000.h | 6 - >> drivers/net/ethernet/intel/e1000e/ethtool.c | 46 ++++ >> drivers/net/ethernet/intel/e1000e/ich8lan.c | 15 +- >> drivers/net/ethernet/intel/e1000e/netdev.c | 47 +--- >> drivers/net/ethernet/intel/e1000e/param.c | 237 ------------------ >> 7 files changed, 69 insertions(+), 306 deletions(-) >> > Concentrating on the Groovy changes from my side. So this looks to replace a > special solution by upstream changes which is always good. Question on testing: > Did we double check that this did not re-introduce the power consumption issues > on at least one of the previously affected platforms? > Other question: Is the groovy version of user-space ethtool able to handle the > additional flag? > Tested on 2 ThinkPads, the power consumption is same as before. Yes, output from ethtool show a private flag like following: $ sudo ethtool -i enp0s31f6 driver: e1000e version: 5.10.4+ firmware-version: 0.5-4 expansion-rom-version: bus-info: 0000:00:1f.6 supports-statistics: yes supports-test: yes supports-eeprom-access: yes supports-register-dump: yes supports-priv-flags: yes Regards, Aaron > > If both is looking good: Acked-by: Stefan Bader <stefan.bader@canonical.com> > -Stefan >
Applied to Groovy/master-next. thank you! Acked-by: Kelsey Skunberg <kelsey.skunberg@canonical.com> On 2021-01-11 16:01:23 , Aaron Ma wrote: > BugLink: https://bugs.launchpad.net/bugs/1910541 > > [Impact] > Due to s2idle failure on e1000e driver in ME enabled system, it disabled > s0ix. > Finally latest kernel accepted the bump up timeout value to fixed the > issue. > s0ix can be supported again. > > [Fix] > Rebase the sauce patch to upstream patch, then support s0ix of e1000e. > > [Test Case] > s2idle can work normally on ME enabled platform. > > [Where problems could occur] > s2idle may fail to suspend on 2nd times. > > These patches are trying to revert the disabled s0ix patch in 5.8+, > no need for 5.7- kernels. > > Aaron Ma (5): > Revert "UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME > un-configure ULP mode" > Revert "UBUNTU: SAUCE: e1000e: Add more Dell AIO systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: Add more Dell CML systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: Add Dell's Comet Lake systems into s0ix > heuristics" > Revert "UBUNTU: SAUCE: e1000e: allow turning s0ix flows on for systems > with ME" > > Mario Limonciello (4): > e1000e: Only run S0ix flows if shutdown succeeded > e1000e: bump up timeout to wait when ME un-configures ULP mode > Revert "e1000e: disable s0ix entry and exit flows for ME systems" > e1000e: Export S0ix flags to ethtool > > .../device_drivers/ethernet/intel/e1000e.rst | 23 -- > drivers/net/ethernet/intel/Kconfig | 1 - > drivers/net/ethernet/intel/e1000e/e1000.h | 6 - > drivers/net/ethernet/intel/e1000e/ethtool.c | 46 ++++ > drivers/net/ethernet/intel/e1000e/ich8lan.c | 15 +- > drivers/net/ethernet/intel/e1000e/netdev.c | 47 +--- > drivers/net/ethernet/intel/e1000e/param.c | 237 ------------------ > 7 files changed, 69 insertions(+), 306 deletions(-) > > -- > 2.28.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
BugLink: https://bugs.launchpad.net/bugs/1910541 [Impact] Due to s2idle failure on e1000e driver in ME enabled system, it disabled s0ix. Finally latest kernel accepted the bump up timeout value to fixed the issue. s0ix can be supported again. [Fix] Rebase the sauce patch to upstream patch, then support s0ix of e1000e. [Test Case] s2idle can work normally on ME enabled platform. [Where problems could occur] s2idle may fail to suspend on 2nd times. These patches are trying to revert the disabled s0ix patch in 5.8+, no need for 5.7- kernels. Aaron Ma (5): Revert "UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME un-configure ULP mode" Revert "UBUNTU: SAUCE: e1000e: Add more Dell AIO systems into s0ix heuristics" Revert "UBUNTU: SAUCE: e1000e: Add more Dell CML systems into s0ix heuristics" Revert "UBUNTU: SAUCE: e1000e: Add Dell's Comet Lake systems into s0ix heuristics" Revert "UBUNTU: SAUCE: e1000e: allow turning s0ix flows on for systems with ME" Mario Limonciello (4): e1000e: Only run S0ix flows if shutdown succeeded e1000e: bump up timeout to wait when ME un-configures ULP mode Revert "e1000e: disable s0ix entry and exit flows for ME systems" e1000e: Export S0ix flags to ethtool .../device_drivers/ethernet/intel/e1000e.rst | 23 -- drivers/net/ethernet/intel/Kconfig | 1 - drivers/net/ethernet/intel/e1000e/e1000.h | 6 - drivers/net/ethernet/intel/e1000e/ethtool.c | 46 ++++ drivers/net/ethernet/intel/e1000e/ich8lan.c | 15 +- drivers/net/ethernet/intel/e1000e/netdev.c | 47 +--- drivers/net/ethernet/intel/e1000e/param.c | 237 ------------------ 7 files changed, 69 insertions(+), 306 deletions(-)