Hi, > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of > Chaitanya Kumar Borah > Sent: Monday, 10 June 2024 10.46 > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@xxxxxxxxx> > Subject: [core-for-CI PATCH] Revert "e1000e: move force SMBUS near the end > of enable_ulp function" > > This reverts commit bfd546a552e140b0a4c8a21527c39d6d21addb28. > > The commit seems to cause problems in suspend-resume tests > > [212.204897] e1000e 0000:00:1f.6: PM: pci_pm_suspend(): > e1000e_pm_suspend [e1000e] returns -2 [212.204928] e1000e 0000:00:1f.6: > PM: dpm_run_callback(): pci_pm_suspend returns -2 [212.204943] e1000e > 0000:00:1f.6: PM: failed to suspend async: error -2 [212.205092] PM: suspend > of devices aborted after 302.254 msecs > > References: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14904/shard- > dg2-4/igt@gem_ccs@suspend-resume@linear-compressed-compfmt0- > lmem0-lmem0.html > References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11305 > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@xxxxxxxxx> Acked-By: Jani Saarinen <jani.saarinen@xxxxxxxxx> We have already trybot results from revert https://patchwork.freedesktop.org/series/134603/#rev2 / https://intel-gfx-ci.01.org/tree/drm-tip/Trybot_134603v2/index.html?testfilter=suspend So helps on these. Let's get this merged asap. Br, Jani > --- > drivers/net/ethernet/intel/e1000e/ich8lan.c | 22 --------------------- > drivers/net/ethernet/intel/e1000e/netdev.c | 18 +++++++++++++++++ > 2 files changed, 18 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c > b/drivers/net/ethernet/intel/e1000e/ich8lan.c > index 2e98a2a0bead..f9e94be36e97 100644 > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c > @@ -1225,28 +1225,6 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw > *hw, bool to_sx) > } > > release: > - /* Switching PHY interface always returns MDI error > - * so disable retry mechanism to avoid wasting time > - */ > - e1000e_disable_phy_retry(hw); > - > - /* Force SMBus mode in PHY */ > - ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, > &phy_reg); > - if (ret_val) { > - e1000e_enable_phy_retry(hw); > - hw->phy.ops.release(hw); > - goto out; > - } > - phy_reg |= CV_SMB_CTRL_FORCE_SMBUS; > - e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, phy_reg); > - > - e1000e_enable_phy_retry(hw); > - > - /* Force SMBus mode in MAC */ > - mac_reg = er32(CTRL_EXT); > - mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS; > - ew32(CTRL_EXT, mac_reg); > - > hw->phy.ops.release(hw); > out: > if (ret_val) > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c > b/drivers/net/ethernet/intel/e1000e/netdev.c > index da5c59daf8ba..220d62fca55d 100644 > --- a/drivers/net/ethernet/intel/e1000e/netdev.c > +++ b/drivers/net/ethernet/intel/e1000e/netdev.c > @@ -6623,6 +6623,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, > bool runtime) > struct e1000_hw *hw = &adapter->hw; > u32 ctrl, ctrl_ext, rctl, status, wufc; > int retval = 0; > + u16 smb_ctrl; > > /* Runtime suspend should only enable wakeup for link changes */ > if (runtime) > @@ -6696,6 +6697,23 @@ static int __e1000_shutdown(struct pci_dev > *pdev, bool runtime) > if (retval) > return retval; > } > + > + /* Force SMBUS to allow WOL */ > + /* Switching PHY interface always returns MDI error > + * so disable retry mechanism to avoid wasting time > + */ > + e1000e_disable_phy_retry(hw); > + > + e1e_rphy(hw, CV_SMB_CTRL, &smb_ctrl); > + smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS; > + e1e_wphy(hw, CV_SMB_CTRL, smb_ctrl); > + > + e1000e_enable_phy_retry(hw); > + > + /* Force SMBus mode in MAC */ > + ctrl_ext = er32(CTRL_EXT); > + ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS; > + ew32(CTRL_EXT, ctrl_ext); > } > > /* Ensure that the appropriate bits are set in LPI_CTRL > -- > 2.25.1
