Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933717AbbHLK3N (ORCPT ); Wed, 12 Aug 2015 06:29:13 -0400 Received: from smtprelay.synopsys.com ([198.182.47.9]:44204 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbbHLK3I convert rfc822-to-8bit (ORCPT ); Wed, 12 Aug 2015 06:29:08 -0400 From: Vineet Gupta To: Christoph Hellwig , "torvalds@linux-foundation.org" , "axboe@kernel.dk" CC: "dan.j.williams@intel.com" , "hskinnemoen@gmail.com" , "egtvedt@samfundet.no" , "realmz6@gmail.com" , "dhowells@redhat.com" , "monstr@monstr.eu" , "x86@kernel.org" , "dwmw2@infradead.org" , "alex.williamson@redhat.com" , "grundler@parisc-linux.org" , "linux-kernel@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-alpha@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-metag@vger.kernel.org" , "linux-mips@linux-mips.org" , "linux-parisc@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-s390@vger.kernel.org" , "sparclinux@vger.kernel.org" , "linux-xtensa@linux-xtensa.org" , "linux-nvdimm@ml01.01.org" , "linux-media@vger.kernel.org" Subject: Re: [PATCH 19/31] arc: handle page-less SG entries Thread-Topic: [PATCH 19/31] arc: handle page-less SG entries Thread-Index: AQHQ1M3b26KgfKsShEK4yGPzrGC9cQ== Date: Wed, 12 Aug 2015 10:28:55 +0000 Message-ID: References: <1439363150-8661-1-git-send-email-hch@lst.de> <1439363150-8661-20-git-send-email-hch@lst.de> Accept-Language: en-US, en-IN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.12.197.191] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2349 Lines: 75 On Wednesday 12 August 2015 12:39 PM, Christoph Hellwig wrote: > Make all cache invalidation conditional on sg_has_page() and use > sg_phys to get the physical address directly. > > Signed-off-by: Christoph Hellwig With a minor nit below. Acked-by: Vineet Gupta > --- > arch/arc/include/asm/dma-mapping.h | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/arch/arc/include/asm/dma-mapping.h b/arch/arc/include/asm/dma-mapping.h > index 2d28ba9..42eb526 100644 > --- a/arch/arc/include/asm/dma-mapping.h > +++ b/arch/arc/include/asm/dma-mapping.h > @@ -108,9 +108,13 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, > struct scatterlist *s; > int i; > > - for_each_sg(sg, s, nents, i) > - s->dma_address = dma_map_page(dev, sg_page(s), s->offset, > - s->length, dir); > + for_each_sg(sg, s, nents, i) { > + if (sg_has_page(s)) { > + _dma_cache_sync((unsigned long)sg_virt(s), s->length, > + dir); > + } > + s->dma_address = sg_phys(s); > + } > > return nents; > } > @@ -163,8 +167,12 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, int nelems, > int i; > struct scatterlist *sg; > > - for_each_sg(sglist, sg, nelems, i) > - _dma_cache_sync((unsigned int)sg_virt(sg), sg->length, dir); > + for_each_sg(sglist, sg, nelems, i) { > + if (sg_has_page(sg)) { > + _dma_cache_sync((unsigned int)sg_virt(sg), sg->length, > + dir); > + } > + } > } > > static inline void > @@ -174,8 +182,12 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, > int i; > struct scatterlist *sg; > > - for_each_sg(sglist, sg, nelems, i) > - _dma_cache_sync((unsigned int)sg_virt(sg), sg->length, dir); > + for_each_sg(sglist, sg, nelems, i) { > + if (sg_has_page(sg)) { > + _dma_cache_sync((unsigned int)sg_virt(sg), sg->length, > + dir); For consistency, could u please fix the left alignment of @dir above - another tab perhaps ? > + } > + } > } > > static inline int dma_supported(struct device *dev, u64 dma_mask) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/