| Message ID | 20210322071448.12023-1-yongxin.liu@windriver.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ixgbe: fix unbalanced device enable/disable in suspend/resume | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
| netdev/kdoc | success | Errors and warnings before: 2 this patch: 2 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/header_inline | success | Link |
>-----Original Message----- >From: Yongxin Liu <yongxin.liu@windriver.com> >Sent: Monday, March 22, 2021 12:15 AM >To: vaibhavgupta40@gmail.com; andrewx.bowers@intel.com; Nguyen, Anthony >L <anthony.l.nguyen@intel.com> >Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; >davem@davemloft.net; Brandeburg, Jesse <jesse.brandeburg@intel.com>; intel- >wired-lan@lists.osuosl.org; kuba@kernel.org >Subject: [PATCH net] ixgbe: fix unbalanced device enable/disable in >suspend/resume > >pci_disable_device() called in __ixgbe_shutdown() decreases >dev->enable_cnt by 1. pci_enable_device_mem() which increases enable_cnt >dev->by 1, was removed from ixgbe_resume() in commit >6f82b2558735 ("ixgbe: use generic power management"). This caused >unbalanced increase/decrease. So add pci_enable_device_mem() back. > >Fix the following call trace. > > ixgbe 0000:17:00.1: disabling already-disabled device > Call Trace: > __ixgbe_shutdown+0x10a/0x1e0 [ixgbe] > ixgbe_suspend+0x32/0x70 [ixgbe] > pci_pm_suspend+0x87/0x160 > ? pci_pm_freeze+0xd0/0xd0 > dpm_run_callback+0x42/0x170 > __device_suspend+0x114/0x460 > async_suspend+0x1f/0xa0 > async_run_entry_fn+0x3c/0xf0 > process_one_work+0x1dd/0x410 > worker_thread+0x34/0x3f0 > ? cancel_delayed_work+0x90/0x90 > kthread+0x14c/0x170 > ? kthread_park+0x90/0x90 > ret_from_fork+0x1f/0x30 > >Fixes: 6f82b2558735 ("ixgbe: use generic power management") >Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> >--- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++++ > 1 file changed, 5 insertions(+) > Tested-by: Dave Switzer <david.switzer@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 9f3f12e2ccf2..b0a8f7a43f06 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -6891,6 +6891,11 @@ static int __maybe_unused ixgbe_resume(struct device *dev_d) adapter->hw.hw_addr = adapter->io_addr; + err = pci_enable_device_mem(pdev); + if (err) { + e_dev_err("Cannot enable PCI device from suspend\n"); + return err; + } smp_mb__before_atomic(); clear_bit(__IXGBE_DISABLED, &adapter->state); pci_set_master(pdev);
pci_disable_device() called in __ixgbe_shutdown() decreases dev->enable_cnt by 1. pci_enable_device_mem() which increases dev->enable_cnt by 1, was removed from ixgbe_resume() in commit 6f82b2558735 ("ixgbe: use generic power management"). This caused unbalanced increase/decrease. So add pci_enable_device_mem() back. Fix the following call trace. ixgbe 0000:17:00.1: disabling already-disabled device Call Trace: __ixgbe_shutdown+0x10a/0x1e0 [ixgbe] ixgbe_suspend+0x32/0x70 [ixgbe] pci_pm_suspend+0x87/0x160 ? pci_pm_freeze+0xd0/0xd0 dpm_run_callback+0x42/0x170 __device_suspend+0x114/0x460 async_suspend+0x1f/0xa0 async_run_entry_fn+0x3c/0xf0 process_one_work+0x1dd/0x410 worker_thread+0x34/0x3f0 ? cancel_delayed_work+0x90/0x90 kthread+0x14c/0x170 ? kthread_park+0x90/0x90 ret_from_fork+0x1f/0x30 Fixes: 6f82b2558735 ("ixgbe: use generic power management") Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++++ 1 file changed, 5 insertions(+)