History

Revert "e1000e: Fix possible HW unit hang after an s0ix exit"

This reverts commit 1866aa0d0d6492bc2f8d22d0df49abaccf50cddd. Commit 1866aa0d0d64 ("e1000e: Fix possible HW unit hang after an s0ix exit") was a workaround for CSME problem to handle messages comes via H2ME mailbox. This problem has been fixed by patch "e1000e: Enable the GPT clock before sending message to the CSME".

Sasha Neftin committed 4 years ago

Commit 6cfa4531 parent b49feac4 files · +0 −32Browse files

Unified · Split

4 files
  1. drivers/net/ethernet/intel/e1000e/hw.h +0 −1
  2. drivers/net/ethernet/intel/e1000e/ich8lan.c +0 −4
  3. drivers/net/ethernet/intel/e1000e/ich8lan.h +0 −1
  4. drivers/net/ethernet/intel/e1000e/netdev.c +0 −26
drivers/net/ethernet/intel/e1000e/hw.h+0−1
@@ -630,7 +630,6 @@ struct e1000_phy_info { · 629 unmodified lines
630 bool disable_polarity_correction;630 bool disable_polarity_correction;
631 bool is_mdix;631 bool is_mdix;
632 bool polarity_correction;632 bool polarity_correction;
633 bool reset_disable;
634 bool speed_downgraded;633 bool speed_downgraded;
635 bool autoneg_wait_to_complete;634 bool autoneg_wait_to_complete;
636};635};
drivers/net/ethernet/intel/e1000e/ich8lan.c+0−4
@@ -2050,10 +2050,6 @@ static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw) · 2049 unmodified lines
2050 bool blocked = false;2050 bool blocked = false;
2051 int i = 0;2051 int i = 0;
2052 2052
2053 /* Check the PHY (LCD) reset flag */
2054 if (hw->phy.reset_disable)
2055 return true;
2056
2057 while ((blocked = !(er32(FWSM) & E1000_ICH_FWSM_RSPCIPHY)) &&2053 while ((blocked = !(er32(FWSM) & E1000_ICH_FWSM_RSPCIPHY)) &&
2058 (i++ < 30))2054 (i++ < 30))
2059 usleep_range(10000, 11000);2055 usleep_range(10000, 11000);
drivers/net/ethernet/intel/e1000e/ich8lan.h+0−1
@@ -271,7 +271,6 @@ · 270 unmodified lines
271#define I217_CGFREG_ENABLE_MTA_RESET 0x0002271#define I217_CGFREG_ENABLE_MTA_RESET 0x0002
272#define I217_MEMPWR PHY_REG(772, 26)272#define I217_MEMPWR PHY_REG(772, 26)
273#define I217_MEMPWR_DISABLE_SMB_RELEASE 0x0010273#define I217_MEMPWR_DISABLE_SMB_RELEASE 0x0010
274#define I217_MEMPWR_MOEM 0x1000
275 274
276/* Receive Address Initial CRC Calculation */275/* Receive Address Initial CRC Calculation */
277#define E1000_PCH_RAICC(_n) (0x05F50 + ((_n) * 4))276#define E1000_PCH_RAICC(_n) (0x05F50 + ((_n) * 4))
drivers/net/ethernet/intel/e1000e/netdev.c+0−26
@@ -6991,21 +6991,8 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev) · 6990 unmodified lines
6991 struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));6991 struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
6992 struct e1000_adapter *adapter = netdev_priv(netdev);6992 struct e1000_adapter *adapter = netdev_priv(netdev);
6993 struct pci_dev *pdev = to_pci_dev(dev);6993 struct pci_dev *pdev = to_pci_dev(dev);
6994 struct e1000_hw *hw = &adapter->hw;
6995 u16 phy_data;
6996 int rc;6994 int rc;
6997 6995
6998 if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
6999 hw->mac.type >= e1000_pch_adp) {
7000 /* Mask OEM Bits / Gig Disable / Restart AN (772_26[12] = 1) */
7001 e1e_rphy(hw, I217_MEMPWR, &phy_data);
7002 phy_data |= I217_MEMPWR_MOEM;
7003 e1e_wphy(hw, I217_MEMPWR, phy_data);
7004
7005 /* Disable LCD reset */
7006 hw->phy.reset_disable = true;
7007 }
7008
7009 e1000e_flush_lpic(pdev);6996 e1000e_flush_lpic(pdev);
7010 6997
7011 e1000e_pm_freeze(dev);6998 e1000e_pm_freeze(dev);
@@ -7027,8 +7014,6 @@ static __maybe_unused int e1000e_pm_resume(struct device *dev) · 15 unmodified lines
7027 struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));7014 struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
7028 struct e1000_adapter *adapter = netdev_priv(netdev);7015 struct e1000_adapter *adapter = netdev_priv(netdev);
7029 struct pci_dev *pdev = to_pci_dev(dev);7016 struct pci_dev *pdev = to_pci_dev(dev);
7030 struct e1000_hw *hw = &adapter->hw;
7031 u16 phy_data;
7032 int rc;7017 int rc;
7033 7018
7034 /* Introduce S0ix implementation */7019 /* Introduce S0ix implementation */
@@ -7039,17 +7024,6 @@ static __maybe_unused int e1000e_pm_resume(struct device *dev) · 4 unmodified lines
7039 if (rc)7024 if (rc)
7040 return rc;7025 return rc;
7041 7026
7042 if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
7043 hw->mac.type >= e1000_pch_adp) {
7044 /* Unmask OEM Bits / Gig Disable / Restart AN 772_26[12] = 0 */
7045 e1e_rphy(hw, I217_MEMPWR, &phy_data);
7046 phy_data &= ~I217_MEMPWR_MOEM;
7047 e1e_wphy(hw, I217_MEMPWR, phy_data);
7048
7049 /* Enable LCD reset */
7050 hw->phy.reset_disable = false;
7051 }
7052
7053 return e1000e_pm_thaw(dev);7027 return e1000e_pm_thaw(dev);
7054}7028}
7055 7029

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t