diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 16:54:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 16:54:12 -0800 |
| commit | e37e0ee0190034a059c9faea8adfb4982fb24ddd (patch) | |
| tree | ba6d6da8ae099eb734f4d8d33bf648fe0dfa39e7 /drivers/pci | |
| parent | Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | dma-mapping: turn dma_cache_sync into a dma_map_ops method (diff) | |
| download | linux-dev-e37e0ee0190034a059c9faea8adfb4982fb24ddd.tar.xz linux-dev-e37e0ee0190034a059c9faea8adfb4982fb24ddd.zip | |
Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- turn dma_cache_sync into a dma_map_ops instance and remove
implementation that purely are dead because the architecture doesn't
support noncoherent allocations
- add a flag for busses that need DMA configuration (Robin Murphy)
* tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: turn dma_cache_sync into a dma_map_ops method
sh: make dma_cache_sync a no-op
xtensa: make dma_cache_sync a no-op
unicore32: make dma_cache_sync a no-op
powerpc: make dma_cache_sync a no-op
mn10300: make dma_cache_sync a no-op
microblaze: make dma_cache_sync a no-op
ia64: make dma_cache_sync a no-op
frv: make dma_cache_sync a no-op
x86: make dma_cache_sync a no-op
floppy: consolidate the dummy fd_cacheflush definition
drivers: flag buses which demand DMA configuration
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 07b8a9b385ab..7f47bb72bf30 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1516,6 +1516,7 @@ struct bus_type pci_bus_type = { .drv_groups = pci_drv_groups, .pm = PCI_PM_OPS_PTR, .num_vf = pci_bus_num_vf, + .force_dma = true, }; EXPORT_SYMBOL(pci_bus_type); |