[PATCH net] e100: Fix "disabling already-disabled device" warning

[PATCH net] e100: Fix "disabling already-disabled device" warning

[Michele Baldessari]

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:

 [<c06a0ba5>] ? pci_disable_device+0x85/0x90
 [<c044a153>] warn_slowpath_fmt+0x33/0x40
 [<c06a0ba5>] pci_disable_device+0x85/0x90
 [<f7fdf7e0>] __e100_shutdown+0x80/0x120 [e100]
 [<c0476ca5>] ? check_preempt_curr+0x65/0x90
 [<f7fdf8d6>] e100_suspend+0x16/0x30 [e100]
 [<c06a1ebb>] pci_legacy_suspend+0x2b/0xb0
 [<c098fc0f>] ? wait_for_completion+0x1f/0xd0
 [<c06a2d50>] ? pci_pm_poweroff+0xb0/0xb0
 [<c06a2de4>] pci_pm_freeze+0x94/0xa0
 [<c0767bb7>] dpm_run_callback+0x37/0x80
 [<c076a204>] ? pm_wakeup_pending+0xc4/0x140
 [<c0767f12>] __device_suspend+0xb2/0x1f0
 [<c076806f>] async_suspend+0x1f/0x90
 [<c04706e5>] async_run_entry_fn+0x35/0x140
 [<c0478aef>] ? wake_up_process+0x1f/0x40
 [<c0464495>] process_one_work+0x115/0x370
 [<c0462645>] ? start_worker+0x25/0x30
 [<c0464dc5>] ? manage_workers.isra.27+0x1a5/0x250
 [<c0464f6e>] worker_thread+0xfe/0x330
 [<c0464e70>] ? manage_workers.isra.27+0x250/0x250
 [<c046a224>] kthread+0x94/0xa0
 [<c0997f37>] ret_from_kernel_thread+0x1b/0x28
 [<c046a190>] ? insert_kthread_work+0x30/0x30

This patch removes pci_disable_device() from __e100_shutdown().
pci_clear_master() is enough.

Signed-off-by: Michele Baldessari <michele@acksyn.org>
Tested-by: Mark Harig <idirectscm@aim.com>
---
 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

Re: [PATCH net] e100: Fix "disabling already-disabled device" warning

[Brown, Aaron F]

On Thu, 2014-01-30 at 10:51 +0000, Michele Baldessari wrote:
>                              From: 
> Michele Baldessari
> <michele@acksyn.org>
>                          Reply-to: 
> Michele Baldessari
> <michele@acksyn.org>
>                                To: 
> netdev@vger.kernel.org
>                                Cc: 
> e1000-devel@lists.sourceforge.net,
> idirectscm@aim.com, David S. Miller
> <davem@davemloft.net>, Michele
> Baldessari <michele@acksyn.org>
>                           Subject: 
> [PATCH net] e100: Fix "disabling
> already-disabled device" warning
>                              Date: 
> Thu, 30 Jan 2014 10:51:04 +0000
> (14-01-30 02:51:04 AM)
> 
> 
> 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:
> 
>  [<c06a0ba5>] ? pci_disable_device+0x85/0x90
>  [<c044a153>] warn_slowpath_fmt+0x33/0x40
>  [<c06a0ba5>] pci_disable_device+0x85/0x90
>  [<f7fdf7e0>] __e100_shutdown+0x80/0x120 [e100]
>  [<c0476ca5>] ? check_preempt_curr+0x65/0x90
>  [<f7fdf8d6>] e100_suspend+0x16/0x30 [e100]
>  [<c06a1ebb>] pci_legacy_suspend+0x2b/0xb0
>  [<c098fc0f>] ? wait_for_completion+0x1f/0xd0
>  [<c06a2d50>] ? pci_pm_poweroff+0xb0/0xb0
>  [<c06a2de4>] pci_pm_freeze+0x94/0xa0
>  [<c0767bb7>] dpm_run_callback+0x37/0x80
>  [<c076a204>] ? pm_wakeup_pending+0xc4/0x140
>  [<c0767f12>] __device_suspend+0xb2/0x1f0
>  [<c076806f>] async_suspend+0x1f/0x90
>  [<c04706e5>] async_run_entry_fn+0x35/0x140
>  [<c0478aef>] ? wake_up_process+0x1f/0x40
>  [<c0464495>] process_one_work+0x115/0x370
>  [<c0462645>] ? start_worker+0x25/0x30
>  [<c0464dc5>] ? manage_workers.isra.27+0x1a5/0x250
>  [<c0464f6e>] worker_thread+0xfe/0x330
>  [<c0464e70>] ? manage_workers.isra.27+0x250/0x250
>  [<c046a224>] kthread+0x94/0xa0
>  [<c0997f37>] ret_from_kernel_thread+0x1b/0x28
>  [<c046a190>] ? insert_kthread_work+0x30/0x30
> 
> This patch removes pci_disable_device() from __e100_shutdown().
> pci_clear_master() is enough.
> 
> Signed-off-by: Michele Baldessari <michele@acksyn.org>
> Tested-by: Mark Harig <idirectscm@aim.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
> ---
>  drivers/net/ethernet/intel/e100.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-) 
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

