From patchwork Sat Apr 19 14:32:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 28661 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A230820553 for ; Sat, 19 Apr 2014 14:35:20 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp4sf15693392obc.8 for ; Sat, 19 Apr 2014 07:35:20 -0700 (PDT) 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=hxyQJlI/9vG/VyVZX24V/hEc9E3yZC73TvdrhPR4S7xtQWqQqop//saUWQQjp9X5Qj XCemaUD1eGmryiPEMjfhYnAM3VzS//a81PluL05FZKB7Ra8suBJGwdPVygmKq+CqsX/C i3jyoqVKTCpEusG6KdjC+2W6XqXnNiKvXh5jWTwGdV5LfgoYuFTPWEv2bRWuuT9OfKWA cxKGN8jjexppqu8U4zZiBBRjlaPRuTj/HOi4gAhk44pJ/BpDkGvigYBdzbzVyFKy9247 byf6qknkOSwuDpmhpS6+5pz50PJATBhX7ZoUDVDPFgYUaHA75wkXvDjFJkKHJwS0q3q5 NZVQ== X-Gm-Message-State: ALoCoQkeUgeEx6BkYNP7Thq06tDqt67cQtp+HKT0oxi/vFeXNBf2/cxittYgj8f22i/lNbMOjZOT X-Received: by 10.50.43.228 with SMTP id z4mr4943477igl.0.1397918120136; Sat, 19 Apr 2014 07:35:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.137 with SMTP id j9ls1908902qgd.70.gmail; Sat, 19 Apr 2014 07:35:20 -0700 (PDT) X-Received: by 10.52.130.225 with SMTP id oh1mr17297438vdb.8.1397918120033; Sat, 19 Apr 2014 07:35:20 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id xv15si5453183veb.206.2014.04.19.07.35.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 19 Apr 2014 07:35:20 -0700 (PDT) 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 jy13so4997463veb.30 for ; Sat, 19 Apr 2014 07:35:20 -0700 (PDT) X-Received: by 10.58.38.166 with SMTP id h6mr19262869vek.22.1397918119962; Sat, 19 Apr 2014 07:35:19 -0700 (PDT) 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.221.72 with SMTP id ib8csp182220vcb; Sat, 19 Apr 2014 07:35:19 -0700 (PDT) X-Received: by 10.69.0.198 with SMTP id ba6mr28149949pbd.16.1397918119252; Sat, 19 Apr 2014 07:35:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tm7si5445115pab.275.2014.04.19.07.35.18; Sat, 19 Apr 2014 07:35:18 -0700 (PDT) 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 S1755074AbaDSOey (ORCPT + 26 others); Sat, 19 Apr 2014 10:34:54 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:58692 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754283AbaDSOe1 (ORCPT ); Sat, 19 Apr 2014 10:34:27 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3JEXoWC028714; Sat, 19 Apr 2014 09:33:50 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3JEXoFL012799; Sat, 19 Apr 2014 09:33:50 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Sat, 19 Apr 2014 09:33:50 -0500 Received: from ula0393909.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3JEXT33019097; Sat, 19 Apr 2014 09:33:49 -0500 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 v2 5/7] ARM: dma: Use dma_pfn_offset for dma address translation Date: Sat, 19 Apr 2014 10:32:50 -0400 Message-ID: <1397917972-6293-6-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397917972-6293-1-git-send-email-santosh.shilimkar@ti.com> References: <1397917972-6293-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