| @@ -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 | |