parisc: always use flush_kernel_dcache_range for DMA cache maintainance

Christoph Hellwig · hdeller · commit 7f1501053811 · 2018-08-13T09:30:23.000+02:00
Current the S/G list based DMA ops use flush_kernel_vmap_range which
contains a few UP optimizations, while the rest of the DMA operations
uses flush_kernel_dcache_range.  The single vs sg operations are supposed
to have the same effect, so they should use the same routines.  Use
the more conservation version for now, but if people more familiar with
parisc think the vmap version is generally fine for DMA we should switch
all interfaces over to it.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Helge Deller &lt;deller@gmx.de&gt;
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
@@ -537,7 +537,7 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
 	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
 	for_each_sg(sglist, sg, nents, i)
-		flush_kernel_vmap_range(sg_virt(sg), sg->length);
+		flush_kernel_dcache_range(sg_virt(sg), sg->length);
 }
 
 static void pa11_dma_sync_single_for_cpu(struct device *dev,
@@ -568,7 +568,7 @@ static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl
 	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
 	for_each_sg(sglist, sg, nents, i)
-		flush_kernel_vmap_range(sg_virt(sg), sg->length);
+		flush_kernel_dcache_range(sg_virt(sg), sg->length);
 }
 
 static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
@@ -579,7 +579,7 @@ static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *
 	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
 	for_each_sg(sglist, sg, nents, i)
-		flush_kernel_vmap_range(sg_virt(sg), sg->length);
+		flush_kernel_dcache_range(sg_virt(sg), sg->length);
 }
 
 static void pa11_dma_cache_sync(struct device *dev, void *vaddr, size_t size,

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ static void pa11_dma_unmap_sg(struct device dev, struct scatterlist sglist,`
`537`	`537`	`/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */`
`538`	`538`
`539`	`539`	`for_each_sg(sglist, sg, nents, i)`
`540`		`- flush_kernel_vmap_range(sg_virt(sg), sg->length);`
	`540`	`+ flush_kernel_dcache_range(sg_virt(sg), sg->length);`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`static void pa11_dma_sync_single_for_cpu(struct device *dev,`
`@@ -568,7 +568,7 @@ static void pa11_dma_sync_sg_for_cpu(struct device dev, struct scatterlist sgl`
`568`	`568`	`/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */`
`569`	`569`
`570`	`570`	`for_each_sg(sglist, sg, nents, i)`
`571`		`- flush_kernel_vmap_range(sg_virt(sg), sg->length);`
	`571`	`+ flush_kernel_dcache_range(sg_virt(sg), sg->length);`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`static void pa11_dma_sync_sg_for_device(struct device dev, struct scatterlist sglist, int nents, enum dma_data_direction direction)`
`@@ -579,7 +579,7 @@ static void pa11_dma_sync_sg_for_device(struct device dev, struct scatterlist `
`579`	`579`	`/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */`
`580`	`580`
`581`	`581`	`for_each_sg(sglist, sg, nents, i)`
`582`		`- flush_kernel_vmap_range(sg_virt(sg), sg->length);`
	`582`	`+ flush_kernel_dcache_range(sg_virt(sg), sg->length);`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`static void pa11_dma_cache_sync(struct device dev, void vaddr, size_t size,`