diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-15 22:14:39 (GMT) |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-15 22:14:39 (GMT) |
| commit | 3a6384ba105ebbb5e83d040a55bfad2fa43f3048 (patch) | |
| tree | cab88a093690d0a3d38303d4bd53db132b7b55ea /arch/x86/include | |
| parent | 472358412b93025b13f39e46008af3ed9541ae2b (diff) | |
| parent | 185a383ada2e7794b0e82e040223e741b24d2bf8 (diff) | |
| download | linux-3a6384ba105ebbb5e83d040a55bfad2fa43f3048.tar.xz | |
Merge branch 'pci/host-vmd' into next
* pci/host-vmd:
x86/PCI: Add driver for Intel Volume Management Device (VMD)
PCI/AER: Use 32 bit PCI domain numbers
x86/PCI: Allow DMA ops specific to a PCI domain
irqdomain: Export irq_domain_set_info() for module use
genirq/MSI: Relax msi_domain_alloc() to support parentless MSI irqdomains
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/device.h | 10 | ||||
| -rw-r--r-- | arch/x86/include/asm/hw_irq.h | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h index 03dd729..684ed6c 100644 --- a/arch/x86/include/asm/device.h +++ b/arch/x86/include/asm/device.h @@ -10,6 +10,16 @@ struct dev_archdata { #endif }; +#if defined(CONFIG_X86_DEV_DMA_OPS) && defined(CONFIG_PCI_DOMAINS) +struct dma_domain { + struct list_head node; + struct dma_map_ops *dma_ops; + int domain_nr; +}; +void add_dma_domain(struct dma_domain *domain); +void del_dma_domain(struct dma_domain *domain); +#endif + struct pdev_archdata { }; diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 1e3408e..1815b73 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -130,6 +130,11 @@ struct irq_alloc_info { char *uv_name; }; #endif +#if IS_ENABLED(CONFIG_VMD) + struct { + struct msi_desc *desc; + }; +#endif }; }; |