UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] PCI: Support PCM PM CAP version 3 

- support PCI PM CAP version 3 (as defined in PCI PM Interface Spec v1.2)

- pci/probe.c sets the PM state initially to 4 which is D3cold.  add a
  PCI_UNKNOWN

- minor cleanups

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Daniel Ritz 2005-08-17 15:32:19 -07:00 committed by Greg Kroah-Hartman
parent cecf4864cf
commit 3fe9d19f9e
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pci/pci.c
View File

@ -294,7 +294,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
return -EIO; return -EIO;
pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc); pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
if ((pmc & PCI_PM_CAP_VER_MASK) > 2) { if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {
printk(KERN_DEBUG printk(KERN_DEBUG
"PCI: %s has unsupported PM cap regs version (%u)\n", "PCI: %s has unsupported PM cap regs version (%u)\n",
pci_name(dev), pmc & PCI_PM_CAP_VER_MASK); pci_name(dev), pmc & PCI_PM_CAP_VER_MASK);
@ -302,12 +302,10 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
} }
/* check if this device supports the desired state */ /* check if this device supports the desired state */
if (state == PCI_D1 || state == PCI_D2) { if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1))
if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1)) return -EIO;
return -EIO; else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2))
else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2)) return -EIO;
return -EIO;
}
pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr); pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);

2
drivers/pci/probe.c
View File

@ -584,7 +584,7 @@ static int pci_setup_device(struct pci_dev * dev)
dev->vendor, dev->device, class, dev->hdr_type); dev->vendor, dev->device, class, dev->hdr_type);
/* "Unknown power state" */ /* "Unknown power state" */
dev->current_state = 4; dev->current_state = PCI_UNKNOWN;
/* Early fixups, before probing the BARs */ /* Early fixups, before probing the BARs */
pci_fixup_device(pci_fixup_early, dev); pci_fixup_device(pci_fixup_early, dev);

1
include/linux/pci.h
View File

@ -75,6 +75,7 @@ typedef int __bitwise pci_power_t;
#define PCI_D2 ((pci_power_t __force) 2) #define PCI_D2 ((pci_power_t __force) 2)
#define PCI_D3hot ((pci_power_t __force) 3) #define PCI_D3hot ((pci_power_t __force) 3)
#define PCI_D3cold ((pci_power_t __force) 4) #define PCI_D3cold ((pci_power_t __force) 4)
#define PCI_UNKNOWN ((pci_power_t __force) 5)
#define PCI_POWER_ERROR ((pci_power_t __force) -1) #define PCI_POWER_ERROR ((pci_power_t __force) -1)
/* /*