From patchwork Mon May 5 21:43:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 29679 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62C05202E6 for ; Mon, 5 May 2014 21:44:11 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id gq1sf6116602obb.3 for ; Mon, 05 May 2014 14:44:10 -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:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=Zz9mE6rYjF8N/AdN7M6t9wzqbIz+iHSmaT04YlSjcaE=; b=d+TN19OJrntb6NYTGoKo6700O4FaHXtKWTkRI1KtMZRUFhfvZbXjD/llYN0jd2zcqJ eq8zHobIO/bCmJ6HTHSgPmUF+ztxEya4YyoIcvo+xypUU95M/89Wak28jnXwlRZNb408 KmAzHDJH91pxC01dtRDH7Bdt7gxxC/UGsZT4/fVfsVbrdfTSHkdvXLgrTO3Qa0LNBJJc FCOQnfBzIWtDjzVKw8dET47DwG21OwW+WyPl0Pfio4gDLn0+KShBJfurFh+WYc6Y0Zm4 z33AUek8sxcCGLdIzkz8u6JPkIpdigkN2TTREDDZJN18ezH3iUrg/rgaXOUJ49x9ONim Bqrw== X-Gm-Message-State: ALoCoQkM1e7ZlB0S92RyR18R7OkV6ZptC+IVb2OA6IYcRVcAr0n1S4JNL+G6wgTLvCNZsa/pyJR3 X-Received: by 10.42.29.138 with SMTP id r10mr17093351icc.11.1399326250812; Mon, 05 May 2014 14:44:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.33 with SMTP id e30ls266103qge.89.gmail; Mon, 05 May 2014 14:44:10 -0700 (PDT) X-Received: by 10.220.69.72 with SMTP id y8mr29673238vci.21.1399326250650; Mon, 05 May 2014 14:44:10 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id tb2si442824vdc.183.2014.05.05.14.44.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 14:44:10 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if11so9314646vcb.22 for ; Mon, 05 May 2014 14:44:10 -0700 (PDT) X-Received: by 10.220.105.130 with SMTP id t2mr29612990vco.18.1399326250525; Mon, 05 May 2014 14:44:10 -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 ib8csp174135vcb; Mon, 5 May 2014 14:44:09 -0700 (PDT) X-Received: by 10.67.14.231 with SMTP id fj7mr75353626pad.115.1399326249071; Mon, 05 May 2014 14:44:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ln8si9801900pab.408.2014.05.05.14.44.08; Mon, 05 May 2014 14:44:08 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756725AbaEEVoH (ORCPT + 8 others); Mon, 5 May 2014 17:44:07 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:44289 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756251AbaEEVoF (ORCPT ); Mon, 5 May 2014 17:44:05 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s45LhQ25022895; Mon, 5 May 2014 16:43:26 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s45LhPnE004578; Mon, 5 May 2014 16:43:25 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 5 May 2014 16:43:25 -0500 Received: from [158.218.103.31] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s45LhOrk000869; Mon, 5 May 2014 16:43:24 -0500 Message-ID: <536805FC.8090406@ti.com> Date: Mon, 5 May 2014 17:43:24 -0400 From: Santosh Shilimkar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Russell King - ARM Linux CC: , , , Grygorii Strashko , Greg Kroah-Hartman , Arnd Bergmann , Olof Johansson , Grant Likely , Rob Herring , Catalin Marinas , Linus Walleij Subject: Re: [PATCH v3 5/7] ARM: dma: Use dma_pfn_offset for dma address translation References: <1398353407-2345-1-git-send-email-santosh.shilimkar@ti.com> <1398353407-2345-6-git-send-email-santosh.shilimkar@ti.com> <20140502145852.GC3693@n2100.arm.linux.org.uk> <5363B42C.4010404@ti.com> <20140505195040.GE3693@n2100.arm.linux.org.uk> In-Reply-To: <20140505195040.GE3693@n2100.arm.linux.org.uk> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: , On Monday 05 May 2014 03:50 PM, Russell King - ARM Linux wrote: > On Fri, May 02, 2014 at 11:05:16AM -0400, Santosh Shilimkar wrote: >> On Friday 02 May 2014 10:58 AM, Russell King - ARM Linux wrote: >>> On Thu, Apr 24, 2014 at 11:30:05AM -0400, Santosh Shilimkar wrote: >>>> static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) >>>> { >>>> - return (void *)__bus_to_virt((unsigned long)addr); >>>> + if (!dev) >>>> + return (void *)__bus_to_virt((unsigned long)addr); >>>> + else >>>> + return (void *)__bus_to_virt(__pfn_to_bus(dma_to_pfn(dev, addr))); >>> >>> This is quite horrendous. There's easier ways to do this... I assume >>> you haven't looked at the assembler resulting from this at all with >>> stuff like the p2v patching enabled? >>> >> I haven't. Will check. > > if (dev) { > unsigned long pfn = dma_to_pfn(dev, addr); > > return phys_to_virt(__pfn_to_phys(pfn)); > } > > return (void *)__bus_to_virt((unsigned long)addr); > Thanks a lot Russell. Updated patch below for archive records. >From 97a6f063270265d03ffcb010b9dc156b274631e7 Mon Sep 17 00:00:00 2001 From: Grygorii Strashko Date: Thu, 24 Apr 2014 11:30:05 -0400 Subject: [PATCH v3 5/7] ARM: dma: Use dma_pfn_offset for dma address translation 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 Thanks to Russell King for suggesting the optimised macro's for conversion. Cc: Greg Kroah-Hartman Cc: Russell King Cc: Arnd Bergmann Cc: Olof Johansson Cc: Grant Likely Cc: Catalin Marinas Cc: Linus Walleij Reviewed-by: Rob Herring Signed-off-by: Grygorii Strashko Signed-off-by: Santosh Shilimkar --- arch/arm/include/asm/dma-mapping.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index e701a4d..b0c79fd 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -58,21 +58,37 @@ 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) { + if (dev) + pfn -= dev->dma_pfn_offset; return (dma_addr_t)__pfn_to_bus(pfn); } static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) { - return __bus_to_pfn(addr); + unsigned long pfn = __bus_to_pfn(addr); + + if (dev) + pfn += dev->dma_pfn_offset; + + return pfn; } static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) { + if (dev) { + unsigned long pfn = dma_to_pfn(dev, addr); + + return phys_to_virt(__pfn_to_phys(pfn)); + } + return (void *)__bus_to_virt((unsigned long)addr); } static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) { + if (dev) + return pfn_to_dma(dev, virt_to_pfn(addr)); + return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); }