From: Brandon Philips <bphilips@suse•de>
To: "Kok, Auke" <auke-jan.h.kok@intel•com>
Cc: e1000-devel@lists•sourceforge.net, netdev@vger•kernel.org,
ram.vepa@neterion•com
Subject: Re: [PATCH] NET: Change pci_enable_device to pci_reenable_device to keep device enable balance
Date: Wed, 8 Aug 2007 10:44:59 -0700 [thread overview]
Message-ID: <20070808174459.GA6840@ifup.org> (raw)
In-Reply-To: <46B9FF1F.3020705@intel.com>
On 10:36 Wed 08 Aug 2007, Kok, Auke wrote:
> Brandon Philips wrote:
>> I sent this last week as part of my devres patches but it is purely a
>> bug fix and can be merged now.
>> On a slot_reset event pci_disable_device() is never called so calling
>> pci_enable_device() will unbalance the enable count.
>> Signed-off-by: Brandon Philips <bphilips@suse•de>
>> Acked-by: Tejun Heo <htejun@gmail•com>
>
>
> ACK all the parts except s2io. Of course, I haven't seen the
> pci_reenable_device rename patch in Jeff's tree yet...
Actually, it is in Linus's tree on git.kernel.org.
>> ---
>> drivers/net/e100.c | 2 +-
>> drivers/net/e1000/e1000_main.c | 2 +-
>> drivers/net/ixgb/ixgb_main.c | 2 +-
>> drivers/net/s2io.c | 2 +-
>> 4 files changed, 4 insertions(+), 4 deletions(-)
>> Index: linux-2.6/drivers/net/e100.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/net/e100.c
>> +++ linux-2.6/drivers/net/e100.c
>> @@ -2828,7 +2828,7 @@ static pci_ers_result_t e100_io_slot_res
>> struct net_device *netdev = pci_get_drvdata(pdev);
>> struct nic *nic = netdev_priv(netdev);
>> - if (pci_enable_device(pdev)) {
>> + if (pci_reenable_device(pdev)) {
>> printk(KERN_ERR "e100: Cannot re-enable PCI device after reset.\n");
>> return PCI_ERS_RESULT_DISCONNECT;
>> }
>> Index: linux-2.6/drivers/net/e1000/e1000_main.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/net/e1000/e1000_main.c
>> +++ linux-2.6/drivers/net/e1000/e1000_main.c
>> @@ -5270,7 +5270,7 @@ static pci_ers_result_t e1000_io_slot_re
>> struct net_device *netdev = pci_get_drvdata(pdev);
>> struct e1000_adapter *adapter = netdev->priv;
>> - if (pci_enable_device(pdev)) {
>> + if (pci_reenable_device(pdev)) {
>> printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
>> return PCI_ERS_RESULT_DISCONNECT;
>> }
>> Index: linux-2.6/drivers/net/ixgb/ixgb_main.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/net/ixgb/ixgb_main.c
>> +++ linux-2.6/drivers/net/ixgb/ixgb_main.c
>> @@ -2294,7 +2294,7 @@ static pci_ers_result_t ixgb_io_slot_res
>> struct net_device *netdev = pci_get_drvdata(pdev);
>> struct ixgb_adapter *adapter = netdev_priv(netdev);
>> - if(pci_enable_device(pdev)) {
>> + if(pci_reenable_device(pdev)) {
>> DPRINTK(PROBE, ERR, "Cannot re-enable PCI device after reset.\n");
>> return PCI_ERS_RESULT_DISCONNECT;
>> }
>> Index: linux-2.6/drivers/net/s2io.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/net/s2io.c
>> +++ linux-2.6/drivers/net/s2io.c
>> @@ -7833,7 +7833,7 @@ static pci_ers_result_t s2io_io_slot_res
>> struct net_device *netdev = pci_get_drvdata(pdev);
>> struct s2io_nic *sp = netdev->priv;
>> - if (pci_enable_device(pdev)) {
>> + if (pci_reenable_device(pdev)) {
>> printk(KERN_ERR "s2io: "
>> "Cannot re-enable PCI device after reset.\n");
>> return PCI_ERS_RESULT_DISCONNECT;
>> -------------------------------------------------------------------------
>> This SF.net email is sponsored by: Splunk Inc.
>> Still grepping through log files to find problems? Stop.
>> Now Search log events and configuration files using AJAX and a browser.
>> Download your FREE copy of Splunk now >> http://get.splunk.com/
>> _______________________________________________
>> E1000-devel mailing list
>> E1000-devel@lists•sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/e1000-devel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
prev parent reply other threads:[~2007-08-08 17:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-08 17:21 [PATCH] NET: Change pci_enable_device to pci_reenable_device to keep device enable balance Brandon Philips
2007-08-08 17:36 ` Kok, Auke
2007-08-08 17:44 ` Brandon Philips [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070808174459.GA6840@ifup.org \
--to=bphilips@suse$(echo .)de \
--cc=auke-jan.h.kok@intel$(echo .)com \
--cc=e1000-devel@lists$(echo .)sourceforge.net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ram.vepa@neterion$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox