diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:45 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:45 -0500 |
| commit | f2e94683162565ff02d8d7386fadee175ab55e40 (patch) | |
| tree | fb9752bf2288737623456872d93791b40c30582f /include/linux/pci.h | |
| parent | ee6df38da8485b143cc5eccee569ae3e238be10a (diff) | |
| parent | 90199c951bd2a6248e55a8db3368a2568e3b3edc (diff) | |
Merge branch 'pci/iova-dma-ranges'
- Add list of legal DMA address ranges to PCI host bridge (Srinath
Mannam)
- Reserve inaccessible DMA ranges so IOMMU doesn't allocate them (Srinath
Mannam)
- Parse iProc DT dma-ranges to learn what PCI devices can reach via DMA
(Srinath Mannam)
* pci/iova-dma-ranges:
PCI: iproc: Add sorted dma ranges resource entries to host bridge
iommu/dma: Reserve IOVA for PCIe inaccessible DMA address
PCI: Add dma_ranges window list
# Conflicts:
# drivers/pci/probe.c
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 6fc361a69e0c..87edbd23eddb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -492,6 +492,7 @@ struct pci_host_bridge { void *sysdata; int busnr; struct list_head windows; /* resource_entry */ + struct list_head dma_ranges; /* dma ranges resource list */ u8 (*swizzle_irq)(struct pci_dev *, u8 *); /* Platform IRQ swizzler */ int (*map_irq)(const struct pci_dev *, u8, u8); void (*release_fn)(struct pci_host_bridge *); |