Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe9d19f authored by Daniel Ritz's avatar Daniel Ritz Committed by Greg Kroah-Hartman
Browse files

[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: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cecf4864

drivers/pci/pci.c

+5 −7
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
		return -EIO; 



	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

		       "PCI: %s has unsupported PM cap regs version (%u)\n",

		       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 */

	if (state == PCI_D1 || state == PCI_D2) {

	if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1))

		return -EIO;

	else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2))

		return -EIO;

	}



	pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int pci_setup_device(struct pci_dev * dev) 
		 dev->vendor, dev->device, class, dev->hdr_type);



	/* "Unknown power state" */

	dev->current_state = 4;

	dev->current_state = PCI_UNKNOWN;



	/* Early fixups, before probing the BARs */

	pci_fixup_device(pci_fixup_early, dev);

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ typedef int __bitwise pci_power_t; 
#define PCI_D2		((pci_power_t __force) 2)

#define PCI_D3hot	((pci_power_t __force) 3)

#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)



/*