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,
Vitaly Lifshits <vitaly.lifshits@intel.com>
Subject: [PATCH v2 1/5] e1000e: fix S0ix flow to allow S0i3.2 subset entry
Date: Wed, 2 Dec 2020 10:17:44 -0600 [thread overview]
Message-ID: <20201202161748.128938-2-mario.limonciello@dell.com> (raw)
In-Reply-To: <20201202161748.128938-1-mario.limonciello@dell.com>
From: Vitaly Lifshits <vitaly.lifshits@intel.com>
Changed a configuration in the flows to align with
architecture requirements to achieve S0i3.2 substate.
Also fixed a typo in the previous commit 632fbd5eb5b0
("e1000e: fix S0ix flows for cable connected case").
Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.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.25.1
next prev parent reply other threads:[~2020-12-02 16:19 UTC|newest]
Thread overview: 9+ 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 ` Mario Limonciello [this message]
2020-12-02 20:10 ` [PATCH v2 1/5] e1000e: fix S0ix flow to allow S0i3.2 subset entry 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 ` [PATCH v2 3/5] e1000e: Add Dell's Comet Lake systems into s0ix heuristics Mario Limonciello
2020-12-02 16:17 ` [PATCH v2 4/5] e1000e: Add more Dell CML " 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
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-2-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 \
--cc=vitaly.lifshits@intel.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;
as well as URLs for NNTP newsgroup(s).