From patchwork Thu Mar 6 09:19:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 25792 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CB1C203C3 for ; Thu, 6 Mar 2014 09:23:36 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id g12sf8815378oah.11 for ; Thu, 06 Mar 2014 01:23:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=CXEyzIGp2b9XVVWTbaG0okVC61vhq6b80rWkz6dvEco=; b=h9O8c58drcV3TlFS3GhrAs0F5J9AORhlawG2mjSCFcLFPIfMUq9WZLqRGJkbzSPL1x v1F1SIUGxwQtbSkG6+50DLob4v3tiLc/ACUNLvmWWKlJ9yFN6JT2JpjB8jpiCkVzNDMt qnymIZyG5FdIHBjo1SAqx/77YeJof/RQn8jkWteSHOfxXQzTzNoy2i1xd1Ra3ArRJQtv F39WLHLu+u163o7YTWHfz2e844PI+k7g4BMASfATb7wDC41qQiOBWUK3JjahbkCASz5f zS/O2G//Ma2Ggi8mMCGw+4K0j8FPa414e39qDwaapRot+a4JVueKUI7syBNHS39o/00N pk/Q== X-Gm-Message-State: ALoCoQmlq8SdXAL737U5ihplUtQrNqFQOCzWYHeSwdDUIkC9fYrL/qTz8i6BlsEwTPew/Rak1R5u X-Received: by 10.42.123.66 with SMTP id q2mr4092136icr.16.1394097815734; Thu, 06 Mar 2014 01:23:35 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.136 with SMTP id 8ls613521qgh.43.gmail; Thu, 06 Mar 2014 01:23:35 -0800 (PST) X-Received: by 10.52.171.68 with SMTP id as4mr7171570vdc.0.1394097815569; Thu, 06 Mar 2014 01:23:35 -0800 (PST) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id dq2si963250veb.145.2014.03.06.01.23.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Mar 2014 01:23:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id cz12so2311940veb.16 for ; Thu, 06 Mar 2014 01:23:35 -0800 (PST) X-Received: by 10.52.241.106 with SMTP id wh10mr7217509vdc.16.1394097815484; Thu, 06 Mar 2014 01:23:35 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp25238vck; Thu, 6 Mar 2014 01:23:35 -0800 (PST) X-Received: by 10.68.170.66 with SMTP id ak2mr12985214pbc.5.1394097814607; Thu, 06 Mar 2014 01:23:34 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j4si4498819pad.225.2014.03.06.01.23.33; Thu, 06 Mar 2014 01:23:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752958AbaCFJXF (ORCPT + 26 others); Thu, 6 Mar 2014 04:23:05 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:33310 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763AbaCFJVM (ORCPT ); Thu, 6 Mar 2014 04:21:12 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s269Kem7031394; Thu, 6 Mar 2014 03:20:40 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s269KeB0003353; Thu, 6 Mar 2014 03:20:40 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 6 Mar 2014 03:20:40 -0600 Received: from ula0393909.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s269K8N4031770; Thu, 6 Mar 2014 03:20:37 -0600 From: Santosh Shilimkar To: CC: , , Grygorii Strashko , Greg Kroah-Hartman , Russell King , Arnd Bergmann , Olof Johansson , Grant Likely , Rob Herring , Catalin Marinas , Linus Walleij , Santosh Shilimkar Subject: [PATCH 6/7] ARM: dma: Use dma_pfn_offset for dma address translation Date: Thu, 6 Mar 2014 17:19:57 +0800 Message-ID: <1394097598-17622-7-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394097598-17622-1-git-send-email-santosh.shilimkar@ti.com> References: <1394097598-17622-1-git-send-email-santosh.shilimkar@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: santosh.shilimkar@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Grygorii Strashko In most of cases DMA addresses can be performed using offset value of Bus address space relatively to physical address space as following: PFN->DMA: __pfn_to_phys(pfn + [-]dma_pfn_offset) DMA->PFN: __phys_to_pfn(dma_addr) + [-]dma_pfn_offset Cc: Greg Kroah-Hartman Cc: Russell King Cc: Arnd Bergmann Cc: Olof Johansson Cc: Grant Likely Cc: Rob Herring Cc: Catalin Marinas Cc: Linus Walleij Signed-off-by: Grygorii Strashko Signed-off-by: Santosh Shilimkar --- arch/arm/include/asm/dma-mapping.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index e701a4d..8c12149 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -58,22 +58,31 @@ static inline int dma_set_mask(struct device *dev, u64 mask) #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) { - return (dma_addr_t)__pfn_to_bus(pfn); + if (!dev) + return DMA_ERROR_CODE; + return (dma_addr_t)__pfn_to_bus(pfn - dev->dma_pfn_offset); } static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) { - return __bus_to_pfn(addr); + if (!dev) + return 0; + return __bus_to_pfn(addr) + dev->dma_pfn_offset; } static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) { - return (void *)__bus_to_virt((unsigned long)addr); + if (!dev) + return NULL; + return (void *)__bus_to_virt(__pfn_to_bus(dma_to_pfn(dev, addr))); } static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) { - return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); + if (!dev) + return DMA_ERROR_CODE; + return pfn_to_dma(dev, + __bus_to_pfn(__virt_to_bus((unsigned long)(addr)))); } #else