From patchwork Fri Mar 18 02:26:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 64012 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp809116lbc; Thu, 17 Mar 2016 19:28:59 -0700 (PDT) X-Received: by 10.98.13.130 with SMTP id 2mr19887403pfn.97.1458268139840; Thu, 17 Mar 2016 19:28:59 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 73si3529391pfp.195.2016.03.17.19.28.59; Thu, 17 Mar 2016 19:28:59 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752711AbcCRC2r (ORCPT + 30 others); Thu, 17 Mar 2016 22:28:47 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:34976 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752643AbcCRC2j (ORCPT ); Thu, 17 Mar 2016 22:28:39 -0400 Received: from 172.24.1.36 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.36]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DHF35887; Fri, 18 Mar 2016 10:28:35 +0800 (CST) Received: from localhost (10.177.23.164) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Fri, 18 Mar 2016 10:28:24 +0800 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH v2 1/1] arm64/dma-mapping: reduce an unnecessary conversion for coherent DMA Date: Fri, 18 Mar 2016 10:26:07 +0800 Message-ID: <1458267967-6332-2-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1458267967-6332-1-git-send-email-thunder.leizhen@huawei.com> References: <1458267967-6332-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.56EB67D4.008D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 05153eeacbaf28f8dd43e4efca14d97b Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1.For coherent DMA In swiotlb_alloc_coherent, it directly return vaddr on success, and pass vaddr to free_pages on failure. So, we can directly transparent pass vaddr from __dma_free to swiotlb_free_coherent. 2.Keep no change for non-coherent DMA. Signed-off-by: Zhen Lei --- arch/arm64/mm/dma-mapping.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.5.0 diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index a6e757c..ceb2018 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -187,16 +187,22 @@ static void __dma_free(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs) { - void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle)); - size = PAGE_ALIGN(size); if (!is_device_dma_coherent(dev)) { if (__free_from_pool(vaddr, size)) return; vunmap(vaddr); + + /* + * For non-coherent DMA, the vaddr is not part of the linear + * mapping as it has been remapped by __dma_alloc() via + * dma_common_contiguous_remap(), hence for swiotlb freeing we + * need the actual linear map address. + */ + vaddr = phys_to_virt(dma_to_phys(dev, dma_handle)); } - __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs); + __dma_free_coherent(dev, size, vaddr, dma_handle, attrs); } static dma_addr_t __swiotlb_map_page(struct device *dev, struct page *page,