From patchwork Fri Nov 2 15:26:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10665679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72BF815E9 for ; Fri, 2 Nov 2018 15:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60FEA2B5CA for ; Fri, 2 Nov 2018 15:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54CAB2B5D3; Fri, 2 Nov 2018 15:26:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2FC32B5D3 for ; Fri, 2 Nov 2018 15:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=LFrObcWKprDogVlq9ZcGT2pP8Xu+HTA1kKUaLXQsvDM=; b=dqE BZcaHAh8m8wXsDYZy/OT0nK2ohFowGOo+4xHQo0x8CTmEjpqVYhKGTt+vSXwBK8c455Fau5K4YB+n N4ySEmkP+mluqQ49G4E9h9TckQ+Qojsm4JCLMaeWnVHsLziTPatYfIYmIJEdInJlg5FmPhJLjO/bY sVryUMXG28bOfaFhCfVDca/MPQzwuRm4TAC7RJXvKAxt8jW3FroWs+UDL7I7zkbX3pojshva/Qiqe JmjJW+H/jLNYbHVpw0NZ30HrJ9uS/nJDmmqLEHWuwJlidrYNIZ+tYzyu3qPtMecHozvwj5K9kF4KU W+/OYUCwQ5wyn3fHT7H6S5x+t++DMZg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gIbLW-0004eK-RN; Fri, 02 Nov 2018 15:26:50 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gIbLT-0004d3-OH for linux-arm-kernel@lists.infradead.org; Fri, 02 Nov 2018 15:26:49 +0000 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MpUQm-1fkbtv0co8-00psVf; Fri, 02 Nov 2018 16:26:27 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MpUQm-1fkbtv0co8-00psVf; Fri, 02 Nov 2018 16:26:27 +0100 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: hide unused swiotlb functions Date: Fri, 2 Nov 2018 16:26:07 +0100 Message-Id: <20181102152624.1189250-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:nCNobV5nkfMsmcJ90ROBj8orktsO+6LRBsyBptMRjN1OTdoTmzO qXwwZq/400SznBVzzHF1Jp8oFMF+UWbR8c1Ayr78PaXDee4gwzvfDYwiydcl1Te1so9lLZd x6n0926Pw9z7utu69cTtEN2MCJC7GIWKNixTHcpJuBWCvBt340lI5ooa8eHrz49w/ByH9d0 1/AuAKklLf4CIK2eSk/Bg== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZoGz1/CV6KA=:XrGZ25MPya55RcATpawBlL AnL6gekBndH7pDvAHsAaWkCVMD5vfvl0TfnCUtE3rblrhNHtxJHXsWhGpGtxba+8XdCI/N+vt PgwfOluK25Ot84QPfGkvoq4HVS5Iy9frnr/GYcPWPuRAFqgAscTdui6ww8k500KSWBMCstdIp 55s9YopowXBeG+tky4hECO0CozWktmkU5NbBwbRUPIpXbLkZ2mmCYexlnf+AqKz/bG50Un1fX H4PhlUsFDMsdsFZwxfFEvC1m0HSTl1TQvpBvJbcRM3Lzv5wd2xwK+eORCPfWdS4cS0A82J1/8 DnK/2Y7FuCIZOWHMyJYt1914yzhWYLJAT23Fltj00OjNYgzs9voMS0cutuibLFaCJaA3ZUthB wDpwn4ubMvncx3uxOWAQAZL4Tp58o1GeJYhTebCIXisl3+2KeYfQVydKyBA9Xd3Mdxjxlw1QX 2mtf1JZIYjKCDGAVCMLX1BvLis++IWGkXjqSsJWG/1PhWnPGOSe3Y4doz6X83wM8fWPdocsro EhnKoXzrVFh0zVvQH9PwiSnSx7xnUe/bDuKb485keKVU/3inlmEQ6IYzYDfF9HZoYUtEgA9+n Gxz6QZgI6DP6rU1XHDwGsPTUV9zeWO8VeOXKFB+iZzmqzGu3an30BLhTYkXrmlmivY8ReqVL0 3E/7vbYQcKTtbbe5drviAWO74O2NomSMeN2ZSSV6y+CPICpmAFI9PunsFmd8ZBVP/9rQ= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181102_082648_091652_2500A44B X-CRM114-Status: GOOD ( 13.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, Robin Murphy , Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP After a good chunk of the swiotlb code has been replaced with the generic version, two functions are only used from inside of an #ifdef: arch/arm64/mm/dma-mapping.c:174:12: error: '__swiotlb_mmap_pfn' defined but not used [-Werror=unused-function] static int __swiotlb_mmap_pfn(struct vm_area_struct *vma, ^~~~~~~~~~~~~~~~~~ arch/arm64/mm/dma-mapping.c:163:12: error: '__swiotlb_get_sgtable_page' defined but not used [-Werror=unused-function] static int __swiotlb_get_sgtable_page(struct sg_table *sgt, Move them into the same #ifdef section to avoid that warning. Fixes: 886643b76632 ("arm64: use the generic swiotlb_dma_ops") Signed-off-by: Arnd Bergmann --- arch/arm64/mm/dma-mapping.c | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 3a703e5d4e32..62356c64e180 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -160,35 +160,6 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, __dma_unmap_area(phys_to_virt(paddr), size, dir); } -static int __swiotlb_get_sgtable_page(struct sg_table *sgt, - struct page *page, size_t size) -{ - int ret = sg_alloc_table(sgt, 1, GFP_KERNEL); - - if (!ret) - sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); - - return ret; -} - -static int __swiotlb_mmap_pfn(struct vm_area_struct *vma, - unsigned long pfn, size_t size) -{ - int ret = -ENXIO; - unsigned long nr_vma_pages = vma_pages(vma); - unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; - unsigned long off = vma->vm_pgoff; - - if (off < nr_pages && nr_vma_pages <= (nr_pages - off)) { - ret = remap_pfn_range(vma, vma->vm_start, - pfn + off, - vma->vm_end - vma->vm_start, - vma->vm_page_prot); - } - - return ret; -} - static int __init atomic_pool_init(void) { pgprot_t prot = __pgprot(PROT_NORMAL_NC); @@ -358,6 +329,35 @@ arch_initcall(arm64_dma_init); #include #include +static int __swiotlb_get_sgtable_page(struct sg_table *sgt, + struct page *page, size_t size) +{ + int ret = sg_alloc_table(sgt, 1, GFP_KERNEL); + + if (!ret) + sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); + + return ret; +} + +static int __swiotlb_mmap_pfn(struct vm_area_struct *vma, + unsigned long pfn, size_t size) +{ + int ret = -ENXIO; + unsigned long nr_vma_pages = vma_pages(vma); + unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long off = vma->vm_pgoff; + + if (off < nr_pages && nr_vma_pages <= (nr_pages - off)) { + ret = remap_pfn_range(vma, vma->vm_start, + pfn + off, + vma->vm_end - vma->vm_start, + vma->vm_page_prot); + } + + return ret; +} + /* Thankfully, all cache ops are by VA so we can ignore phys here */ static void flush_page(struct device *dev, const void *virt, phys_addr_t phys) {