From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH v2 9/9] xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable() Date: Sun, 27 Jan 2013 11:33:28 +0100 Message-ID: <1359282808-31398-10-git-send-email-geert@linux-m68k.org> References: <1359282808-31398-1-git-send-email-geert@linux-m68k.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1359282808-31398-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Marek Szyprowski , linux-xtensa@linux-xtensa.org List-Id: linux-arch.vger.kernel.org xtensa/allmodconfig: drivers/media/v4l2-core/videobuf2-dma-contig.c: In function =E2=80=98vb= 2_dc_mmap=E2=80=99: drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit dec= laration of function =E2=80=98dma_mmap_coherent=E2=80=99 drivers/media/v4l2-core/videobuf2-dma-contig.c: In function =E2=80=98vb= 2_dc_get_base_sgt=E2=80=99: drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit dec= laration of function =E2=80=98dma_get_sgtable=E2=80=99 =46or architectures using dma_map_ops, dma_mmap_coherent() and dma_get_sgtable() are provided in . Xtensa does not use dma_map_ops, hence it should implement them itself. =46or now, use dummy implementations that just return -EINVAL, until th= e API has been finalized. Signed-off-by: Geert Uytterhoeven Cc: Marek Szyprowski Cc: linux-xtensa@linux-xtensa.org --- v2: Dummy implementations that just return -EINVAL --- arch/xtensa/include/asm/dma-mapping.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/includ= e/asm/dma-mapping.h index 4acb5fe..172a02a 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -170,4 +170,19 @@ dma_cache_sync(struct device *dev, void *vaddr, si= ze_t size, consistent_sync(vaddr, size, direction); } =20 +/* Not supported for now */ +static inline int dma_mmap_coherent(struct device *dev, + struct vm_area_struct *vma, void *cpu_addr, + dma_addr_t dma_addr, size_t size) +{ + return -EINVAL; +} + +static inline int dma_get_sgtable(struct device *dev, struct sg_table = *sgt, + void *cpu_addr, dma_addr_t dma_addr, + size_t size) +{ + return -EINVAL; +} + #endif /* _XTENSA_DMA_MAPPING_H */ --=20 1.7.0.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from jacques.telenet-ops.be ([195.130.132.50]:38163 "EHLO jacques.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756512Ab3A0Kdi (ORCPT ); Sun, 27 Jan 2013 05:33:38 -0500 From: Geert Uytterhoeven Subject: [PATCH v2 9/9] xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable() Date: Sun, 27 Jan 2013 11:33:28 +0100 Message-ID: <1359282808-31398-10-git-send-email-geert@linux-m68k.org> In-Reply-To: <1359282808-31398-1-git-send-email-geert@linux-m68k.org> References: <1359282808-31398-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Marek Szyprowski , linux-xtensa@linux-xtensa.org Message-ID: <20130127103328.7x6cbVK0bYmp4na6xaWKOrWQpYrqtyG1YPQ_7VuNfhs@z> xtensa/allmodconfig: drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’: drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’ drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’: drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’ For architectures using dma_map_ops, dma_mmap_coherent() and dma_get_sgtable() are provided in . Xtensa does not use dma_map_ops, hence it should implement them itself. For now, use dummy implementations that just return -EINVAL, until the API has been finalized. Signed-off-by: Geert Uytterhoeven Cc: Marek Szyprowski Cc: linux-xtensa@linux-xtensa.org --- v2: Dummy implementations that just return -EINVAL --- arch/xtensa/include/asm/dma-mapping.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index 4acb5fe..172a02a 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -170,4 +170,19 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, consistent_sync(vaddr, size, direction); } +/* Not supported for now */ +static inline int dma_mmap_coherent(struct device *dev, + struct vm_area_struct *vma, void *cpu_addr, + dma_addr_t dma_addr, size_t size) +{ + return -EINVAL; +} + +static inline int dma_get_sgtable(struct device *dev, struct sg_table *sgt, + void *cpu_addr, dma_addr_t dma_addr, + size_t size) +{ + return -EINVAL; +} + #endif /* _XTENSA_DMA_MAPPING_H */ -- 1.7.0.4