[PATCH 20/31] avr32: handle page-less SG entries

[Christoph Hellwig]

Make all cache invalidation conditional on sg_has_page() and use
sg_phys to get the physical address directly, bypassing the noop
page_to_bus.

Signed-off-by: Christoph Hellwig h...@lst.de
---
 arch/avr32/include/asm/dma-mapping.h | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/avr32/include/asm/dma-mapping.h 
b/arch/avr32/include/asm/dma-mapping.h
index ae7ac92..a662ce2 100644
--- a/arch/avr32/include/asm/dma-mapping.h
+++ b/arch/avr32/include/asm/dma-mapping.h
@@ -216,11 +216,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sglist, 
int nents,
struct scatterlist *sg;
 
for_each_sg(sglist, sg, nents, i) {
-   char *virt;
-
-   sg-dma_address = page_to_bus(sg_page(sg)) + sg-offset;
-   virt = sg_virt(sg);
-   dma_cache_sync(dev, virt, sg-length, direction);
+   sg-dma_address = sg_phys(sg);
+   if (sg_has_page(sg))
+   dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
}
 
return nents;
@@ -328,8 +326,10 @@ dma_sync_sg_for_device(struct device *dev, struct 
scatterlist *sglist,
int i;
struct scatterlist *sg;
 
-   for_each_sg(sglist, sg, nents, i)
-   dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
+   for_each_sg(sglist, sg, nents, i) {
+   if (sg_has_page(sg))
+   dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
+   }
 }
 
 /* Now for the API extensions over the pci_ one */
-- 
1.9.1

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 20/31] avr32: handle page-less SG entries

[Hans-Christian Egtvedt]

Around Wed 12 Aug 2015 09:05:39 +0200 or thereabout, Christoph Hellwig wrote:
 Make all cache invalidation conditional on sg_has_page() and use
 sg_phys to get the physical address directly, bypassing the noop
 page_to_bus.
 
 Signed-off-by: Christoph Hellwig h...@lst.de

Acked-by: Hans-Christian Egtvedt egtv...@samfundet.no

 ---
  arch/avr32/include/asm/dma-mapping.h | 14 +++---
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/arch/avr32/include/asm/dma-mapping.h 
 b/arch/avr32/include/asm/dma-mapping.h
 index ae7ac92..a662ce2 100644
 --- a/arch/avr32/include/asm/dma-mapping.h
 +++ b/arch/avr32/include/asm/dma-mapping.h
 @@ -216,11 +216,9 @@ dma_map_sg(struct device *dev, struct scatterlist 
 *sglist, int nents,
   struct scatterlist *sg;
  
   for_each_sg(sglist, sg, nents, i) {
 - char *virt;
 -
 - sg-dma_address = page_to_bus(sg_page(sg)) + sg-offset;
 - virt = sg_virt(sg);
 - dma_cache_sync(dev, virt, sg-length, direction);
 + sg-dma_address = sg_phys(sg);
 + if (sg_has_page(sg))
 + dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
   }
  
   return nents;
 @@ -328,8 +326,10 @@ dma_sync_sg_for_device(struct device *dev, struct 
 scatterlist *sglist,
   int i;
   struct scatterlist *sg;
  
 - for_each_sg(sglist, sg, nents, i)
 - dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
 + for_each_sg(sglist, sg, nents, i) {
 + if (sg_has_page(sg))
 + dma_cache_sync(dev, sg_virt(sg), sg-length, direction);
 + }
  }
  
  /* Now for the API extensions over the pci_ one */
-- 
mvh
Hans-Christian Egtvedt
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev