diff options
author | Andrew Patterson <andrew.patterson@hp.com> | 2008-11-10 17:30:55 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 14:12:29 -0500 |
commit | 3e1b16002af29758b6bc9c38939d43838d9335bc (patch) | |
tree | 6782f844e3813355280ad3367c58d90d576901f2 /include/linux | |
parent | 0ef5f8f6159e44b4faa997be08d1a3bcbf44ad08 (diff) |
ACPI/PCI: PCIe ASPM _OSC support capabilities called when root bridge added
The _OSC capabilities OSC_ACTIVE_STATE_PWR_SUPPORT and
OSC_CLOCK_PWR_CAPABILITY_SUPPORT are set when the root bridge is added
with pci_acpi_osc_support(), so we no longer need to do it in the ASPM
driver. Also add the function pcie_aspm_enabled, which returns true if
pcie_aspm=off is not on the kernel command-line.
Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 6fd47654ca4e..eae97a2bf603 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -791,6 +791,15 @@ extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); | |||
791 | extern void pci_restore_msi_state(struct pci_dev *dev); | 791 | extern void pci_restore_msi_state(struct pci_dev *dev); |
792 | #endif | 792 | #endif |
793 | 793 | ||
794 | #ifndef CONFIG_PCIEASPM | ||
795 | static inline int pcie_aspm_enabled(void) | ||
796 | { | ||
797 | return 0; | ||
798 | } | ||
799 | #else | ||
800 | extern int pcie_aspm_enabled(void); | ||
801 | #endif | ||
802 | |||
794 | #ifdef CONFIG_HT_IRQ | 803 | #ifdef CONFIG_HT_IRQ |
795 | /* The functions a driver should call */ | 804 | /* The functions a driver should call */ |
796 | int ht_create_irq(struct pci_dev *dev, int idx); | 805 | int ht_create_irq(struct pci_dev *dev, int idx); |