| Message ID | 1391079064-18411-1-git-send-email-michele@acksyn.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- 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
> 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 -- 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
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. -- 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
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)