From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hiroshi Doyu Subject: Re: [PATCHv7 9/9] ARM: dma-mapping: add support for IOMMU mapper Date: Thu, 29 Mar 2012 10:19:27 +0300 Message-ID: <20120329101927.8ab6b1993475b7e16ae2258f@nvidia.com> References: <1330527862-16234-1-git-send-email-m.szyprowski@samsung.com> <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> Sender: owner-linux-mm@kvack.org To: Marek Szyprowski Cc: "linux-arm-kernel@lists.infradead.org" , "linaro-mm-sig@lists.linaro.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Shariq Hasnain , Arnd Bergmann , Benjamin Herrenschmidt , Krishna Reddy , Kyungmin Park , Andrzej Pietrasiewicz , Russell King - ARM Linux , KyongHo Cho , Chunsang Jeong List-Id: linux-arch.vger.kernel.org Hi Marek, On Wed, 29 Feb 2012 16:04:22 +0100 Marek Szyprowski wrote: > This patch add a complete implementation of DMA-mapping API for > devices that have IOMMU support. All DMA-mapping calls are supported. > > This patch contains some of the code kindly provided by Krishna Reddy > and Andrzej Pietrasiewicz > > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/arm/Kconfig | 8 + > arch/arm/include/asm/device.h | 3 + > arch/arm/include/asm/dma-iommu.h | 34 ++ > arch/arm/mm/dma-mapping.c | 726 +++++++++++++++++++++++++++++++++++++- > arch/arm/mm/vmregion.h | 2 +- > 5 files changed, 758 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/include/asm/dma-iommu.h > > +/* > + * Map a part of the scatter-gather list into contiguous io address space > + */ > +static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, > + size_t size, dma_addr_t *handle, > + enum dma_data_direction dir) > +{ > + struct dma_iommu_mapping *mapping = dev->archdata.mapping; > + dma_addr_t iova, iova_base; > + int ret = 0; > + unsigned int count; > + struct scatterlist *s; > + > + size = PAGE_ALIGN(size); > + *handle = ARM_DMA_ERROR; > + > + iova_base = iova = __alloc_iova(mapping, size); > + if (iova == ARM_DMA_ERROR) > + return -ENOMEM; > + > + for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) > + { > + phys_addr_t phys = page_to_phys(sg_page(s)); > + unsigned int len = PAGE_ALIGN(s->offset + s->length); > + > + if (!arch_is_coherent()) > + __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); > + > + ret = iommu_map(mapping->domain, iova, phys, len, 0); > + if (ret < 0) > + goto fail; > + count += len >> PAGE_SHIFT; > + iova += len; > + } > + *handle = iova_base; > + > + return 0; > +fail: > + iommu_unmap(mapping->domain, iova_base, count * PAGE_SIZE); > + __free_iova(mapping, iova_base, size); > + return ret; > +} Do we need to set dma_address as below? >From e8bcc3cdac5375b5d7f5ac5b3f716a11c1008f38 Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Thu, 29 Mar 2012 09:59:04 +0300 Subject: [PATCH 1/1] ARM: dma-mapping: Fix dma_address in sglist s->dma_address wasn't set at mapping. Signed-off-by: Hiroshi DOYU --- arch/arm/mm/dma-mapping.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 3347c37..11a9d65 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1111,6 +1111,8 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, ret = iommu_map(mapping->domain, iova, phys, len, 0); if (ret < 0) goto fail; + s->dma_address = iova; + count += len >> PAGE_SHIFT; iova += len; } -- 1.7.5.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hqemgate04.nvidia.com ([216.228.121.35]:1152 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933615Ab2C2HTe (ORCPT ); Thu, 29 Mar 2012 03:19:34 -0400 Date: Thu, 29 Mar 2012 10:19:27 +0300 From: Hiroshi Doyu Subject: Re: [PATCHv7 9/9] ARM: dma-mapping: add support for IOMMU mapper Message-ID: <20120329101927.8ab6b1993475b7e16ae2258f@nvidia.com> In-Reply-To: <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> References: <1330527862-16234-1-git-send-email-m.szyprowski@samsung.com> <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Marek Szyprowski Cc: "linux-arm-kernel@lists.infradead.org" , "linaro-mm-sig@lists.linaro.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Shariq Hasnain , Arnd Bergmann , Benjamin Herrenschmidt , Krishna Reddy , Kyungmin Park , Andrzej Pietrasiewicz , Russell King - ARM Linux , KyongHo Cho , Chunsang Jeong Message-ID: <20120329071927.6zzeKrXMSCFCYTc6uzNsR4fvZuNB7hKbBX0-_0uiBP4@z> Hi Marek, On Wed, 29 Feb 2012 16:04:22 +0100 Marek Szyprowski wrote: > This patch add a complete implementation of DMA-mapping API for > devices that have IOMMU support. All DMA-mapping calls are supported. > > This patch contains some of the code kindly provided by Krishna Reddy > and Andrzej Pietrasiewicz > > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/arm/Kconfig | 8 + > arch/arm/include/asm/device.h | 3 + > arch/arm/include/asm/dma-iommu.h | 34 ++ > arch/arm/mm/dma-mapping.c | 726 +++++++++++++++++++++++++++++++++++++- > arch/arm/mm/vmregion.h | 2 +- > 5 files changed, 758 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/include/asm/dma-iommu.h > > +/* > + * Map a part of the scatter-gather list into contiguous io address space > + */ > +static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, > + size_t size, dma_addr_t *handle, > + enum dma_data_direction dir) > +{ > + struct dma_iommu_mapping *mapping = dev->archdata.mapping; > + dma_addr_t iova, iova_base; > + int ret = 0; > + unsigned int count; > + struct scatterlist *s; > + > + size = PAGE_ALIGN(size); > + *handle = ARM_DMA_ERROR; > + > + iova_base = iova = __alloc_iova(mapping, size); > + if (iova == ARM_DMA_ERROR) > + return -ENOMEM; > + > + for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) > + { > + phys_addr_t phys = page_to_phys(sg_page(s)); > + unsigned int len = PAGE_ALIGN(s->offset + s->length); > + > + if (!arch_is_coherent()) > + __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); > + > + ret = iommu_map(mapping->domain, iova, phys, len, 0); > + if (ret < 0) > + goto fail; > + count += len >> PAGE_SHIFT; > + iova += len; > + } > + *handle = iova_base; > + > + return 0; > +fail: > + iommu_unmap(mapping->domain, iova_base, count * PAGE_SIZE); > + __free_iova(mapping, iova_base, size); > + return ret; > +} Do we need to set dma_address as below? >From e8bcc3cdac5375b5d7f5ac5b3f716a11c1008f38 Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Thu, 29 Mar 2012 09:59:04 +0300 Subject: [PATCH 1/1] ARM: dma-mapping: Fix dma_address in sglist s->dma_address wasn't set at mapping. Signed-off-by: Hiroshi DOYU --- arch/arm/mm/dma-mapping.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 3347c37..11a9d65 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1111,6 +1111,8 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, ret = iommu_map(mapping->domain, iova, phys, len, 0); if (ret < 0) goto fail; + s->dma_address = iova; + count += len >> PAGE_SHIFT; iova += len; } -- 1.7.5.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hiroshi Doyu Subject: Re: [PATCHv7 9/9] ARM: dma-mapping: add support for IOMMU mapper Date: Thu, 29 Mar 2012 10:19:27 +0300 Message-ID: <20120329101927.8ab6b1993475b7e16ae2258f@nvidia.com> References: <1330527862-16234-1-git-send-email-m.szyprowski@samsung.com> <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> Sender: owner-linux-mm@kvack.org To: Marek Szyprowski Cc: "linux-arm-kernel@lists.infradead.org" , "linaro-mm-sig@lists.linaro.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Shariq Hasnain , Arnd Bergmann , Benjamin Herrenschmidt , Krishna Reddy , Kyungmin Park , Andrzej Pietrasiewicz , Russell King - ARM Linux , KyongHo Cho , Chunsang Jeong List-Id: linux-samsung-soc@vger.kernel.org Hi Marek, On Wed, 29 Feb 2012 16:04:22 +0100 Marek Szyprowski wrote: > This patch add a complete implementation of DMA-mapping API for > devices that have IOMMU support. All DMA-mapping calls are supported. > > This patch contains some of the code kindly provided by Krishna Reddy > and Andrzej Pietrasiewicz > > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/arm/Kconfig | 8 + > arch/arm/include/asm/device.h | 3 + > arch/arm/include/asm/dma-iommu.h | 34 ++ > arch/arm/mm/dma-mapping.c | 726 +++++++++++++++++++++++++++++++++++++- > arch/arm/mm/vmregion.h | 2 +- > 5 files changed, 758 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/include/asm/dma-iommu.h > > +/* > + * Map a part of the scatter-gather list into contiguous io address space > + */ > +static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, > + size_t size, dma_addr_t *handle, > + enum dma_data_direction dir) > +{ > + struct dma_iommu_mapping *mapping = dev->archdata.mapping; > + dma_addr_t iova, iova_base; > + int ret = 0; > + unsigned int count; > + struct scatterlist *s; > + > + size = PAGE_ALIGN(size); > + *handle = ARM_DMA_ERROR; > + > + iova_base = iova = __alloc_iova(mapping, size); > + if (iova == ARM_DMA_ERROR) > + return -ENOMEM; > + > + for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) > + { > + phys_addr_t phys = page_to_phys(sg_page(s)); > + unsigned int len = PAGE_ALIGN(s->offset + s->length); > + > + if (!arch_is_coherent()) > + __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); > + > + ret = iommu_map(mapping->domain, iova, phys, len, 0); > + if (ret < 0) > + goto fail; > + count += len >> PAGE_SHIFT; > + iova += len; > + } > + *handle = iova_base; > + > + return 0; > +fail: > + iommu_unmap(mapping->domain, iova_base, count * PAGE_SIZE); > + __free_iova(mapping, iova_base, size); > + return ret; > +} Do we need to set dma_address as below? >>From e8bcc3cdac5375b5d7f5ac5b3f716a11c1008f38 Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Thu, 29 Mar 2012 09:59:04 +0300 Subject: [PATCH 1/1] ARM: dma-mapping: Fix dma_address in sglist s->dma_address wasn't set at mapping. Signed-off-by: Hiroshi DOYU --- arch/arm/mm/dma-mapping.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 3347c37..11a9d65 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1111,6 +1111,8 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, ret = iommu_map(mapping->domain, iova, phys, len, 0); if (ret < 0) goto fail; + s->dma_address = iova; + count += len >> PAGE_SHIFT; iova += len; } -- 1.7.5.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx175.postini.com [74.125.245.175]) by kanga.kvack.org (Postfix) with SMTP id E1B866B0044 for ; Thu, 29 Mar 2012 03:19:33 -0400 (EDT) Date: Thu, 29 Mar 2012 10:19:27 +0300 From: Hiroshi Doyu Subject: Re: [PATCHv7 9/9] ARM: dma-mapping: add support for IOMMU mapper Message-ID: <20120329101927.8ab6b1993475b7e16ae2258f@nvidia.com> In-Reply-To: <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> References: <1330527862-16234-1-git-send-email-m.szyprowski@samsung.com> <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Marek Szyprowski Cc: "linux-arm-kernel@lists.infradead.org" , "linaro-mm-sig@lists.linaro.org" , "linux-mm@kvack.org" , "linux-arch@vger.kernel.org" , "linux-samsung-soc@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Shariq Hasnain , Arnd Bergmann , Benjamin Herrenschmidt , Krishna Reddy , Kyungmin Park , Andrzej Pietrasiewicz , Russell King - ARM Linux , KyongHo Cho , Chunsang Jeong Hi Marek, On Wed, 29 Feb 2012 16:04:22 +0100 Marek Szyprowski wrote: > This patch add a complete implementation of DMA-mapping API for > devices that have IOMMU support. All DMA-mapping calls are supported. > > This patch contains some of the code kindly provided by Krishna Reddy > and Andrzej Pietrasiewicz > > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/arm/Kconfig | 8 + > arch/arm/include/asm/device.h | 3 + > arch/arm/include/asm/dma-iommu.h | 34 ++ > arch/arm/mm/dma-mapping.c | 726 +++++++++++++++++++++++++++++++++++++- > arch/arm/mm/vmregion.h | 2 +- > 5 files changed, 758 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/include/asm/dma-iommu.h > > +/* > + * Map a part of the scatter-gather list into contiguous io address space > + */ > +static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, > + size_t size, dma_addr_t *handle, > + enum dma_data_direction dir) > +{ > + struct dma_iommu_mapping *mapping = dev->archdata.mapping; > + dma_addr_t iova, iova_base; > + int ret = 0; > + unsigned int count; > + struct scatterlist *s; > + > + size = PAGE_ALIGN(size); > + *handle = ARM_DMA_ERROR; > + > + iova_base = iova = __alloc_iova(mapping, size); > + if (iova == ARM_DMA_ERROR) > + return -ENOMEM; > + > + for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) > + { > + phys_addr_t phys = page_to_phys(sg_page(s)); > + unsigned int len = PAGE_ALIGN(s->offset + s->length); > + > + if (!arch_is_coherent()) > + __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); > + > + ret = iommu_map(mapping->domain, iova, phys, len, 0); > + if (ret < 0) > + goto fail; > + count += len >> PAGE_SHIFT; > + iova += len; > + } > + *handle = iova_base; > + > + return 0; > +fail: > + iommu_unmap(mapping->domain, iova_base, count * PAGE_SIZE); > + __free_iova(mapping, iova_base, size); > + return ret; > +} Do we need to set dma_address as below? From mboxrd@z Thu Jan 1 00:00:00 1970 From: hdoyu@nvidia.com (Hiroshi Doyu) Date: Thu, 29 Mar 2012 10:19:27 +0300 Subject: [PATCHv7 9/9] ARM: dma-mapping: add support for IOMMU mapper In-Reply-To: <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> References: <1330527862-16234-1-git-send-email-m.szyprowski@samsung.com> <1330527862-16234-10-git-send-email-m.szyprowski@samsung.com> Message-ID: <20120329101927.8ab6b1993475b7e16ae2258f@nvidia.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Marek, On Wed, 29 Feb 2012 16:04:22 +0100 Marek Szyprowski wrote: > This patch add a complete implementation of DMA-mapping API for > devices that have IOMMU support. All DMA-mapping calls are supported. > > This patch contains some of the code kindly provided by Krishna Reddy > and Andrzej Pietrasiewicz > > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > Reviewed-by: Konrad Rzeszutek Wilk > --- > arch/arm/Kconfig | 8 + > arch/arm/include/asm/device.h | 3 + > arch/arm/include/asm/dma-iommu.h | 34 ++ > arch/arm/mm/dma-mapping.c | 726 +++++++++++++++++++++++++++++++++++++- > arch/arm/mm/vmregion.h | 2 +- > 5 files changed, 758 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/include/asm/dma-iommu.h > > +/* > + * Map a part of the scatter-gather list into contiguous io address space > + */ > +static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, > + size_t size, dma_addr_t *handle, > + enum dma_data_direction dir) > +{ > + struct dma_iommu_mapping *mapping = dev->archdata.mapping; > + dma_addr_t iova, iova_base; > + int ret = 0; > + unsigned int count; > + struct scatterlist *s; > + > + size = PAGE_ALIGN(size); > + *handle = ARM_DMA_ERROR; > + > + iova_base = iova = __alloc_iova(mapping, size); > + if (iova == ARM_DMA_ERROR) > + return -ENOMEM; > + > + for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) > + { > + phys_addr_t phys = page_to_phys(sg_page(s)); > + unsigned int len = PAGE_ALIGN(s->offset + s->length); > + > + if (!arch_is_coherent()) > + __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir); > + > + ret = iommu_map(mapping->domain, iova, phys, len, 0); > + if (ret < 0) > + goto fail; > + count += len >> PAGE_SHIFT; > + iova += len; > + } > + *handle = iova_base; > + > + return 0; > +fail: > + iommu_unmap(mapping->domain, iova_base, count * PAGE_SIZE); > + __free_iova(mapping, iova_base, size); > + return ret; > +} Do we need to set dma_address as below? >>From e8bcc3cdac5375b5d7f5ac5b3f716a11c1008f38 Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Thu, 29 Mar 2012 09:59:04 +0300 Subject: [PATCH 1/1] ARM: dma-mapping: Fix dma_address in sglist s->dma_address wasn't set at mapping. Signed-off-by: Hiroshi DOYU --- arch/arm/mm/dma-mapping.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 3347c37..11a9d65 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1111,6 +1111,8 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, ret = iommu_map(mapping->domain, iova, phys, len, 0); if (ret < 0) goto fail; + s->dma_address = iova; + count += len >> PAGE_SHIFT; iova += len; } -- 1.7.5.4