From patchwork Fri Mar 19 18:32:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert Herranz X-Patchwork-Id: 48174 X-Patchwork-Delegate: grant.likely@secretlab.ca Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id DEFDD100910 for ; Sat, 20 Mar 2010 05:34:25 +1100 (EST) Received: from smtp133.mail.ukl.yahoo.com (smtp133.mail.ukl.yahoo.com [77.238.184.64]) by ozlabs.org (Postfix) with SMTP id EF30EB7D5F for ; Sat, 20 Mar 2010 05:32:59 +1100 (EST) Received: (qmail 43456 invoked from network); 19 Mar 2010 18:32:53 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.es; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=zy2DMTiMeYmx/vG+DWrusItYM6+ZLYOeKZNSr5rv4TYtN5pCz/PYgmWblcoUHEZ3V2KE4G2F5xjVVBWXMsk1ECJEVnVJB+LZbLn34v4a5g4Q2cjePrEryBPiBDXvcaon5OTCdhImPk3sBzkI/VB7gFZFIQXVmOVm4AkD7IR3oX8= ; Received: from 37.Red-81-34-164.dynamicIP.rima-tde.net (albert_herranz@81.34.164.37 with login) by smtp133.mail.ukl.yahoo.com with SMTP; 19 Mar 2010 18:32:52 +0000 GMT X-Yahoo-SMTP: czee06uswBAtfIYshc.kP27UlfEXaxwWNSjJ X-YMail-OSG: iyLpkS8VM1lVGOaQfQnE6aPyva.YP3612wBEmq7Qe8Y3YqUyuMErLD4cpQjP4XBxynSJl5.lYUCAW2Otd.lpVWaDnKMm6gP4anFH3qnA939Ws1sAaPRPFtpKNy9pU.nl19PjrUfbHuXWkmkXhXriAACJA53SHTGb0nvXnblYr_mej0Kqy__kSzxVTVJfxAT7GDy04WCXA_5m8AAkkP4nyMHBgsCQ5G1Gx.5PVe7m4p0Q_trqY_N0cOMI6.MD X-Yahoo-Newman-Property: ymail-3 From: Albert Herranz To: linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org Subject: [PATCH v5 03/10] powerpc: add per-device dma coherent support Date: Fri, 19 Mar 2010 19:32:19 +0100 Message-Id: <1269023546-25534-4-git-send-email-albert_herranz@yahoo.es> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1269023546-25534-1-git-send-email-albert_herranz@yahoo.es> References: <1269023546-25534-1-git-send-email-albert_herranz@yahoo.es> Cc: Albert Herranz , konrad.wilk@oracle.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Use the generic per-device dma coherent allocator on powerpc. This allows a driver to declare coherent memory area from where a device can allocate coherent memory chunks. Signed-off-by: Albert Herranz --- arch/powerpc/include/asm/dma-mapping.h | 1 + arch/powerpc/kernel/dma.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index 80a973b..18ecec8 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -17,6 +17,7 @@ #include #include #include +#include #define DMA_ERROR_CODE (~(dma_addr_t)0x0) diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 6215062..83d5232 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -27,6 +27,9 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size, { void *ret; #ifdef CONFIG_NOT_COHERENT_CACHE + if (dma_alloc_from_coherent(dev, size, dma_handle, &ret)) + return ret; + ret = __dma_alloc_coherent(dev, size, dma_handle, flag); if (ret == NULL) return NULL; @@ -54,6 +57,8 @@ void dma_direct_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { #ifdef CONFIG_NOT_COHERENT_CACHE + if (dma_release_from_coherent(dev, get_order(size), vaddr)) + return; __dma_free_coherent(size, vaddr); #else free_pages((unsigned long)vaddr, get_order(size));