From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI patches for 2.6.10
Date: Mon, 10 Jan 2005 09:20:57 -0800 [thread overview]
Message-ID: <1105377657239@kroah.com> (raw)
In-Reply-To: <11053776573816@kroah.com>
ChangeSet 1.1938.447.7, 2004/12/17 13:44:10-08:00, dhowells@redhat.com
[PATCH] PCI: Make pci_set_power_state() check register version
The attached patch makes pci_set_power_state() check the PM register version
and ignore non-version 2 registers. Trampling on earlier version PM registers
such as are sported by the Promise 20269 IDE card can cause the system to
hang.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/pci/pci.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff -Nru a/drivers/pci/pci.c b/drivers/pci/pci.c
--- a/drivers/pci/pci.c 2005-01-10 09:03:28 -08:00
+++ b/drivers/pci/pci.c 2005-01-10 09:03:28 -08:00
@@ -245,7 +245,7 @@
pci_set_power_state(struct pci_dev *dev, int state)
{
int pm;
- u16 pmcsr;
+ u16 pmcsr, pmc;
/* bound the state we're entering */
if (state > 3) state = 3;
@@ -265,10 +265,16 @@
/* abort if the device doesn't support PM capabilities */
if (!pm) return -EIO;
+ pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
+ if ((pmc & PCI_PM_CAP_VER_MASK) != 2) {
+ printk(KERN_WARNING
+ "PCI: %s has unsupported PM cap regs version (%u)\n",
+ dev->slot_name, pmc & PCI_PM_CAP_VER_MASK);
+ return -EIO;
+ }
+
/* check if this device supports the desired state */
if (state == 1 || state == 2) {
- u16 pmc;
- pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
if (state == 1 && !(pmc & PCI_PM_CAP_D1)) return -EIO;
else if (state == 2 && !(pmc & PCI_PM_CAP_D2)) return -EIO;
}
next prev parent reply other threads:[~2005-01-10 17:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-10 17:18 [BK PATCH] PCI patches for 2.6.10-rc2 Greg KH
2005-01-10 17:19 ` Greg KH
2005-01-10 17:20 ` [PATCH] PCI patches for 2.6.10 Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH [this message]
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-10 17:20 ` Greg KH
2005-01-11 22:39 ` Matt Mackall
2005-01-11 22:44 ` Greg KH
2005-01-12 13:09 ` Domen Puncer
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=1105377657239@kroah.com \
--to=greg@kroah.com \
--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;
as well as URLs for NNTP newsgroup(s).