summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Patterson <andrew.patterson@hp.com>2008-11-11 01:30:55 +0300
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 22:12:29 +0300
commit3e1b16002af29758b6bc9c38939d43838d9335bc (patch)
tree6782f844e3813355280ad3367c58d90d576901f2 /include/linux
parent0ef5f8f6159e44b4faa997be08d1a3bcbf44ad08 (diff)
downloadlinux-3e1b16002af29758b6bc9c38939d43838d9335bc.tar.xz
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.h9
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);
extern void pci_restore_msi_state(struct pci_dev *dev);
#endif
+#ifndef CONFIG_PCIEASPM
+static inline int pcie_aspm_enabled(void)
+{
+ return 0;
+}
+#else
+extern int pcie_aspm_enabled(void);
+#endif
+
#ifdef CONFIG_HT_IRQ
/* The functions a driver should call */
int ht_create_irq(struct pci_dev *dev, int idx);