| Message ID | 20181203055438.363-1-kai.heng.feng@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | igb: Fix an issue that PME is not enabled during runtime suspend | expand |
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Kai-Heng Feng > Sent: Sunday, December 2, 2018 9:55 PM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com> > Cc: netdev@vger.kernel.org; Kai-Heng Feng > <kai.heng.feng@canonical.com>; intel-wired-lan@lists.osuosl.org; > davem@davemloft.net; linux-kernel@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH] igb: Fix an issue that PME is not enabled > during runtime suspend > > I210 ethernet card doesn't wakeup when a cable gets plugged. It's > because its PME is not set. > > Since commit 42eca2302146 ("PCI: Don't touch card regs after runtime > suspend D3"), if the PCI state is saved, pci_pm_runtime_suspend() stops > calling pci_finish_runtime_suspend(), which enables the PCI PME. > > To fix the issue, let's not to save PCI states when it's runtime > suspend, to let the PCI subsytem enables PME. > > Fixes: 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3") > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 5df88ad8ac81..93f150784cfc 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8770,9 +8770,11 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, rtnl_unlock(); #ifdef CONFIG_PM - retval = pci_save_state(pdev); - if (retval) - return retval; + if (!runtime) { + retval = pci_save_state(pdev); + if (retval) + return retval; + } #endif status = rd32(E1000_STATUS);
I210 ethernet card doesn't wakeup when a cable gets plugged. It's because its PME is not set. Since commit 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3"), if the PCI state is saved, pci_pm_runtime_suspend() stops calling pci_finish_runtime_suspend(), which enables the PCI PME. To fix the issue, let's not to save PCI states when it's runtime suspend, to let the PCI subsytem enables PME. Fixes: 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3") Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)