From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Subject: [PATCH 1/3] sky2: resume clocks
Date: Sun, 7 Feb 2010 08:23:53 -0800 [thread overview]
Message-ID: <20100207082353.2d0c6a93@nehalam> (raw)
Change the resume path to use pci write config for a couple of reasons:
1. pci_write_config_dword() allows for more error
checking of PCI health after resume.
2. better to toggle this register on all chip types, since that
is what vendor driver does.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/sky2.c 2010-02-03 09:17:01.602741445 -0800
+++ b/drivers/net/sky2.c 2010-02-03 09:24:17.943679463 -0800
@@ -4859,10 +4859,11 @@ static int sky2_resume(struct pci_dev *p
pci_enable_wake(pdev, PCI_D0, 0);
/* Re-enable all clocks */
- if (hw->chip_id == CHIP_ID_YUKON_EX ||
- hw->chip_id == CHIP_ID_YUKON_EC_U ||
- hw->chip_id == CHIP_ID_YUKON_FE_P)
- sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+ err = pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
+ if (err) {
+ dev_err(&pdev->dev, "PCI write config failed\n");
+ goto out;
+ }
sky2_reset(hw);
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
next reply other threads:[~2010-02-07 16:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-07 16:23 Stephen Hemminger [this message]
2010-02-07 16:24 ` [PATCH 2/3]: sky2: disable ASF on Yukon Supreme Stephen Hemminger
2010-02-11 1:57 ` David Miller
2010-02-07 16:28 ` [PATCH 3/3] sky2: receive checksum refactoring Stephen Hemminger
2010-02-11 1:57 ` David Miller
2010-02-11 1:57 ` [PATCH 1/3] sky2: resume clocks David Miller
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=20100207082353.2d0c6a93@nehalam \
--to=shemminger@vyatta.com \
--cc=davem@davemloft.net \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).