From: Li Shaohua <shaohua.li@intel.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@osdl.org>
Subject: [PATCH]E1000 stop working after resume
Date: Tue, 02 Nov 2004 16:45:00 +0800 [thread overview]
Message-ID: <1099385047.2628.3.camel@sli10-desk.sh.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
Hi,
Obviously pci_enable_device should be called after pci_restore_state.
Shaohua
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
---
2.6-root/drivers/net/e1000/e1000_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-resume
drivers/net/e1000/e1000_main.c
--- 2.6/drivers/net/e1000/e1000_main.c~e1000-resume 2004-11-02
16:34:31.665692032 +0800
+++ 2.6-root/drivers/net/e1000/e1000_main.c 2004-11-02
16:35:18.095633608 +0800
@@ -2885,9 +2885,11 @@ e1000_resume(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev->priv;
uint32_t manc, ret;
- ret = pci_enable_device(pdev);
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);
+ ret = pci_enable_device(pdev);
+ if (pdev->is_busmaster)
+ pci_set_master(pdev);
pci_enable_wake(pdev, 3, 0);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
_
[-- Attachment #2: e1000-resume.patch --]
[-- Type: text/x-patch, Size: 754 bytes --]
---
2.6-root/drivers/net/e1000/e1000_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-resume drivers/net/e1000/e1000_main.c
--- 2.6/drivers/net/e1000/e1000_main.c~e1000-resume 2004-11-02 16:34:31.665692032 +0800
+++ 2.6-root/drivers/net/e1000/e1000_main.c 2004-11-02 16:35:18.095633608 +0800
@@ -2885,9 +2885,11 @@ e1000_resume(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev->priv;
uint32_t manc, ret;
- ret = pci_enable_device(pdev);
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);
+ ret = pci_enable_device(pdev);
+ if (pdev->is_busmaster)
+ pci_set_master(pdev);
pci_enable_wake(pdev, 3, 0);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
_
reply other threads:[~2004-11-02 8:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1099385047.2628.3.camel@sli10-desk.sh.intel.com \
--to=shaohua.li@intel.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®