diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:56:16 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:56:16 -0500 |
| commit | cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4 (patch) | |
| tree | 0f3a162561d9a64cf4f509fb516f2d58f70530d9 /arch/x86/include/asm/pci.h | |
| parent | 562df5c8521e1371f3cbd0b7b868034da376d714 (diff) | |
| parent | 4daace0d8ce851f8f8f91563c835e3000c954d5e (diff) | |
| download | op-kernel-dev-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.zip op-kernel-dev-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.gz | |
Merge branch 'pci/host-hv' into next
* pci/host-hv:
PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs
PCI: Look up IRQ domain by fwnode_handle
PCI: Add fwnode_handle to x86 pci_sysdata
Diffstat (limited to 'arch/x86/include/asm/pci.h')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 7fd8eaa..9ab7507 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -20,6 +20,9 @@ struct pci_sysdata { #ifdef CONFIG_X86_64 void *iommu; /* IOMMU private data */ #endif +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN + void *fwnode; /* IRQ domain for MSI assignment */ +#endif }; extern int pci_routeirq; @@ -32,6 +35,7 @@ extern int noioapicreroute; static inline int pci_domain_nr(struct pci_bus *bus) { struct pci_sysdata *sd = bus->sysdata; + return sd->domain; } @@ -41,6 +45,17 @@ static inline int pci_proc_domain(struct pci_bus *bus) } #endif +#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; +} + +#define pci_root_bus_fwnode _pci_root_bus_fwnode +#endif + /* Can be used to override the logic in pci_scan_bus for skipping already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */ |
