Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"A few dma-mapping fixes for the fallout from the changes in rc1"
* tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping:
powerpc/macio: set a proper dma_coherent_mask
dma-mapping: fix a comment typo
dma-direct: comment the dma_direct_free calling convention
dma-direct: mark as is_phys
ia64: fix build failure with CONFIG_SWIOTLB
+7
-2
-1
arch/ia64/kernel/Makefile
-1
arch/ia64/kernel/Makefile
+1
drivers/macintosh/macio_asic.c
+1
drivers/macintosh/macio_asic.c
···
375
375
dev->ofdev.dev.of_node = np;
376
376
dev->ofdev.archdata.dma_mask = 0xffffffffUL;
377
377
dev->ofdev.dev.dma_mask = &dev->ofdev.archdata.dma_mask;
378
+
dev->ofdev.dev.coherent_dma_mask = dev->ofdev.archdata.dma_mask;
378
379
dev->ofdev.dev.parent = parent;
379
380
dev->ofdev.dev.bus = &macio_bus_type;
380
381
dev->ofdev.dev.release = macio_release_dev;
+1
-1
include/linux/dma-mapping.h
+1
-1
include/linux/dma-mapping.h
+5
lib/dma-direct.c
+5
lib/dma-direct.c
···
84
84
return page_address(page);
85
85
}
86
86
87
+
/*
88
+
* NOTE: this function must never look at the dma_addr argument, because we want
89
+
* to be able to use it as a helper for iommu implementations as well.
90
+
*/
87
91
void dma_direct_free(struct device *dev, size_t size, void *cpu_addr,
88
92
dma_addr_t dma_addr, unsigned long attrs)
89
93
{
···
156
152
.map_sg = dma_direct_map_sg,
157
153
.dma_supported = dma_direct_supported,
158
154
.mapping_error = dma_direct_mapping_error,
155
+
.is_phys = 1,
159
156
};
160
157
EXPORT_SYMBOL(dma_direct_ops);