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

Commit 98e6e286 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

PCI PM: Register power state of devices during initialization 



Use the observation that the power state of a PCI device can be
loaded into its pci_dev structure as soon as pci_pm_init() is run for
it and make that happen.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ad8cfa1d

drivers/pci/pci.c

+6 −2
Original line number Diff line number Diff line
@@ -1260,14 +1260,15 @@ void pci_pm_init(struct pci_dev *dev) 
	/* find PCI PM capability in list */

	pm = pci_find_capability(dev, PCI_CAP_ID_PM);

	if (!pm)

		return;

		goto Exit;



	/* Check device's ability to generate PME# */

	pci_read_config_word(dev, pm + PCI_PM_PMC, &pmc);



	if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {

		dev_err(&dev->dev, "unsupported PM cap regs version (%u)\n",

			pmc & PCI_PM_CAP_VER_MASK);

		return;

		goto Exit;

	}



	dev->pm_cap = pm;
@@ -1306,6 +1307,9 @@ void pci_pm_init(struct pci_dev *dev) 
	} else {

		dev->pme_support = 0;

	}



 Exit:

	pci_update_current_state(dev, PCI_D0);

}



/**