From ebd6e20919906fd1ea489ac601748ae41c8aa178 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 21 Feb 2014 08:16:59 -0500 Subject: [PATCH] Fix WARN from e100 from Michele Baldessari (rhbz 994438) --- ...ling-already-disabled-device-warning.patch | 65 +++++++++++++++++++ kernel.spec | 9 +++ 2 files changed, 74 insertions(+) create mode 100644 e100-Fix-disabling-already-disabled-device-warning.patch diff --git a/e100-Fix-disabling-already-disabled-device-warning.patch b/e100-Fix-disabling-already-disabled-device-warning.patch new file mode 100644 index 000000000..d98982877 --- /dev/null +++ b/e100-Fix-disabling-already-disabled-device-warning.patch @@ -0,0 +1,65 @@ +Bugzilla: 994438 +Upstream-status: 3.14 + +From 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 Mon Sep 17 00:00:00 2001 +From: Michele Baldessari +Date: Thu, 30 Jan 2014 10:51:04 +0000 +Subject: [PATCH] e100: Fix "disabling already-disabled device" warning + +In https://bugzilla.redhat.com/show_bug.cgi?id=994438 and +https://bugzilla.redhat.com/show_bug.cgi?id=970480 we +received different reports of e100 throwing the following +warning: + + [] ? pci_disable_device+0x85/0x90 + [] warn_slowpath_fmt+0x33/0x40 + [] pci_disable_device+0x85/0x90 + [] __e100_shutdown+0x80/0x120 [e100] + [] ? check_preempt_curr+0x65/0x90 + [] e100_suspend+0x16/0x30 [e100] + [] pci_legacy_suspend+0x2b/0xb0 + [] ? wait_for_completion+0x1f/0xd0 + [] ? pci_pm_poweroff+0xb0/0xb0 + [] pci_pm_freeze+0x94/0xa0 + [] dpm_run_callback+0x37/0x80 + [] ? pm_wakeup_pending+0xc4/0x140 + [] __device_suspend+0xb2/0x1f0 + [] async_suspend+0x1f/0x90 + [] async_run_entry_fn+0x35/0x140 + [] ? wake_up_process+0x1f/0x40 + [] process_one_work+0x115/0x370 + [] ? start_worker+0x25/0x30 + [] ? manage_workers.isra.27+0x1a5/0x250 + [] worker_thread+0xfe/0x330 + [] ? manage_workers.isra.27+0x250/0x250 + [] kthread+0x94/0xa0 + [] ret_from_kernel_thread+0x1b/0x28 + [] ? insert_kthread_work+0x30/0x30 + +This patch removes pci_disable_device() from __e100_shutdown(). +pci_clear_master() is enough. + +Signed-off-by: Michele Baldessari +Tested-by: Mark Harig +Signed-off-by: Aaron Brown +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/intel/e100.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c +index cbaba44..bf7a01e 100644 +--- a/drivers/net/ethernet/intel/e100.c ++++ b/drivers/net/ethernet/intel/e100.c +@@ -3034,7 +3034,7 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake) + *enable_wake = false; + } + +- pci_disable_device(pdev); ++ pci_clear_master(pdev); + } + + static int __e100_power_off(struct pci_dev *pdev, bool wake) +-- +1.8.5.3 + diff --git a/kernel.spec b/kernel.spec index 30986ed55..5d34a224d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -770,6 +770,9 @@ Patch25201: cifs-sanity-check-length-of-data-to-send-before-sending.patch #rhbz 1054408 Patch25203: cpufreq-powernow-k8-Initialize-per-cpu-data-structures-properly.patch +#rhbz 994438 +Patch25024: e100-Fix-disabling-already-disabled-device-warning.patch + # END OF PATCH DEFINITIONS %endif @@ -1486,6 +1489,9 @@ ApplyPatch cifs-sanity-check-length-of-data-to-send-before-sending.patch #rhbz 1054408 ApplyPatch cpufreq-powernow-k8-Initialize-per-cpu-data-structures-properly.patch +#rhbz 994438 +ApplyPatch e100-Fix-disabling-already-disabled-device-warning.patch + # END OF PATCH APPLICATIONS @@ -2299,6 +2305,9 @@ fi # and build. %changelog +* Fri Feb 21 2014 Josh Boyer +- Fix WARN from e100 from Michele Baldessari (rhbz 994438) + * Thu Feb 20 2014 Justin M. Forbes - 3.13.4-100 - Linux v3.13.4