[PATCH 1/4] UBUNTU: SAUCE: e1000e: fix S0ix flow to allow S0i3.2 subset entry
Timo Aaltonen
tjaalton at ubuntu.com
Tue Nov 3 10:31:14 UTC 2020
From: Vitaly Lifshits <vitaly.lifshits at intel.com>
BugLink: https://bugs.launchpad.net/bugs/1902687
Changed a configuration in the flows to align with
architecture requirements to achieve S0i3.2 substate.
Also fixed a typo in the previous patch- e1000e: fix S0ix flows for
cable connected case (632fbd5eb5b).
Signed-off-by: Vitaly Lifshits <vitaly.lifshits at intel.com>
Tested-by: Aaron Brown <aaron.f.brown at intel.com>
Tested-by: Aaron Brown <aaron.f.brown at intel.com>
Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index b30f00891c03..128ab6898070 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6475,13 +6475,13 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter)
/* Ungate PGCB clock */
mac_data = er32(FEXTNVM9);
- mac_data |= BIT(28);
+ mac_data &= ~BIT(28);
ew32(FEXTNVM9, mac_data);
/* Enable K1 off to enable mPHY Power Gating */
mac_data = er32(FEXTNVM6);
mac_data |= BIT(31);
- ew32(FEXTNVM12, mac_data);
+ ew32(FEXTNVM6, mac_data);
/* Enable mPHY power gating for any link and speed */
mac_data = er32(FEXTNVM8);
@@ -6525,11 +6525,11 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter)
/* Disable K1 off */
mac_data = er32(FEXTNVM6);
mac_data &= ~BIT(31);
- ew32(FEXTNVM12, mac_data);
+ ew32(FEXTNVM6, mac_data);
/* Disable Ungate PGCB clock */
mac_data = er32(FEXTNVM9);
- mac_data &= ~BIT(28);
+ mac_data |= BIT(28);
ew32(FEXTNVM9, mac_data);
/* Cancel not waking from dynamic
--
2.27.0
More information about the kernel-team
mailing list