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

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 arch/openrisc/kernel/dma.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index 0b77ddb..94ed052 100644
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -184,8 +184,13 @@ or1k_map_sg(struct device *dev, struct scatterlist *sg,
        int i;
 
        for_each_sg(sg, s, nents, i) {
-               s->dma_address = or1k_map_page(dev, sg_page(s), s->offset,
-                                              s->length, dir, NULL);
+               if (sg_has_page(s)) {
+                       s->dma_address = or1k_map_page(dev, sg_page(s),
+                                               s->offset, s->length, dir,
+                                               NULL);
+               } else {
+                       s->dma_address = sg_phys(s);
+               }
        }
 
        return nents;
-- 
1.9.1

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

Reply via email to