From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com
Cc: sasha.neftin@intel.com, acelan.kao@canonical.com,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] Revert "e1000e: Add polling mechanism to indicate CSME DPG exit"
Date: Tue, 23 Nov 2021 00:19:26 +0800 [thread overview]
Message-ID: <20211122161927.874291-2-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20211122161927.874291-1-kai.heng.feng@canonical.com>
This reverts commit ef407b86d3cc7ab7ad37658c1c7a094cb8f3b6b4.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=214821
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/net/ethernet/intel/e1000e/ich8lan.h | 1 -
drivers/net/ethernet/intel/e1000e/netdev.c | 24 ---------------------
drivers/net/ethernet/intel/e1000e/regs.h | 1 -
3 files changed, 26 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h
index 2504b11c3169f..1dfa1d28dae64 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.h
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h
@@ -41,7 +41,6 @@
#define E1000_FWSM_WLOCK_MAC_MASK 0x0380
#define E1000_FWSM_WLOCK_MAC_SHIFT 7
#define E1000_FWSM_ULP_CFG_DONE 0x00000400 /* Low power cfg done */
-#define E1000_EXFWSM_DPG_EXIT_DONE 0x00000001
/* Shared Receive Address Registers */
#define E1000_SHRAL_PCH_LPT(_i) (0x05408 + ((_i) * 8))
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index e16b7c0d98089..242314809e59c 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6483,10 +6483,8 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter)
static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
- bool firmware_bug = false;
u32 mac_data;
u16 phy_data;
- u32 i = 0;
if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {
/* Request ME unconfigure the device from S0ix */
@@ -6494,28 +6492,6 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter)
mac_data &= ~E1000_H2ME_START_DPG;
mac_data |= E1000_H2ME_EXIT_DPG;
ew32(H2ME, mac_data);
-
- /* Poll up to 2.5 seconds for ME to unconfigure DPG.
- * If this takes more than 1 second, show a warning indicating a
- * firmware bug
- */
- while (!(er32(EXFWSM) & E1000_EXFWSM_DPG_EXIT_DONE)) {
- if (i > 100 && !firmware_bug)
- firmware_bug = true;
-
- if (i++ == 250) {
- e_dbg("Timeout (firmware bug): %d msec\n",
- i * 10);
- break;
- }
-
- usleep_range(10000, 11000);
- }
- if (firmware_bug)
- e_warn("DPG_EXIT_DONE took %d msec. This is a firmware bug\n",
- i * 10);
- else
- e_dbg("DPG_EXIT_DONE cleared after %d msec\n", i * 10);
} else {
/* Request driver unconfigure the device from S0ix */
diff --git a/drivers/net/ethernet/intel/e1000e/regs.h b/drivers/net/ethernet/intel/e1000e/regs.h
index 6c0cd8cab3ef2..8165ba2619a4d 100644
--- a/drivers/net/ethernet/intel/e1000e/regs.h
+++ b/drivers/net/ethernet/intel/e1000e/regs.h
@@ -213,7 +213,6 @@
#define E1000_FACTPS 0x05B30 /* Function Active and Power State to MNG */
#define E1000_SWSM 0x05B50 /* SW Semaphore */
#define E1000_FWSM 0x05B54 /* FW Semaphore */
-#define E1000_EXFWSM 0x05B58 /* Extended FW Semaphore */
/* Driver-only SW semaphore (not used by BOOT agents) */
#define E1000_SWSM2 0x05B58
#define E1000_FFLT_DBG 0x05F04 /* Debug Register */
--
2.32.0
next prev parent reply other threads:[~2021-11-22 16:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 16:19 [PATCH 1/3] Revert "e1000e: Additional PHY power saving in S0ix" Kai-Heng Feng
2021-11-22 16:19 ` Kai-Heng Feng [this message]
2021-11-22 16:19 ` [PATCH 3/3] Revert "e1000e: Add handshake with the CSME to support S0ix" Kai-Heng Feng
2021-11-28 13:23 ` Sasha Neftin
2021-11-30 15:52 ` [External] " Mark Pearson
2021-12-01 16:38 ` Ruinskiy, Dima
2021-12-01 19:00 ` Mark Pearson
[not found] ` <14e6c86d-0764-ceaf-4244-fcbf2c2dc23e@intel.com>
2021-11-24 6:34 ` [Intel-wired-lan] [PATCH 1/3] Revert "e1000e: Additional PHY power saving in S0ix" Kai-Heng Feng
2021-11-28 12:33 ` Sasha Neftin
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=20211122161927.874291-2-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=acelan.kao@canonical.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sasha.neftin@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).