Re: [PATCH net] e100: Fix "disabling already-disabled device" warning

[David Miller]

From: Michele Baldessari <michele@acksyn.org>
Date: Thu, 30 Jan 2014 10:51:04 +0000

> 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:
 ...
> This patch removes pci_disable_device() from __e100_shutdown().
> pci_clear_master() is enough.
> 
> Signed-off-by: Michele Baldessari <michele@acksyn.org>
> Tested-by: Mark Harig <idirectscm@aim.com>

Can I get some Intel folks to review/ack this?

Thanks.

RE: [PATCH net] e100: Fix "disabling already-disabled device" warning

[Brown, Aaron F]

> From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> On Behalf Of David Miller
> Sent: Thursday, January 30, 2014 4:28 PM
> To: michele@acksyn.org
> Cc: netdev@vger.kernel.org; e1000-devel@lists.sourceforge.net;
> idirectscm@aim.com
> Subject: Re: [PATCH net] e100: Fix "disabling already-disabled device"
> warning
> 
> From: Michele Baldessari <michele@acksyn.org>
> Date: Thu, 30 Jan 2014 10:51:04 +0000
> 
> > 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:
>  ...
> > This patch removes pci_disable_device() from __e100_shutdown().
> > pci_clear_master() is enough.
> >
> > Signed-off-by: Michele Baldessari <michele@acksyn.org>
> > Tested-by: Mark Harig <idirectscm@aim.com>

Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>

Sorry if it's a duplicate, one I sent out earlier did not seem to hit netdev.


> 
> Can I get some Intel folks to review/ack this?
> 
> Thanks.
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in the
> body of a message to majordomo@vger.kernel.org More majordomo info at
> http://vger.kernel.org/majordomo-info.html

Re: [PATCH net] e100: Fix "disabling already-disabled device" warning

[David Miller]

From: "Brown, Aaron F" <aaron.f.brown@intel.com>
Date: Fri, 31 Jan 2014 00:40:16 +0000

>> From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
>> On Behalf Of David Miller
>> Sent: Thursday, January 30, 2014 4:28 PM
>> To: michele@acksyn.org
>> Cc: netdev@vger.kernel.org; e1000-devel@lists.sourceforge.net;
>> idirectscm@aim.com
>> Subject: Re: [PATCH net] e100: Fix "disabling already-disabled device"
>> warning
>> 
>> From: Michele Baldessari <michele@acksyn.org>
>> Date: Thu, 30 Jan 2014 10:51:04 +0000
>> 
>> > 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:
>>  ...
>> > This patch removes pci_disable_device() from __e100_shutdown().
>> > pci_clear_master() is enough.
>> >
>> > Signed-off-by: Michele Baldessari <michele@acksyn.org>
>> > Tested-by: Mark Harig <idirectscm@aim.com>
> 
> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
> 
> Sorry if it's a duplicate, one I sent out earlier did not seem to hit netdev.

I think this patch was posted twice, once without netdev properly
CC:'d and you replied to that copy.

Thanks Aaron, I'll apply this.