From patchwork Thu Nov 1 18:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 10664465 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 C3AEF109C for ; Thu, 1 Nov 2018 18:54:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B28472C180 for ; Thu, 1 Nov 2018 18:54:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6CED2C1C0; Thu, 1 Nov 2018 18:54:08 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 4F55B2C180 for ; Thu, 1 Nov 2018 18:54:08 +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=OC8OvKBGzrcuQJGipoy7ntbJMPQR9vx33PeveVyNqdw=; b=Lu8 m9hJwMjsrqqmPZApRVysYQMHbS1jb+71iU+E9J3VjnbsERgGG8cvqFf2/4Dv+Bi4+JUhWWDJ7N54x Efe65vMI5t3XnWm4dJZ0uetBpyduQmz0BtM+fNYcmJX2lpAbOw5pWO52oV1ZeemrwXafxZRoUhjeQ c8hEAzHPN0pqZt7rRWtp4sTuWwQ1Ziie7WFpNeMNdGFDhR0CReVIlN9T8HYWDLfF7z+uZWHSXXYPz 0Yefr53MChiBFpeVzQT1TnvlFS8CNRAPpiGzhS8AyexAzpyFN/ZnqC51ekn4BclhQxTPkLMKKybUl ZzgJsCvFQJ+kG404dq4GS1/cKnfEj2w==; 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 1gII6U-0005C5-Kn; Thu, 01 Nov 2018 18:54:02 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gII6R-0005B0-Qo for linux-arm-kernel@lists.infradead.org; Thu, 01 Nov 2018 18:54:01 +0000 Received: by mail-pl1-x641.google.com with SMTP id c13-v6so1517823plz.13 for ; Thu, 01 Nov 2018 11:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=uTpWpNZGhoVK3YWg4IywStWPJDkNPjsQamkC499X1uM=; b=iX8LCu/Guh6pwDFuWrVoOZFNlWKDTpqQbSJo/uYVh9++VyPldRsUVcEgJiFw5myTYS TVtmZQ89g4XlZkyJziloQV2LPQodCB3EMup6hdaBHyhy0xkMR23qoNImPx3vNkEIqpC6 8Cypjp1eDnX+nzXe/UIMNQdkorrJVYW+8xcc12GLQW/cwYyKGOLD9K2wqwLFx1K/srJe 7g5l90pEk60+8smTBJkwPvtLvNHRcCxKh3xzeuZLQX2R+61+F7f3tNc/Jq/Y30OG8bvH aih6UmOYIzaViJQg79EyoToN5JTOT6jEXJcUN5ze//WZsPpNb27o6hthhJadbD4wvhIT SruA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uTpWpNZGhoVK3YWg4IywStWPJDkNPjsQamkC499X1uM=; b=MaOGIGxitW2R6VlaFy5nPetgf6sKa6ZQQ21VqkYsi2Mmdg6AAEJNDGmp6p4LWTKg9e 3OZezY+1g3qMWsTUif/TNSHE0hgXpHYAOkU+EVn7a8RGHFiGKozDrbm5SYFO/Em4iHOd u+tkOB2YA+pe5yum0WApTvqUaHs2fP85W6LM7GvhRRT7yDai2RXSPpYYorej4Cevag+B PEjKMNEtsFk7UD1v0onE3jx9+Zuh1bNtAZtA5CtA2K7l7jgwkye31MU/TPE3nXEUbzou oxl5Rok+qty/8cCZbXxHuVw3zPh+5D7RlKGwyqbMsDPAoG0ng5m7s9Sdz0sLtT2wQT4r 7/cA== X-Gm-Message-State: AGRZ1gLcbEGSJjSxIVM6w6HUOMMGdP/J55Rui4ciDyjurED5nzV9LdgT 870zjkNiytiC7TkvWicJ0/fsGQ== X-Google-Smtp-Source: AJdET5eZ8IYS6rH9uSRonPJPbqUrCWJcKFW2Hfor1iCEqsinGdb7OpCDZGID8T99P3XN0yv9DbeQYg== X-Received: by 2002:a17:902:4e25:: with SMTP id f34-v6mr8543351ple.43.1541098427750; Thu, 01 Nov 2018 11:53:47 -0700 (PDT) Received: from localhost.localdomain (99-152-116-91.lightspeed.sntcca.sbcglobal.net. [99.152.116.91]) by smtp.gmail.com with ESMTPSA id u69-v6sm46298545pfk.68.2018.11.01.11.53.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 11:53:46 -0700 (PDT) From: Olof Johansson To: Catalin Marinas , Will Deacon Subject: [PATCH] ARM64: dma: move swiotlb helpers under CONFIG_IOMMU_DMA Date: Thu, 1 Nov 2018 11:53:40 -0700 Message-Id: <20181101185340.32664-1-olof@lixom.net> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181101_115359_869587_ABD3A44C X-CRM114-Status: GOOD ( 14.07 ) 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: Olof Johansson , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Fixes the following tinyconfig warnings: arch/arm64/mm/dma-mapping.c:174:12: warning: '__swiotlb_mmap_pfn' defined but not used [-Wunused-function] arch/arm64/mm/dma-mapping.c:163:12: warning: '__swiotlb_get_sgtable_page' defined but not used [-Wunused-function] Signed-off-by: Olof Johansson --- 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) {