Merge tag 'pci-v5.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / pci.h

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index c1fdd43fe18764517165847b69bc5349dd3b46fd..40ac1330adb212735a8de39b484a61e23366066c 100644 (file)
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -25,7 +25,7 @@ struct pci_sysdata {
        void            *fwnode;        /* IRQ domain for MSI assignment */
 #endif
 #if IS_ENABLED(CONFIG_VMD)
-       bool vmd_domain;                /* True if in Intel VMD domain */
+       struct pci_dev  *vmd_dev;       /* VMD Device if in Intel VMD domain */
 #endif
 };
 
@@ -35,12 +35,15 @@ extern int noioapicreroute;
 
 #ifdef CONFIG_PCI
 
+static inline struct pci_sysdata *to_pci_sysdata(const struct pci_bus *bus)
+{
+       return bus->sysdata;
+}
+
 #ifdef CONFIG_PCI_DOMAINS
 static inline int pci_domain_nr(struct pci_bus *bus)
 {
-       struct pci_sysdata *sd = bus->sysdata;
-
-       return sd->domain;
+       return to_pci_sysdata(bus)->domain;
 }
 
 static inline int pci_proc_domain(struct pci_bus *bus)
@@ -52,24 +55,20 @@ static inline int pci_proc_domain(struct pci_bus *bus)
 #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
 static inline void *_pci_root_bus_fwnode(struct pci_bus *bus)
 {
-       struct pci_sysdata *sd = bus->sysdata;
-
-       return sd->fwnode;
+       return to_pci_sysdata(bus)->fwnode;
 }
 
 #define pci_root_bus_fwnode    _pci_root_bus_fwnode
 #endif
 
+#if IS_ENABLED(CONFIG_VMD)
 static inline bool is_vmd(struct pci_bus *bus)
 {
-#if IS_ENABLED(CONFIG_VMD)
-       struct pci_sysdata *sd = bus->sysdata;
-
-       return sd->vmd_domain;
-#else
-       return false;
-#endif
+       return to_pci_sysdata(bus)->vmd_dev != NULL;
 }
+#else
+#define is_vmd(bus)            false
+#endif /* CONFIG_VMD */
 
 /* Can be used to override the logic in pci_scan_bus for skipping
    already-configured bus numbers - to be used for buggy BIOSes
@@ -124,9 +123,7 @@ void native_restore_msi_irqs(struct pci_dev *dev);
 /* Returns the node based on pci bus */
 static inline int __pcibus_to_node(const struct pci_bus *bus)
 {
-       const struct pci_sysdata *sd = bus->sysdata;
-
-       return sd->node;
+       return to_pci_sysdata(bus)->node;
 }
 
 static inline const struct cpumask *