[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1439363150-8661-29-git-send-email-hch@lst.de>
Date: Wed, 12 Aug 2015 09:05:47 +0200
From: Christoph Hellwig <hch@....de>
To: torvalds@...ux-foundation.org, axboe@...nel.dk
Cc: dan.j.williams@...el.com, vgupta@...opsys.com,
hskinnemoen@...il.com, egtvedt@...fundet.no, realmz6@...il.com,
dhowells@...hat.com, monstr@...str.eu, x86@...nel.org,
dwmw2@...radead.org, alex.williamson@...hat.com,
grundler@...isc-linux.org, linux-kernel@...r.kernel.org,
linux-arch@...r.kernel.org, linux-alpha@...r.kernel.org,
linux-ia64@...r.kernel.org, linux-metag@...r.kernel.org,
linux-mips@...ux-mips.org, linux-parisc@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-s390@...r.kernel.org,
sparclinux@...r.kernel.org, linux-xtensa@...ux-xtensa.org,
linux-nvdimm@...1.01.org, linux-media@...r.kernel.org
Subject: [PATCH 28/31] powerpc: handle page-less SG entries
Make all cache invalidation conditional on sg_has_page().
Signed-off-by: Christoph Hellwig <hch@....de>
---
arch/powerpc/kernel/dma.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 35e4dcc..cece40b 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -135,7 +135,10 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
for_each_sg(sgl, sg, nents, i) {
sg->dma_address = sg_phys(sg) + get_dma_offset(dev);
sg->dma_length = sg->length;
- __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
+ if (sg_has_page(sg)) {
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length,
+ direction);
+ }
}
return nents;
@@ -200,7 +203,10 @@ static inline void dma_direct_sync_sg(struct device *dev,
int i;
for_each_sg(sgl, sg, nents, i)
- __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
+ if (sg_has_page(sg)) {
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length,
+ direction);
+ }
}
static inline void dma_direct_sync_single(struct device *dev,
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists