|
@@ -211,7 +211,8 @@ static dma_addr_t __swiotlb_map_page(struct device *dev, struct page *page,
|
|
|
dma_addr_t dev_addr;
|
|
dma_addr_t dev_addr;
|
|
|
|
|
|
|
|
dev_addr = swiotlb_map_page(dev, page, offset, size, dir, attrs);
|
|
dev_addr = swiotlb_map_page(dev, page, offset, size, dir, attrs);
|
|
|
- if (!is_device_dma_coherent(dev))
|
|
|
|
|
|
|
+ if (!is_device_dma_coherent(dev) &&
|
|
|
|
|
+ (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0)
|
|
|
__dma_map_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);
|
|
__dma_map_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);
|
|
|
|
|
|
|
|
return dev_addr;
|
|
return dev_addr;
|
|
@@ -222,7 +223,8 @@ static void __swiotlb_unmap_page(struct device *dev, dma_addr_t dev_addr,
|
|
|
size_t size, enum dma_data_direction dir,
|
|
size_t size, enum dma_data_direction dir,
|
|
|
unsigned long attrs)
|
|
unsigned long attrs)
|
|
|
{
|
|
{
|
|
|
- if (!is_device_dma_coherent(dev))
|
|
|
|
|
|
|
+ if (!is_device_dma_coherent(dev) &&
|
|
|
|
|
+ (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0)
|
|
|
__dma_unmap_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);
|
|
__dma_unmap_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);
|
|
|
swiotlb_unmap_page(dev, dev_addr, size, dir, attrs);
|
|
swiotlb_unmap_page(dev, dev_addr, size, dir, attrs);
|
|
|
}
|
|
}
|
|
@@ -235,7 +237,8 @@ static int __swiotlb_map_sg_attrs(struct device *dev, struct scatterlist *sgl,
|
|
|
int i, ret;
|
|
int i, ret;
|
|
|
|
|
|
|
|
ret = swiotlb_map_sg_attrs(dev, sgl, nelems, dir, attrs);
|
|
ret = swiotlb_map_sg_attrs(dev, sgl, nelems, dir, attrs);
|
|
|
- if (!is_device_dma_coherent(dev))
|
|
|
|
|
|
|
+ if (!is_device_dma_coherent(dev) &&
|
|
|
|
|
+ (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0)
|
|
|
for_each_sg(sgl, sg, ret, i)
|
|
for_each_sg(sgl, sg, ret, i)
|
|
|
__dma_map_area(phys_to_virt(dma_to_phys(dev, sg->dma_address)),
|
|
__dma_map_area(phys_to_virt(dma_to_phys(dev, sg->dma_address)),
|
|
|
sg->length, dir);
|
|
sg->length, dir);
|
|
@@ -251,7 +254,8 @@ static void __swiotlb_unmap_sg_attrs(struct device *dev,
|
|
|
struct scatterlist *sg;
|
|
struct scatterlist *sg;
|
|
|
int i;
|
|
int i;
|
|
|
|
|
|
|
|
- if (!is_device_dma_coherent(dev))
|
|
|
|
|
|
|
+ if (!is_device_dma_coherent(dev) &&
|
|
|
|
|
+ (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0)
|
|
|
for_each_sg(sgl, sg, nelems, i)
|
|
for_each_sg(sgl, sg, nelems, i)
|
|
|
__dma_unmap_area(phys_to_virt(dma_to_phys(dev, sg->dma_address)),
|
|
__dma_unmap_area(phys_to_virt(dma_to_phys(dev, sg->dma_address)),
|
|
|
sg->length, dir);
|
|
sg->length, dir);
|