[PATCH 23/31] sh: handle page-less SG entries

Christoph Hellwig
2015-08-12T07:05:42Z

Make all cache invalidation conditional on sg_has_page().

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/sh/kernel/dma-nommu.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
index 5b0bfcd..3b64dc7 100644
--- a/arch/sh/kernel/dma-nommu.c
+++ b/arch/sh/kernel/dma-nommu.c
@@ -33,9 +33,8 @@ static int nommu_map_sg(struct device *dev, struct scatterlist *sg,
WARN_ON(nents = 0 || sg[0].length = 0);

for_each_sg(sg, s, nents, i) {
- BUG_ON(!sg_page(s));
-
- dma_cache_sync(dev, sg_virt(s), s->length, dir);
+ if (sg_has_page(s))
+ dma_cache_sync(dev, sg_virt(s), s->length, dir);

s->dma_address = sg_phys(s);
s->dma_length = s->length;
@@ -57,8 +56,10 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
struct scatterlist *s;
int i;

- for_each_sg(sg, s, nelems, i)
- dma_cache_sync(dev, sg_virt(s), s->length, dir);
+ for_each_sg(sg, s, nelems, i) {
+ if (sg_has_page(s))
+ dma_cache_sync(dev, sg_virt(s), s->length, dir);
+ }
}
#endif

--
1.9.1