summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2018-05-23 17:24:08 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-06-02 00:18:28 -0500
commit5352a44a561d708f1a975a90f5ce16a054fe265c (patch)
treece141dc89652f25a3288ea4069563ee9b9b18f41 /include/linux/pci.h
parent9310f0dc1c6430ca9e370a8341bea9f5dc85f40b (diff)
downloadlinux-stable-5352a44a561d708f1a975a90f5ce16a054fe265c.tar.gz
linux-stable-5352a44a561d708f1a975a90f5ce16a054fe265c.tar.bz2
linux-stable-5352a44a561d708f1a975a90f5ce16a054fe265c.zip
PCI: pciehp: Make pciehp_is_native() stricter
Previously pciehp_is_native() returned true for any PCI device in a hierarchy where _OSC says we can use pciehp. This is incorrect because bridges without PCI_EXP_SLTCAP_HPC capability should be managed by acpiphp instead. Improve pciehp_is_native() to return true only when PCI_EXP_SLTCAP_HPC is set and the pciehp driver is present. In any other case return false to let acpiphp handle those. Suggested-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> [bhelgaas: remove NULL pointer check] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 30ec7e86af55..3f009003706a 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1454,8 +1454,10 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d,
#ifdef CONFIG_PCIEPORTBUS
extern bool pcie_ports_disabled;
+extern bool pcie_ports_native;
#else
#define pcie_ports_disabled true
+#define pcie_ports_native false
#endif
#ifdef CONFIG_PCIEASPM